diff --git a/epmet-oper-web/.env.development b/epmet-oper-web/.env.development index 4f5c1a9..aca9324 100644 --- a/epmet-oper-web/.env.development +++ b/epmet-oper-web/.env.development @@ -1,8 +1,9 @@ NODE_ENV=development # VUE_APP_API_SERVER = http://118.190.150.119:41080/api +# VUE_APP_API_SERVER = http://192.168.1.144/api VUE_APP_API_SERVER = http://192.168.1.144/api -# VUE_APP_API_SERVER = http://192.168.51.36:8080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api + VUE_APP_NODE_ENV=dev #项目根路径 VUE_APP_PUBLIC_PATH=epmet-oper diff --git a/epmet-oper-web/src/js/columns/miniPro/partnerApp.js b/epmet-oper-web/src/js/columns/miniPro/partnerApp.js index f3d1056..846e427 100644 --- a/epmet-oper-web/src/js/columns/miniPro/partnerApp.js +++ b/epmet-oper-web/src/js/columns/miniPro/partnerApp.js @@ -38,12 +38,12 @@ export default [{ block: true, width: 40 }, -{ - key: 'secret', - title: '秘钥', - display: ['formA', 'formU', 'table', 'model'], - fixed: false, - block: true, - width: 200 -}, +// { +// key: 'secret', +// title: '秘钥', +// display: ['formA', 'formU', 'table', 'model'], +// fixed: false, +// block: true, +// width: 200 +// }, ] diff --git a/epmet-oper-web/src/utils/loadTinymce.js b/epmet-oper-web/src/utils/loadTinymce.js index ff84740..f3704d6 100644 --- a/epmet-oper-web/src/utils/loadTinymce.js +++ b/epmet-oper-web/src/utils/loadTinymce.js @@ -17,7 +17,8 @@ export default function loadTinymce(cb) { background: 'rgba(255, 255, 255, 0.5)' }) - loadScript('https://lib.baomitu.com/tinymce/latest/tinymce.min.js', () => { + // loadScript('https://lib.baomitu.com/tinymce/latest/tinymce.min.js', () => { + loadScript('http://lib.baomitu.com/tinymce/4.9.2/tinymce.min.js', () => { loading.close() // eslint-disable-next-line no-undef tinymceObj = tinymce diff --git a/epmet-oper-web/src/views/modules/customer/customize/menu-customer-add-or-update.vue b/epmet-oper-web/src/views/modules/customer/customize/menu-customer-add-or-update.vue index be2a5e0..83e0c50 100644 --- a/epmet-oper-web/src/views/modules/customer/customize/menu-customer-add-or-update.vue +++ b/epmet-oper-web/src/views/modules/customer/customize/menu-customer-add-or-update.vue @@ -49,10 +49,10 @@ export default { iconList: [], iconListVisible: false, dataForm: { - id: '', + id: '', // 菜单id type: 0, name: '', - pid: '0', + pid: '0', // 菜单pid customerId:'', parentName: '', url: '', @@ -91,16 +91,38 @@ export default { }, // 获取信息 - getInfo () { - this.$http.get(`/gov/access/govMenuCustomerRelation/${this.dataForm.id}`).then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg) - } - this.dataForm = { - ...this.dataForm, - ...res.data - } - }).catch(() => {}) + async getInfo () { + let {data: epmetRelationResult} = await this.$http.get(`/gov/access/govMenuCustomerRelation/getCustomizedMenuInfo?menuId=${this.dataForm.id}&customerId=${this.dataForm.customerId}`) + + if (epmetRelationResult.code !== 0) { + this.$message.error("网络错误") + return + } + + if (epmetRelationResult.data !== null) { + // 如果有该菜单的自定义信息 + this.dataForm.type = epmetRelationResult.data.type + this.dataForm.name = epmetRelationResult.data.name + this.dataForm.pid = epmetRelationResult.data.pid + this.dataForm.parentName = epmetRelationResult.data.parentName + this.dataForm.url = epmetRelationResult.data.url + this.dataForm.useFlag = epmetRelationResult.data.useFlag + this.dataForm.sort = epmetRelationResult.data.sort + this.dataForm.icon = epmetRelationResult.data.icon + } else { + // 如果没有该菜单的自定义信息， + let { data: epmeMenuResult } = await this.$http.get(`/gov/access/menu/${this.dataForm.id}`) + + this.dataForm.type = epmeMenuResult.data.type + this.dataForm.name = epmeMenuResult.data.name + this.dataForm.pid = epmeMenuResult.data.pid + this.dataForm.parentName = epmeMenuResult.data.parentName + this.dataForm.url = epmeMenuResult.data.url + this.dataForm.useFlag = 1 + this.dataForm.sort = epmeMenuResult.data.sort + this.dataForm.icon = epmeMenuResult.data.icon + } + }, // 图标, 选中 iconListCurrentChangeHandle (icon) { diff --git a/epmet-oper-web/src/views/modules/customer/customize/menuCustomer.vue b/epmet-oper-web/src/views/modules/customer/customize/menuCustomer.vue index fa4c3e1..31dd98f 100644 --- a/epmet-oper-web/src/views/modules/customer/customize/menuCustomer.vue +++ b/epmet-oper-web/src/views/modules/customer/customize/menuCustomer.vue @@ -33,6 +33,7 @@ + @@ -78,6 +105,7 @@ import { requestPost } from "@/js/dai/request"; import { envIsDev, mockUrlPrefix } from "@/js/dai/config"; import { Loading } from "element-ui"; import nextTick from "dai-js/tools/nextTick"; +import params from "@/views/modules/sys/params.vue"; // 当前是否是开发环境 const isMockEnv = envIsDev && false; @@ -89,11 +117,19 @@ export default { data () { return { + // 当前操作的appId + currAppId: null, + // 是否显示密钥对话框 + isShowSecretsDlgShow: false, + secrets: { + symSecret: null, + asymSecretPublic: null + }, tableUrl: requestUrlPrefix + "/commonservice/externalapp/list", // 查询条件 tableParams: { customerId: "", - customerType: "internal", + customerType: "external", }, operations: [ @@ -110,30 +146,42 @@ export default { }, }, { - lable: "复制秘钥", // 按钮显示名称 - size: "mini", - style: "margin: 0 6px;", - type: "text", - slot: "", - plain: false, - methodName: "copySecret", // 回调方法名称 - isShow: (row) => { - return true; - }, - }, - { - lable: "重置秘钥", // 按钮显示名称 + lable: "查看秘钥", // 按钮显示名称 size: "mini", style: "margin: 0 6px;", type: "text", slot: "", plain: false, - methodName: "resetSecret", // 回调方法名称 + methodName: "showSecrets", // 回调方法名称 isShow: (row) => { return true; }, }, // { + // lable: "复制秘钥", // 按钮显示名称 + // size: "mini", + // style: "margin: 0 6px;", + // type: "text", + // slot: "", + // plain: false, + // methodName: "copySecret", // 回调方法名称 + // isShow: (row) => { + // return true; + // }, + // }, + // { + // lable: "重置秘钥", // 按钮显示名称 + // size: "mini", + // style: "margin: 0 6px;", + // type: "text", + // slot: "", + // plain: false, + // methodName: "resetSecret", // 回调方法名称 + // isShow: (row) => { + // return true; + // }, + // }, + // { // lable: "删除", // 按钮显示名称 // size: "mini", // style: "margin: 0 6px;", @@ -280,6 +328,80 @@ export default { editDiaOK () { this.refresh(); }, + + /** + * 显示密钥 + */ + showSecrets(row) { + // 查询密钥 + this.currAppId = row.appId + let url = `/commonservice/externalapp/getSecrets`; + let params = { + appId: row.appId + } + window.app.ajax.get( + url, + params, + (data, msg) => { + this.secrets.symSecret = data.symSecret + this.secrets.asymSecretPublic = data.asymSecretPublic + }, + (data, msg) => { + + }) + + this.isShowSecretsDlgShow = true + }, + + /** + * 重置对称加密密钥 + */ + resetSymSecret() { + this.$confirm('确认重置?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let url = "/commonservice/externalapp/resetSymSecret"; + let params = { + appId: this.currAppId + } + + window.app.ajax.post(url, params, + (data, msg) => { + this.$message.success('重置成功') + this.secrets.symSecret = data; + }, + (msg, data) => { + this.$message.info('重置失败') + }) + }) + }, + + /** + * 重置非对称加密密钥 + */ + resetAsymSecret() { + this.$confirm('确认重置?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let url = "/commonservice/externalapp/resetAsymSecrets"; + let params = { + appId: this.currAppId + } + + window.app.ajax.post(url, params, + (data, msg) => { + this.$message.success('重置成功') + this.secrets.asymSecretPublic = data.publicKey; + }, + (msg, data) => { + this.$message.info('重置失败') + }) + }) + } }, }; diff --git a/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue b/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue new file mode 100644 index 0000000..27ae6e9 --- /dev/null +++ b/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue @@ -0,0 +1,275 @@ + + + + + +