diff --git a/epmet-oper-web/.env.development b/epmet-oper-web/.env.development index 7ebfcb6..1428cba 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.98: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_NODE_ENV=dev \ No newline at end of file diff --git a/epmet-oper-web/src/js/columns/code/commitCode.js b/epmet-oper-web/src/js/columns/code/commitCode.js index 8136b57..49cd1cc 100644 --- a/epmet-oper-web/src/js/columns/code/commitCode.js +++ b/epmet-oper-web/src/js/columns/code/commitCode.js @@ -4,11 +4,13 @@ export default { key: 'customerName', title: '客户名称', type: 'select', - rule: [{ - required: true, - message: '请选择客户', - trigger: 'blur' - }], + rule: [ + { + required: true, + message: '请选择客户', + trigger: 'blur' + } + ], display: ['formA', 'formU', 'table', 'model'], fixed: false, block: false, @@ -18,16 +20,18 @@ export default { key: 'clientType', title: '类型', type: 'radio', - rule: [{ - required: true, - message: '请选择类型', - trigger: 'blur' - }], + rule: [ + { + required: true, + message: '请选择类型', + trigger: 'blur' + } + ], display: ['formA', 'formU', 'table', 'model'], fixed: false, block: false, width: 80, - format: function (cellValue, index) { + format: (cellValue, index) => { if (cellValue === 'resi') { return '居民端' } else if (cellValue === 'work') { @@ -41,11 +45,13 @@ export default { key: 'appId', title: 'appId', type: 'radio', - rule: [{ - required: true, - message: '请输入appId', - trigger: 'blur' - }], + rule: [ + { + required: true, + message: '请输入appId', + trigger: 'blur' + } + ], display: ['formA', 'formU', 'table', 'model'], fixed: false, block: true, @@ -55,11 +61,13 @@ export default { key: 'version', title: '版本号', type: 'input', - rule: [{ - required: true, - message: '请输入版本号', - trigger: 'blur' - }], + rule: [ + { + required: true, + message: '请输入版本号', + trigger: 'blur' + } + ], display: ['formA', 'formU', 'table', 'model'], fixed: false, block: true, @@ -69,11 +77,13 @@ export default { key: 'codeInfo', title: '代码描述', type: 'textarea', - rule: [{ - required: true, - message: '请输入代码描述', - trigger: 'blur' - }], + rule: [ + { + required: true, + message: '请输入代码描述', + trigger: 'blur' + } + ], display: ['formA', 'formU', 'table', 'model'], block: true }, @@ -81,15 +91,17 @@ export default { key: 'status', title: '状态', type: 'input', - rule: [{ - required: true, - message: '请输入代码描述', - trigger: 'blur' - }], + rule: [ + { + required: true, + message: '请输入代码描述', + trigger: 'blur' + } + ], display: ['formA', 'formU', 'table', 'model'], block: true, width: 80, - format: function (cellValue, index) { + format: (cellValue, index) => { // 状态 未审核:unaudited;审核中:auditing;审核成功:audit_success;审核被拒绝:audit_failed;已撤回:withdrawn;审核延后:delay; // 发布成功:release_success;发布失败:release_failed if (cellValue === 'unaudited') { @@ -117,11 +129,13 @@ export default { key: 'uploadTime', title: '上传时间', type: 'input', - rule: [{ - required: true, - message: '请输入代码描述', - trigger: 'blur' - }], + rule: [ + { + required: true, + message: '请输入代码描述', + trigger: 'blur' + } + ], display: ['formA', 'formU', 'table', 'model'], block: true }, @@ -129,53 +143,73 @@ export default { key: 'auditTime', title: '提交审核时间', type: 'input', - rule: [{ - required: true, - message: '请输入代码描述', - trigger: 'blur' - }], + rule: [ + { + required: true, + message: '请输入代码描述', + trigger: 'blur' + } + ], display: ['formA', 'formU', 'table', 'model'], block: true } ], form: [ { - key: 'clientType', - title: '类型', - type: 'radio', - rule: [{ - required: true, - message: '请选择类型', - trigger: 'blur' - }], + key: 'customerId', + title: '客户', + type: 'select', + rule: [ + { + required: true, + message: '请选择客户', + trigger: 'blur' + } + ], display: ['formA', 'formU', 'table', 'model'], + disabled: ['formA', 'formU'], fixed: true, block: false, width: 100 }, { - key: 'customerId', - title: '客户', - type: 'select', - rule: [{ - required: true, - message: '请选择客户', - trigger: 'blur' - }], + key: 'clientType', + title: '类型', + type: 'span', + rule: [ + { + required: true, + message: '请选择类型', + trigger: 'blur' + } + ], display: ['formA', 'formU', 'table', 'model'], + disabled: ['formA', 'formU'], fixed: true, block: false, - width: 100 + width: 100, + format: (cellValue) => { + if (cellValue === 'resi') { + return '居民端' + } else if (cellValue === 'work') { + return '工作端' + } else { + return '未知' + } + } }, + { key: 'userVersion', title: '版本号', type: 'input', - rule: [{ - required: true, - message: '请输入版本号', - trigger: 'blur' - }], + rule: [ + { + required: true, + message: '请输入版本号', + trigger: 'blur' + } + ], display: ['formA', 'formU', 'table', 'model'], fixed: true, block: false, @@ -185,14 +219,14 @@ export default { key: 'userDesc', title: '代码描述', type: 'textarea', - rule: [{ - required: true, - message: '请输入代码描述', - trigger: 'blur' - }], - option: { - - }, + rule: [ + { + required: true, + message: '请输入代码描述', + trigger: 'blur' + } + ], + option: {}, display: ['formA', 'formU', 'model'], block: false, width: 120 diff --git a/epmet-oper-web/src/js/columns/customer/miniProManage.js b/epmet-oper-web/src/js/columns/customer/miniProManage.js index 10d8e00..a4d6425 100644 --- a/epmet-oper-web/src/js/columns/customer/miniProManage.js +++ b/epmet-oper-web/src/js/columns/customer/miniProManage.js @@ -55,21 +55,21 @@ export default [ fixed: false, block: true, width: 120 - }, - { - key: 'version', - title: '版本号', - type: 'input', - rule: [ - { - required: true, - message: '请输入版本号', - trigger: 'blur' - } - ], - display: ['formA', 'formU', 'table', 'model'], - fixed: false, - block: true, - width: 80 } + // { + // key: 'version', + // title: '版本号', + // type: 'input', + // rule: [ + // { + // required: true, + // message: '请输入版本号', + // trigger: 'blur' + // } + // ], + // display: ['formA', 'formU', 'table', 'model'], + // fixed: false, + // block: true, + // width: 80 + // } ] diff --git a/epmet-oper-web/src/views/components/CForm.vue b/epmet-oper-web/src/views/components/CForm.vue index b282094..2e4257a 100644 --- a/epmet-oper-web/src/views/components/CForm.vue +++ b/epmet-oper-web/src/views/components/CForm.vue @@ -15,8 +15,9 @@ :label-width="(column.LabelWidth?column.LabelWidth:labelWidth) + 'px'" :style="{display:column.block?'block':'inline-block'}" :key="i"> - - {{column.format?column.format(model[column.key]):model[column.key]}} + + diff --git a/epmet-oper-web/src/views/modules/code/SubmitItem.vue b/epmet-oper-web/src/views/modules/code/SubmitItem.vue index 2a3d1b7..1a6eb79 100644 --- a/epmet-oper-web/src/views/modules/code/SubmitItem.vue +++ b/epmet-oper-web/src/views/modules/code/SubmitItem.vue @@ -190,8 +190,10 @@ export default { data () { return { codeId: '', - addressUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/getpage', - categoryUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/getcategory', + // addressUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/getpage', + addressUrl: '/third/code/getpage', + // categoryUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/getcategory', + categoryUrl: '/third/code/getcategory', addressList: [], // 页面列表 categoryList: [], // 类目列表 templateRadio: '', diff --git a/epmet-oper-web/src/views/modules/code/VersionItem.vue b/epmet-oper-web/src/views/modules/code/VersionItem.vue index 8b17cb8..ebfb703 100644 --- a/epmet-oper-web/src/views/modules/code/VersionItem.vue +++ b/epmet-oper-web/src/views/modules/code/VersionItem.vue @@ -1,9 +1,11 @@ @@ -66,10 +66,10 @@