-
+
@@ -37,6 +37,23 @@
]
}
},
+ mounted(){
+ this.changeTab('井盖状态监测')
+ },
+ methods:{
+ changeTab(tab){
+ this.currentTab=tab
+ if(tab=='井盖状态监测'){
+ this.seriesData = [{name:'井盖开启',data:[0, 3, 0, 10, 3, 0, 1],color:'0,255,204'}]
+ }else if(tab=='液位监测'){
+ this.seriesData = [{name:'液位超限',data:[0, 3, 2, 1, 0, 0, 1],color:'58,55,194'}]
+ }else if(tab=='有害气体监测'){
+ this.seriesData = [{name:'有害气体超标',data:[0, 2, 0, 0, 0, 0, 1],color:'109,202,23'}]
+ }else if(tab=='消防栓监测'){
+ this.seriesData = [{name:'消防栓开启',data:[0, 0, 0, 1, 0, 0, 3],color:'255,192,203'}]
+ }
+ }
+ }
}
@@ -67,6 +84,9 @@
/*text-overflow:ellipsis;*/
}
}
+ .tab:hover{
+ cursor: pointer;
+ }
.current-tab{
border-top: 2px solid #4e91ff;
.text{
diff --git a/package-lock.json b/package-lock.json
index 9388eb6..2a1c2dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1206,6 +1206,61 @@
"resolved": "https://registry.npmjs.org/@types/zrender/-/zrender-4.0.0.tgz",
"integrity": "sha512-s89GOIeKFiod2KSqHkfd2rzx+T2DVu7ihZCBEBnhFrzvQPUmzvDSBot9Fi1DfMQm9Odg+rTqoMGC38RvrwJK2w=="
},
+ "@videojs/http-streaming": {
+ "version": "2.9.2",
+ "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.9.2.tgz",
+ "integrity": "sha512-2ZsxJn4/nZZ6k6jIhic2l9ynGmKwprtuI5b3+M6JgqOSLvQQ/ah+heVs/0g2Ze7qJxodqR+aSY948JwJIz1gCw==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "@videojs/vhs-utils": "^3.0.2",
+ "aes-decrypter": "3.1.2",
+ "global": "^4.4.0",
+ "m3u8-parser": "4.7.0",
+ "mpd-parser": "0.17.0",
+ "mux.js": "5.12.2",
+ "video.js": "^6 || ^7"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
+ "@videojs/vhs-utils": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.3.tgz",
+ "integrity": "sha512-bU7daxDHhzcTDbmty1cXjzsTYvx2cBGbA8hG5H2Gvpuk4sdfuvkZtMCwtCqL59p6dsleMPspyaNS+7tWXx2Y0A==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "global": "^4.4.0",
+ "url-toolkit": "^2.2.1"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
+ "@videojs/xhr": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/@videojs/xhr/-/xhr-2.5.1.tgz",
+ "integrity": "sha512-wV9nGESHseSK+S9ePEru2+OJZ1jq/ZbbzniGQ4weAmTIepuBMSYPx5zrxxQA0E786T5ykpO8ts+LayV+3/oI2w==",
+ "requires": {
+ "@babel/runtime": "^7.5.5",
+ "global": "~4.4.0",
+ "is-function": "^1.0.1"
+ }
+ },
"@vue/babel-helper-vue-jsx-merge-props": {
"version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/@vue/babel-helper-vue-jsx-merge-props/download/@vue/babel-helper-vue-jsx-merge-props-1.0.0.tgz",
@@ -1869,6 +1924,27 @@
"integrity": "sha1-vxEWycdYxRt6kz0pa3LCIe2UKLY=",
"dev": true
},
+ "aes-decrypter": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.2.tgz",
+ "integrity": "sha512-42nRwfQuPRj9R1zqZBdoxnaAmnIFyDi0MNyTVhjdFOd8fifXKKRfwIHIZ6AMn1or4x5WONzjwRTbTWcsIQ0O4A==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "@videojs/vhs-utils": "^3.0.0",
+ "global": "^4.4.0",
+ "pkcs7": "^1.0.4"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
"aggregate-error": {
"version": "3.0.1",
"resolved": "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.0.1.tgz",
@@ -3356,15 +3432,6 @@
"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
"dev": true
},
- "copy-anything": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.3.tgz",
- "integrity": "sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ==",
- "dev": true,
- "requires": {
- "is-what": "^3.12.0"
- }
- },
"copy-concurrently": {
"version": "1.0.5",
"resolved": "https://registry.npm.taobao.org/copy-concurrently/download/copy-concurrently-1.0.5.tgz",
@@ -4172,6 +4239,11 @@
}
}
},
+ "dom-walk": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+ "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
+ },
"domain-browser": {
"version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz?cache=0&sync_timestamp=1575879298649&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomain-browser%2Fdownload%2Fdomain-browser-1.2.0.tgz",
@@ -6071,6 +6143,15 @@
"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
"dev": true
},
+ "global": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+ "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+ "requires": {
+ "min-document": "^2.19.0",
+ "process": "^0.11.10"
+ }
+ },
"globals": {
"version": "11.12.0",
"resolved": "https://registry.npm.taobao.org/globals/download/globals-11.12.0.tgz",
@@ -6538,13 +6619,6 @@
"integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=",
"dev": true
},
- "image-size": {
- "version": "0.5.5",
- "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
- "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
- "dev": true,
- "optional": true
- },
"import-cwd": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz",
@@ -6601,6 +6675,11 @@
"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
"dev": true
},
+ "individual": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/individual/-/individual-2.0.0.tgz",
+ "integrity": "sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c="
+ },
"infer-owner": {
"version": "1.0.4",
"resolved": "https://registry.npm.taobao.org/infer-owner/download/infer-owner-1.0.4.tgz",
@@ -6866,6 +6945,11 @@
"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
"dev": true
},
+ "is-function": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
+ "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="
+ },
"is-glob": {
"version": "4.0.1",
"resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-4.0.1.tgz",
@@ -7001,12 +7085,6 @@
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
"dev": true
},
- "is-what": {
- "version": "3.14.1",
- "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
- "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
- "dev": true
- },
"is-windows": {
"version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/is-windows/download/is-windows-1.0.2.tgz",
@@ -7197,6 +7275,11 @@
"verror": "1.10.0"
}
},
+ "keycode": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz",
+ "integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ="
+ },
"killable": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/killable/download/killable-1.0.1.tgz",
@@ -7209,12 +7292,6 @@
"integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=",
"dev": true
},
- "klona": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
- "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
- "dev": true
- },
"launch-editor": {
"version": "2.2.1",
"resolved": "https://registry.npm.taobao.org/launch-editor/download/launch-editor-2.2.1.tgz",
@@ -7243,49 +7320,6 @@
"invert-kv": "^2.0.0"
}
},
- "less": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/less/-/less-4.1.1.tgz",
- "integrity": "sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw==",
- "dev": true,
- "requires": {
- "copy-anything": "^2.0.1",
- "errno": "^0.1.1",
- "graceful-fs": "^4.1.2",
- "image-size": "~0.5.0",
- "make-dir": "^2.1.0",
- "mime": "^1.4.1",
- "needle": "^2.5.2",
- "parse-node-version": "^1.0.1",
- "source-map": "~0.6.0",
- "tslib": "^1.10.0"
- },
- "dependencies": {
- "mime": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
- "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
- "dev": true,
- "optional": true
- },
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "dev": true,
- "optional": true
- }
- }
- },
- "less-loader": {
- "version": "10.0.1",
- "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-10.0.1.tgz",
- "integrity": "sha512-Crln//HpW9M5CbtdfWm3IO66Cvx1WhZQvNybXgfB2dD/6Sav9ppw+IWqs/FQKPBFO4B6X0X28Z0WNznshgwUzA==",
- "dev": true,
- "requires": {
- "klona": "^2.0.4"
- }
- },
"leven": {
"version": "3.1.0",
"resolved": "https://registry.npm.taobao.org/leven/download/leven-3.1.0.tgz",
@@ -7490,6 +7524,26 @@
"yallist": "^3.0.2"
}
},
+ "m3u8-parser": {
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.7.0.tgz",
+ "integrity": "sha512-48l/OwRyjBm+QhNNigEEcRcgbRvnUjL7rxs597HmW9QSNbyNvt+RcZ9T/d9vxi9A9z7EZrB1POtZYhdRlwYQkQ==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "@videojs/vhs-utils": "^3.0.0",
+ "global": "^4.4.0"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
"make-dir": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/make-dir/download/make-dir-2.1.0.tgz?cache=0&sync_timestamp=1581565511672&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmake-dir%2Fdownload%2Fmake-dir-2.1.0.tgz",
@@ -7681,6 +7735,14 @@
"integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
"dev": true
},
+ "min-document": {
+ "version": "2.19.0",
+ "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+ "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
+ "requires": {
+ "dom-walk": "^0.1.0"
+ }
+ },
"mini-css-extract-plugin": {
"version": "0.9.0",
"resolved": "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.9.0.tgz?cache=0&sync_timestamp=1576856499989&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-0.9.0.tgz",
@@ -7864,6 +7926,27 @@
"run-queue": "^1.0.3"
}
},
+ "mpd-parser": {
+ "version": "0.17.0",
+ "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.17.0.tgz",
+ "integrity": "sha512-oKS5G0jCcHHJ3sHYlcLeM9Xcbuixl08eAx7QW0Th7ChlZiI0YvLtGaHE/L0aKUBJFNvtkeksIr8XgJgSBBsS4g==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "@videojs/vhs-utils": "^3.0.2",
+ "global": "^4.4.0",
+ "xmldom": "^0.5.0"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
@@ -7896,6 +7979,24 @@
"integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
"dev": true
},
+ "mux.js": {
+ "version": "5.12.2",
+ "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-5.12.2.tgz",
+ "integrity": "sha512-9OY1lrFIo7FxMeIC6aLUftiNv97AztufDfi30N7qDll1Pcy7bCxlHztyHp1Ce0KQwy2XqchGeENPS4v1NJngHQ==",
+ "requires": {
+ "@babel/runtime": "^7.11.2"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
"mz": {
"version": "2.7.0",
"resolved": "https://registry.npm.taobao.org/mz/download/mz-2.7.0.tgz",
@@ -7949,30 +8050,6 @@
"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
"dev": true
},
- "needle": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/needle/-/needle-2.8.0.tgz",
- "integrity": "sha512-ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw==",
- "dev": true,
- "optional": true,
- "requires": {
- "debug": "^3.2.6",
- "iconv-lite": "^0.4.4",
- "sax": "^1.2.4"
- },
- "dependencies": {
- "debug": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "ms": "^2.1.1"
- }
- }
- }
- },
"negotiator": {
"version": "0.6.2",
"resolved": "https://registry.npm.taobao.org/negotiator/download/negotiator-0.6.2.tgz",
@@ -8530,12 +8607,6 @@
"lines-and-columns": "^1.1.6"
}
},
- "parse-node-version": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
- "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
- "dev": true
- },
"parse5": {
"version": "5.1.1",
"resolved": "https://registry.npm.taobao.org/parse5/download/parse5-5.1.1.tgz",
@@ -8667,6 +8738,14 @@
"pinkie": "^2.0.0"
}
},
+ "pkcs7": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-1.0.4.tgz",
+ "integrity": "sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==",
+ "requires": {
+ "@babel/runtime": "^7.5.5"
+ }
+ },
"pkg-dir": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-3.0.0.tgz",
@@ -9334,8 +9413,7 @@
"process": {
"version": "0.11.10",
"resolved": "https://registry.npm.taobao.org/process/download/process-0.11.10.tgz",
- "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
- "dev": true
+ "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
},
"process-nextick-args": {
"version": "2.0.1",
@@ -9906,6 +9984,14 @@
"aproba": "^1.1.1"
}
},
+ "rust-result": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/rust-result/-/rust-result-1.0.0.tgz",
+ "integrity": "sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=",
+ "requires": {
+ "individual": "^2.0.0"
+ }
+ },
"rxjs": {
"version": "6.5.4",
"resolved": "https://registry.npm.taobao.org/rxjs/download/rxjs-6.5.4.tgz",
@@ -9921,6 +10007,14 @@
"integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
"dev": true
},
+ "safe-json-parse": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-4.0.0.tgz",
+ "integrity": "sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=",
+ "requires": {
+ "rust-result": "^1.0.0"
+ }
+ },
"safe-regex": {
"version": "1.1.0",
"resolved": "https://registry.npm.taobao.org/safe-regex/download/safe-regex-1.1.0.tgz",
@@ -11400,6 +11494,11 @@
"requires-port": "^1.0.0"
}
},
+ "url-toolkit": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.3.tgz",
+ "integrity": "sha512-Da75SQoxsZ+2wXS56CZBrj2nukQ4nlGUZUP/dqUBG5E1su5GKThgT94Q00x81eVII7AyS1Pn+CtTTZ4Z0pLUtQ=="
+ },
"use": {
"version": "3.1.1",
"resolved": "https://registry.npm.taobao.org/use/download/use-3.1.1.tgz",
@@ -11498,6 +11597,49 @@
"extsprintf": "^1.2.0"
}
},
+ "video.js": {
+ "version": "7.14.3",
+ "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.14.3.tgz",
+ "integrity": "sha512-6avCdSIfn5ss5NOgoQfY/xEfPNcz9DXSw+ZN80NwPguCdRd4VL4y40b/d7osYJwyCdF+YkvhqAW7dw4s0vBigg==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "@videojs/http-streaming": "2.9.2",
+ "@videojs/vhs-utils": "^3.0.2",
+ "@videojs/xhr": "2.5.1",
+ "aes-decrypter": "3.1.2",
+ "global": "^4.4.0",
+ "keycode": "^2.2.0",
+ "m3u8-parser": "4.7.0",
+ "mpd-parser": "0.17.0",
+ "mux.js": "5.12.2",
+ "safe-json-parse": "4.0.0",
+ "videojs-font": "3.2.0",
+ "videojs-vtt.js": "^0.15.3"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
+ "videojs-font": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-3.2.0.tgz",
+ "integrity": "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA=="
+ },
+ "videojs-vtt.js": {
+ "version": "0.15.3",
+ "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.3.tgz",
+ "integrity": "sha512-5FvVsICuMRx6Hd7H/Y9s9GDeEtYcXQWzGMS+sl4UX3t/zoHp3y+isSfIPRochnTH7h+Bh1ILyC639xy9Z6kPag==",
+ "requires": {
+ "global": "^4.3.1"
+ }
+ },
"vm-browserify": {
"version": "1.1.2",
"resolved": "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz?cache=0&sync_timestamp=1572870717730&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvm-browserify%2Fdownload%2Fvm-browserify-1.1.2.tgz",
@@ -12107,6 +12249,11 @@
"async-limiter": "~1.0.0"
}
},
+ "xmldom": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
+ "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="
+ },
"xtend": {
"version": "4.0.2",
"resolved": "https://registry.npm.taobao.org/xtend/download/xtend-4.0.2.tgz",
diff --git a/package.json b/package.json
index fcd5682..ddf0717 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
"echarts": "^4.6.0",
"js-cookie": "^2.2.1",
"leaflet": "^1.7.1",
+ "video.js": "^7.14.3",
"vue": "^2.6.11",
"vue-awesome": "^4.0.2",
"vue-router": "^3.1.5",
@@ -53,7 +54,9 @@
"warn",
"never"
],
- "no-debugger": ["off"]
+ "no-debugger": [
+ "off"
+ ]
}
},
"browserslist": [
diff --git a/public/static/project.config.json b/public/static/project.config.json
index cec4541..49b4225 100644
--- a/public/static/project.config.json
+++ b/public/static/project.config.json
@@ -1,16 +1,17 @@
{
- "title": "数据可视化",
+ "title": "珠海三溪科创小镇智慧园区平台",
"baseUrl": "http://111.198.10.15:11409/",
"singleSys": true,
"city":"三溪小镇",
"mapType":[
"leaflet"
],
- "center":[22.289656,113.497393],
- "zoom":14,
+ "center":[22.289856,113.496093],
+ "zoom":15,
"mapUrl":"https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447",
"labelUrl":"https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447",
"satelliteUrl":"http://t0.tianditu.gov.cn/img_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447",
+ "satelliteLabelUrl":"http://t0.tianditu.gov.cn/cia_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447",
"defaultRefresh": 60000,
"status": "online"
}
diff --git a/public/static/video/lukou.mp4 b/public/static/video/lukou.mp4
new file mode 100644
index 0000000..89340eb
--- /dev/null
+++ b/public/static/video/lukou.mp4
Binary files differ
diff --git a/src/assets/img/map/alarm.png b/src/assets/img/map/alarm.png
new file mode 100644
index 0000000..61e9f42
--- /dev/null
+++ b/src/assets/img/map/alarm.png
Binary files differ
diff --git a/src/assets/img/map/close.png b/src/assets/img/map/close.png
new file mode 100644
index 0000000..485e69b
--- /dev/null
+++ b/src/assets/img/map/close.png
Binary files differ
diff --git a/src/assets/img/map/maximum.png b/src/assets/img/map/maximum.png
new file mode 100644
index 0000000..03fa799
--- /dev/null
+++ b/src/assets/img/map/maximum.png
Binary files differ
diff --git a/src/assets/img/map/video.png b/src/assets/img/map/video.png
new file mode 100644
index 0000000..54e8692
--- /dev/null
+++ b/src/assets/img/map/video.png
Binary files differ
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 5164f73..6c7c5b9 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -92,7 +92,7 @@
fontSize: '16'
},
axisPointer: {
- type: 'cross',
+ type: 'line',
label: {
fontSize: '16'
}
@@ -125,11 +125,16 @@
verticalAlign: 'middle'
},
splitLine: {
+ show: false,
lineStyle: {
color: ['#101641'],
type: 'dashed'
}
},
+ max: function(value){
+ return value.max+2
+ },
+ minIntermal:1,
axisLine: {
lineStyle: {
color: this.axisLineColor
@@ -141,7 +146,6 @@
}
}
],
-
series: []
}
}
diff --git a/src/components/leafletMap/base/mixins/common.js b/src/components/leafletMap/base/mixins/common.js
index 2fd1a28..a2c7173 100644
--- a/src/components/leafletMap/base/mixins/common.js
+++ b/src/components/leafletMap/base/mixins/common.js
@@ -18,13 +18,13 @@
const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
-function destroyInstance () {
- const { unload, renderByParent, $parent } = this
- if (renderByParent) {
- $parent.reload()
- }
- unload()
-}
+// function destroyInstance () {
+// const { unload, renderByParent, $parent } = this
+// if (renderByParent) {
+// $parent.reload()
+// }
+// unload()
+// }
class Mixin {
constructor (prop) {
@@ -60,7 +60,9 @@
default:
map[types[prop.type].unload](originInstance)
}
- } catch (e) {}
+ } catch (e) {
+ console.log(e)
+ }
}
}
this.computed = {
diff --git a/src/components/leafletMap/leafletMap.vue b/src/components/leafletMap/leafletMap.vue
index 2860b5f..434553b 100644
--- a/src/components/leafletMap/leafletMap.vue
+++ b/src/components/leafletMap/leafletMap.vue
@@ -46,8 +46,13 @@
this.initMap()
},
watch: {
- layers(){
-
+ layers:{
+ handler(val){
+ console.log(val)
+ this.clearLayers()
+ this.addLayers()
+ },
+ deep: true
},
zoom(){
diff --git a/src/router/index.js b/src/router/index.js
index d4131b7..5831da6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -9,7 +9,8 @@
{ path: '/main', name:'数据看板', component: () => import('@/views/screen/mainDashboard'), hidden: true },
{ path: '/404', component: () => import('@/views/errorPage/404.vue'), hidden: true },
{ path: '/401', component: () => import('@/views/errorPage/401.vue'), hidden: true },
- { path: '/', name: 'index', component: () => import('../views/index.vue') },
+ // { path: '/', name: 'index', component: () => import('../views/index.vue') },
+ { path: '/', redirect: '/main'},
{ path: '*', redirect: '/404',hidden: true}
]
diff --git a/src/store/getters.js b/src/store/getters.js
index d28b64f..4002fec 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,6 +1,4 @@
const getters = {
- visitedViews: state => state.tagsView.visitedViews,
- cachedViews: state => state.tagsView.cachedViews,
sidebar: state => state.app.sidebar, // 侧边栏
device: state => state.app.device, // 设备
kaptcha: state => state.app.kaptcha, // 验证码
@@ -8,32 +6,5 @@
sid: state => state.app.sid, // 用户标识
currentSystem: state => state.app.currentSystem, // 用户标识
changeFlag: state => state.app.changeFlag, // 切换子系统标志
- token: state => state.user.token, // token
- name: state => state.user.name, // 姓名
- userId: state => state.user.id, // id
- roleList: state => state.user.roleList, // 角色列表
- roleNames: state => state.user.roleNames, // 角色名称列表
- roleTips: state => state.user.roleTips, // 角色名称列表
- deptId: state => state.user.deptId, // 权属单位
- deptName: state => state.user.deptName, // 权属单位名称
- menus: state => state.permission.menus, // 菜单
- systems: state => state.permission.systems, // 子系统
- permission_routers: state => state.permission.routers, // 用户有权限的路由
- addRouters: state => state.permission.addRouters, // 添加的路由
- btns: state => state.permission.btns, // 用户所有的按钮权限
- wellTypes: state => state.user.wellTypes, // 用户支持的闸井类型
- deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
- communications: state => state.user.communications, // 用户支持的通讯方式
- area: state => state.user.area, // 用户所在区域
- urls: state => state.map.urls, // 地图服务地址列表
- baseUrl: state => state.map.baseUrl, // 地图服务地址
- partsUrl: state => state.map.partsUrl, // 部件分层地址
- partsEditUrl: state => state.map.partsEditUrl, // 部件分层地址
- partsAllUrl: state => state.map.partsAllUrl, // 部件不分层地址
- shopUrl: state => state.map.shopUrl, // 部件不分层地址
- mapUrl: state => state.map.mapUrl, // 底图地址
- mapDtUrl: state => state.map.mapDtUrl, // 无网格底图地址
- gridUrl: state => state.map.gridUrl, // 网格图层
- editUrl: state => state.map.editUrl // 编辑地图地址
}
export default getters
diff --git a/src/views/screen/mainComponents/alarmLayer.vue b/src/views/screen/mainComponents/alarmLayer.vue
new file mode 100644
index 0000000..10809bf
--- /dev/null
+++ b/src/views/screen/mainComponents/alarmLayer.vue
@@ -0,0 +1,254 @@
+
+
+
{{tab}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/screen/mainComponents/bizStatistic.vue b/src/views/screen/mainComponents/bizStatistic.vue
index f948a33..bd27b53 100644
--- a/src/views/screen/mainComponents/bizStatistic.vue
+++ b/src/views/screen/mainComponents/bizStatistic.vue
@@ -22,13 +22,13 @@
data(){
return {
data:[
- {name:'路灯亮灯率', value:{already:34, total:100,rate:34}, color:'#009eec'},
+ {name:'路灯亮灯率', value:{already:34, total:100,rate:98}, color:'#009eec'},
// {name:'地下管线监测设备报警率', value:[{already:34, total:100,rate:34}]},
- {name:'井盖报警率', value:{already:34, total:100,rate:50}, color:'#9fe6b8'},
- {name:'液位报警率', value:{already:34, total:100,rate:79}, color:'#99ccff'},
- {name:'有害气体报警率', value:{already:34, total:100,rate:20, color:'#ffdb5c'}},
- {name:'噪声报警率', value:{already:34, total:100,rate:15}, color:'#ff9f7f'},
- {name:'消防栓报警率', value:{already:34, total:100,rate:54}, color:'#fb7293'}
+ {name:'井盖报警率', value:{already:34, total:100,rate:8}, color:'#9fe6b8'},
+ {name:'液位报警率', value:{already:34, total:100,rate:5}, color:'#99ccff'},
+ {name:'有害气体报警率', value:{already:34, total:100,rate:2, color:'#ffdb5c'}},
+ {name:'噪声报警率', value:{already:34, total:100,rate:7}, color:'#ff9f7f'},
+ {name:'消防栓报警率', value:{already:34, total:100,rate:0}, color:'#fb7293'}
]
}
},
diff --git a/src/views/screen/mainComponents/deviceAlarmHistory.vue b/src/views/screen/mainComponents/deviceAlarmHistory.vue
index 6d02e1b..1e9e452 100644
--- a/src/views/screen/mainComponents/deviceAlarmHistory.vue
+++ b/src/views/screen/mainComponents/deviceAlarmHistory.vue
@@ -7,7 +7,7 @@
-
+
@@ -37,6 +37,23 @@
]
}
},
+ mounted(){
+ this.changeTab('井盖状态监测')
+ },
+ methods:{
+ changeTab(tab){
+ this.currentTab=tab
+ if(tab=='井盖状态监测'){
+ this.seriesData = [{name:'井盖开启',data:[0, 3, 0, 10, 3, 0, 1],color:'0,255,204'}]
+ }else if(tab=='液位监测'){
+ this.seriesData = [{name:'液位超限',data:[0, 3, 2, 1, 0, 0, 1],color:'58,55,194'}]
+ }else if(tab=='有害气体监测'){
+ this.seriesData = [{name:'有害气体超标',data:[0, 2, 0, 0, 0, 0, 1],color:'109,202,23'}]
+ }else if(tab=='消防栓监测'){
+ this.seriesData = [{name:'消防栓开启',data:[0, 0, 0, 1, 0, 0, 3],color:'255,192,203'}]
+ }
+ }
+ }
}
@@ -67,6 +84,9 @@
/*text-overflow:ellipsis;*/
}
}
+ .tab:hover{
+ cursor: pointer;
+ }
.current-tab{
border-top: 2px solid #4e91ff;
.text{
diff --git a/src/views/screen/mainComponents/deviceAlarmRank.vue b/src/views/screen/mainComponents/deviceAlarmRank.vue
index 021d404..a5936a1 100644
--- a/src/views/screen/mainComponents/deviceAlarmRank.vue
+++ b/src/views/screen/mainComponents/deviceAlarmRank.vue
@@ -21,11 +21,11 @@
ranking: {
data: [
// {name: "路灯", value: 55},
- {name: "井盖状态监测仪", value: 120},
- {name: "液位监测仪", value: 78},
- {name: "有害气体监测仪", value: 66},
- {name: "消防栓防盗水监测仪", value: 80},
- {name: "噪声监测仪", value: 80}
+ {name: "井盖状态监测仪", value: 4},
+ {name: "液位监测仪", value: 1},
+ {name: "有害气体监测仪", value: 1},
+ {name: "消防栓防盗水监测仪", value: 0},
+ {name: "噪声监测仪", value: 1}
],
unit: "次",
showValue: true
diff --git a/package-lock.json b/package-lock.json
index 9388eb6..2a1c2dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1206,6 +1206,61 @@
"resolved": "https://registry.npmjs.org/@types/zrender/-/zrender-4.0.0.tgz",
"integrity": "sha512-s89GOIeKFiod2KSqHkfd2rzx+T2DVu7ihZCBEBnhFrzvQPUmzvDSBot9Fi1DfMQm9Odg+rTqoMGC38RvrwJK2w=="
},
+ "@videojs/http-streaming": {
+ "version": "2.9.2",
+ "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.9.2.tgz",
+ "integrity": "sha512-2ZsxJn4/nZZ6k6jIhic2l9ynGmKwprtuI5b3+M6JgqOSLvQQ/ah+heVs/0g2Ze7qJxodqR+aSY948JwJIz1gCw==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "@videojs/vhs-utils": "^3.0.2",
+ "aes-decrypter": "3.1.2",
+ "global": "^4.4.0",
+ "m3u8-parser": "4.7.0",
+ "mpd-parser": "0.17.0",
+ "mux.js": "5.12.2",
+ "video.js": "^6 || ^7"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
+ "@videojs/vhs-utils": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.3.tgz",
+ "integrity": "sha512-bU7daxDHhzcTDbmty1cXjzsTYvx2cBGbA8hG5H2Gvpuk4sdfuvkZtMCwtCqL59p6dsleMPspyaNS+7tWXx2Y0A==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "global": "^4.4.0",
+ "url-toolkit": "^2.2.1"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
+ "@videojs/xhr": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/@videojs/xhr/-/xhr-2.5.1.tgz",
+ "integrity": "sha512-wV9nGESHseSK+S9ePEru2+OJZ1jq/ZbbzniGQ4weAmTIepuBMSYPx5zrxxQA0E786T5ykpO8ts+LayV+3/oI2w==",
+ "requires": {
+ "@babel/runtime": "^7.5.5",
+ "global": "~4.4.0",
+ "is-function": "^1.0.1"
+ }
+ },
"@vue/babel-helper-vue-jsx-merge-props": {
"version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/@vue/babel-helper-vue-jsx-merge-props/download/@vue/babel-helper-vue-jsx-merge-props-1.0.0.tgz",
@@ -1869,6 +1924,27 @@
"integrity": "sha1-vxEWycdYxRt6kz0pa3LCIe2UKLY=",
"dev": true
},
+ "aes-decrypter": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.2.tgz",
+ "integrity": "sha512-42nRwfQuPRj9R1zqZBdoxnaAmnIFyDi0MNyTVhjdFOd8fifXKKRfwIHIZ6AMn1or4x5WONzjwRTbTWcsIQ0O4A==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "@videojs/vhs-utils": "^3.0.0",
+ "global": "^4.4.0",
+ "pkcs7": "^1.0.4"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
"aggregate-error": {
"version": "3.0.1",
"resolved": "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.0.1.tgz",
@@ -3356,15 +3432,6 @@
"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
"dev": true
},
- "copy-anything": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.3.tgz",
- "integrity": "sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ==",
- "dev": true,
- "requires": {
- "is-what": "^3.12.0"
- }
- },
"copy-concurrently": {
"version": "1.0.5",
"resolved": "https://registry.npm.taobao.org/copy-concurrently/download/copy-concurrently-1.0.5.tgz",
@@ -4172,6 +4239,11 @@
}
}
},
+ "dom-walk": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+ "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
+ },
"domain-browser": {
"version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz?cache=0&sync_timestamp=1575879298649&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomain-browser%2Fdownload%2Fdomain-browser-1.2.0.tgz",
@@ -6071,6 +6143,15 @@
"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
"dev": true
},
+ "global": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+ "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+ "requires": {
+ "min-document": "^2.19.0",
+ "process": "^0.11.10"
+ }
+ },
"globals": {
"version": "11.12.0",
"resolved": "https://registry.npm.taobao.org/globals/download/globals-11.12.0.tgz",
@@ -6538,13 +6619,6 @@
"integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=",
"dev": true
},
- "image-size": {
- "version": "0.5.5",
- "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
- "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
- "dev": true,
- "optional": true
- },
"import-cwd": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz",
@@ -6601,6 +6675,11 @@
"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
"dev": true
},
+ "individual": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/individual/-/individual-2.0.0.tgz",
+ "integrity": "sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c="
+ },
"infer-owner": {
"version": "1.0.4",
"resolved": "https://registry.npm.taobao.org/infer-owner/download/infer-owner-1.0.4.tgz",
@@ -6866,6 +6945,11 @@
"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
"dev": true
},
+ "is-function": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
+ "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="
+ },
"is-glob": {
"version": "4.0.1",
"resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-4.0.1.tgz",
@@ -7001,12 +7085,6 @@
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
"dev": true
},
- "is-what": {
- "version": "3.14.1",
- "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
- "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
- "dev": true
- },
"is-windows": {
"version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/is-windows/download/is-windows-1.0.2.tgz",
@@ -7197,6 +7275,11 @@
"verror": "1.10.0"
}
},
+ "keycode": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz",
+ "integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ="
+ },
"killable": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/killable/download/killable-1.0.1.tgz",
@@ -7209,12 +7292,6 @@
"integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=",
"dev": true
},
- "klona": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
- "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
- "dev": true
- },
"launch-editor": {
"version": "2.2.1",
"resolved": "https://registry.npm.taobao.org/launch-editor/download/launch-editor-2.2.1.tgz",
@@ -7243,49 +7320,6 @@
"invert-kv": "^2.0.0"
}
},
- "less": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/less/-/less-4.1.1.tgz",
- "integrity": "sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw==",
- "dev": true,
- "requires": {
- "copy-anything": "^2.0.1",
- "errno": "^0.1.1",
- "graceful-fs": "^4.1.2",
- "image-size": "~0.5.0",
- "make-dir": "^2.1.0",
- "mime": "^1.4.1",
- "needle": "^2.5.2",
- "parse-node-version": "^1.0.1",
- "source-map": "~0.6.0",
- "tslib": "^1.10.0"
- },
- "dependencies": {
- "mime": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
- "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
- "dev": true,
- "optional": true
- },
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "dev": true,
- "optional": true
- }
- }
- },
- "less-loader": {
- "version": "10.0.1",
- "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-10.0.1.tgz",
- "integrity": "sha512-Crln//HpW9M5CbtdfWm3IO66Cvx1WhZQvNybXgfB2dD/6Sav9ppw+IWqs/FQKPBFO4B6X0X28Z0WNznshgwUzA==",
- "dev": true,
- "requires": {
- "klona": "^2.0.4"
- }
- },
"leven": {
"version": "3.1.0",
"resolved": "https://registry.npm.taobao.org/leven/download/leven-3.1.0.tgz",
@@ -7490,6 +7524,26 @@
"yallist": "^3.0.2"
}
},
+ "m3u8-parser": {
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.7.0.tgz",
+ "integrity": "sha512-48l/OwRyjBm+QhNNigEEcRcgbRvnUjL7rxs597HmW9QSNbyNvt+RcZ9T/d9vxi9A9z7EZrB1POtZYhdRlwYQkQ==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "@videojs/vhs-utils": "^3.0.0",
+ "global": "^4.4.0"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
"make-dir": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/make-dir/download/make-dir-2.1.0.tgz?cache=0&sync_timestamp=1581565511672&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmake-dir%2Fdownload%2Fmake-dir-2.1.0.tgz",
@@ -7681,6 +7735,14 @@
"integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
"dev": true
},
+ "min-document": {
+ "version": "2.19.0",
+ "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+ "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
+ "requires": {
+ "dom-walk": "^0.1.0"
+ }
+ },
"mini-css-extract-plugin": {
"version": "0.9.0",
"resolved": "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.9.0.tgz?cache=0&sync_timestamp=1576856499989&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-0.9.0.tgz",
@@ -7864,6 +7926,27 @@
"run-queue": "^1.0.3"
}
},
+ "mpd-parser": {
+ "version": "0.17.0",
+ "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.17.0.tgz",
+ "integrity": "sha512-oKS5G0jCcHHJ3sHYlcLeM9Xcbuixl08eAx7QW0Th7ChlZiI0YvLtGaHE/L0aKUBJFNvtkeksIr8XgJgSBBsS4g==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "@videojs/vhs-utils": "^3.0.2",
+ "global": "^4.4.0",
+ "xmldom": "^0.5.0"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
@@ -7896,6 +7979,24 @@
"integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
"dev": true
},
+ "mux.js": {
+ "version": "5.12.2",
+ "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-5.12.2.tgz",
+ "integrity": "sha512-9OY1lrFIo7FxMeIC6aLUftiNv97AztufDfi30N7qDll1Pcy7bCxlHztyHp1Ce0KQwy2XqchGeENPS4v1NJngHQ==",
+ "requires": {
+ "@babel/runtime": "^7.11.2"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
"mz": {
"version": "2.7.0",
"resolved": "https://registry.npm.taobao.org/mz/download/mz-2.7.0.tgz",
@@ -7949,30 +8050,6 @@
"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
"dev": true
},
- "needle": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/needle/-/needle-2.8.0.tgz",
- "integrity": "sha512-ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw==",
- "dev": true,
- "optional": true,
- "requires": {
- "debug": "^3.2.6",
- "iconv-lite": "^0.4.4",
- "sax": "^1.2.4"
- },
- "dependencies": {
- "debug": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "ms": "^2.1.1"
- }
- }
- }
- },
"negotiator": {
"version": "0.6.2",
"resolved": "https://registry.npm.taobao.org/negotiator/download/negotiator-0.6.2.tgz",
@@ -8530,12 +8607,6 @@
"lines-and-columns": "^1.1.6"
}
},
- "parse-node-version": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
- "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
- "dev": true
- },
"parse5": {
"version": "5.1.1",
"resolved": "https://registry.npm.taobao.org/parse5/download/parse5-5.1.1.tgz",
@@ -8667,6 +8738,14 @@
"pinkie": "^2.0.0"
}
},
+ "pkcs7": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-1.0.4.tgz",
+ "integrity": "sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==",
+ "requires": {
+ "@babel/runtime": "^7.5.5"
+ }
+ },
"pkg-dir": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-3.0.0.tgz",
@@ -9334,8 +9413,7 @@
"process": {
"version": "0.11.10",
"resolved": "https://registry.npm.taobao.org/process/download/process-0.11.10.tgz",
- "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
- "dev": true
+ "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
},
"process-nextick-args": {
"version": "2.0.1",
@@ -9906,6 +9984,14 @@
"aproba": "^1.1.1"
}
},
+ "rust-result": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/rust-result/-/rust-result-1.0.0.tgz",
+ "integrity": "sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=",
+ "requires": {
+ "individual": "^2.0.0"
+ }
+ },
"rxjs": {
"version": "6.5.4",
"resolved": "https://registry.npm.taobao.org/rxjs/download/rxjs-6.5.4.tgz",
@@ -9921,6 +10007,14 @@
"integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
"dev": true
},
+ "safe-json-parse": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-4.0.0.tgz",
+ "integrity": "sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=",
+ "requires": {
+ "rust-result": "^1.0.0"
+ }
+ },
"safe-regex": {
"version": "1.1.0",
"resolved": "https://registry.npm.taobao.org/safe-regex/download/safe-regex-1.1.0.tgz",
@@ -11400,6 +11494,11 @@
"requires-port": "^1.0.0"
}
},
+ "url-toolkit": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.3.tgz",
+ "integrity": "sha512-Da75SQoxsZ+2wXS56CZBrj2nukQ4nlGUZUP/dqUBG5E1su5GKThgT94Q00x81eVII7AyS1Pn+CtTTZ4Z0pLUtQ=="
+ },
"use": {
"version": "3.1.1",
"resolved": "https://registry.npm.taobao.org/use/download/use-3.1.1.tgz",
@@ -11498,6 +11597,49 @@
"extsprintf": "^1.2.0"
}
},
+ "video.js": {
+ "version": "7.14.3",
+ "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.14.3.tgz",
+ "integrity": "sha512-6avCdSIfn5ss5NOgoQfY/xEfPNcz9DXSw+ZN80NwPguCdRd4VL4y40b/d7osYJwyCdF+YkvhqAW7dw4s0vBigg==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "@videojs/http-streaming": "2.9.2",
+ "@videojs/vhs-utils": "^3.0.2",
+ "@videojs/xhr": "2.5.1",
+ "aes-decrypter": "3.1.2",
+ "global": "^4.4.0",
+ "keycode": "^2.2.0",
+ "m3u8-parser": "4.7.0",
+ "mpd-parser": "0.17.0",
+ "mux.js": "5.12.2",
+ "safe-json-parse": "4.0.0",
+ "videojs-font": "3.2.0",
+ "videojs-vtt.js": "^0.15.3"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
+ "videojs-font": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-3.2.0.tgz",
+ "integrity": "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA=="
+ },
+ "videojs-vtt.js": {
+ "version": "0.15.3",
+ "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.3.tgz",
+ "integrity": "sha512-5FvVsICuMRx6Hd7H/Y9s9GDeEtYcXQWzGMS+sl4UX3t/zoHp3y+isSfIPRochnTH7h+Bh1ILyC639xy9Z6kPag==",
+ "requires": {
+ "global": "^4.3.1"
+ }
+ },
"vm-browserify": {
"version": "1.1.2",
"resolved": "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz?cache=0&sync_timestamp=1572870717730&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvm-browserify%2Fdownload%2Fvm-browserify-1.1.2.tgz",
@@ -12107,6 +12249,11 @@
"async-limiter": "~1.0.0"
}
},
+ "xmldom": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
+ "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="
+ },
"xtend": {
"version": "4.0.2",
"resolved": "https://registry.npm.taobao.org/xtend/download/xtend-4.0.2.tgz",
diff --git a/package.json b/package.json
index fcd5682..ddf0717 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
"echarts": "^4.6.0",
"js-cookie": "^2.2.1",
"leaflet": "^1.7.1",
+ "video.js": "^7.14.3",
"vue": "^2.6.11",
"vue-awesome": "^4.0.2",
"vue-router": "^3.1.5",
@@ -53,7 +54,9 @@
"warn",
"never"
],
- "no-debugger": ["off"]
+ "no-debugger": [
+ "off"
+ ]
}
},
"browserslist": [
diff --git a/public/static/project.config.json b/public/static/project.config.json
index cec4541..49b4225 100644
--- a/public/static/project.config.json
+++ b/public/static/project.config.json
@@ -1,16 +1,17 @@
{
- "title": "数据可视化",
+ "title": "珠海三溪科创小镇智慧园区平台",
"baseUrl": "http://111.198.10.15:11409/",
"singleSys": true,
"city":"三溪小镇",
"mapType":[
"leaflet"
],
- "center":[22.289656,113.497393],
- "zoom":14,
+ "center":[22.289856,113.496093],
+ "zoom":15,
"mapUrl":"https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447",
"labelUrl":"https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447",
"satelliteUrl":"http://t0.tianditu.gov.cn/img_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447",
+ "satelliteLabelUrl":"http://t0.tianditu.gov.cn/cia_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447",
"defaultRefresh": 60000,
"status": "online"
}
diff --git a/public/static/video/lukou.mp4 b/public/static/video/lukou.mp4
new file mode 100644
index 0000000..89340eb
--- /dev/null
+++ b/public/static/video/lukou.mp4
Binary files differ
diff --git a/src/assets/img/map/alarm.png b/src/assets/img/map/alarm.png
new file mode 100644
index 0000000..61e9f42
--- /dev/null
+++ b/src/assets/img/map/alarm.png
Binary files differ
diff --git a/src/assets/img/map/close.png b/src/assets/img/map/close.png
new file mode 100644
index 0000000..485e69b
--- /dev/null
+++ b/src/assets/img/map/close.png
Binary files differ
diff --git a/src/assets/img/map/maximum.png b/src/assets/img/map/maximum.png
new file mode 100644
index 0000000..03fa799
--- /dev/null
+++ b/src/assets/img/map/maximum.png
Binary files differ
diff --git a/src/assets/img/map/video.png b/src/assets/img/map/video.png
new file mode 100644
index 0000000..54e8692
--- /dev/null
+++ b/src/assets/img/map/video.png
Binary files differ
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 5164f73..6c7c5b9 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -92,7 +92,7 @@
fontSize: '16'
},
axisPointer: {
- type: 'cross',
+ type: 'line',
label: {
fontSize: '16'
}
@@ -125,11 +125,16 @@
verticalAlign: 'middle'
},
splitLine: {
+ show: false,
lineStyle: {
color: ['#101641'],
type: 'dashed'
}
},
+ max: function(value){
+ return value.max+2
+ },
+ minIntermal:1,
axisLine: {
lineStyle: {
color: this.axisLineColor
@@ -141,7 +146,6 @@
}
}
],
-
series: []
}
}
diff --git a/src/components/leafletMap/base/mixins/common.js b/src/components/leafletMap/base/mixins/common.js
index 2fd1a28..a2c7173 100644
--- a/src/components/leafletMap/base/mixins/common.js
+++ b/src/components/leafletMap/base/mixins/common.js
@@ -18,13 +18,13 @@
const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
-function destroyInstance () {
- const { unload, renderByParent, $parent } = this
- if (renderByParent) {
- $parent.reload()
- }
- unload()
-}
+// function destroyInstance () {
+// const { unload, renderByParent, $parent } = this
+// if (renderByParent) {
+// $parent.reload()
+// }
+// unload()
+// }
class Mixin {
constructor (prop) {
@@ -60,7 +60,9 @@
default:
map[types[prop.type].unload](originInstance)
}
- } catch (e) {}
+ } catch (e) {
+ console.log(e)
+ }
}
}
this.computed = {
diff --git a/src/components/leafletMap/leafletMap.vue b/src/components/leafletMap/leafletMap.vue
index 2860b5f..434553b 100644
--- a/src/components/leafletMap/leafletMap.vue
+++ b/src/components/leafletMap/leafletMap.vue
@@ -46,8 +46,13 @@
this.initMap()
},
watch: {
- layers(){
-
+ layers:{
+ handler(val){
+ console.log(val)
+ this.clearLayers()
+ this.addLayers()
+ },
+ deep: true
},
zoom(){
diff --git a/src/router/index.js b/src/router/index.js
index d4131b7..5831da6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -9,7 +9,8 @@
{ path: '/main', name:'数据看板', component: () => import('@/views/screen/mainDashboard'), hidden: true },
{ path: '/404', component: () => import('@/views/errorPage/404.vue'), hidden: true },
{ path: '/401', component: () => import('@/views/errorPage/401.vue'), hidden: true },
- { path: '/', name: 'index', component: () => import('../views/index.vue') },
+ // { path: '/', name: 'index', component: () => import('../views/index.vue') },
+ { path: '/', redirect: '/main'},
{ path: '*', redirect: '/404',hidden: true}
]
diff --git a/src/store/getters.js b/src/store/getters.js
index d28b64f..4002fec 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,6 +1,4 @@
const getters = {
- visitedViews: state => state.tagsView.visitedViews,
- cachedViews: state => state.tagsView.cachedViews,
sidebar: state => state.app.sidebar, // 侧边栏
device: state => state.app.device, // 设备
kaptcha: state => state.app.kaptcha, // 验证码
@@ -8,32 +6,5 @@
sid: state => state.app.sid, // 用户标识
currentSystem: state => state.app.currentSystem, // 用户标识
changeFlag: state => state.app.changeFlag, // 切换子系统标志
- token: state => state.user.token, // token
- name: state => state.user.name, // 姓名
- userId: state => state.user.id, // id
- roleList: state => state.user.roleList, // 角色列表
- roleNames: state => state.user.roleNames, // 角色名称列表
- roleTips: state => state.user.roleTips, // 角色名称列表
- deptId: state => state.user.deptId, // 权属单位
- deptName: state => state.user.deptName, // 权属单位名称
- menus: state => state.permission.menus, // 菜单
- systems: state => state.permission.systems, // 子系统
- permission_routers: state => state.permission.routers, // 用户有权限的路由
- addRouters: state => state.permission.addRouters, // 添加的路由
- btns: state => state.permission.btns, // 用户所有的按钮权限
- wellTypes: state => state.user.wellTypes, // 用户支持的闸井类型
- deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
- communications: state => state.user.communications, // 用户支持的通讯方式
- area: state => state.user.area, // 用户所在区域
- urls: state => state.map.urls, // 地图服务地址列表
- baseUrl: state => state.map.baseUrl, // 地图服务地址
- partsUrl: state => state.map.partsUrl, // 部件分层地址
- partsEditUrl: state => state.map.partsEditUrl, // 部件分层地址
- partsAllUrl: state => state.map.partsAllUrl, // 部件不分层地址
- shopUrl: state => state.map.shopUrl, // 部件不分层地址
- mapUrl: state => state.map.mapUrl, // 底图地址
- mapDtUrl: state => state.map.mapDtUrl, // 无网格底图地址
- gridUrl: state => state.map.gridUrl, // 网格图层
- editUrl: state => state.map.editUrl // 编辑地图地址
}
export default getters
diff --git a/src/views/screen/mainComponents/alarmLayer.vue b/src/views/screen/mainComponents/alarmLayer.vue
new file mode 100644
index 0000000..10809bf
--- /dev/null
+++ b/src/views/screen/mainComponents/alarmLayer.vue
@@ -0,0 +1,254 @@
+
+
+
{{tab}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/screen/mainComponents/bizStatistic.vue b/src/views/screen/mainComponents/bizStatistic.vue
index f948a33..bd27b53 100644
--- a/src/views/screen/mainComponents/bizStatistic.vue
+++ b/src/views/screen/mainComponents/bizStatistic.vue
@@ -22,13 +22,13 @@
data(){
return {
data:[
- {name:'路灯亮灯率', value:{already:34, total:100,rate:34}, color:'#009eec'},
+ {name:'路灯亮灯率', value:{already:34, total:100,rate:98}, color:'#009eec'},
// {name:'地下管线监测设备报警率', value:[{already:34, total:100,rate:34}]},
- {name:'井盖报警率', value:{already:34, total:100,rate:50}, color:'#9fe6b8'},
- {name:'液位报警率', value:{already:34, total:100,rate:79}, color:'#99ccff'},
- {name:'有害气体报警率', value:{already:34, total:100,rate:20, color:'#ffdb5c'}},
- {name:'噪声报警率', value:{already:34, total:100,rate:15}, color:'#ff9f7f'},
- {name:'消防栓报警率', value:{already:34, total:100,rate:54}, color:'#fb7293'}
+ {name:'井盖报警率', value:{already:34, total:100,rate:8}, color:'#9fe6b8'},
+ {name:'液位报警率', value:{already:34, total:100,rate:5}, color:'#99ccff'},
+ {name:'有害气体报警率', value:{already:34, total:100,rate:2, color:'#ffdb5c'}},
+ {name:'噪声报警率', value:{already:34, total:100,rate:7}, color:'#ff9f7f'},
+ {name:'消防栓报警率', value:{already:34, total:100,rate:0}, color:'#fb7293'}
]
}
},
diff --git a/src/views/screen/mainComponents/deviceAlarmHistory.vue b/src/views/screen/mainComponents/deviceAlarmHistory.vue
index 6d02e1b..1e9e452 100644
--- a/src/views/screen/mainComponents/deviceAlarmHistory.vue
+++ b/src/views/screen/mainComponents/deviceAlarmHistory.vue
@@ -7,7 +7,7 @@
-
+
@@ -37,6 +37,23 @@
]
}
},
+ mounted(){
+ this.changeTab('井盖状态监测')
+ },
+ methods:{
+ changeTab(tab){
+ this.currentTab=tab
+ if(tab=='井盖状态监测'){
+ this.seriesData = [{name:'井盖开启',data:[0, 3, 0, 10, 3, 0, 1],color:'0,255,204'}]
+ }else if(tab=='液位监测'){
+ this.seriesData = [{name:'液位超限',data:[0, 3, 2, 1, 0, 0, 1],color:'58,55,194'}]
+ }else if(tab=='有害气体监测'){
+ this.seriesData = [{name:'有害气体超标',data:[0, 2, 0, 0, 0, 0, 1],color:'109,202,23'}]
+ }else if(tab=='消防栓监测'){
+ this.seriesData = [{name:'消防栓开启',data:[0, 0, 0, 1, 0, 0, 3],color:'255,192,203'}]
+ }
+ }
+ }
}
@@ -67,6 +84,9 @@
/*text-overflow:ellipsis;*/
}
}
+ .tab:hover{
+ cursor: pointer;
+ }
.current-tab{
border-top: 2px solid #4e91ff;
.text{
diff --git a/src/views/screen/mainComponents/deviceAlarmRank.vue b/src/views/screen/mainComponents/deviceAlarmRank.vue
index 021d404..a5936a1 100644
--- a/src/views/screen/mainComponents/deviceAlarmRank.vue
+++ b/src/views/screen/mainComponents/deviceAlarmRank.vue
@@ -21,11 +21,11 @@
ranking: {
data: [
// {name: "路灯", value: 55},
- {name: "井盖状态监测仪", value: 120},
- {name: "液位监测仪", value: 78},
- {name: "有害气体监测仪", value: 66},
- {name: "消防栓防盗水监测仪", value: 80},
- {name: "噪声监测仪", value: 80}
+ {name: "井盖状态监测仪", value: 4},
+ {name: "液位监测仪", value: 1},
+ {name: "有害气体监测仪", value: 1},
+ {name: "消防栓防盗水监测仪", value: 0},
+ {name: "噪声监测仪", value: 1}
],
unit: "次",
showValue: true
diff --git a/src/views/screen/mainComponents/lampAlarmHistory.vue b/src/views/screen/mainComponents/lampAlarmHistory.vue
index d21b279..e4a2052 100644
--- a/src/views/screen/mainComponents/lampAlarmHistory.vue
+++ b/src/views/screen/mainComponents/lampAlarmHistory.vue
@@ -35,11 +35,11 @@
components: {SimpleBlock, GradientLineChart, Container1},
data(){
return {
- data1: {name:'路灯单灯监测仪总数', value:'9981', unit:'个',icon:'setting'},
- data2: {name:'路灯报警', value:'81', unit:'次',icon:'alert'},
+ data1: {name:'路灯单灯监测仪总数', value:'89', unit:'个',icon:'setting'},
+ data2: {name:'路灯报警', value:'1', unit:'次',icon:'alert'},
xAxisData:['周一','周二','周三','周四','周五','周六','周日'],
seriesData:[
- {name:'单灯控制器',data:[120, 252, 101, 134, 290, 230, 110],color:'0,191,255'}
+ {name:'单灯控制器',data:[2, 3, 1, 8, 1, 0, 0],color:'0,191,255'}
]
}
},
diff --git a/package-lock.json b/package-lock.json
index 9388eb6..2a1c2dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1206,6 +1206,61 @@
"resolved": "https://registry.npmjs.org/@types/zrender/-/zrender-4.0.0.tgz",
"integrity": "sha512-s89GOIeKFiod2KSqHkfd2rzx+T2DVu7ihZCBEBnhFrzvQPUmzvDSBot9Fi1DfMQm9Odg+rTqoMGC38RvrwJK2w=="
},
+ "@videojs/http-streaming": {
+ "version": "2.9.2",
+ "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.9.2.tgz",
+ "integrity": "sha512-2ZsxJn4/nZZ6k6jIhic2l9ynGmKwprtuI5b3+M6JgqOSLvQQ/ah+heVs/0g2Ze7qJxodqR+aSY948JwJIz1gCw==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "@videojs/vhs-utils": "^3.0.2",
+ "aes-decrypter": "3.1.2",
+ "global": "^4.4.0",
+ "m3u8-parser": "4.7.0",
+ "mpd-parser": "0.17.0",
+ "mux.js": "5.12.2",
+ "video.js": "^6 || ^7"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
+ "@videojs/vhs-utils": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.3.tgz",
+ "integrity": "sha512-bU7daxDHhzcTDbmty1cXjzsTYvx2cBGbA8hG5H2Gvpuk4sdfuvkZtMCwtCqL59p6dsleMPspyaNS+7tWXx2Y0A==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "global": "^4.4.0",
+ "url-toolkit": "^2.2.1"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
+ "@videojs/xhr": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/@videojs/xhr/-/xhr-2.5.1.tgz",
+ "integrity": "sha512-wV9nGESHseSK+S9ePEru2+OJZ1jq/ZbbzniGQ4weAmTIepuBMSYPx5zrxxQA0E786T5ykpO8ts+LayV+3/oI2w==",
+ "requires": {
+ "@babel/runtime": "^7.5.5",
+ "global": "~4.4.0",
+ "is-function": "^1.0.1"
+ }
+ },
"@vue/babel-helper-vue-jsx-merge-props": {
"version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/@vue/babel-helper-vue-jsx-merge-props/download/@vue/babel-helper-vue-jsx-merge-props-1.0.0.tgz",
@@ -1869,6 +1924,27 @@
"integrity": "sha1-vxEWycdYxRt6kz0pa3LCIe2UKLY=",
"dev": true
},
+ "aes-decrypter": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.2.tgz",
+ "integrity": "sha512-42nRwfQuPRj9R1zqZBdoxnaAmnIFyDi0MNyTVhjdFOd8fifXKKRfwIHIZ6AMn1or4x5WONzjwRTbTWcsIQ0O4A==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "@videojs/vhs-utils": "^3.0.0",
+ "global": "^4.4.0",
+ "pkcs7": "^1.0.4"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
"aggregate-error": {
"version": "3.0.1",
"resolved": "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.0.1.tgz",
@@ -3356,15 +3432,6 @@
"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
"dev": true
},
- "copy-anything": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.3.tgz",
- "integrity": "sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ==",
- "dev": true,
- "requires": {
- "is-what": "^3.12.0"
- }
- },
"copy-concurrently": {
"version": "1.0.5",
"resolved": "https://registry.npm.taobao.org/copy-concurrently/download/copy-concurrently-1.0.5.tgz",
@@ -4172,6 +4239,11 @@
}
}
},
+ "dom-walk": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+ "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
+ },
"domain-browser": {
"version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz?cache=0&sync_timestamp=1575879298649&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomain-browser%2Fdownload%2Fdomain-browser-1.2.0.tgz",
@@ -6071,6 +6143,15 @@
"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
"dev": true
},
+ "global": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+ "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+ "requires": {
+ "min-document": "^2.19.0",
+ "process": "^0.11.10"
+ }
+ },
"globals": {
"version": "11.12.0",
"resolved": "https://registry.npm.taobao.org/globals/download/globals-11.12.0.tgz",
@@ -6538,13 +6619,6 @@
"integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=",
"dev": true
},
- "image-size": {
- "version": "0.5.5",
- "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
- "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
- "dev": true,
- "optional": true
- },
"import-cwd": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz",
@@ -6601,6 +6675,11 @@
"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
"dev": true
},
+ "individual": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/individual/-/individual-2.0.0.tgz",
+ "integrity": "sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c="
+ },
"infer-owner": {
"version": "1.0.4",
"resolved": "https://registry.npm.taobao.org/infer-owner/download/infer-owner-1.0.4.tgz",
@@ -6866,6 +6945,11 @@
"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
"dev": true
},
+ "is-function": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
+ "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="
+ },
"is-glob": {
"version": "4.0.1",
"resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-4.0.1.tgz",
@@ -7001,12 +7085,6 @@
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
"dev": true
},
- "is-what": {
- "version": "3.14.1",
- "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
- "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
- "dev": true
- },
"is-windows": {
"version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/is-windows/download/is-windows-1.0.2.tgz",
@@ -7197,6 +7275,11 @@
"verror": "1.10.0"
}
},
+ "keycode": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz",
+ "integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ="
+ },
"killable": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/killable/download/killable-1.0.1.tgz",
@@ -7209,12 +7292,6 @@
"integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=",
"dev": true
},
- "klona": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
- "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
- "dev": true
- },
"launch-editor": {
"version": "2.2.1",
"resolved": "https://registry.npm.taobao.org/launch-editor/download/launch-editor-2.2.1.tgz",
@@ -7243,49 +7320,6 @@
"invert-kv": "^2.0.0"
}
},
- "less": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/less/-/less-4.1.1.tgz",
- "integrity": "sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw==",
- "dev": true,
- "requires": {
- "copy-anything": "^2.0.1",
- "errno": "^0.1.1",
- "graceful-fs": "^4.1.2",
- "image-size": "~0.5.0",
- "make-dir": "^2.1.0",
- "mime": "^1.4.1",
- "needle": "^2.5.2",
- "parse-node-version": "^1.0.1",
- "source-map": "~0.6.0",
- "tslib": "^1.10.0"
- },
- "dependencies": {
- "mime": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
- "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
- "dev": true,
- "optional": true
- },
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "dev": true,
- "optional": true
- }
- }
- },
- "less-loader": {
- "version": "10.0.1",
- "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-10.0.1.tgz",
- "integrity": "sha512-Crln//HpW9M5CbtdfWm3IO66Cvx1WhZQvNybXgfB2dD/6Sav9ppw+IWqs/FQKPBFO4B6X0X28Z0WNznshgwUzA==",
- "dev": true,
- "requires": {
- "klona": "^2.0.4"
- }
- },
"leven": {
"version": "3.1.0",
"resolved": "https://registry.npm.taobao.org/leven/download/leven-3.1.0.tgz",
@@ -7490,6 +7524,26 @@
"yallist": "^3.0.2"
}
},
+ "m3u8-parser": {
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.7.0.tgz",
+ "integrity": "sha512-48l/OwRyjBm+QhNNigEEcRcgbRvnUjL7rxs597HmW9QSNbyNvt+RcZ9T/d9vxi9A9z7EZrB1POtZYhdRlwYQkQ==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "@videojs/vhs-utils": "^3.0.0",
+ "global": "^4.4.0"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
"make-dir": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/make-dir/download/make-dir-2.1.0.tgz?cache=0&sync_timestamp=1581565511672&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmake-dir%2Fdownload%2Fmake-dir-2.1.0.tgz",
@@ -7681,6 +7735,14 @@
"integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
"dev": true
},
+ "min-document": {
+ "version": "2.19.0",
+ "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+ "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
+ "requires": {
+ "dom-walk": "^0.1.0"
+ }
+ },
"mini-css-extract-plugin": {
"version": "0.9.0",
"resolved": "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.9.0.tgz?cache=0&sync_timestamp=1576856499989&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-0.9.0.tgz",
@@ -7864,6 +7926,27 @@
"run-queue": "^1.0.3"
}
},
+ "mpd-parser": {
+ "version": "0.17.0",
+ "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.17.0.tgz",
+ "integrity": "sha512-oKS5G0jCcHHJ3sHYlcLeM9Xcbuixl08eAx7QW0Th7ChlZiI0YvLtGaHE/L0aKUBJFNvtkeksIr8XgJgSBBsS4g==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "@videojs/vhs-utils": "^3.0.2",
+ "global": "^4.4.0",
+ "xmldom": "^0.5.0"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
@@ -7896,6 +7979,24 @@
"integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
"dev": true
},
+ "mux.js": {
+ "version": "5.12.2",
+ "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-5.12.2.tgz",
+ "integrity": "sha512-9OY1lrFIo7FxMeIC6aLUftiNv97AztufDfi30N7qDll1Pcy7bCxlHztyHp1Ce0KQwy2XqchGeENPS4v1NJngHQ==",
+ "requires": {
+ "@babel/runtime": "^7.11.2"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
"mz": {
"version": "2.7.0",
"resolved": "https://registry.npm.taobao.org/mz/download/mz-2.7.0.tgz",
@@ -7949,30 +8050,6 @@
"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
"dev": true
},
- "needle": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/needle/-/needle-2.8.0.tgz",
- "integrity": "sha512-ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw==",
- "dev": true,
- "optional": true,
- "requires": {
- "debug": "^3.2.6",
- "iconv-lite": "^0.4.4",
- "sax": "^1.2.4"
- },
- "dependencies": {
- "debug": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "ms": "^2.1.1"
- }
- }
- }
- },
"negotiator": {
"version": "0.6.2",
"resolved": "https://registry.npm.taobao.org/negotiator/download/negotiator-0.6.2.tgz",
@@ -8530,12 +8607,6 @@
"lines-and-columns": "^1.1.6"
}
},
- "parse-node-version": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
- "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
- "dev": true
- },
"parse5": {
"version": "5.1.1",
"resolved": "https://registry.npm.taobao.org/parse5/download/parse5-5.1.1.tgz",
@@ -8667,6 +8738,14 @@
"pinkie": "^2.0.0"
}
},
+ "pkcs7": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-1.0.4.tgz",
+ "integrity": "sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==",
+ "requires": {
+ "@babel/runtime": "^7.5.5"
+ }
+ },
"pkg-dir": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-3.0.0.tgz",
@@ -9334,8 +9413,7 @@
"process": {
"version": "0.11.10",
"resolved": "https://registry.npm.taobao.org/process/download/process-0.11.10.tgz",
- "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
- "dev": true
+ "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
},
"process-nextick-args": {
"version": "2.0.1",
@@ -9906,6 +9984,14 @@
"aproba": "^1.1.1"
}
},
+ "rust-result": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/rust-result/-/rust-result-1.0.0.tgz",
+ "integrity": "sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=",
+ "requires": {
+ "individual": "^2.0.0"
+ }
+ },
"rxjs": {
"version": "6.5.4",
"resolved": "https://registry.npm.taobao.org/rxjs/download/rxjs-6.5.4.tgz",
@@ -9921,6 +10007,14 @@
"integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
"dev": true
},
+ "safe-json-parse": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-4.0.0.tgz",
+ "integrity": "sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=",
+ "requires": {
+ "rust-result": "^1.0.0"
+ }
+ },
"safe-regex": {
"version": "1.1.0",
"resolved": "https://registry.npm.taobao.org/safe-regex/download/safe-regex-1.1.0.tgz",
@@ -11400,6 +11494,11 @@
"requires-port": "^1.0.0"
}
},
+ "url-toolkit": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.3.tgz",
+ "integrity": "sha512-Da75SQoxsZ+2wXS56CZBrj2nukQ4nlGUZUP/dqUBG5E1su5GKThgT94Q00x81eVII7AyS1Pn+CtTTZ4Z0pLUtQ=="
+ },
"use": {
"version": "3.1.1",
"resolved": "https://registry.npm.taobao.org/use/download/use-3.1.1.tgz",
@@ -11498,6 +11597,49 @@
"extsprintf": "^1.2.0"
}
},
+ "video.js": {
+ "version": "7.14.3",
+ "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.14.3.tgz",
+ "integrity": "sha512-6avCdSIfn5ss5NOgoQfY/xEfPNcz9DXSw+ZN80NwPguCdRd4VL4y40b/d7osYJwyCdF+YkvhqAW7dw4s0vBigg==",
+ "requires": {
+ "@babel/runtime": "^7.12.5",
+ "@videojs/http-streaming": "2.9.2",
+ "@videojs/vhs-utils": "^3.0.2",
+ "@videojs/xhr": "2.5.1",
+ "aes-decrypter": "3.1.2",
+ "global": "^4.4.0",
+ "keycode": "^2.2.0",
+ "m3u8-parser": "4.7.0",
+ "mpd-parser": "0.17.0",
+ "mux.js": "5.12.2",
+ "safe-json-parse": "4.0.0",
+ "videojs-font": "3.2.0",
+ "videojs-vtt.js": "^0.15.3"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.15.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+ "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+ "requires": {
+ "regenerator-runtime": "^0.13.4"
+ }
+ }
+ }
+ },
+ "videojs-font": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-3.2.0.tgz",
+ "integrity": "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA=="
+ },
+ "videojs-vtt.js": {
+ "version": "0.15.3",
+ "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.3.tgz",
+ "integrity": "sha512-5FvVsICuMRx6Hd7H/Y9s9GDeEtYcXQWzGMS+sl4UX3t/zoHp3y+isSfIPRochnTH7h+Bh1ILyC639xy9Z6kPag==",
+ "requires": {
+ "global": "^4.3.1"
+ }
+ },
"vm-browserify": {
"version": "1.1.2",
"resolved": "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz?cache=0&sync_timestamp=1572870717730&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvm-browserify%2Fdownload%2Fvm-browserify-1.1.2.tgz",
@@ -12107,6 +12249,11 @@
"async-limiter": "~1.0.0"
}
},
+ "xmldom": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
+ "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="
+ },
"xtend": {
"version": "4.0.2",
"resolved": "https://registry.npm.taobao.org/xtend/download/xtend-4.0.2.tgz",
diff --git a/package.json b/package.json
index fcd5682..ddf0717 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
"echarts": "^4.6.0",
"js-cookie": "^2.2.1",
"leaflet": "^1.7.1",
+ "video.js": "^7.14.3",
"vue": "^2.6.11",
"vue-awesome": "^4.0.2",
"vue-router": "^3.1.5",
@@ -53,7 +54,9 @@
"warn",
"never"
],
- "no-debugger": ["off"]
+ "no-debugger": [
+ "off"
+ ]
}
},
"browserslist": [
diff --git a/public/static/project.config.json b/public/static/project.config.json
index cec4541..49b4225 100644
--- a/public/static/project.config.json
+++ b/public/static/project.config.json
@@ -1,16 +1,17 @@
{
- "title": "数据可视化",
+ "title": "珠海三溪科创小镇智慧园区平台",
"baseUrl": "http://111.198.10.15:11409/",
"singleSys": true,
"city":"三溪小镇",
"mapType":[
"leaflet"
],
- "center":[22.289656,113.497393],
- "zoom":14,
+ "center":[22.289856,113.496093],
+ "zoom":15,
"mapUrl":"https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447",
"labelUrl":"https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447",
"satelliteUrl":"http://t0.tianditu.gov.cn/img_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447",
+ "satelliteLabelUrl":"http://t0.tianditu.gov.cn/cia_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=adbdd8e08c292f6cb4e3f0289f7d0447",
"defaultRefresh": 60000,
"status": "online"
}
diff --git a/public/static/video/lukou.mp4 b/public/static/video/lukou.mp4
new file mode 100644
index 0000000..89340eb
--- /dev/null
+++ b/public/static/video/lukou.mp4
Binary files differ
diff --git a/src/assets/img/map/alarm.png b/src/assets/img/map/alarm.png
new file mode 100644
index 0000000..61e9f42
--- /dev/null
+++ b/src/assets/img/map/alarm.png
Binary files differ
diff --git a/src/assets/img/map/close.png b/src/assets/img/map/close.png
new file mode 100644
index 0000000..485e69b
--- /dev/null
+++ b/src/assets/img/map/close.png
Binary files differ
diff --git a/src/assets/img/map/maximum.png b/src/assets/img/map/maximum.png
new file mode 100644
index 0000000..03fa799
--- /dev/null
+++ b/src/assets/img/map/maximum.png
Binary files differ
diff --git a/src/assets/img/map/video.png b/src/assets/img/map/video.png
new file mode 100644
index 0000000..54e8692
--- /dev/null
+++ b/src/assets/img/map/video.png
Binary files differ
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 5164f73..6c7c5b9 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -92,7 +92,7 @@
fontSize: '16'
},
axisPointer: {
- type: 'cross',
+ type: 'line',
label: {
fontSize: '16'
}
@@ -125,11 +125,16 @@
verticalAlign: 'middle'
},
splitLine: {
+ show: false,
lineStyle: {
color: ['#101641'],
type: 'dashed'
}
},
+ max: function(value){
+ return value.max+2
+ },
+ minIntermal:1,
axisLine: {
lineStyle: {
color: this.axisLineColor
@@ -141,7 +146,6 @@
}
}
],
-
series: []
}
}
diff --git a/src/components/leafletMap/base/mixins/common.js b/src/components/leafletMap/base/mixins/common.js
index 2fd1a28..a2c7173 100644
--- a/src/components/leafletMap/base/mixins/common.js
+++ b/src/components/leafletMap/base/mixins/common.js
@@ -18,13 +18,13 @@
const getParent = $component => ($component.abstract || $component.$el === $component.$children[0].$el) ? getParent($component.$parent) : $component
-function destroyInstance () {
- const { unload, renderByParent, $parent } = this
- if (renderByParent) {
- $parent.reload()
- }
- unload()
-}
+// function destroyInstance () {
+// const { unload, renderByParent, $parent } = this
+// if (renderByParent) {
+// $parent.reload()
+// }
+// unload()
+// }
class Mixin {
constructor (prop) {
@@ -60,7 +60,9 @@
default:
map[types[prop.type].unload](originInstance)
}
- } catch (e) {}
+ } catch (e) {
+ console.log(e)
+ }
}
}
this.computed = {
diff --git a/src/components/leafletMap/leafletMap.vue b/src/components/leafletMap/leafletMap.vue
index 2860b5f..434553b 100644
--- a/src/components/leafletMap/leafletMap.vue
+++ b/src/components/leafletMap/leafletMap.vue
@@ -46,8 +46,13 @@
this.initMap()
},
watch: {
- layers(){
-
+ layers:{
+ handler(val){
+ console.log(val)
+ this.clearLayers()
+ this.addLayers()
+ },
+ deep: true
},
zoom(){
diff --git a/src/router/index.js b/src/router/index.js
index d4131b7..5831da6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -9,7 +9,8 @@
{ path: '/main', name:'数据看板', component: () => import('@/views/screen/mainDashboard'), hidden: true },
{ path: '/404', component: () => import('@/views/errorPage/404.vue'), hidden: true },
{ path: '/401', component: () => import('@/views/errorPage/401.vue'), hidden: true },
- { path: '/', name: 'index', component: () => import('../views/index.vue') },
+ // { path: '/', name: 'index', component: () => import('../views/index.vue') },
+ { path: '/', redirect: '/main'},
{ path: '*', redirect: '/404',hidden: true}
]
diff --git a/src/store/getters.js b/src/store/getters.js
index d28b64f..4002fec 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,6 +1,4 @@
const getters = {
- visitedViews: state => state.tagsView.visitedViews,
- cachedViews: state => state.tagsView.cachedViews,
sidebar: state => state.app.sidebar, // 侧边栏
device: state => state.app.device, // 设备
kaptcha: state => state.app.kaptcha, // 验证码
@@ -8,32 +6,5 @@
sid: state => state.app.sid, // 用户标识
currentSystem: state => state.app.currentSystem, // 用户标识
changeFlag: state => state.app.changeFlag, // 切换子系统标志
- token: state => state.user.token, // token
- name: state => state.user.name, // 姓名
- userId: state => state.user.id, // id
- roleList: state => state.user.roleList, // 角色列表
- roleNames: state => state.user.roleNames, // 角色名称列表
- roleTips: state => state.user.roleTips, // 角色名称列表
- deptId: state => state.user.deptId, // 权属单位
- deptName: state => state.user.deptName, // 权属单位名称
- menus: state => state.permission.menus, // 菜单
- systems: state => state.permission.systems, // 子系统
- permission_routers: state => state.permission.routers, // 用户有权限的路由
- addRouters: state => state.permission.addRouters, // 添加的路由
- btns: state => state.permission.btns, // 用户所有的按钮权限
- wellTypes: state => state.user.wellTypes, // 用户支持的闸井类型
- deviceTypes: state => state.user.deviceTypes, // 用户支持的设备类型
- communications: state => state.user.communications, // 用户支持的通讯方式
- area: state => state.user.area, // 用户所在区域
- urls: state => state.map.urls, // 地图服务地址列表
- baseUrl: state => state.map.baseUrl, // 地图服务地址
- partsUrl: state => state.map.partsUrl, // 部件分层地址
- partsEditUrl: state => state.map.partsEditUrl, // 部件分层地址
- partsAllUrl: state => state.map.partsAllUrl, // 部件不分层地址
- shopUrl: state => state.map.shopUrl, // 部件不分层地址
- mapUrl: state => state.map.mapUrl, // 底图地址
- mapDtUrl: state => state.map.mapDtUrl, // 无网格底图地址
- gridUrl: state => state.map.gridUrl, // 网格图层
- editUrl: state => state.map.editUrl // 编辑地图地址
}
export default getters
diff --git a/src/views/screen/mainComponents/alarmLayer.vue b/src/views/screen/mainComponents/alarmLayer.vue
new file mode 100644
index 0000000..10809bf
--- /dev/null
+++ b/src/views/screen/mainComponents/alarmLayer.vue
@@ -0,0 +1,254 @@
+
+
+
{{tab}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/screen/mainComponents/bizStatistic.vue b/src/views/screen/mainComponents/bizStatistic.vue
index f948a33..bd27b53 100644
--- a/src/views/screen/mainComponents/bizStatistic.vue
+++ b/src/views/screen/mainComponents/bizStatistic.vue
@@ -22,13 +22,13 @@
data(){
return {
data:[
- {name:'路灯亮灯率', value:{already:34, total:100,rate:34}, color:'#009eec'},
+ {name:'路灯亮灯率', value:{already:34, total:100,rate:98}, color:'#009eec'},
// {name:'地下管线监测设备报警率', value:[{already:34, total:100,rate:34}]},
- {name:'井盖报警率', value:{already:34, total:100,rate:50}, color:'#9fe6b8'},
- {name:'液位报警率', value:{already:34, total:100,rate:79}, color:'#99ccff'},
- {name:'有害气体报警率', value:{already:34, total:100,rate:20, color:'#ffdb5c'}},
- {name:'噪声报警率', value:{already:34, total:100,rate:15}, color:'#ff9f7f'},
- {name:'消防栓报警率', value:{already:34, total:100,rate:54}, color:'#fb7293'}
+ {name:'井盖报警率', value:{already:34, total:100,rate:8}, color:'#9fe6b8'},
+ {name:'液位报警率', value:{already:34, total:100,rate:5}, color:'#99ccff'},
+ {name:'有害气体报警率', value:{already:34, total:100,rate:2, color:'#ffdb5c'}},
+ {name:'噪声报警率', value:{already:34, total:100,rate:7}, color:'#ff9f7f'},
+ {name:'消防栓报警率', value:{already:34, total:100,rate:0}, color:'#fb7293'}
]
}
},
diff --git a/src/views/screen/mainComponents/deviceAlarmHistory.vue b/src/views/screen/mainComponents/deviceAlarmHistory.vue
index 6d02e1b..1e9e452 100644
--- a/src/views/screen/mainComponents/deviceAlarmHistory.vue
+++ b/src/views/screen/mainComponents/deviceAlarmHistory.vue
@@ -7,7 +7,7 @@
-
+
@@ -37,6 +37,23 @@
]
}
},
+ mounted(){
+ this.changeTab('井盖状态监测')
+ },
+ methods:{
+ changeTab(tab){
+ this.currentTab=tab
+ if(tab=='井盖状态监测'){
+ this.seriesData = [{name:'井盖开启',data:[0, 3, 0, 10, 3, 0, 1],color:'0,255,204'}]
+ }else if(tab=='液位监测'){
+ this.seriesData = [{name:'液位超限',data:[0, 3, 2, 1, 0, 0, 1],color:'58,55,194'}]
+ }else if(tab=='有害气体监测'){
+ this.seriesData = [{name:'有害气体超标',data:[0, 2, 0, 0, 0, 0, 1],color:'109,202,23'}]
+ }else if(tab=='消防栓监测'){
+ this.seriesData = [{name:'消防栓开启',data:[0, 0, 0, 1, 0, 0, 3],color:'255,192,203'}]
+ }
+ }
+ }
}
@@ -67,6 +84,9 @@
/*text-overflow:ellipsis;*/
}
}
+ .tab:hover{
+ cursor: pointer;
+ }
.current-tab{
border-top: 2px solid #4e91ff;
.text{
diff --git a/src/views/screen/mainComponents/deviceAlarmRank.vue b/src/views/screen/mainComponents/deviceAlarmRank.vue
index 021d404..a5936a1 100644
--- a/src/views/screen/mainComponents/deviceAlarmRank.vue
+++ b/src/views/screen/mainComponents/deviceAlarmRank.vue
@@ -21,11 +21,11 @@
ranking: {
data: [
// {name: "路灯", value: 55},
- {name: "井盖状态监测仪", value: 120},
- {name: "液位监测仪", value: 78},
- {name: "有害气体监测仪", value: 66},
- {name: "消防栓防盗水监测仪", value: 80},
- {name: "噪声监测仪", value: 80}
+ {name: "井盖状态监测仪", value: 4},
+ {name: "液位监测仪", value: 1},
+ {name: "有害气体监测仪", value: 1},
+ {name: "消防栓防盗水监测仪", value: 0},
+ {name: "噪声监测仪", value: 1}
],
unit: "次",
showValue: true
diff --git a/src/views/screen/mainComponents/lampAlarmHistory.vue b/src/views/screen/mainComponents/lampAlarmHistory.vue
index d21b279..e4a2052 100644
--- a/src/views/screen/mainComponents/lampAlarmHistory.vue
+++ b/src/views/screen/mainComponents/lampAlarmHistory.vue
@@ -35,11 +35,11 @@
components: {SimpleBlock, GradientLineChart, Container1},
data(){
return {
- data1: {name:'路灯单灯监测仪总数', value:'9981', unit:'个',icon:'setting'},
- data2: {name:'路灯报警', value:'81', unit:'次',icon:'alert'},
+ data1: {name:'路灯单灯监测仪总数', value:'89', unit:'个',icon:'setting'},
+ data2: {name:'路灯报警', value:'1', unit:'次',icon:'alert'},
xAxisData:['周一','周二','周三','周四','周五','周六','周日'],
seriesData:[
- {name:'单灯控制器',data:[120, 252, 101, 134, 290, 230, 110],color:'0,191,255'}
+ {name:'单灯控制器',data:[2, 3, 1, 8, 1, 0, 0],color:'0,191,255'}
]
}
},
diff --git a/src/views/screen/mainComponents/mapView.vue b/src/views/screen/mainComponents/mapView.vue
index 930e8cd..a02bb5f 100644
--- a/src/views/screen/mainComponents/mapView.vue
+++ b/src/views/screen/mainComponents/mapView.vue
@@ -5,7 +5,10 @@
-->
{{tab}}
-
+
@@ -26,21 +29,21 @@
![]()
-
路灯
+
![]()
-
摄像头
+
![]()
-
管线运行
-
+
@@ -37,6 +37,23 @@
]
}
},
+ mounted(){
+ this.changeTab('井盖状态监测')
+ },
+ methods:{
+ changeTab(tab){
+ this.currentTab=tab
+ if(tab=='井盖状态监测'){
+ this.seriesData = [{name:'井盖开启',data:[0, 3, 0, 10, 3, 0, 1],color:'0,255,204'}]
+ }else if(tab=='液位监测'){
+ this.seriesData = [{name:'液位超限',data:[0, 3, 2, 1, 0, 0, 1],color:'58,55,194'}]
+ }else if(tab=='有害气体监测'){
+ this.seriesData = [{name:'有害气体超标',data:[0, 2, 0, 0, 0, 0, 1],color:'109,202,23'}]
+ }else if(tab=='消防栓监测'){
+ this.seriesData = [{name:'消防栓开启',data:[0, 0, 0, 1, 0, 0, 3],color:'255,192,203'}]
+ }
+ }
+ }
}
@@ -67,6 +84,9 @@
/*text-overflow:ellipsis;*/
}
}
+ .tab:hover{
+ cursor: pointer;
+ }
.current-tab{
border-top: 2px solid #4e91ff;
.text{
diff --git a/src/views/screen/mainComponents/deviceAlarmRank.vue b/src/views/screen/mainComponents/deviceAlarmRank.vue
index 021d404..a5936a1 100644
--- a/src/views/screen/mainComponents/deviceAlarmRank.vue
+++ b/src/views/screen/mainComponents/deviceAlarmRank.vue
@@ -21,11 +21,11 @@
ranking: {
data: [
// {name: "路灯", value: 55},
- {name: "井盖状态监测仪", value: 120},
- {name: "液位监测仪", value: 78},
- {name: "有害气体监测仪", value: 66},
- {name: "消防栓防盗水监测仪", value: 80},
- {name: "噪声监测仪", value: 80}
+ {name: "井盖状态监测仪", value: 4},
+ {name: "液位监测仪", value: 1},
+ {name: "有害气体监测仪", value: 1},
+ {name: "消防栓防盗水监测仪", value: 0},
+ {name: "噪声监测仪", value: 1}
],
unit: "次",
showValue: true
diff --git a/src/views/screen/mainComponents/lampAlarmHistory.vue b/src/views/screen/mainComponents/lampAlarmHistory.vue
index d21b279..e4a2052 100644
--- a/src/views/screen/mainComponents/lampAlarmHistory.vue
+++ b/src/views/screen/mainComponents/lampAlarmHistory.vue
@@ -35,11 +35,11 @@
components: {SimpleBlock, GradientLineChart, Container1},
data(){
return {
- data1: {name:'路灯单灯监测仪总数', value:'9981', unit:'个',icon:'setting'},
- data2: {name:'路灯报警', value:'81', unit:'次',icon:'alert'},
+ data1: {name:'路灯单灯监测仪总数', value:'89', unit:'个',icon:'setting'},
+ data2: {name:'路灯报警', value:'1', unit:'次',icon:'alert'},
xAxisData:['周一','周二','周三','周四','周五','周六','周日'],
seriesData:[
- {name:'单灯控制器',data:[120, 252, 101, 134, 290, 230, 110],color:'0,191,255'}
+ {name:'单灯控制器',data:[2, 3, 1, 8, 1, 0, 0],color:'0,191,255'}
]
}
},
diff --git a/src/views/screen/mainComponents/mapView.vue b/src/views/screen/mainComponents/mapView.vue
index 930e8cd..a02bb5f 100644
--- a/src/views/screen/mainComponents/mapView.vue
+++ b/src/views/screen/mainComponents/mapView.vue
@@ -5,7 +5,10 @@
-->
{{tab}}
-
+
@@ -26,21 +29,21 @@
![]()
-
路灯
+
![]()
-
摄像头
+
![]()
-
管线运行
-
+
@@ -37,6 +37,23 @@
]
}
},
+ mounted(){
+ this.changeTab('井盖状态监测')
+ },
+ methods:{
+ changeTab(tab){
+ this.currentTab=tab
+ if(tab=='井盖状态监测'){
+ this.seriesData = [{name:'井盖开启',data:[0, 3, 0, 10, 3, 0, 1],color:'0,255,204'}]
+ }else if(tab=='液位监测'){
+ this.seriesData = [{name:'液位超限',data:[0, 3, 2, 1, 0, 0, 1],color:'58,55,194'}]
+ }else if(tab=='有害气体监测'){
+ this.seriesData = [{name:'有害气体超标',data:[0, 2, 0, 0, 0, 0, 1],color:'109,202,23'}]
+ }else if(tab=='消防栓监测'){
+ this.seriesData = [{name:'消防栓开启',data:[0, 0, 0, 1, 0, 0, 3],color:'255,192,203'}]
+ }
+ }
+ }
}
@@ -67,6 +84,9 @@
/*text-overflow:ellipsis;*/
}
}
+ .tab:hover{
+ cursor: pointer;
+ }
.current-tab{
border-top: 2px solid #4e91ff;
.text{
diff --git a/src/views/screen/mainComponents/deviceAlarmRank.vue b/src/views/screen/mainComponents/deviceAlarmRank.vue
index 021d404..a5936a1 100644
--- a/src/views/screen/mainComponents/deviceAlarmRank.vue
+++ b/src/views/screen/mainComponents/deviceAlarmRank.vue
@@ -21,11 +21,11 @@
ranking: {
data: [
// {name: "路灯", value: 55},
- {name: "井盖状态监测仪", value: 120},
- {name: "液位监测仪", value: 78},
- {name: "有害气体监测仪", value: 66},
- {name: "消防栓防盗水监测仪", value: 80},
- {name: "噪声监测仪", value: 80}
+ {name: "井盖状态监测仪", value: 4},
+ {name: "液位监测仪", value: 1},
+ {name: "有害气体监测仪", value: 1},
+ {name: "消防栓防盗水监测仪", value: 0},
+ {name: "噪声监测仪", value: 1}
],
unit: "次",
showValue: true
diff --git a/src/views/screen/mainComponents/lampAlarmHistory.vue b/src/views/screen/mainComponents/lampAlarmHistory.vue
index d21b279..e4a2052 100644
--- a/src/views/screen/mainComponents/lampAlarmHistory.vue
+++ b/src/views/screen/mainComponents/lampAlarmHistory.vue
@@ -35,11 +35,11 @@
components: {SimpleBlock, GradientLineChart, Container1},
data(){
return {
- data1: {name:'路灯单灯监测仪总数', value:'9981', unit:'个',icon:'setting'},
- data2: {name:'路灯报警', value:'81', unit:'次',icon:'alert'},
+ data1: {name:'路灯单灯监测仪总数', value:'89', unit:'个',icon:'setting'},
+ data2: {name:'路灯报警', value:'1', unit:'次',icon:'alert'},
xAxisData:['周一','周二','周三','周四','周五','周六','周日'],
seriesData:[
- {name:'单灯控制器',data:[120, 252, 101, 134, 290, 230, 110],color:'0,191,255'}
+ {name:'单灯控制器',data:[2, 3, 1, 8, 1, 0, 0],color:'0,191,255'}
]
}
},
diff --git a/src/views/screen/mainComponents/mapView.vue b/src/views/screen/mainComponents/mapView.vue
index 930e8cd..a02bb5f 100644
--- a/src/views/screen/mainComponents/mapView.vue
+++ b/src/views/screen/mainComponents/mapView.vue
@@ -5,7 +5,10 @@
-->
{{tab}}
-
+
@@ -26,21 +29,21 @@
![]()
-
路灯
+
![]()
-
摄像头
+
![]()
-
管线运行
-
+
@@ -37,6 +37,23 @@
]
}
},
+ mounted(){
+ this.changeTab('井盖状态监测')
+ },
+ methods:{
+ changeTab(tab){
+ this.currentTab=tab
+ if(tab=='井盖状态监测'){
+ this.seriesData = [{name:'井盖开启',data:[0, 3, 0, 10, 3, 0, 1],color:'0,255,204'}]
+ }else if(tab=='液位监测'){
+ this.seriesData = [{name:'液位超限',data:[0, 3, 2, 1, 0, 0, 1],color:'58,55,194'}]
+ }else if(tab=='有害气体监测'){
+ this.seriesData = [{name:'有害气体超标',data:[0, 2, 0, 0, 0, 0, 1],color:'109,202,23'}]
+ }else if(tab=='消防栓监测'){
+ this.seriesData = [{name:'消防栓开启',data:[0, 0, 0, 1, 0, 0, 3],color:'255,192,203'}]
+ }
+ }
+ }
}
@@ -67,6 +84,9 @@
/*text-overflow:ellipsis;*/
}
}
+ .tab:hover{
+ cursor: pointer;
+ }
.current-tab{
border-top: 2px solid #4e91ff;
.text{
diff --git a/src/views/screen/mainComponents/deviceAlarmRank.vue b/src/views/screen/mainComponents/deviceAlarmRank.vue
index 021d404..a5936a1 100644
--- a/src/views/screen/mainComponents/deviceAlarmRank.vue
+++ b/src/views/screen/mainComponents/deviceAlarmRank.vue
@@ -21,11 +21,11 @@
ranking: {
data: [
// {name: "路灯", value: 55},
- {name: "井盖状态监测仪", value: 120},
- {name: "液位监测仪", value: 78},
- {name: "有害气体监测仪", value: 66},
- {name: "消防栓防盗水监测仪", value: 80},
- {name: "噪声监测仪", value: 80}
+ {name: "井盖状态监测仪", value: 4},
+ {name: "液位监测仪", value: 1},
+ {name: "有害气体监测仪", value: 1},
+ {name: "消防栓防盗水监测仪", value: 0},
+ {name: "噪声监测仪", value: 1}
],
unit: "次",
showValue: true
diff --git a/src/views/screen/mainComponents/lampAlarmHistory.vue b/src/views/screen/mainComponents/lampAlarmHistory.vue
index d21b279..e4a2052 100644
--- a/src/views/screen/mainComponents/lampAlarmHistory.vue
+++ b/src/views/screen/mainComponents/lampAlarmHistory.vue
@@ -35,11 +35,11 @@
components: {SimpleBlock, GradientLineChart, Container1},
data(){
return {
- data1: {name:'路灯单灯监测仪总数', value:'9981', unit:'个',icon:'setting'},
- data2: {name:'路灯报警', value:'81', unit:'次',icon:'alert'},
+ data1: {name:'路灯单灯监测仪总数', value:'89', unit:'个',icon:'setting'},
+ data2: {name:'路灯报警', value:'1', unit:'次',icon:'alert'},
xAxisData:['周一','周二','周三','周四','周五','周六','周日'],
seriesData:[
- {name:'单灯控制器',data:[120, 252, 101, 134, 290, 230, 110],color:'0,191,255'}
+ {name:'单灯控制器',data:[2, 3, 1, 8, 1, 0, 0],color:'0,191,255'}
]
}
},
diff --git a/src/views/screen/mainComponents/mapView.vue b/src/views/screen/mainComponents/mapView.vue
index 930e8cd..a02bb5f 100644
--- a/src/views/screen/mainComponents/mapView.vue
+++ b/src/views/screen/mainComponents/mapView.vue
@@ -5,7 +5,10 @@
-->
{{tab}}
-
+
@@ -26,21 +29,21 @@
![]()
-
路灯
+
![]()
-
摄像头
+
![]()
-
管线运行
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/screen/mainComponents/bizStatistic.vue b/src/views/screen/mainComponents/bizStatistic.vue
index f948a33..bd27b53 100644
--- a/src/views/screen/mainComponents/bizStatistic.vue
+++ b/src/views/screen/mainComponents/bizStatistic.vue
@@ -22,13 +22,13 @@
data(){
return {
data:[
- {name:'路灯亮灯率', value:{already:34, total:100,rate:34}, color:'#009eec'},
+ {name:'路灯亮灯率', value:{already:34, total:100,rate:98}, color:'#009eec'},
// {name:'地下管线监测设备报警率', value:[{already:34, total:100,rate:34}]},
- {name:'井盖报警率', value:{already:34, total:100,rate:50}, color:'#9fe6b8'},
- {name:'液位报警率', value:{already:34, total:100,rate:79}, color:'#99ccff'},
- {name:'有害气体报警率', value:{already:34, total:100,rate:20, color:'#ffdb5c'}},
- {name:'噪声报警率', value:{already:34, total:100,rate:15}, color:'#ff9f7f'},
- {name:'消防栓报警率', value:{already:34, total:100,rate:54}, color:'#fb7293'}
+ {name:'井盖报警率', value:{already:34, total:100,rate:8}, color:'#9fe6b8'},
+ {name:'液位报警率', value:{already:34, total:100,rate:5}, color:'#99ccff'},
+ {name:'有害气体报警率', value:{already:34, total:100,rate:2, color:'#ffdb5c'}},
+ {name:'噪声报警率', value:{already:34, total:100,rate:7}, color:'#ff9f7f'},
+ {name:'消防栓报警率', value:{already:34, total:100,rate:0}, color:'#fb7293'}
]
}
},
diff --git a/src/views/screen/mainComponents/deviceAlarmHistory.vue b/src/views/screen/mainComponents/deviceAlarmHistory.vue
index 6d02e1b..1e9e452 100644
--- a/src/views/screen/mainComponents/deviceAlarmHistory.vue
+++ b/src/views/screen/mainComponents/deviceAlarmHistory.vue
@@ -7,7 +7,7 @@
-
+
@@ -37,6 +37,23 @@
]
}
},
+ mounted(){
+ this.changeTab('井盖状态监测')
+ },
+ methods:{
+ changeTab(tab){
+ this.currentTab=tab
+ if(tab=='井盖状态监测'){
+ this.seriesData = [{name:'井盖开启',data:[0, 3, 0, 10, 3, 0, 1],color:'0,255,204'}]
+ }else if(tab=='液位监测'){
+ this.seriesData = [{name:'液位超限',data:[0, 3, 2, 1, 0, 0, 1],color:'58,55,194'}]
+ }else if(tab=='有害气体监测'){
+ this.seriesData = [{name:'有害气体超标',data:[0, 2, 0, 0, 0, 0, 1],color:'109,202,23'}]
+ }else if(tab=='消防栓监测'){
+ this.seriesData = [{name:'消防栓开启',data:[0, 0, 0, 1, 0, 0, 3],color:'255,192,203'}]
+ }
+ }
+ }
}
@@ -67,6 +84,9 @@
/*text-overflow:ellipsis;*/
}
}
+ .tab:hover{
+ cursor: pointer;
+ }
.current-tab{
border-top: 2px solid #4e91ff;
.text{
diff --git a/src/views/screen/mainComponents/deviceAlarmRank.vue b/src/views/screen/mainComponents/deviceAlarmRank.vue
index 021d404..a5936a1 100644
--- a/src/views/screen/mainComponents/deviceAlarmRank.vue
+++ b/src/views/screen/mainComponents/deviceAlarmRank.vue
@@ -21,11 +21,11 @@
ranking: {
data: [
// {name: "路灯", value: 55},
- {name: "井盖状态监测仪", value: 120},
- {name: "液位监测仪", value: 78},
- {name: "有害气体监测仪", value: 66},
- {name: "消防栓防盗水监测仪", value: 80},
- {name: "噪声监测仪", value: 80}
+ {name: "井盖状态监测仪", value: 4},
+ {name: "液位监测仪", value: 1},
+ {name: "有害气体监测仪", value: 1},
+ {name: "消防栓防盗水监测仪", value: 0},
+ {name: "噪声监测仪", value: 1}
],
unit: "次",
showValue: true
diff --git a/src/views/screen/mainComponents/lampAlarmHistory.vue b/src/views/screen/mainComponents/lampAlarmHistory.vue
index d21b279..e4a2052 100644
--- a/src/views/screen/mainComponents/lampAlarmHistory.vue
+++ b/src/views/screen/mainComponents/lampAlarmHistory.vue
@@ -35,11 +35,11 @@
components: {SimpleBlock, GradientLineChart, Container1},
data(){
return {
- data1: {name:'路灯单灯监测仪总数', value:'9981', unit:'个',icon:'setting'},
- data2: {name:'路灯报警', value:'81', unit:'次',icon:'alert'},
+ data1: {name:'路灯单灯监测仪总数', value:'89', unit:'个',icon:'setting'},
+ data2: {name:'路灯报警', value:'1', unit:'次',icon:'alert'},
xAxisData:['周一','周二','周三','周四','周五','周六','周日'],
seriesData:[
- {name:'单灯控制器',data:[120, 252, 101, 134, 290, 230, 110],color:'0,191,255'}
+ {name:'单灯控制器',data:[2, 3, 1, 8, 1, 0, 0],color:'0,191,255'}
]
}
},
diff --git a/src/views/screen/mainComponents/mapView.vue b/src/views/screen/mainComponents/mapView.vue
index 930e8cd..a02bb5f 100644
--- a/src/views/screen/mainComponents/mapView.vue
+++ b/src/views/screen/mainComponents/mapView.vue
@@ -5,7 +5,10 @@
-->
{{tab}}
-
+
@@ -26,21 +29,21 @@
![]()
-
路灯
+
![]()
-
摄像头
+
![]()
-
管线运行