From d27d085229978df9ecb56a248e7aa733a92b63a5 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 14 Sep 2020 09:04:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-oper-web/.env.development | 2 +- .../modules/customer/customize/ConfigItem.vue | 13 +- .../modules/customer/init/RegisterList.vue | 259 ++++++++++++++++-- .../src/views/modules/partner/app/edit.vue | 4 +- .../productConfig/subscribe/MyTempList.vue | 8 +- .../productConfig/subscribe/TempEdit.vue | 4 +- .../productConfig/subscribe/TempList.vue | 131 ++++++--- 7 files changed, 356 insertions(+), 65 deletions(-) diff --git a/epmet-oper-web/.env.development b/epmet-oper-web/.env.development index eabfef7..1706469 100644 --- a/epmet-oper-web/.env.development +++ b/epmet-oper-web/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development # VUE_APP_API_SERVER = http://192.168.1.130:8080/api -VUE_APP_API_SERVER = http://10.10.10.50:8080/api +VUE_APP_API_SERVER = http://10.10.10.17:8080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api VUE_APP_NODE_ENV=dev \ No newline at end of file diff --git a/epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue b/epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue index 6c04b78..a8101f1 100644 --- a/epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue +++ b/epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue @@ -508,14 +508,15 @@ export default { const url = "/epmetuser/govstaffrole/resigovrolelist" // const url = "https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/epmetuser/govstaffrole/resigovrolelist" const params = {} - const { data, code, msg } = await requestPost(url, params) + const { data, code, msg, internalMsg } = await requestPost(url, params) if (code === 0) { this.roleList = data this.roleAllList = this.activeName === 'resi' ? data.resiRoleList : data.govRoleList this.roleAllList.forEach(item => { this.roleCheckedArray.push(item.roleKey) }) - + } else { + this.$message.error(msg + ":" + internalMsg) } this.endLoading() }, @@ -673,7 +674,7 @@ export default { const url = "/oper/customize/customerfunctionrole/customerfunctionrolelist" // this.upOrDownForm.roleList = roleList - const { data, code, msg } = await requestPost(url, this.upOrDownForm) + const { data, code, msg, internalMsg } = await requestPost(url, this.upOrDownForm) if (code === 0) { this.roleCheckedArray = [] @@ -695,7 +696,7 @@ export default { } else { - this.$message.error(m) + this.$message.error(msg + ":" + internalMsg) } this.endLoading() @@ -726,13 +727,13 @@ export default { // const url = "https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfunctionrole/savecustomerfunctionrole" // this.upOrDownForm.roleList = roleList - const { data, code, msg } = await requestPost(url, this.upOrDownForm) + const { data, code, msg, internalMsg } = await requestPost(url, this.upOrDownForm) if (code === 0) { this.$message.success('操作成功') this.upOrDownDia.visible = false } else { - this.$message.error(msg) + this.$message.error(msg + ":" + internalMsg) } this.endLoading() }, 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 f330d24..e54e2d2 100644 --- a/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue +++ b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue @@ -26,7 +26,8 @@ :tableHeight="tableHeight" @init="init" @delete="del" - @showToken="showToken"> + @showToken="showToken" + @showSubscribe="showSubscribe"> @@ -45,36 +46,132 @@
- {{tokenForm.customerName}}
+ {{tokenForm.customerName}} +
- {{tokenForm.componentAccessToken}}
+ {{tokenForm.componentAccessToken}} +
- {{tokenForm.workAuthorizerToken}}
+ {{tokenForm.workAuthorizerToken}} +
- {{tokenForm.resiAuthorizerToken}}
+ {{tokenForm.resiAuthorizerToken}} +
+ + +
+
+ + 同步默认订阅消息 + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+