From 455a6363a3889bca46a6d36abeb05942d0d90173 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Thu, 6 Jul 2023 09:26:13 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../management/monitoringEquipment/photographicDevice/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue index 05030e4..a482f8b 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/index.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue @@ -491,6 +491,7 @@ export default { }, //查询 onSubmit() { + this.page = 1; this.terminalList(); }, //重置 From 80d3a221b95f17b790aca799b840d9fd1c840c21 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Thu, 6 Jul 2023 13:46:56 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/userManagement.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/userManagement.vue b/src/views/system/userManagement.vue index 7ddb683..0fde1cd 100644 --- a/src/views/system/userManagement.vue +++ b/src/views/system/userManagement.vue @@ -178,7 +178,7 @@ export default { .deviceBox { border: 1px solid #dddddd; - height: calc(100% - 24x); + height: calc(100% - 24px); padding: 12px; border-radius: 4px; } From 5cff9926e9ec9a37399d3130298fc53c8c674932 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Thu, 6 Jul 2023 13:47:56 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/management/userEquipment/towerInformation/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/management/userEquipment/towerInformation/index.vue b/src/views/management/userEquipment/towerInformation/index.vue index e830601..0ce10d1 100644 --- a/src/views/management/userEquipment/towerInformation/index.vue +++ b/src/views/management/userEquipment/towerInformation/index.vue @@ -1,5 +1,5 @@ + + + + - \ No newline at end of file + diff --git a/vue.config.js b/vue.config.js index c861b15..0c32024 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,5 +1,6 @@ const { defineConfig } = require("@vue/cli-service"); const path = require("path"); +const webpack = require("webpack"); module.exports = defineConfig({ //打包清除console chainWebpack(config) { @@ -37,4 +38,14 @@ module.exports = defineConfig({ }, }, }, + chainWebpack: (config) => { + config.plugin("provide").use(webpack.ProvidePlugin, [ + { + $: "jquery", + jquery: "jquery", + jQuery: "jquery", + "window.jQuery": "jquery", + }, + ]); + }, }); From c50af173f9415bca1ea4638457c3805a7801f980 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Wed, 12 Jul 2023 14:49:18 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E6=9D=86=E5=A1=94=E7=BA=BF=E8=B7=AF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/alarmHandling/index.vue | 96 +++++++++++---- src/views/cameraChannel/index.vue | 3 + src/views/devicePhotoSchedule/index.vue | 3 + .../components/baseInfor.vue | 95 +++++++++++---- .../photographicDevice/components/gpsSite.vue | 74 ++++++++---- .../components/runStatus.vue | 81 +++++++++---- .../components/workStatus.vue | 110 +++++++++++++----- .../photographicDevice/index.vue | 11 ++ .../photographicDevice/indexhn1.vue | 3 + .../userEquipment/lineInformation/index.vue | 72 ++++++++++-- .../towerInformation/components/addDialog.vue | 6 +- .../userEquipment/towerInformation/index.vue | 83 +++++++++++-- src/views/realTimeMonitor/index.vue | 8 ++ src/views/system/userManagement.vue | 3 + 14 files changed, 516 insertions(+), 132 deletions(-) diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue index f1e65cb..41e1d60 100644 --- a/src/views/alarmHandling/index.vue +++ b/src/views/alarmHandling/index.vue @@ -85,7 +85,7 @@ -
+
+