From 3e0dc4d2ee4b36789416bfadfe431d3da969b56f Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Fri, 25 Aug 2023 16:32:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E8=BF=90=E7=BB=B4?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Sidebar.vue | 5 + src/router/index.js | 9 +- src/views/itOperation/index.vue | 718 ++++++++++++++++++ .../components/addPhotoDialog.vue | 8 + .../components/parameterSetDialog.vue | 79 +- .../photographicDevice/index.vue | 1 - .../userEquipment/towerInformation/index.vue | 86 ++- 7 files changed, 877 insertions(+), 29 deletions(-) create mode 100644 src/views/itOperation/index.vue diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue index 4b1582b..b906383 100644 --- a/src/components/common/Sidebar.vue +++ b/src/components/common/Sidebar.vue @@ -140,6 +140,11 @@ export default { }, ], }, + // { + // icon: "el-icon-setting", + // index: "/itOperation", + // title: "运维管理", + // }, ], items1: [ { diff --git a/src/router/index.js b/src/router/index.js index f5e4c42..756148b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -162,7 +162,14 @@ const routes = [ ), meta: { title: "全局设置" }, }, - + { + path: "/itoperation", + component: () => + import( + /* webpackChunkName: "tabs" */ "../views/itOperation/index.vue" + ), + meta: { title: "运维管理", icon: "el-icon-setting" }, + }, // { // path: "/videoMonitor", // component: () => diff --git a/src/views/itOperation/index.vue b/src/views/itOperation/index.vue new file mode 100644 index 0000000..7c63e36 --- /dev/null +++ b/src/views/itOperation/index.vue @@ -0,0 +1,718 @@ + + + diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue index 2b6d4f4..ddb60e4 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue @@ -299,6 +299,14 @@ export default { ], }); } + if (val.list.length == 0) { + console.log(val); + console.log("我是没有通道的"); + val.list.push({ + id: "", + alias: "", + }); + } //this.formInfo = val; this.formInfo = JSON.parse(JSON.stringify(val)); diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue index f66b45d..e9df46c 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue @@ -233,11 +233,13 @@ :model="idParameter" label-position="right" label-width="124px" + ref="idParameterref" + :rules="idrules" > - + - + @@ -391,6 +393,14 @@ export default { videoCapture, }, data() { + let validCmid = (rule, value, callback) => { + let reg = /^[0-9A-Za-z_/\\/-]{17}$/; + if (!reg.test(value)) { + callback(new Error("装置id为17位编码")); + } else { + callback(); + } + }; return { isShow: false, activeName: "2", @@ -426,6 +436,16 @@ export default { componentId: "", originalId: "", }, + idrules: { + newCmdId: [ + { required: true, message: "请输入CMD_ID", trigger: "blur" }, + { validator: validCmid, trigger: "blur" }, + ], + componentId: [ + { required: true, message: "请输入杆塔ID", trigger: "blur" }, + { validator: validCmid, trigger: "blur" }, + ], + }, idLoading: false, idSetLoading: false, runStatusForm: {}, @@ -708,30 +728,37 @@ export default { //id参数设置 idSet() { if (this.rowData.isonline) { - this.idSetLoading = true; - let params = [ - { - name: "act", - value: "termid", - }, - { - name: "flag", - value: 1, - }, - { - name: "newcmdid", - value: this.idParameter.newCmdId, - }, - { - name: "compid", - value: this.idParameter.componentId, - }, - { - name: "orgid", - value: this.idParameter.originalId, - }, - ]; - this.setTermFn(params); + this.$refs.idParameterref.validate((valid) => { + if (valid) { + this.idSetLoading = true; + let params = [ + { + name: "act", + value: "termid", + }, + { + name: "flag", + value: 1, + }, + { + name: "newcmdid", + value: this.idParameter.newCmdId, + }, + { + name: "compid", + value: this.idParameter.componentId, + }, + { + name: "orgid", + value: this.idParameter.originalId, + }, + ]; + this.setTermFn(params); + } else { + console.log("error submit!!"); + return false; + } + }); } else { this.$message({ duration: 1500, diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue index 3f02906..464ad22 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/index.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue @@ -141,7 +141,6 @@ label="规约名称" show-overflow-tooltip min-width="90" - v-if="roleUser != 2" />
+ +