From 0997c6e2c7c2864d5a652fb041a60f9e1d71de5d Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Mon, 3 Jul 2023 14:47:38 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../photographicDevice/index.vue | 154 +++++------------- 1 file changed, 42 insertions(+), 112 deletions(-) diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue index 05030e4..75d78a0 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/index.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue @@ -233,10 +233,38 @@ - + @@ -499,6 +527,7 @@ export default { this.getSearchdy(); this.page = 1; this.pageSize = 20; + this.terminalList(); }, ////获取拍照装置列表数据 @@ -546,105 +575,6 @@ export default { this.$refs.addPhotoDialogref.getdataform(data); console.log(data); }, - //装置复位 - handleDeviceReset(data) { - this.$confirm("此操作将复位装置, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - resetTerminalApi({ cmId: data.cmdId }) - .then((res) => { - if (res.code == 200) { - this.$message({ - duration: 1500, - showClose: true, - message: "装置已复位", - type: "success", - }); - } else { - this.$message({ - duration: 1500, - showClose: true, - message: res.msg, - type: "error", - }); - } - }) - .catch((err) => {}); - }) - .catch(() => { - // this.$message({ - // duration: 1500, - // showClose: true, - // type: "info", - // message: "已取消删除", - // }); - }); - }, - //获取GPS位置 - handleShowGPS(data) { - // this.$refs.gpsdialog_ref.display(); - // this.$refs.gpsdialog_ref.getgpsData(data); - this.$refs.gpsdialog_ref.display(data); - this.$refs.gpsdialog_ref.getgpssql(); - console.log(data); - }, - - //切换gps开启关闭 - changeGPS(val, row) { - console.log(val, row); - setTermGPSJoggle({ gpsstatus: val, cmdId: row.cmdId }) - .then((res) => { - console.log(res); - if (val == 0) { - this.$message({ - duration: 1500, - message: "关闭GPS", - type: "success", - showClose: true, - }); - } else { - this.$message({ - duration: 1500, - message: "成功开启GPS", - type: "success", - showClose: true, - }); - } - }) - .catch((err) => { - console.log(err); //代码错误、请求失败捕获 - }); - }, - handleCommand(command, row) { - console.log(command, row); - switch (command) { - case "open": //开启 - this.changeGPS(1, row); - break; - case "close": //关闭 - this.changeGPS(0, row); - break; - } - }, - // - // gpsChange(val) { - // console.log(val); - // }, - //图像采集参数 - handleImageCapture(data) { - this.$refs.imageCaptureref.display(); - this.$refs.imageCaptureref.getSingleAccess(data); - this.$refs.imageCaptureref.getRatio(); - }, - //视频采集参数 - handleVideoCapture(data) { - this.$refs.videoCaptureref.display(); - this.$refs.videoCaptureref.getSingleAccess(data); - this.$refs.videoCaptureref.getRatio(); - }, //线缆绘制 handlepicture(data) { @@ -779,7 +709,7 @@ export default { } .dropgps { color: @color-primary; - margin-left: 16px; + // margin-left: 16px; // margin-right: 16px; cursor: pointer; font-size: 12px; From 84588b0dff9d7d5fa8b03ce336e5522b917f69b8 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Mon, 3 Jul 2023 15:46:38 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=9B=BE=E5=83=8F=E9=87=87=E9=9B=86?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/imageCapture.vue | 30 ++++++++++++++--- .../components/videoCapture.vue | 32 +++++++++++++++---- 2 files changed, 51 insertions(+), 11 deletions(-) diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue b/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue index ae9f7a5..c71f23d 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue @@ -13,9 +13,19 @@ + > + {{ + item.alias !== null && item.alias !== "" + ? item.alias + : item.channelname + }} +
@@ -95,9 +105,19 @@ + > + {{ + item.alias !== null && item.alias !== "" + ? item.alias + : item.channelname + }} + @@ -246,7 +266,7 @@ export default { this.searchloading = true; getPhotoParamApi({ channelId: this.selaccess, - cmdId: this.selcmdId, + termId: this.seltermid, }) .then((res) => { if (res.code == 200) { diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue b/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue index 8d37ce8..9424bab 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue @@ -13,9 +13,19 @@ + > + {{ + item.alias !== null && item.alias !== "" + ? item.alias + : item.channelname + }} +
@@ -78,9 +88,19 @@ + > + {{ + item.alias !== null && item.alias !== "" + ? item.alias + : item.channelname + }} + @@ -142,7 +162,7 @@ export default { selaccess: "", //选中的通道 capturenr: {}, //查询后的内容 setForm: { - preset: 255 + preset: 255, }, //设置参数 rules: { channelId: [{ required: true, message: "请选择通道", trigger: "blur" }], @@ -169,7 +189,7 @@ export default { //获取设备通道 getSingleAccess(val) { this.setForm = { - preset: 255 + preset: 255, }; console.log(val); this.seltermid = val.id; From cbf1a255ea9da0d6a7f17cdae245239de064fde9 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Mon, 3 Jul 2023 17:04:08 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/realTimeSearch/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue index bab34a9..6bc95dc 100644 --- a/src/views/realTimeSearch/index.vue +++ b/src/views/realTimeSearch/index.vue @@ -309,6 +309,7 @@ export default { //获取图片列表 getPicData() { this.loading = true; + this.picList = []; this.$set(this.formdata, "pageindex", this.page); this.$set(this.formdata, "pagesize", this.pageSize); // this.$set(this.formdata, "starttime", this.formdata.timeVal[0]); From 4a62b106c66069f59157967ffd904a8496a62fe5 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Tue, 4 Jul 2023 10:50:26 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E8=A3=85=E7=BD=AE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/baseInfor.vue | 93 +++++++++++---- .../photographicDevice/components/gpsSite.vue | 72 +++++++++--- .../components/parameterSetDialog.vue | 2 + .../components/runStatus.vue | 79 +++++++++---- .../components/workStatus.vue | 108 ++++++++++++++---- .../photographicDevice/index.vue | 57 +++------ 6 files changed, 283 insertions(+), 128 deletions(-) diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue b/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue index ea6218d..cfd2620 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue @@ -1,5 +1,11 @@ - - - - - - - - - + + + + + + + + +
- diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue b/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue index a05680e..42f1c45 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue @@ -1,5 +1,11 @@ - - - - - - + + + + + +
- diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue index e4997a5..4fa8214 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue @@ -400,6 +400,8 @@ export default { }, handleclose() { this.isShow = false; + this.activeName = "1"; + this.tabsActive = "first"; }, }, }; diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue index c28f3af..9ec7b1c 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue @@ -1,5 +1,11 @@ - - - - - - - + + + + + + +
- diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue index ff408c6..c4508a7 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue @@ -1,5 +1,11 @@ - - - - - - - - + + + + + + + + - - - - + + + +
@@ -69,9 +129,7 @@ - diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue index 75d78a0..9ed3997 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/index.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue @@ -67,14 +67,15 @@ @row-click="handleRowClick" v-loading="loading" > - + - + Date: Wed, 5 Jul 2023 09:29:58 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E8=A3=85=E7=BD=AE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitoringEquipment/photographicDevice/index.vue | 4 ++-- src/views/pictureRotation/index.vue | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue index 9ed3997..f42dbff 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/index.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue @@ -386,8 +386,8 @@ import { getTerminalJoggle, deleteTerminalJoggle, - resetTerminalApi, - setTermGPSJoggle, + // resetTerminalApi, + // setTermGPSJoggle, getSearchInfo, } from "@/utils/api/index"; import moment from "moment"; diff --git a/src/views/pictureRotation/index.vue b/src/views/pictureRotation/index.vue index 5121fb1..2a458fc 100644 --- a/src/views/pictureRotation/index.vue +++ b/src/views/pictureRotation/index.vue @@ -260,6 +260,7 @@ export default { //请求数据接口方法 getPicData() { this.loading = true; + this.picList = []; getPictureList({ pageindex: this.page, pagesize: this.rowNum * this.colNum, From c0cfb29c5328f090c8917890d536501d11ec5723 Mon Sep 17 00:00:00 2001 From: 13703816893 Date: Wed, 5 Jul 2023 09:52:28 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../photographicDevice/components/baseInfor.vue | 3 +++ .../photographicDevice/components/gpsSite.vue | 3 +++ .../photographicDevice/components/runStatus.vue | 3 +++ .../photographicDevice/components/workStatus.vue | 3 +++ 4 files changed, 12 insertions(+) diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue b/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue index cfd2620..0b6a70c 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue @@ -112,6 +112,9 @@ >
+
+ 取 消 +
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue b/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue index edaedac..2c619d4 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue @@ -4,7 +4,7 @@ title="GPS位置数据" :visible.sync="isShow" :close-on-click-modal="false" - width="70%" + width="1280px" > @@ -106,7 +106,14 @@ export default { return { isShow: false, formdata: {}, - listData: [], + listData: [ + { + name: "测试", + }, + { + name: "测试2", + }, + ], loading: false, seltermid: "", //装置id selcmdId: "", //cmdId @@ -166,5 +173,15 @@ export default { diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue index bd624b9..d255d0d 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue @@ -4,7 +4,7 @@ title="装置运行状态" :visible.sync="isShow" :close-on-click-modal="false" - width="70%" + width="1280px" > @@ -112,7 +112,14 @@ export default { return { isShow: false, formdata: {}, - listData: [], + listData: [ + { + name: "测试", + }, + { + name: "测试2", + }, + ], loading: false, seltermid: "", //装置id selcmdId: "", //cmdId @@ -172,5 +179,15 @@ export default { diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue index 4e77be6..38474b1 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue @@ -4,7 +4,7 @@ title="工作状态" :visible.sync="isShow" :close-on-click-modal="false" - width="70%" + width="1280px" > @@ -138,7 +138,14 @@ export default { return { isShow: false, formdata: {}, - listData: [], + listData: [ + { + name: "测试", + }, + { + name: "测试2", + }, + ], loading: false, seltermid: "", //装置id selcmdId: "", //cmdId @@ -198,5 +205,15 @@ export default { diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue index 336d6f0..0f17a58 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/index.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue @@ -106,12 +106,22 @@ min-width="150" > + + + + - - + diff --git a/src/views/management/userEquipment/lineInformation/index.vue b/src/views/management/userEquipment/lineInformation/index.vue index 5aa9267..43e7b14 100644 --- a/src/views/management/userEquipment/lineInformation/index.vue +++ b/src/views/management/userEquipment/lineInformation/index.vue @@ -48,6 +48,16 @@ min-width="120" > + + +