提交 3be5a510 编写于 作者: 刘英杰's avatar 刘英杰

Merge remote-tracking branch 'origin/wx' into wx

# Conflicts:
#	dist/index.html
#	dist/static/css/chunk-6a5a2e48.3f17dbaf.css
#	dist/static/css/chunk-719b0e87.3c931f7e.css
#	dist/static/js/chunk-719b0e87.6073d2f0.js
#	dist/static/js/chunk-ca7f468e.e6d8923f.js
流水线 #36472 已通过 ,包含阶段
in 2 minute 和 29 second
# 制度文件移动端 # 制度文件移动端
单点:cardToSSo?token=真实token
\ No newline at end of file
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,minimum-scale=1,viewport-fit=cover"><link rel="icon" href="favicon.ico"><title>制度文件</title><link href="static/css/chunk-0a4c7d10.0d4ffbe9.css" rel="prefetch"><link href="static/css/chunk-6a5a2e48.3f17dbaf.css" rel="prefetch"><link href="static/css/chunk-719b0e87.3c931f7e.css" rel="prefetch"><link href="static/css/chunk-ca7f468e.331f546b.css" rel="prefetch"><link href="static/js/chunk-0a4c7d10.ef68b27b.js" rel="prefetch"><link href="static/js/chunk-6a5a2e48.835587d9.js" rel="prefetch"><link href="static/js/chunk-719b0e87.6073d2f0.js" rel="prefetch"><link href="static/js/chunk-ca7f468e.e6d8923f.js" rel="prefetch"><link href="static/css/app~748942c6.1203707a.css" rel="preload" as="style"><link href="static/css/chunk-vendors~253ae210.09af4a6b.css" rel="preload" as="style"><link href="static/css/chunk-vendors~cfbf0a2e.48dbcca1.css" rel="preload" as="style"><link href="static/js/app~748942c6.234fcb2d.js" rel="preload" as="script"><link href="static/js/chunk-vendors~253ae210.b50231cf.js" rel="preload" as="script"><link href="static/js/chunk-vendors~2a42e354.a4bc0fdf.js" rel="preload" as="script"><link href="static/js/chunk-vendors~7d359b94.08414d6d.js" rel="preload" as="script"><link href="static/js/chunk-vendors~ac50015d.fd71f295.js" rel="preload" as="script"><link href="static/js/chunk-vendors~cfbf0a2e.db930841.js" rel="preload" as="script"><link href="static/css/chunk-vendors~253ae210.09af4a6b.css" rel="stylesheet"><link href="static/css/chunk-vendors~cfbf0a2e.48dbcca1.css" rel="stylesheet"><link href="static/css/app~748942c6.1203707a.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but votemanage_webapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="static/js/chunk-vendors~253ae210.b50231cf.js"></script><script src="static/js/chunk-vendors~2a42e354.a4bc0fdf.js"></script><script src="static/js/chunk-vendors~ac50015d.fd71f295.js"></script><script src="static/js/chunk-vendors~7d359b94.08414d6d.js"></script><script src="static/js/chunk-vendors~cfbf0a2e.db930841.js"></script><script src="static/js/app~748942c6.234fcb2d.js"></script></body></html>
\ No newline at end of file
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
...@@ -9,7 +9,7 @@ import 'vant/lib/index.css'; ...@@ -9,7 +9,7 @@ import 'vant/lib/index.css';
export function setSession(value,key){ export function setSession(value,key){
//设置session //设置session
window.sessionStorage.setItem(JSON.stringify(value),key); window.sessionStorage.setItem(key,JSON.stringify(value));
} }
export function getSession(key1){ export function getSession(key1){
//获取session //获取session
......
...@@ -22,7 +22,7 @@ const routes = [ ...@@ -22,7 +22,7 @@ const routes = [
keepAlive: false, keepAlive: false,
} }
}, },
/*{ /* {
path: "/", path: "/",
name: "home", name: "home",
component: () => import('@/views/home/index'), component: () => import('@/views/home/index'),
...@@ -49,6 +49,16 @@ const routes = [ ...@@ -49,6 +49,16 @@ const routes = [
keepAlive: false, keepAlive: false,
} }
},*/ },*/
{
path: "/newsColumns",
name: "newsColumns",
component: () => import('@/views/newsColumns/index'),
meta: {
title: '文件栏目',
keepAlive: false,
}
},
{ {
path: "/newsList", path: "/newsList",
name: "newsList", name: "newsList",
......
...@@ -14,7 +14,7 @@ export default { ...@@ -14,7 +14,7 @@ export default {
getTokenInfo({username: decode.id}).then(res => { getTokenInfo({username: decode.id}).then(res => {
hooks.setStorage(res.data[0],"accuracyControlDocumentWxUserInfo") hooks.setStorage(res.data[0],"accuracyControlDocumentWxUserInfo")
this.$router.replace({ this.$router.replace({
path: "/newsList", path: "/newsColumns",
}) })
}) })
} }
......
此差异已折叠。
...@@ -188,7 +188,8 @@ export default { ...@@ -188,7 +188,8 @@ export default {
getDataFIle() { getDataFIle() {
//获取附件数据 //获取附件数据
SelectFileForDb({masterId: this.routeData.id}).then(resp => { SelectFileForDb({masterId: this.routeData.id}).then(resp => {
this.details.file = resp.data console.log("resp🚀🚀,",resp)
this.details.file = resp.data.filter(cur=>cur!==null)
return resp return resp
}) })
}, },
...@@ -255,8 +256,8 @@ export default { ...@@ -255,8 +256,8 @@ export default {
this.onLoad(); this.onLoad();
}, },
onClickLeft() { onClickLeft() {
this.$router.back()
this.$router.replace("newsList"); // this.$router.replace("newsList");
}, },
//////////////搜索////////////////// //////////////搜索//////////////////
//发布状态 //发布状态
......
...@@ -10,7 +10,20 @@ ...@@ -10,7 +10,20 @@
<template #title> <template #title>
<div> <div>
<van-dropdown-menu :z-index="999" class="selectItem"> <van-dropdown-menu :z-index="999" class="selectItem">
<van-dropdown-item v-model="search.value1" :options="search.option1"/> <van-dropdown-item v-model="search.value1" :options="search.option1">
<template #title>
<div style="width: 100%;height: 100%;display: flex;align-items: center;justify-content: center;">
<span v-if="search.value1"
style="margin-right: 5px; width: 22px;height:22px;border-radius: 50%; background: #8cbcff;color: white;display: flex;justify-content: center;align-items: center">
{{ search.option1.find(cur => cur.value === search.value1).num }}
</span>
<span v-if="search.value1"
style="font-size: 18px;font-family: 黑体">{{
search.option1.find(cur => cur.value === search.value1).text
}}</span>
</div>
</template>
</van-dropdown-item>
</van-dropdown-menu> </van-dropdown-menu>
</div> </div>
</template> </template>
...@@ -57,70 +70,6 @@ ...@@ -57,70 +70,6 @@
</van-cell> </van-cell>
</van-cell-group> </van-cell-group>
<!-- <van-pull-refresh
v-model="refreshing"
@refresh="onRefresh"
success-text="刷新成功"
>
<van-list
v-model="loading"
:finished="finished"
finished-text="没有更多了"
@load="onLoad"
>
<div
class="list"
v-for="(item, index) in list"
:key="index"
>
<van-image
width="55"
height="55"
style="position: absolute;right: 0;z-index: 1;"
:src="item.发布状态标识 == '0'?require('@/assets/images/svg/待发布.svg'):require('@/assets/images/svg/已发布.svg')"
/>
<van-cell-group>
<van-cell :border="true">
<template #title>
<div style="font-size: 16px;min-width: 300px">
<div>{{item.标题}}</div>
</div>
</template>
</van-cell>
<div style="margin: 12px 0;">
<van-cell
title="栏目"
:value="item.一级栏目名"
:border="false"
class="cellStyle_middle"
/>
<van-cell
title="日期"
:value="item.日期"
:border="false"
class="cellStyle_middle"
/>
<van-cell
title="发布时间"
:value="item.发布时间"
:border="false"
class="cellStyle_middle"
/>
</div>
<van-row style="margin: 12px" gutter="20">
<van-col span="12"><van-button block round plain type="info" class="btn"
@click="goDetail(item.id,item.发布状态标识)" >编辑</van-button></van-col>
<van-col span="12">
<van-button block round plain type="info" class="btn" @click="handle_('Issue',item)" v-if="item.发布状态标识 == 0">发布</van-button>
<van-button block round plain type="info" class="btn" @click="handle_('revocation',item)" v-if="item.发布状态标识 == 1">撤回</van-button>
</van-col>
</van-row>
</van-cell-group>
</div>
</van-list>
</van-pull-refresh>-->
</div> </div>
</div> </div>
</template> </template>
...@@ -134,16 +83,14 @@ import {Toast} from "vant"; ...@@ -134,16 +83,14 @@ import {Toast} from "vant";
export default { export default {
data() { data() {
return { return {
aaa:123123, aaa: 123123,
timer: {}, timer: {},
userInfo: hooks.getStorage("accuracyControlDocumentWxUserInfo"), userInfo: hooks.getStorage("accuracyControlDocumentWxUserInfo"),
columns: { columns: {
data: [], data: [],
}, },
search: { search: {
option1: [ option1: [],
],
value1: 0, value1: 0,
params: { params: {
columnId: '', columnId: '',
...@@ -193,9 +140,10 @@ export default { ...@@ -193,9 +140,10 @@ export default {
return { return {
text: cur.name, text: cur.name,
value: cur.columnId, value: cur.columnId,
num: cur.num,
} }
}) })
this.search.value1 = this.search.option1[0].value; this.search.value1 = this.$route.query.id ? this.$route.query.id : this.search.option1[0].value; //默认拿第一项 或拿路由
this.search.params = { this.search.params = {
columnId: this.search.value1, columnId: this.search.value1,
department: this.userInfo.departmentName, department: this.userInfo.departmentName,
...@@ -227,7 +175,7 @@ export default { ...@@ -227,7 +175,7 @@ export default {
this.search.params = { this.search.params = {
columnId: this.searchValue === '' ? this.search.value1 : this.searchValue, columnId: this.searchValue === '' ? this.search.value1 : this.searchValue,
department: this.userInfo.departmentName, department: this.userInfo.departmentName,
name:this.searchValue === '' ? 'ColumnId' : 'Title' , name: this.searchValue === '' ? 'ColumnId' : 'Title',
teacherId: this.userInfo.id, teacherId: this.userInfo.id,
teacherName: this.userInfo.name, teacherName: this.userInfo.name,
} }
...@@ -242,7 +190,7 @@ export default { ...@@ -242,7 +190,7 @@ export default {
}); });
//获取栏目下的数据 //获取栏目下的数据
ShowIndexResult(this.search.params).then((resp) => { ShowIndexResult(this.search.params).then((resp) => {
if (resp.data!==null){ if (resp.data !== null) {
let currentSelectName = this.search.option1.find(cur => { let currentSelectName = this.search.option1.find(cur => {
return cur.value === this.search.value1 return cur.value === this.search.value1
}).text }).text
...@@ -255,7 +203,7 @@ export default { ...@@ -255,7 +203,7 @@ export default {
this.aaa++ this.aaa++
return resp return resp
}).finally(()=>{ }).finally(() => {
toast.close(); toast.close();
}); });
}, },
...@@ -387,7 +335,7 @@ export default { ...@@ -387,7 +335,7 @@ export default {
this.onLoad(); this.onLoad();
},*/ },*/
onClickLeft() { onClickLeft() {
window.location.href = "/TeacherMobOA" this.$router.replace('/newsColumns')
}, },
//////////////搜索////////////////// //////////////搜索//////////////////
//发布状态 //发布状态
...@@ -537,9 +485,11 @@ export default { ...@@ -537,9 +485,11 @@ export default {
line-height: 36px; line-height: 36px;
background-color: #fff; background-color: #fff;
} }
/deep/.van-dropdown-item__option--active .van-dropdown-item__icon {
/deep/ .van-dropdown-item__option--active .van-dropdown-item__icon {
color: #1989fa; color: #1989fa;
} }
/deep/ .van-dropdown-menu__title--active { /deep/ .van-dropdown-menu__title--active {
color: #2aa9ff; color: #2aa9ff;
} }
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或