From 1ace24ec065b5b2c3d789ce76859d6eefbed44ed Mon Sep 17 00:00:00 2001 From: Esacpe <1113279529@qq.com> Date: Fri, 23 Jan 2026 15:48:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 14 +++++++------- package.json | 2 +- vue.config.js | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 36b5cd8..e9bf01f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,7 @@ "moment": "^2.30.1", "ol": "^6.14.1", "pinia": "^3.0.1", - "pizzip": "^3.1.5", + "pizzip": "^3.2.0", "siriwave": "2.3.0", "tesseract.js": "^6.0.1", "vue": "^3.2.8", @@ -13996,9 +13996,9 @@ } }, "node_modules/pizzip": { - "version": "3.1.5", - "resolved": "https://registry.npmmirror.com/pizzip/-/pizzip-3.1.5.tgz", - "integrity": "sha512-uQXb7woLr9baq43Z9EY4wD5cpzrXQd6QUEwehreC1HyRuE4Q1UaGVG9/aCL4CqM4SMz47iE1UyrGtyzmleWHhQ==", + "version": "3.2.0", + "resolved": "https://registry.npmmirror.com/pizzip/-/pizzip-3.2.0.tgz", + "integrity": "sha512-X4NPNICxCfIK8VYhF6wbksn81vTiziyLbvKuORVAmolvnUzl1A1xmz9DAWKxPRq9lZg84pJOOAMq3OE61bD8IQ==", "dependencies": { "pako": "^2.1.0" } @@ -31902,9 +31902,9 @@ } }, "pizzip": { - "version": "3.1.5", - "resolved": "https://registry.npmmirror.com/pizzip/-/pizzip-3.1.5.tgz", - "integrity": "sha512-uQXb7woLr9baq43Z9EY4wD5cpzrXQd6QUEwehreC1HyRuE4Q1UaGVG9/aCL4CqM4SMz47iE1UyrGtyzmleWHhQ==", + "version": "3.2.0", + "resolved": "https://registry.npmmirror.com/pizzip/-/pizzip-3.2.0.tgz", + "integrity": "sha512-X4NPNICxCfIK8VYhF6wbksn81vTiziyLbvKuORVAmolvnUzl1A1xmz9DAWKxPRq9lZg84pJOOAMq3OE61bD8IQ==", "requires": { "pako": "^2.1.0" } diff --git a/package.json b/package.json index 506ac9f..c1262c2 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "moment": "^2.30.1", "ol": "^6.14.1", "pinia": "^3.0.1", - "pizzip": "^3.1.5", + "pizzip": "^3.2.0", "siriwave": "2.3.0", "tesseract.js": "^6.0.1", "vue": "^3.2.8", diff --git a/vue.config.js b/vue.config.js index 24473a1..7b50ece 100644 --- a/vue.config.js +++ b/vue.config.js @@ -5,12 +5,12 @@ function resolve(dir) { } // http://47.108.232.77:9537/mosty-api/mosty-zhgj/docs.html // const serverHost = "http://47.108.232.77:9537"//线上 -const serverHost = "http://192.168.2.206:8006"//线上 +// const serverHost = "http://192.168.2.206:8006"//线上 // const serverHost = "http://192.168.191.75:8006"//周 // const serverHost = "http://192.168.212.75:8016"//周 // const serverHost = "http://192.168.1.98:8006"//毛毛 // const serverHost = "http://192.168.193.75:8006"//线上 -// const serverHost = "http://47.108.232.77:9537"//线上 +const serverHost = "http://47.108.232.77:9537"//线上 module.exports = { // configureWebpack: { // resolve: { From aedcfb6a99941ad413b831ff57b2db9c646abbfb Mon Sep 17 00:00:00 2001 From: Esacpe <1113279529@qq.com> Date: Fri, 23 Jan 2026 16:10:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/layout/head.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/home/layout/head.vue b/src/views/home/layout/head.vue index 5493ccb..bc92975 100644 --- a/src/views/home/layout/head.vue +++ b/src/views/home/layout/head.vue @@ -186,7 +186,7 @@ const handleBtns = (val) => { btnsActive.value = val; switch (val) { case "数据整合": - router.push("/resourceMonitoring"); + router.push("/dataReduction"); break; case "实站支撑": router.push("/InfoCollection"); @@ -195,10 +195,10 @@ const handleBtns = (val) => { router.push("/ResearchHome"); break; case "后台": - router.push("/fouColorWarning");//editPassword + router.push("/YjData"); break; case "安全监控": - router.push("/BaseLibrary"); + router.push("/resourceMonitoring"); break; case "退出登录": store.dispatch("user/logout"); From a8904c2a6730bf72c079efa3ecf230a8b648b469 Mon Sep 17 00:00:00 2001 From: Esacpe <1113279529@qq.com> Date: Fri, 23 Jan 2026 16:39:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/aboutTable/MyTable.vue | 2 +- .../fourColorManage/YjData/index.vue | 21 ++++-------- .../warningControl/fouColorWarning/index.vue | 33 +++++++++++-------- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/components/aboutTable/MyTable.vue b/src/components/aboutTable/MyTable.vue index e7f6162..16bc04f 100644 --- a/src/components/aboutTable/MyTable.vue +++ b/src/components/aboutTable/MyTable.vue @@ -26,7 +26,7 @@ + :show-overflow-tooltip="item.showOverflowTooltip || true" :sortable="item.sortable || false"> diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/fouColorWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/fouColorWarning/index.vue index 124a2d7..5af3948 100644 --- a/src/views/backOfficeSystem/fourColorManage/warningControl/fouColorWarning/index.vue +++ b/src/views/backOfficeSystem/fourColorManage/warningControl/fouColorWarning/index.vue @@ -11,15 +11,15 @@ :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">