Skip to content

C
court-inner
Commit eb47f27e by 杨琪琪
Options

Merge branch 'master' of http://139.159.239.83:9093/mxl/court-inner 

# Conflicts:
#	.env.development
合并
parents 8ce51df8 c103cc9a
Showing with 223 additions and 20 deletions
.env.development
ENV = 'development'
VUE_APP_BASE_API = 'http://192.168.0.138:9888'
VUE_APP_WS_API = 'ws://192.168..0.138:9888'
VUE_APP_FILE_API = 'http://192.168.0.138:9888'
VUE_APP_BASE_API = 'http://192.168.11.45:9888'
VUE_APP_WS_API = 'ws://192.168..11.45:9888'
VUE_APP_FILE_API = 'http://192.168.11.45:9888'
VUE_APP_LOGIN_API = 'http://171.106.48.55:36003/cas/login?service=http://192.168.0.138:9888/oauth/login?systemTag=oa-interInformation'
VUE_APP_LOGIN_API = 'http://171.106.48.55:36003/cas/login?service=http://192.168.11.45:9888/oauth/login?systemTag=oa-interInformation'
#获取菜单标识
VUE_APP_SYSTEAMTAG = ''
......
public/index.html
......@@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>court-oa-meeting</title>
<title>内部信息网</title>
<!-- <title></title> -->
</head>
<body>
......
src/api/homePage.js
......@@ -127,3 +127,12 @@ export function enableTurnOnSystem(data) {
})
}
// // 干警栏目
// export function getBoardAndSubAllNews(data) {
// return request({
// url: `/websiteCluster/web/getBoardAndSubAllNews`,
// method: 'POST',
// data,
// })
// }
src/api/manage/manage.js
......@@ -233,3 +233,36 @@ export const sendBatchAssRemindSms = (data) => {
})
}
//获取指定栏目审核人
export const getAssUserList = (data) => {
return request({
url: 'websiteCluster/website/getAssUserList',
method: 'POST',
data
})
}
export const getAssUserRecently = (data) => {
return request({
url: 'websiteCluster/website/getAssUserRecently',
method: 'POST',
data
})
}
export const boardList = (data) => {
return request({
url: 'websiteCluster/website/boardList',
method: 'POST',
data
})
}
export const boardDetail = (data) => {
return request({
url: 'websiteCluster/board/boardDetail',
method: 'POST',
data
})
}
src/views/home.vue
......@@ -87,9 +87,9 @@ import { mapGetters, mapMutations } from "vuex";
import { setUserInfo } from "@/utils/auth";
import { getInfo,logout } from "@/api/login";
import { removeToken,getToken } from "@/utils/auth";
import {
enableTurnOnSystem
} from "@/api/homePage.js"
// import {
// enableTurnOnSystem
// } from "@/api/homePage.js"
export default {
components: {
......@@ -104,7 +104,7 @@ export default {
created() {
if(getToken()){
this.getUserInfo();
this.enableTurnOnSystem();
// this.enableTurnOnSystem();
}
},
......@@ -135,11 +135,11 @@ export default {
console.log('loginURL222222222222==',process.env.VUE_APP_LOGIN_API);
location.href = process.env.VUE_APP_LOGIN_API
},
enableTurnOnSystem(){
enableTurnOnSystem().then((res) => {
sessionStorage.setItem('publishFlag',res.success);
});
}
// enableTurnOnSystem(){
// enableTurnOnSystem().then((res) => {
// sessionStorage.setItem('publishFlag',res.success);
// });
// }
},
};
</script>
......
src/views/list/index.vue
......@@ -388,12 +388,13 @@ export default {
},
// 查看详情
setParams(val){
this.$router.push({
path:'/detail',//跳转路由
query:{//参数对象
newsId:val.newsId
}
});
window.open(`/#/detail?newsId=${val.newsId}`,'_blank');
// this.$router.push({
// path:'/detail',//跳转路由
// query:{//参数对象
// newsId:val.newsId
// }
// });
},
},
};
......
src/views/manage/audit.vue 0 → 100644
<template>
<div>
<el-dialog :visible.sync="visible" title="提交审核" width="380px">
<div>
<el-input
type="textarea"
disabled
placeholder="请选择用户"
:value="selectUser.nickName || ''"
></el-input>
</div>
<div class="mt-10 text-center">
<el-button @click="getAssUserRecently" size="mini"
>最近联系人</el-button
>
<el-button @click="userShow = true" size="mini">选择审核用户</el-button>
<el-button @click="selectUser = {}" size="mini">清空</el-button>
</div>
<div class="mt-15 text-center">
<el-button @click="submit" size="mini" type="primary"
>确认</el-button
>
<el-button @click="visible = false" size="mini" type="danger"
>关闭</el-button
>
</div>
</el-dialog>
<el-dialog :visible.sync="userShow" title="选择审核人" width="380px">
<div>
<div>
<div class="title">板块负责人</div>
<div
v-for="(item, index) in assUserList.moderatorList"
:key="index"
class="list"
@click="select(item)"
>
{{ item.nickName }}
</div>
</div>
<div class="mt-20">
<div class="title">板块审核人</div>
<div
v-for="(item, index) in assUserList.assessorList"
:key="index"
class="list"
@click="select(item)"
>
{{ item.nickName }}
</div>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
import { getAssUserList, getAssUserRecently } from "@/api/manage/manage";
export default {
data() {
return {
visible: false,
param: {},
//审核列表
userShow: false,
assUserList: {},
selectUser: {},
};
},
created() {},
methods: {
//显示审核框
dialogShow(param) {
console.log(param);
this.visible = true;
this.param = param;
this.getAssUserList();
},
//隐藏提交审核框
dialogClose() {
this.visible = false;
},
select(item) {
this.selectUser = item;
console.log(item);
this.userShow = false;
},
//获取审核人员
getAssUserList() {
getAssUserList({
boardId: this.param.boardId,
}).then((res) => {
if (res) {
this.assUserList = res.data;
} else {
this.$message.error(res.errMsg);
}
});
},
//最近审核人
getAssUserRecently() {
getAssUserRecently({
boardId: this.param.boardId,
}).then((res) => {
if (res.success) {
this.selectUser = res.data.id ? res.data : {};
} else {
this.$message.error(res.errMsg);
}
});
},
//提交
submit() {
this.$emit("submit", this.selectUser);
this.dialogClose();
},
},
};
</script>
<style lang="scss" scoped>
::v-deep {
.el-textarea__inner {
font-size: 18px;
}
.el-textarea.is-disabled .el-textarea__inner {
color: #303133;
}
}
.title {
line-height: 30px;
color: #333333;
background: #eeeeee;
text-align: center;
}
.list {
line-height: 30px;
// border-radius: 4px;
padding: 0 10px;
margin-top: 5px;
// text-align: center;
}
.list:hover {
background: #e6a23c;
// border-radius: 4px;
color: #ffffff;
font-weight: bold;
cursor: pointer;
}
</style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment