From 2585ecb4775b864b800fea6534b0a566417eb80c Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Fri, 28 Jul 2023 09:49:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 84 +++++ src/assets/archives/023.png | Bin 0 -> 1791 bytes src/utils/request.js | 1 + src/views/head.vue | 140 ++++++- yarn.lock | 705 +++++++++++++++++++++++------------- 5 files changed, 658 insertions(+), 272 deletions(-) create mode 100644 src/assets/archives/023.png diff --git a/package-lock.json b/package-lock.json index b857744..588819a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,9 @@ "js-cookie": "^3.0.1", "less": "3.9.0", "less-loader": "7", + "swiper": "4.5.1", "vue": "^2.6.11", + "vue-awesome-swiper": "3.1.3", "vue-router": "3", "vuex": "3" }, @@ -6631,6 +6633,19 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.5.tgz", + "integrity": "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==", + "dependencies": { + "ssr-window": "^2.0.0" + } + }, + "node_modules/dom7/node_modules/ssr-window": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-2.0.0.tgz", + "integrity": "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==" + }, "node_modules/domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmmirror.com/domain-browser/-/domain-browser-1.2.0.tgz", @@ -13872,6 +13887,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-1.0.1.tgz", + "integrity": "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg==" + }, "node_modules/ssri": { "version": "6.0.2", "resolved": "https://registry.npmmirror.com/ssri/-/ssri-6.0.2.tgz", @@ -14299,6 +14319,19 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/swiper": { + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-4.5.1.tgz", + "integrity": "sha512-se6I7PWWu950NAMXXT+ENtF/6SVb8mPyO+bTfNxbQBILSeLqsYp3Ndap+YOA0EczOIUlea274PKejT6gKZDseA==", + "hasInstallScript": true, + "dependencies": { + "dom7": "^2.1.3", + "ssr-window": "^1.0.1" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/table": { "version": "5.4.6", "resolved": "https://registry.npmmirror.com/table/-/table-5.4.6.tgz", @@ -15264,6 +15297,19 @@ "csstype": "^3.1.0" } }, + "node_modules/vue-awesome-swiper": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/vue-awesome-swiper/-/vue-awesome-swiper-3.1.3.tgz", + "integrity": "sha512-E7suzkyApO8vNZbgdEnjSmnpsmQZyRvSVXJ7sey3XYwKPOkLhH3+GnHroBw+5PZIQXvWBwdCeQsPG1xQ1r1Rhg==", + "dependencies": { + "object-assign": "^4.1.1", + "swiper": "^4.0.7" + }, + "engines": { + "node": ">= 4.0.0", + "npm": ">= 3.0.0" + } + }, "node_modules/vue-eslint-parser": { "version": "7.11.0", "resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz", @@ -21046,6 +21092,21 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.5.tgz", + "integrity": "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==", + "requires": { + "ssr-window": "^2.0.0" + }, + "dependencies": { + "ssr-window": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-2.0.0.tgz", + "integrity": "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==" + } + } + }, "domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmmirror.com/domain-browser/-/domain-browser-1.2.0.tgz", @@ -26316,6 +26377,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-1.0.1.tgz", + "integrity": "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg==" + }, "ssri": { "version": "6.0.2", "resolved": "https://registry.npmmirror.com/ssri/-/ssri-6.0.2.tgz", @@ -26634,6 +26700,15 @@ } } }, + "swiper": { + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-4.5.1.tgz", + "integrity": "sha512-se6I7PWWu950NAMXXT+ENtF/6SVb8mPyO+bTfNxbQBILSeLqsYp3Ndap+YOA0EczOIUlea274PKejT6gKZDseA==", + "requires": { + "dom7": "^2.1.3", + "ssr-window": "^1.0.1" + } + }, "table": { "version": "5.4.6", "resolved": "https://registry.npmmirror.com/table/-/table-5.4.6.tgz", @@ -27347,6 +27422,15 @@ } } }, + "vue-awesome-swiper": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/vue-awesome-swiper/-/vue-awesome-swiper-3.1.3.tgz", + "integrity": "sha512-E7suzkyApO8vNZbgdEnjSmnpsmQZyRvSVXJ7sey3XYwKPOkLhH3+GnHroBw+5PZIQXvWBwdCeQsPG1xQ1r1Rhg==", + "requires": { + "object-assign": "^4.1.1", + "swiper": "^4.0.7" + } + }, "vue-eslint-parser": { "version": "7.11.0", "resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz", diff --git a/src/assets/archives/023.png b/src/assets/archives/023.png new file mode 100644 index 0000000000000000000000000000000000000000..ed738864201ae3ec6a42289ab1333055fdf27897 GIT binary patch literal 1791 zcmeAS@N?(olHy`uVBq!ia0vp^-xwGe%{Z8Vth?`j%m-48#X;^)4C~IxyaaMwQX@Rm ze0>?TfNTy1#`a7G7LXDkmI7i12Id8f49q~95hS*N2`>9>0W*xvXa-Vv|7x%-0|Q&8 zr;B4q1>@UGfuar!3`YZG5^FLSwK6$nENnG;G~w{w>#Yie2>;6ehuVwadc9E}Oe0Y^Tmr)_63{?4ey85}Sb4q9e E03Ss*od5s; literal 0 HcmV?d00001 diff --git a/src/utils/request.js b/src/utils/request.js index 52bc36f..edb908c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,6 +7,7 @@ const request = axios.create({ // baseURL: 'http://172.18.113.50:8080/zhapi', //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强 //baseURL: 'http://192.168.0.188:8888/zhapi', + //baseURL: 'http://121.41.91.94:12002/zhapi', baseURL: `http://${window.location.host}/zhapi`, timeout: 50000, headers: { 'content-type': 'application/json' }, diff --git a/src/views/head.vue b/src/views/head.vue index 642396f..8a47f98 100644 --- a/src/views/head.vue +++ b/src/views/head.vue @@ -5,30 +5,63 @@
镇海平安企业（园区）
- +
- 综合指数 + 综合指数
- 实时预警 + 实时预警
- 闭环处置 + 闭环处置
- 要素资源 + 要素资源
- 企业档案 + 企业档案
- 应用超市 + 应用超市
- 系统管理 + 系统管理
-
+
   王警官
+
+
+ +
+ +
+ +
王警官
+ +
个人中心
+ + +
+
@@ -36,18 +69,37 @@ \ No newline at end of file diff --git a/src/views/applySupermarket/index.vue b/src/views/applySupermarket/index.vue index 8f267a3..b921a7f 100644 --- a/src/views/applySupermarket/index.vue +++ b/src/views/applySupermarket/index.vue @@ -3,7 +3,7 @@
应用超市
-
>>处置详情
+
>>人员背景审查
diff --git a/src/views/head.vue b/src/views/head.vue index 8a47f98..730a9d9 100644 --- a/src/views/head.vue +++ b/src/views/head.vue @@ -50,14 +50,8 @@
- -
- -
- -
王警官
-
个人中心
+
修改密码
@@ -170,7 +164,7 @@ export default { top: 70px; right: 10px; width: 180px; - height: 200px; + height: 100px; // border: 0.1px solid #33cccc; padding: 10px; background: url("~@/assets/archives/023.png") no-repeat; @@ -178,25 +172,9 @@ export default { z-index: 2; .user_box_body { width: 160px; - height: 180px; + height: 80px; // border: 0.1px solid #33cccc; } - .user_box_img { - width: 60px; - height: 60px; - margin: 5px auto; - img { - width: 60px; - height: 60px; - } - } - .user_name { - width: 160px; - height: 25px; - color: #d9e7ff; - font-size: 15px; - text-align: center; - } .user_center { width: 160px; height: 40px; diff --git a/src/views/safetyIndex/toubu.vue b/src/views/safetyIndex/toubu.vue index 109d9cc..18c9b45 100644 --- a/src/views/safetyIndex/toubu.vue +++ b/src/views/safetyIndex/toubu.vue @@ -1,753 +1,814 @@ \ No newline at end of file -- 2.36.3 From 5c56e879ebe62ae1c02ad21ca5474daaaf5525e9 Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Mon, 31 Jul 2023 17:39:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E7=82=B9=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/baiduapi.js | 8 +- src/components/offLineMap/index.vue | 535 ++++--- .../personBack/components/abnormalTable.vue | 2 +- .../personBack/components/normalTable.vue | 2 +- src/views/factorResources/map.vue | 458 +++--- src/views/realtimeWarning/index.vue | 1258 +++++++++-------- src/views/realtimeWarning/map.vue | 524 ++++--- 7 files changed, 1489 insertions(+), 1298 deletions(-) diff --git a/public/baiduapi.js b/public/baiduapi.js index 8e9f33d..bfc7fba 100644 --- a/public/baiduapi.js +++ b/public/baiduapi.js @@ -6034,13 +6034,13 @@ window.BMAP_AUTHENTIC_KEY = "iSZit9hpxlgGq28nmIyFk8lQQ21widby"; }) } }); - var Ad = new nd(I.pa + "", new M(19, 25), { + var Ad = new nd(I.pa + "marker_red_sprite.png", new M(19, 25), { anchor: new M(10, 25), infoWindowAnchor: new M(10, 0) }) - , Bd = new nd(I.pa + "marker_red_sprite.png", new M(20, 11), { - anchor: new M(6, 11), - imageOffset: new M(-19, -13) + , Bd = new nd(I.pa + "marker_red_sprite.png", new M(50, 120), { + anchor: new M(50, 120), + imageOffset: new M(-10, 40) }); function W(a, b) { b = b || {}; diff --git a/src/components/offLineMap/index.vue b/src/components/offLineMap/index.vue index 7c70e42..434f450 100644 --- a/src/components/offLineMap/index.vue +++ b/src/components/offLineMap/index.vue @@ -1,234 +1,202 @@ \ No newline at end of file diff --git a/src/views/applySupermarket/personBack/components/abnormalTable.vue b/src/views/applySupermarket/personBack/components/abnormalTable.vue index e21c0e5..a804beb 100644 --- a/src/views/applySupermarket/personBack/components/abnormalTable.vue +++ b/src/views/applySupermarket/personBack/components/abnormalTable.vue @@ -235,7 +235,7 @@ export default { // } .pagination_body { width: 44vw; - height: 4vh; + height: 4.5vh; display: flex; flex-direction: row-reverse; // border: 0.1px solid #2f6363; diff --git a/src/views/applySupermarket/personBack/components/normalTable.vue b/src/views/applySupermarket/personBack/components/normalTable.vue index 76a4081..400e48e 100644 --- a/src/views/applySupermarket/personBack/components/normalTable.vue +++ b/src/views/applySupermarket/personBack/components/normalTable.vue @@ -139,7 +139,7 @@ export default { } .pagination_body { width: 44vw; - height: 4vh; + height: 4.5vh; display: flex; flex-direction: row-reverse; // border: 0.1px solid #2f6363; diff --git a/src/views/factorResources/map.vue b/src/views/factorResources/map.vue index 1304e14..36aa051 100644 --- a/src/views/factorResources/map.vue +++ b/src/views/factorResources/map.vue @@ -1,215 +1,270 @@ \ No newline at end of file diff --git a/src/views/realtimeWarning/index.vue b/src/views/realtimeWarning/index.vue index f7225d8..2ec3720 100644 --- a/src/views/realtimeWarning/index.vue +++ b/src/views/realtimeWarning/index.vue @@ -1,663 +1,723 @@ \ No newline at end of file diff --git a/src/views/realtimeWarning/map.vue b/src/views/realtimeWarning/map.vue index 076d34a..523547e 100644 --- a/src/views/realtimeWarning/map.vue +++ b/src/views/realtimeWarning/map.vue @@ -1,179 +1,184 @@ \ No newline at end of file -- 2.36.3