diff --git a/epmet-oper-web/.env.development b/epmet-oper-web/.env.development index 91d7451..46bff07 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://192.168.1.130:8080/api # VUE_APP_API_SERVER = http://10.10.10.207:8080/api -# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/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/.env.production b/epmet-oper-web/.env.production index e5254a5..7675639 100644 --- a/epmet-oper-web/.env.production +++ b/epmet-oper-web/.env.production @@ -1,2 +1,3 @@ NODE_ENV=production +VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api VUE_APP_NODE_ENV=prod \ No newline at end of file diff --git a/epmet-oper-web/public/index.html b/epmet-oper-web/public/index.html index a683c38..8ddaf91 100644 --- a/epmet-oper-web/public/index.html +++ b/epmet-oper-web/public/index.html @@ -34,11 +34,13 @@ <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> - --> - + <% } %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %> diff --git a/epmet-oper-web/src/js/columns/columns.js b/epmet-oper-web/src/js/columns/columns.js index 545442b..13d439d 100644 --- a/epmet-oper-web/src/js/columns/columns.js +++ b/epmet-oper-web/src/js/columns/columns.js @@ -6,6 +6,8 @@ import RegisterInfo from './customer/customer' import MiniProManage from './customer/miniProManage' import Version from './customer/version' +import CustomizedFunction from './miniPro/customizedFunction' + export default { Temp: Temp, // 代码上传——模板list CommitCodeList: CommitCode['list'], // 代码上传——已上传的代码列表 @@ -15,5 +17,8 @@ export default { RegisterInfo: RegisterInfo, // 客户管理——客户注册信息 MiniProManage: MiniProManage, // 客户管理——客户小程序管理 - Version: Version // 客户管理——基础库 + Version: Version, // 客户管理——基础库 + + // 小程序管理 + CustomizedFunction: CustomizedFunction // 定制功能 } diff --git a/epmet-oper-web/src/js/columns/miniPro/customizedFunction.js b/epmet-oper-web/src/js/columns/miniPro/customizedFunction.js new file mode 100644 index 0000000..c099d3e --- /dev/null +++ b/epmet-oper-web/src/js/columns/miniPro/customizedFunction.js @@ -0,0 +1,84 @@ +export default [ + { + key: 'customizedName', + title: '功能名称', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 100 + }, + { + key: 'shoppingStatus', + title: '上架状态', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + format: (cellValue, index) => { + if (cellValue === 0) { + return '下架' + } else if (cellValue === 1) { + return '上架' + } else { + return '未知' + } + }, + width: 80 + }, + { + key: 'functionExplain', + title: '功能说明', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 120 + }, + { + key: 'iconLargeImg', + title: '大图标', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 100, + tableType: 'image' + }, + { + key: 'iconSmallImg', + title: '小图标', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 100, + tableType: 'image' + }, + + { + key: 'targetLink', + title: '外链地址', + display: ['formA', 'formU', 'table', 'model'], + block: true, + width: 60 + }, + // { + // key: 'domainName', + // title: '业务域名', + // display: ['formA', 'formU', 'table', 'model'], + // block: true, + // width: 60 + // }, + { + key: 'fromApp', + title: '来源', + display: ['formA', 'formU', 'table', 'model'], + block: true, + format: (cellValue, index) => { + if (cellValue === 'gov') { + return '工作端' + } else if (cellValue === 'resi') { + return '居民端' + } else { + return '未知' + } + }, + width: 80 + } +] diff --git a/epmet-oper-web/src/views/components/CTable.vue b/epmet-oper-web/src/views/components/CTable.vue index 9f52ebe..a70ca8b 100644 --- a/epmet-oper-web/src/views/components/CTable.vue +++ b/epmet-oper-web/src/views/components/CTable.vue @@ -37,7 +37,7 @@ + + + + - { - return 120 - // if (this.operations.includes('add')) { - // return (this.operations.length - 1) * 80 // 操作列包含add类型按钮时返回 - // } else if (this.operations.includes('analyze')) { - // return (this.operations.length + 0.5) * 80 // 操作列包含analyze类型按钮时返回 - // } else { - // return this.operations.length * 140 - // } - }, + // operationWidth: () => { + // return 120 + // // if (this.operations.includes('add')) { + // // return (this.operations.length - 1) * 80 // 操作列包含add类型按钮时返回 + // // } else if (this.operations.includes('analyze')) { + // // return (this.operations.length + 0.5) * 80 // 操作列包含analyze类型按钮时返回 + // // } else { + // // return this.operations.length * 140 + // // } + // }, tableSize () { if (this.resolution === 'small') { return 10 diff --git a/epmet-oper-web/src/views/modules/code/VersionItem.vue b/epmet-oper-web/src/views/modules/code/VersionItem.vue index 55e0b85..9f5ef63 100644 --- a/epmet-oper-web/src/views/modules/code/VersionItem.vue +++ b/epmet-oper-web/src/views/modules/code/VersionItem.vue @@ -2,12 +2,16 @@
- 返回 - 刷新 - 操作历史 + {{customerName}}——{{clientTypeShow}}
@@ -88,7 +92,7 @@ type="primary" @click="speedupaudit">加急申请 - { - const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/release' + const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/revertcoderelease' // const url = '/third/code/revertcoderelease' const param = { codeId: this.release.codeId diff --git a/epmet-oper-web/src/views/modules/code/VersionManage.vue b/epmet-oper-web/src/views/modules/code/VersionManage.vue index c2910f5..72905cf 100644 --- a/epmet-oper-web/src/views/modules/code/VersionManage.vue +++ b/epmet-oper-web/src/views/modules/code/VersionManage.vue @@ -108,18 +108,18 @@ export default { return true } }, - { - lable: '基本信息', // 按钮显示名称 - size: 'mini', - style: 'margin: 0 6px;', - type: 'text', - slot: '', - plain: false, - methodName: 'getaccountbasicinfo', // 回调方法名称 - isShow: (row) => { - return true - } - }, + // { + // lable: '基本信息', // 按钮显示名称 + // size: 'mini', + // style: 'margin: 0 6px;', + // type: 'text', + // slot: '', + // plain: false, + // methodName: 'getaccountbasicinfo', // 回调方法名称 + // isShow: (row) => { + // return true + // } + // }, { lable: '设置基础库版本', // 按钮显示名称 size: 'mini', @@ -131,19 +131,19 @@ export default { isShow: (row) => { return true } - }, - { - lable: '类目', // 按钮显示名称 - size: 'mini', - style: 'margin: 0 6px;', - type: 'text', - slot: '', - plain: false, - methodName: 'getcategory', // 回调方法名称 - isShow: (row) => { - return true - } } + // { + // lable: '类目', // 按钮显示名称 + // size: 'mini', + // style: 'margin: 0 6px;', + // type: 'text', + // slot: '', + // plain: false, + // methodName: 'getcategory', // 回调方法名称 + // isShow: (row) => { + // return true + // } + // } ], // 版本管理相关 showVersion: false, @@ -208,7 +208,7 @@ export default { // 显示版本管理 versionManage (row) { this.showVersion = true - this.$refs['ref_version_item'].initData(row.customerId, row.clientType, this.form.data) + this.$refs['ref_version_item'].initData(row.customerId, row.clientType, row.customerName, this.form.data) }, // 显示版本确定 diff --git a/epmet-oper-web/src/views/modules/customer-manage/MiniProManage/MiniProManage.vue b/epmet-oper-web/src/views/modules/customer-manage/MiniProManage/MiniProManage.vue deleted file mode 100644 index f2b4677..0000000 --- a/epmet-oper-web/src/views/modules/customer-manage/MiniProManage/MiniProManage.vue +++ /dev/null @@ -1,266 +0,0 @@ - - - - - diff --git a/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue b/epmet-oper-web/src/views/modules/customer/RegisterList.vue similarity index 100% rename from epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue rename to epmet-oper-web/src/views/modules/customer/RegisterList.vue diff --git a/epmet-oper-web/src/views/modules/customer-manage/customer-info.vue b/epmet-oper-web/src/views/modules/customer/customer-info.vue similarity index 100% rename from epmet-oper-web/src/views/modules/customer-manage/customer-info.vue rename to epmet-oper-web/src/views/modules/customer/customer-info.vue diff --git a/epmet-oper-web/src/views/modules/customer-manage/customer-manage.vue b/epmet-oper-web/src/views/modules/customer/customer-manage.vue similarity index 100% rename from epmet-oper-web/src/views/modules/customer-manage/customer-manage.vue rename to epmet-oper-web/src/views/modules/customer/customer-manage.vue diff --git a/epmet-oper-web/src/views/modules/customer/miniCustomize/ConfigEdit.vue b/epmet-oper-web/src/views/modules/customer/miniCustomize/ConfigEdit.vue new file mode 100644 index 0000000..8f2c71b --- /dev/null +++ b/epmet-oper-web/src/views/modules/customer/miniCustomize/ConfigEdit.vue @@ -0,0 +1,180 @@ + + + + + diff --git a/epmet-oper-web/src/views/modules/customer/miniCustomize/ConfigItem.vue b/epmet-oper-web/src/views/modules/customer/miniCustomize/ConfigItem.vue new file mode 100644 index 0000000..9567762 --- /dev/null +++ b/epmet-oper-web/src/views/modules/customer/miniCustomize/ConfigItem.vue @@ -0,0 +1,370 @@ + + + + + diff --git a/epmet-oper-web/src/views/modules/customer/miniCustomize/CustomerList.vue b/epmet-oper-web/src/views/modules/customer/miniCustomize/CustomerList.vue new file mode 100644 index 0000000..52913d1 --- /dev/null +++ b/epmet-oper-web/src/views/modules/customer/miniCustomize/CustomerList.vue @@ -0,0 +1,163 @@ + + + diff --git a/epmet-oper-web/src/views/modules/customer/miniCustomize/MiniHome.vue b/epmet-oper-web/src/views/modules/customer/miniCustomize/MiniHome.vue new file mode 100644 index 0000000..8e18f86 --- /dev/null +++ b/epmet-oper-web/src/views/modules/customer/miniCustomize/MiniHome.vue @@ -0,0 +1,889 @@ + + + + + diff --git a/epmet-oper-web/src/views/modules/customize/CustomizedFunction copy.vue b/epmet-oper-web/src/views/modules/customize/CustomizedFunction copy.vue new file mode 100644 index 0000000..1e1a448 --- /dev/null +++ b/epmet-oper-web/src/views/modules/customize/CustomizedFunction copy.vue @@ -0,0 +1,167 @@ + + + + + diff --git a/epmet-oper-web/src/views/modules/miniPro/customFun/CustomFun.vue b/epmet-oper-web/src/views/modules/miniPro/customFun/CustomFun.vue new file mode 100644 index 0000000..e636652 --- /dev/null +++ b/epmet-oper-web/src/views/modules/miniPro/customFun/CustomFun.vue @@ -0,0 +1,247 @@ + + + + diff --git a/epmet-oper-web/src/views/modules/miniPro/customFun/Edit.vue b/epmet-oper-web/src/views/modules/miniPro/customFun/Edit.vue new file mode 100644 index 0000000..a787c4c --- /dev/null +++ b/epmet-oper-web/src/views/modules/miniPro/customFun/Edit.vue @@ -0,0 +1,263 @@ + + + + +