diff --git a/epmet-oper-web/package.json b/epmet-oper-web/package.json index 03e1fcb..035c6fa 100644 --- a/epmet-oper-web/package.json +++ b/epmet-oper-web/package.json @@ -27,6 +27,7 @@ "gulp-rename": "^1.4.0", "gulp-sass": "^4.0.2", "js-cookie": "^2.2.0", + "jsencrypt": "^3.0.3", "lodash": "^4.17.15", "node-sass": "^4.12.0", "portfinder": "^1.0.21", diff --git a/epmet-oper-web/src/App.vue b/epmet-oper-web/src/App.vue index 16e4c02..bfd2d4d 100644 --- a/epmet-oper-web/src/App.vue +++ b/epmet-oper-web/src/App.vue @@ -50,7 +50,7 @@ export default { localStorage.setItem('userType', 'oper') } - console.log("为空后设置默认值：：：：" + localStorage.getItem('userType')) + //console.log("为空后设置默认值：：：：" + localStorage.getItem('userType')) const that = this let envShow = process.env.VUE_APP_NODE_ENV let env = 'dev' diff --git a/epmet-oper-web/src/js/ajax.js b/epmet-oper-web/src/js/ajax.js index 367d22e..8467b60 100644 --- a/epmet-oper-web/src/js/ajax.js +++ b/epmet-oper-web/src/js/ajax.js @@ -88,9 +88,17 @@ axios.interceptors.request.use( */ axios.interceptors.response.use( (response) => { - if (response.data.code === 401 || response.data.code === 10001) { + if (response.data.code === 401 || response.data.code === 10001 || response.data.code === 10005) { + debugger; clearLoginInfo() - router.replace({ name: 'login' }) + localStorage.setItem('userType', 'work') + let userType = localStorage.getItem("userType"); + if (userType === 'work'){ + router.replace({ name: 'loginWork' }) + }else { + router.replace({ name: 'login' }) + } + return Promise.reject(response.data.msg) } return response diff --git a/epmet-oper-web/src/router/index.js b/epmet-oper-web/src/router/index.js index 54dd2a6..696a7dd 100644 --- a/epmet-oper-web/src/router/index.js +++ b/epmet-oper-web/src/router/index.js @@ -119,10 +119,62 @@ router.beforeEach((to, from, next) => { // 获取菜单列表, 添加并全局变量保存 const userType = localStorage.getItem('userType') - console.log('获取菜单：：：：' + localStorage.getItem('userType')) + if (userType === 'work') { - http + const customerId=localStorage.getItem('customerId') + console.log('customerId：' ,customerId) + if(customerId==='1e68188b8f7e9ab15658c164bd5b3676'){ + // if(customerId==='45687aa479955f9d06204d415238f7cc'){ + const menuList=[ + { + children: [], + createdBy: "a76fc711807ac9827d7611b0f94ec220", + createdTime: "2020-08-26 16:38", + delFlag: null, + icon: "icon-database", + id: "abe812eb350f6b5eda575e268e50ac1c", + name: "定制功能配置", + parentName: null, + permissions: "", + pid: "0", + resourceList: null, + revision: 0, + showFlag: 1, + sort: 2, + type: 0, + updatedBy: "a76fc711807ac9827d7611b0f94ec220", + updatedTime: "2020-09-02 14:49", + url: "customer/customize/ConfigItem", + }, + { + children: [], + createdBy: "a76fc711807ac9827d7611b0f94ec220", + createdTime: "2020-08-26 16:38", + delFlag: null, + icon: "icon-file-text", + id: "8e55eba74c920c00c44c125e3bc73ddc", + name: "居民端首页配置", + parentName: null, + permissions: "", + pid: "0", + resourceList: null, + revision: 0, + showFlag: 1, + sort: 3, + type: 0, + updatedBy: "a76fc711807ac9827d7611b0f94ec220", + updatedTime: "2020-09-02 14:49", + url: "customer/customize/MiniHome", + } + ] + + window.SITE_CONFIG['menuList'] = menuList + fnAddDynamicMenuRoutes(window.SITE_CONFIG['menuList']) + // next({ ...to, replace: true }) + next({ ...to, replace: true }) + }else{ + http .get('/gov/access/menu/nav') .then(({ data: res }) => { if (res.code !== 0) { @@ -137,6 +189,12 @@ router.beforeEach((to, from, next) => { .catch(() => { next({ name: 'loginWork' }) }) + } + + // localStorage.getItem('customerId') + // 1e68188b8f7e9ab15658c164bd5b3676 + + } else { http .get('/oper/access/menu/nav') diff --git a/epmet-oper-web/src/views/main-navbar.vue b/epmet-oper-web/src/views/main-navbar.vue index f8f936e..1f6024e 100644 --- a/epmet-oper-web/src/views/main-navbar.vue +++ b/epmet-oper-web/src/views/main-navbar.vue @@ -1,88 +1,94 @@ + + diff --git a/epmet-oper-web/src/views/main-sidebar.vue b/epmet-oper-web/src/views/main-sidebar.vue index 9cd7fb0..bdf212a 100644 --- a/epmet-oper-web/src/views/main-sidebar.vue +++ b/epmet-oper-web/src/views/main-sidebar.vue @@ -30,7 +30,8 @@ export default { } diff --git a/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue b/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue index 6205f6c..33ef701 100644 --- a/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue +++ b/epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue @@ -42,7 +42,7 @@ fixed="right" header-align="center" align="center" - width="400"> + width="500"> @@ -87,6 +87,10 @@ :tableKeywork="'FootBarCustomize'" @cancleBack="cancleBack"> +
+ +
0) { this.tableData = this.$refs.table.getTableData() // 获取表格数据 - console.log(this.tableData) + //console.log(this.tableData) this.startLoading() let resultList = [] let one = {} @@ -266,7 +266,7 @@ export default { resultList.push(obj) } } - console.log(resultList) + //console.log(resultList) // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfunctiondetail/updatedisplayorder' const url = '/oper/customize/customerfunctiondetail/updatedisplayorder' diff --git a/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue b/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue index edd22d5..1056a64 100644 --- a/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue +++ b/epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue @@ -632,7 +632,7 @@ export default { } })] this.cptTypeList = list - console.log('可用组件列表', list) + //console.log('可用组件列表', list) } }).catch((err) => { console.log(err) @@ -658,7 +658,7 @@ export default { ] this.cptList = list.map(this.processBackendCptData) this.lastSavedCptList = cloneDeep(this.cptList) - console.log('用户储存组件列表', list) + //console.log('用户储存组件列表', list) } }).catch((err) => { console.log(err) diff --git a/epmet-oper-web/src/views/modules/customer/feedback/DetailForm.vue b/epmet-oper-web/src/views/modules/customer/feedback/DetailForm.vue index 446d1f6..81982e6 100644 --- a/epmet-oper-web/src/views/modules/customer/feedback/DetailForm.vue +++ b/epmet-oper-web/src/views/modules/customer/feedback/DetailForm.vue @@ -143,11 +143,17 @@
{{'建议图片'}}
- + + @@ -229,12 +235,17 @@
{{'政府回复取证'}}
- - + + @@ -355,6 +366,8 @@ export default { span2Title: 3, span2Con: 20, + srcList: [], + diaVisible: false, adviceId: '',//建议id，父组件传来 adviceData: { diff --git a/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue index 249955d..c914509 100644 --- a/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue +++ b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue @@ -36,7 +36,7 @@ :isNest="false" :visible="diaVisible" :dialogHeight="1.1" - :width="40" + :width="60" @cancel="diaCancel"> - -
-
+
- 同步默认订阅消息 - -
- - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + name="work"> + + + + + + + + +
@@ -171,6 +168,7 @@ import CDialog from '@c/CDialog' import CTable from '@c/CTable' import config from "@/js/dai/config"; +import TempList from "./TempList"; import { requestPost } from "@/js/dai/request"; import { mapGetters } from 'vuex' import { Loading } from 'element-ui' // 引入Loading服务 @@ -283,7 +281,7 @@ export default { selCustomerId: '', diaSubVisible: false, activeName: 'resi', - dataListLoading: false, + resiDataList: [], workDataList: [], resiTempIdList: [],//居民端未同步的模板数组 @@ -291,7 +289,7 @@ export default { } }, components: { - CTable, CDialog + CTable, CDialog, TempList }, activated () { this.$nextTick(() => { @@ -301,8 +299,8 @@ export default { mounted () { this.tableParams.source = this.env - console.log("客户初始化列表------本地环境-----------------") - console.log(this.env) + + if (this.env === 'test') {//测试 this.workAppid = config.appId.testWorkAppid this.resiAppid = config.appId.testResiAppid @@ -314,10 +312,19 @@ export default { this.resiAppid = config.appId.devResiAppid } + console.log("工作端appId") + console.log(this.workAppid) + console.log("居民端appId") + console.log(this.resiAppid) + // eslint-disable-next-line this.loadData() }, computed: { + subTabHeight () { + return this.clientHeight * 0.57 / 2 + }, + tableHeight () { return this.clientHeight - 60 - 80 - 80 - 50 }, @@ -416,84 +423,69 @@ export default { this.resiDataList = [] this.workDataList = [] this.$nextTick(() => { - this.loadSubscribeData(row.customerId) // 解决表格错位 + this.selCustomerId = row.customerId + + this.loadSubscribeData() + }) }, + //加载列表数据 - async loadSubscribeData (customerId) { - this.dataListLoading = true - this.selCustomerId = customerId - // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/getcustomerlist', + async loadSubscribeData () { + this.$refs.temp_list_resi_has.setTableLoading() + this.$refs.temp_list_resi_no.setTableLoading() + this.$refs.temp_list_work_has.setTableLoading() + this.$refs.temp_list_work_no.setTableLoading() + // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/getcustomerlist' const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/getcustomerlist' let params = { - customerId: customerId, - workAppId: this.workAppid, + customerId: this.selCustomerId, resiAppId: this.resiAppid, + workAppId: this.workAppid + // sync: sync } const { data, code, msg, internalMsg } = await requestPost(url, params) if (code === 0) { - this.resiDataList = data.resiList - this.workDataList = data.workList - this.resiTempIdList = [] - this.workTempIdList = [] - this.resiDataList.forEach(element => { + let resiList = [] + let resiList_sync = [] + let resiList_sync_no = [] + + let workList = [] + let workList_sync = [] + let workList_sync_no = [] + + + data.resiList.forEach(element => { if (element.state === '0') { - this.resiTempIdList.push(element.id) + resiList_sync_no.push(element) + } else { + resiList_sync.push(element) } - }) - this.workDataList.forEach(element => { + + data.workList.forEach(element => { if (element.state === '0') { - this.workTempIdList.push(element.id) + workList_sync_no.push(element) + } else { + workList_sync.push(element) } - }) + this.$refs.temp_list_resi_has.setTableData(resiList_sync, this.selCustomerId, this.resiAppid, this.workAppid) + this.$refs.temp_list_resi_no.setTableData(resiList_sync_no, this.selCustomerId, this.resiAppid, this.workAppid) + this.$refs.temp_list_work_has.setTableData(workList_sync, this.selCustomerId, this.resiAppid, this.workAppid) + this.$refs.temp_list_work_no.setTableData(workList_sync_no, this.selCustomerId, this.resiAppid, this.workAppid) - } else { - this.$message.error(msg + "：" + internalMsg) - } - this.dataListLoading = false - }, - - //同步客户的订阅消息为默认订阅消息 - async syncSubSure () { - this.$confirm('确认同步客户的订阅消息为默认订阅消息', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - this.syncSub() - }).catch(() => { - - }) - }, - async syncSub () { - - this.startLoading() - // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/init' - const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/init' - - let params = { - customerId: this.selCustomerId, - workAppId: this.workAppid, - resiAppId: this.resiAppid, - resiTempIdList: this.resiTempIdList, - workTempIdList: this.workTempIdList, - } - - const { data, code, msg, internalMsg } = await requestPost(url, params) - if (code === 0) { - this.$message.success('同步成功') - this.loadSubscribeData(this.selCustomerId) } else { this.$message.error(msg + "：" + internalMsg) } - this.endLoading() - + this.$refs.temp_list_resi_has.setTableLoading() + this.$refs.temp_list_resi_no.setTableLoading() + this.$refs.temp_list_work_has.setTableLoading() + this.$refs.temp_list_work_no.setTableLoading() }, // 订阅消息窗口取消 @@ -518,9 +510,9 @@ export default { } } - diff --git a/epmet-oper-web/src/views/modules/customer/init/TempList.vue b/epmet-oper-web/src/views/modules/customer/init/TempList.vue new file mode 100644 index 0000000..0e75ceb --- /dev/null +++ b/epmet-oper-web/src/views/modules/customer/init/TempList.vue @@ -0,0 +1,268 @@ + + + + diff --git a/epmet-oper-web/src/views/modules/customer/manage/CustomerInfo.vue b/epmet-oper-web/src/views/modules/customer/manage/CustomerInfo.vue index 7fd33f7..ea7e907 100644 --- a/epmet-oper-web/src/views/modules/customer/manage/CustomerInfo.vue +++ b/epmet-oper-web/src/views/modules/customer/manage/CustomerInfo.vue @@ -315,11 +315,11 @@ export default { }, showGender (key) { if (key === '1') { - return '女' - } else if (key === '0') { return '男' - } else { - return key + } else if (key === '2') { + return '女' + }else { + return '未知' } } } @@ -333,4 +333,4 @@ export default { .btn_save { margin: 0 50px; } - \ No newline at end of file + diff --git a/epmet-oper-web/src/views/modules/customer/miniProAgent/MiniProList.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/MiniProList.vue index 0c4ef74..3940efd 100644 --- a/epmet-oper-web/src/views/modules/customer/miniProAgent/MiniProList.vue +++ b/epmet-oper-web/src/views/modules/customer/miniProAgent/MiniProList.vue @@ -1,70 +1,71 @@ diff --git a/epmet-oper-web/src/views/modules/customer/role.vue b/epmet-oper-web/src/views/modules/customer/role.vue new file mode 100644 index 0000000..6f79e22 --- /dev/null +++ b/epmet-oper-web/src/views/modules/customer/role.vue @@ -0,0 +1,370 @@ + + + + + diff --git a/epmet-oper-web/src/views/modules/productConfig/autoTest/autoTestList.vue b/epmet-oper-web/src/views/modules/productConfig/autoTest/autoTestList.vue index a6045d3..f7d0fd7 100644 --- a/epmet-oper-web/src/views/modules/productConfig/autoTest/autoTestList.vue +++ b/epmet-oper-web/src/views/modules/productConfig/autoTest/autoTestList.vue @@ -156,8 +156,8 @@ label="账号" header-align="center" min-width="140"> - - + + --> -
- - - ffffffffff - - -
+ +
+ +
+
+ 项目滞留超期提醒 +
+
+
+ + + + 取消返回 +
+ + +
+ 设定核算单位天/日起止时间： + + + 至 + + +
+ +
+ 设定滞留超期时间： + + + + + + + + / + + + + +
+ + +
+ 设定即将超期时间提醒： + + + + + + + + + + 单位天 +
+ +
+ 统一定时消息推送时间： + + +
- - + + +
+
+ 议题发布前经网络员审核 +
+
+
+ + + +
+ + +
+ 议题发布前经网络员审核： + + +
+ + +
+
+ 待办事项短信通知 +
+
+
+ + + +
+ + +
+ 待办事项发送短信通知： + + +
+ +
+ 剩余短信数量： + + + 单位条 +
+ + +
+
+ 小组审核机制 +
+
+
+ + + +
+ + +
+ 新建小组进组需小组审核： + + +
+ + +
+
+ 其他设置 +
+
+
+ + + +
+ +
+ - - diff --git a/epmet-oper-web/src/views/modules/productConfig/subscribe/MyTempList.vue b/epmet-oper-web/src/views/modules/productConfig/subscribe/MyTempList.vue index e77675b..409897f 100644 --- a/epmet-oper-web/src/views/modules/productConfig/subscribe/MyTempList.vue +++ b/epmet-oper-web/src/views/modules/productConfig/subscribe/MyTempList.vue @@ -27,6 +27,9 @@ align="center" width="150">