From 851af6c968582ce59acce74450bf1fa02f30fc23 Mon Sep 17 00:00:00 2001 From: renpy Date: Fri, 25 Aug 2023 11:05:10 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=20=E5=8F=B0=E7=AB=99=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E7=8A=B6=E6=80=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stationOperation/components/MapMarker.vue | 65 +++++++++++++++++-- src/views/stationOperation/index.vue | 38 ++++++++++- 2 files changed, 93 insertions(+), 10 deletions(-) diff --git a/src/views/stationOperation/components/MapMarker.vue b/src/views/stationOperation/components/MapMarker.vue index 763ec8f..4e840a2 100644 --- a/src/views/stationOperation/components/MapMarker.vue +++ b/src/views/stationOperation/components/MapMarker.vue @@ -161,13 +161,23 @@ export default { }) }, - getRipple({ lon, lat, stationId, stationType }) { + getRipple({ lon, lat, stationId, stationType, quality }) { + // console.log("lon, lat, stationId, stationType, quality",lon, lat, stationId, stationType, quality); const rippleDiv = document.createElement('div') rippleDiv.className = 'custom-ripple' - - rippleDiv.innerHTML = `
-
- ` + if (quality == "excellent") { + rippleDiv.innerHTML = `
+
+ ` + } else if (quality == "good") { + rippleDiv.innerHTML = `
+
+ ` + } else if(quality == "bad"){ + rippleDiv.innerHTML = `
+
+ ` + } return new Overlay({ position: fromLonLat([lon, lat]), @@ -266,6 +276,7 @@ export default { line-height: 30px; border-bottom: 1px solid #0a544e; margin-bottom: 0; + color: rgb(187, 138, 18); } } @@ -301,7 +312,7 @@ export default { @duration: 1.8s; @delay: 0.9s; - .inner-ripple-1 { + .inner-ripple-excellent-1 { position: absolute; top: 0; width: 100%; @@ -311,7 +322,7 @@ export default { animation: rippleEffect @duration linear 0s infinite; } - .inner-ripple-2 { + .inner-ripple-excellent-2 { position: absolute; top: 0; width: 100%; @@ -321,6 +332,46 @@ export default { background-image: radial-gradient(circle, transparent 10%, rgba(15, 148, 28, 0.2) 30%, rgba(15, 148, 28, 0.5) 60%); animation: rippleEffect @duration linear @delay infinite; } + .inner-ripple-good-1 { + position: absolute; + top: 0; + width: 100%; + height: 100%; + border-radius: 50%; + background-image: radial-gradient(circle, transparent 10%, rgba(187, 138, 18, 0.2) 30%, rgba(187, 138, 18, 0.5) 60%); + animation: rippleEffect @duration linear 0s infinite; + } + + .inner-ripple-good-2 { + position: absolute; + top: 0; + width: 100%; + height: 100%; + border-radius: 50%; + transform: scale(0); + background-image: radial-gradient(circle, transparent 10%, rgba(187, 138, 18, 0.2) 30%, rgba(187, 138, 18, 0.5) 60%); + animation: rippleEffect @duration linear @delay infinite; + } + .inner-ripple-bad-1 { + position: absolute; + top: 0; + width: 100%; + height: 100%; + border-radius: 50%; + background-image: radial-gradient(circle, transparent 10%, rgba(165, 58, 35, 0.2) 30%, rgba(165, 58, 35, 0.5) 60%); + animation: rippleEffect @duration linear 0s infinite; + } + + .inner-ripple-bad-2 { + position: absolute; + top: 0; + width: 100%; + height: 100%; + border-radius: 50%; + transform: scale(0); + background-image: radial-gradient(circle, transparent 10%, rgba(165, 58, 35, 0.2) 30%, rgba(165, 58, 35, 0.5) 60%); + animation: rippleEffect @duration linear @delay infinite; + } } @keyframes rippleEffect { diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue index 3acfadf..3484244 100644 --- a/src/views/stationOperation/index.vue +++ b/src/views/stationOperation/index.vue @@ -183,6 +183,7 @@ export default { dataList: [], // 左侧All Data 列表 followedDataList: [], // 关注 markerList: [], // 地图上标记点列表 + markerList_clone: [], // 地图上标记点列表 markerType: 1, // 是否绘制地图上的圆 circleRadius: 0, @@ -201,7 +202,8 @@ export default { stationTypeList: [], - treeData: [] // 台站树列表 + treeData: [], // 台站树列表 + timer: null } }, created() { @@ -210,6 +212,10 @@ export default { this.getStationTypeList() this.getStationTree() }, + destroyed () { + clearInterval(this.timer); + this.timer = null + }, methods: { // 获取站点列表 async getStationList() { @@ -218,8 +224,14 @@ export default { const res = await getAction('/jeecg-station-operation/stationOperation/findList') this.originalDataList = res // 保留初始版本 this.dataList = cloneDeep(res) - this.markerList = cloneDeep(res) - + // this.markerList = cloneDeep(res) + this.markerList_clone = cloneDeep(res) + this.getDataProvisionEfficiency(this.markerList_clone) + this.timer = setInterval(() => { + setTimeout(() => { + this.getDataProvisionEfficiency(this.markerList_clone) + }, 0); + }, 15000); this.$nextTick(() => { this.$refs.scrollContainerRef.checkScrollEnd() }) @@ -230,6 +242,26 @@ export default { } }, + // 查询台站数据提供率及有效率 + async getDataProvisionEfficiency(arr) { + this.markerList=[] + try { + const res = await getAction('/stationOperation/getDataProvisionEfficiency') + console.log("getDataProvisionEfficiency", res); + arr.forEach(item => { + res.result.forEach(data => { + if (parseInt(data.id) == item.stationId) { + item.quality = data.quality + } + }) + this.markerList.push(item) + }) + console.log("this.markerListthis.markerListthis.markerList",this.markerList); + } catch (error) { + console.error(error) + } + }, + // 获取已关注站点列表 async getFollowedStationList() { try { From 40115f448f9b1732e0f428b859c5593248cf5227 Mon Sep 17 00:00:00 2001 From: renpy Date: Mon, 28 Aug 2023 20:18:09 +0800 Subject: [PATCH 02/16] =?UTF-8?q?station=E6=A8=A1=E5=9D=97=EF=BC=8C?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=E6=95=88?= =?UTF-8?q?=E6=9E=9C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stationOperation/components/MapMarker.vue | 39 ++++++++++++++++--- src/views/stationOperation/index.vue | 35 ++++++++++++----- 2 files changed, 59 insertions(+), 15 deletions(-) diff --git a/src/views/stationOperation/components/MapMarker.vue b/src/views/stationOperation/components/MapMarker.vue index 4e840a2..0dee9cb 100644 --- a/src/views/stationOperation/components/MapMarker.vue +++ b/src/views/stationOperation/components/MapMarker.vue @@ -28,6 +28,10 @@ export default { type: Array, required: true }, + currList: { + type: Array, + required: true + }, markerType: { type: Number, default: 1 @@ -151,11 +155,12 @@ export default { // 初始化波纹 initRipples() { - this.list - .filter( - stationInfo => - stationInfo.stationType !== MarkerType.NuclearFacility && stationInfo.stationType !== MarkerType.NRL - ) + console.log("xuanran",this.currList); + this.currList + // .filter( + // stationInfo => + // stationInfo.stationType !== MarkerType.NuclearFacility && stationInfo.stationType !== MarkerType.NRL + // ) .forEach(stationInfo => { this.map.addOverlay(this.getRipple(stationInfo)) }) @@ -236,6 +241,14 @@ export default { } }, watch: { + // list: { + // // 数据变化时执行的逻辑代码 + // handler(newName, oldName) { + // console.log(newName); + // }, + // // 开启深度监听 + // deep: true + // } list() { this.map.getOverlays().clear() this.initMapPopup() @@ -244,6 +257,22 @@ export default { if (this.markerType == 2) { this.initCircles() } + }, + currList: { + handler(newVal, oldVal) { + console.log(newVal); + newVal.forEach(item => { + var layer = this.map.getOverlays().getArray().find(layer=> { + return layer.id === `ripple_${item.stationType}_${item.stationId}`; + }); + console.log("adfasdfadsf",layer); + if (layer) { + this.map.removeOverlay(layer); + } + }) + this.initRipples() + }, + deep:true } } } diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue index 3484244..86f36e2 100644 --- a/src/views/stationOperation/index.vue +++ b/src/views/stationOperation/index.vue @@ -144,7 +144,7 @@ ref="mapRef" token="AAPK2b935e8bbf564ef581ca3c6fcaa5f2a71ZH84cPqqFvyz3KplFRHP8HyAwJJkh6cnpcQ-qkWh5aiyDQsGJbsXglGx0QM2cPm" > - + { setTimeout(() => { this.getDataProvisionEfficiency(this.markerList_clone) + // this.upDateStationList.forEach(item => { + // if (item.quality=="excellent") { + // item.quality="bad" + // } + // }) }, 0); }, 15000); this.$nextTick(() => { @@ -244,19 +250,28 @@ export default { // 查询台站数据提供率及有效率 async getDataProvisionEfficiency(arr) { - this.markerList=[] try { const res = await getAction('/stationOperation/getDataProvisionEfficiency') - console.log("getDataProvisionEfficiency", res); - arr.forEach(item => { - res.result.forEach(data => { - if (parseInt(data.id) == item.stationId) { - item.quality = data.quality + // console.log("getDataProvisionEfficiency", res); + res.result.forEach(item => { + arr.forEach(el => { + if (parseInt(item.id) == el.stationId) { + item.stationType = el.stationType + item.stationId = el.stationId } }) - this.markerList.push(item) }) - console.log("this.markerListthis.markerListthis.markerList",this.markerList); + // console.log(res.result); + this.upDateStationList = res.result + // arr.forEach(item => { + // res.result.forEach(data => { + // if (parseInt(data.id) == item.stationId) { + // item.quality = data.quality + // } + // }) + // this.markerList.push(item) + // }) + // console.log("this.markerListthis.markerListthis.markerList",this.markerList); } catch (error) { console.error(error) } From 9cf85087413f43d7c41ecd3fb237749554709b5d Mon Sep 17 00:00:00 2001 From: renpy Date: Tue, 29 Aug 2023 14:55:38 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E6=9C=89=E6=95=88=E7=8E=87=E7=9A=84?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=BA=94=E8=AF=A5=E8=B7=9F=E9=9A=8F=E5=8F=B0?= =?UTF-8?q?=E7=AB=99=20Icon=20=E4=B8=80=E8=B5=B7=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + .../stationOperation/components/MapMarker.vue | 8 +- src/views/stationOperation/index.vue | 31 +- vue.config.js | 13 + yarn.lock | 300 +++++++++++++++++- 5 files changed, 327 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index bbea7cf..44eb672 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "xss": "^1.0.13" }, "devDependencies": { + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", "@babel/polyfill": "^7.2.5", "@types/crypto-js": "^4.1.1", "@vue/cli-plugin-babel": "^3.3.0", diff --git a/src/views/stationOperation/components/MapMarker.vue b/src/views/stationOperation/components/MapMarker.vue index 0dee9cb..4dd9c4f 100644 --- a/src/views/stationOperation/components/MapMarker.vue +++ b/src/views/stationOperation/components/MapMarker.vue @@ -32,6 +32,10 @@ export default { type: Array, required: true }, + orgList: { + type: Array, + required: true + }, markerType: { type: Number, default: 1 @@ -260,12 +264,10 @@ export default { }, currList: { handler(newVal, oldVal) { - console.log(newVal); - newVal.forEach(item => { + this.orgList.forEach(item => { var layer = this.map.getOverlays().getArray().find(layer=> { return layer.id === `ripple_${item.stationType}_${item.stationId}`; }); - console.log("adfasdfadsf",layer); if (layer) { this.map.removeOverlay(layer); } diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue index 86f36e2..ffdbdbb 100644 --- a/src/views/stationOperation/index.vue +++ b/src/views/stationOperation/index.vue @@ -144,7 +144,14 @@ ref="mapRef" token="AAPK2b935e8bbf564ef581ca3c6fcaa5f2a71ZH84cPqqFvyz3KplFRHP8HyAwJJkh6cnpcQ-qkWh5aiyDQsGJbsXglGx0QM2cPm" > - + { setTimeout(() => { this.getDataProvisionEfficiency(this.markerList_clone) - // this.upDateStationList.forEach(item => { - // if (item.quality=="excellent") { - // item.quality="bad" - // } - // }) }, 0); }, 15000); this.$nextTick(() => { @@ -252,26 +255,16 @@ export default { async getDataProvisionEfficiency(arr) { try { const res = await getAction('/stationOperation/getDataProvisionEfficiency') - // console.log("getDataProvisionEfficiency", res); res.result.forEach(item => { arr.forEach(el => { - if (parseInt(item.id) == el.stationId) { + if (parseInt(item.id) == el.stationId&&el.stationType!="Nuclear Facility"&&el.stationType!="NRL") { item.stationType = el.stationType item.stationId = el.stationId } }) }) - // console.log(res.result); + this.orgStationList = res.result this.upDateStationList = res.result - // arr.forEach(item => { - // res.result.forEach(data => { - // if (parseInt(data.id) == item.stationId) { - // item.quality = data.quality - // } - // }) - // this.markerList.push(item) - // }) - // console.log("this.markerListthis.markerListthis.markerList",this.markerList); } catch (error) { console.error(error) } @@ -426,6 +419,8 @@ export default { filterDataQuality ) this.markerList = this.originalDataList.filter(item => filterType.includes(item.stationType)) + this.upDateStationList = this.orgStationList.filter(item => filterType.includes(item.stationType)) + console.log("ertyuiodfghj",this.upDateStationList); }, // 地图图标点击 diff --git a/vue.config.js b/vue.config.js index 1c90d4c..6ac77a3 100644 --- a/vue.config.js +++ b/vue.config.js @@ -69,6 +69,19 @@ module.exports = { .use() .loader('babel-loader') .end() + config.module + .rule('ol') + .test(/\.js$/) + .include + .add(resolve('node_modules/ol')) + .end() + .use() + .loader('babel-loader') + .options({ + presets: ['@babel/preset-env'], + plugins: ['@babel/plugin-proposal-nullish-coalescing-operator'] + }) + .end() }, css: { diff --git a/yarn.lock b/yarn.lock index faee6b5..344a79a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -312,6 +312,11 @@ resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== +"@babel/helper-plugin-utils@^7.18.6": + version "7.22.5" + resolved "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" + integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== + "@babel/helper-regex@^7.10.4": version "7.10.4" resolved "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.4.tgz#59b373daaf3458e5747dece71bbaf45f9676af6d" @@ -427,6 +432,14 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-json-strings" "^7.8.0" +"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6": + version "7.18.6" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1" + integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-proposal-object-rest-spread@^7.3.4": version "7.10.4" resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0" @@ -487,6 +500,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" +"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": + version "7.8.3" + resolved "https://registry.npmmirror.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + "@babel/plugin-syntax-object-rest-spread@^7.2.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0": version "7.8.3" resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" @@ -821,6 +841,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.13.10": + version "7.22.11" + resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.22.11.tgz#7a9ba3bbe406ad6f9e8dd4da2ece453eb23a77a4" + integrity sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA== + dependencies: + regenerator-runtime "^0.14.0" + "@babel/template@^7.10.4": version "7.10.4" resolved "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278" @@ -895,10 +922,39 @@ cssnano-preset-default "^4.0.0" postcss "^7.0.0" -"@jeecg/antd-online-mini@3.1.0-beta": - version "3.1.0-beta" - resolved "https://registry.npmmirror.com/@jeecg/antd-online-mini/-/antd-online-mini-3.1.0-beta.tgz#cf3e254259503405a5e83ffa6775ac9fa02fe74c" - integrity sha512-pW0zWzExnxjlC3e7DzGYjQibLU22K/7N0kp1ddJrGgX33Ia/wq7ELOcwn6bLzITD89RcvX1JUW/om+IJ1PxOSw== +"@jeecg/antd-online-mini@3.4.3-beta2": + version "3.4.3-beta2" + resolved "https://registry.npmmirror.com/@jeecg/antd-online-mini/-/antd-online-mini-3.4.3-beta2.tgz#5903547f48a7d51f2df9773b85d25d28807e57ae" + integrity sha512-uZLjtQG/vAcBsCEysE1HceUyzwiHwU+JlNzvHxNnenNDHeaawZa9CfILUImNFJ5JQVqE5J11QpQNb6i5Boo3Gw== + +"@mapbox/jsonlint-lines-primitives@~2.0.2": + version "2.0.2" + resolved "https://registry.npmmirror.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz#ce56e539f83552b58d10d672ea4d6fc9adc7b234" + integrity sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ== + +"@mapbox/mapbox-gl-style-spec@^13.23.1": + version "13.28.0" + resolved "https://registry.npmmirror.com/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.28.0.tgz#2ec226320a0f77856046e000df9b419303a56458" + integrity sha512-B8xM7Fp1nh5kejfIl4SWeY0gtIeewbuRencqO3cJDrCHZpaPg7uY+V8abuR+esMeuOjRl5cLhVTP40v+1ywxbg== + dependencies: + "@mapbox/jsonlint-lines-primitives" "~2.0.2" + "@mapbox/point-geometry" "^0.1.0" + "@mapbox/unitbezier" "^0.0.0" + csscolorparser "~1.0.2" + json-stringify-pretty-compact "^2.0.0" + minimist "^1.2.6" + rw "^1.3.3" + sort-object "^0.3.2" + +"@mapbox/point-geometry@^0.1.0": + version "0.1.0" + resolved "https://registry.npmmirror.com/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz#8a83f9335c7860effa2eeeca254332aa0aeed8f2" + integrity sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ== + +"@mapbox/unitbezier@^0.0.0": + version "0.0.0" + resolved "https://registry.npmmirror.com/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz#15651bd553a67b8581fb398810c98ad86a34524e" + integrity sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA== "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" @@ -913,6 +969,11 @@ resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== +"@petamoriken/float16@^3.4.7": + version "3.8.3" + resolved "https://registry.npmmirror.com/@petamoriken/float16/-/float16-3.8.3.tgz#adf9dcb5d46b5976b347310f22ce247b8bb48ef9" + integrity sha512-an2OZ7/6er9Jja8EDUvU/tmtGIutdlb6LwXOwgjzoCjDRAsUd8sRZMBjoPEy78Xa9iOp+Kglk2CHgVwZuZbWbw== + "@simonwep/pickr@~1.7.0": version "1.7.1" resolved "https://registry.npmjs.org/@simonwep/pickr/-/pickr-1.7.1.tgz#7bdcccca2041967434f9d7e18720e85598601008" @@ -962,6 +1023,11 @@ resolved "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== +"@types/crypto-js@^4.1.1": + version "4.1.1" + resolved "https://registry.npmmirror.com/@types/crypto-js/-/crypto-js-4.1.1.tgz#602859584cecc91894eb23a4892f38cfa927890d" + integrity sha512-BG7fQKZ689HIoc5h+6D2Dgq1fABRa0RbBWKBd9SP/MVRVXROflpm5fhwyATX5duFmbStzyzyycPB8qUYKDH3NA== + "@types/d3-format@*": version "1.3.1" resolved "https://registry.npmjs.org/@types/d3-format/-/d3-format-1.3.1.tgz#35bf88264bd6bcda39251165bb827f67879c4384" @@ -3182,6 +3248,11 @@ classnames@^2.2.5: resolved "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce" integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q== +claygl@^1.2.1: + version "1.3.0" + resolved "https://registry.npmmirror.com/claygl/-/claygl-1.3.0.tgz#7a6e2903210519ac358848f5d78070ed211685f3" + integrity sha512-+gGtJjT6SSHD2l2yC3MCubW/sCV40tZuSs5opdtn79vFSGUgp/lH139RNEQ6Jy078/L0aV8odCw8RSrUcMfLaQ== + clean-css@4.2.x, clean-css@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" @@ -3741,6 +3812,11 @@ crypto-browserify@^3.11.0: randombytes "^2.0.0" randomfill "^1.0.3" +crypto-js@^4.1.1: + version "4.1.1" + resolved "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf" + integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw== + css-color-names@0.0.4, css-color-names@^0.0.4: version "0.0.4" resolved "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" @@ -3862,6 +3938,11 @@ css@^2.0.0: source-map-resolve "^0.5.2" urix "^0.1.0" +csscolorparser@~1.0.2: + version "1.0.3" + resolved "https://registry.npmmirror.com/csscolorparser/-/csscolorparser-1.0.3.tgz#b34f391eea4da8f3e98231e2ccd8df9c041f171b" + integrity sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w== + cssesc@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" @@ -4560,6 +4641,11 @@ duplexify@^3.4.2, duplexify@^3.6.0: readable-stream "^2.0.0" stream-shift "^1.0.0" +earcut@^2.2.3: + version "2.2.4" + resolved "https://registry.npmmirror.com/earcut/-/earcut-2.2.4.tgz#6d02fd4d68160c114825d06890a92ecaae60343a" + integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ== + easy-stack@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.0.tgz#12c91b3085a37f0baa336e9486eac4bf94e3e788" @@ -4573,6 +4659,22 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" +echarts-gl@^2.0.9: + version "2.0.9" + resolved "https://registry.npmmirror.com/echarts-gl/-/echarts-gl-2.0.9.tgz#ee228a6c7520a6fb7bbb71ea94394f3637ade033" + integrity sha512-oKeMdkkkpJGWOzjgZUsF41DOh6cMsyrGGXimbjK2l6Xeq/dBQu4ShG2w2Dzrs/1bD27b2pLTGSaUzouY191gzA== + dependencies: + claygl "^1.2.1" + zrender "^5.1.1" + +echarts@^5.4.2: + version "5.4.3" + resolved "https://registry.npmmirror.com/echarts/-/echarts-5.4.3.tgz#f5522ef24419164903eedcfd2b506c6fc91fb20c" + integrity sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA== + dependencies: + tslib "2.3.0" + zrender "5.4.4" + ee-first@1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -5696,6 +5798,19 @@ gensync@^1.0.0-beta.1: resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg== +geotiff@^2.0.7: + version "2.0.7" + resolved "https://registry.npmmirror.com/geotiff/-/geotiff-2.0.7.tgz#358e578233af70bfb0b4dee62d599ad78fc5cfca" + integrity sha512-FKvFTNowMU5K6lHYY2f83d4lS2rsCNdpUC28AX61x9ZzzqPNaWFElWv93xj0eJFaNyOYA63ic5OzJ88dHpoA5Q== + dependencies: + "@petamoriken/float16" "^3.4.7" + lerc "^3.0.0" + pako "^2.0.4" + parse-headers "^2.0.2" + quick-lru "^6.1.1" + web-worker "^1.2.0" + xml-utils "^1.0.2" + get-caller-file@^1.0.1: version "1.0.3" resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" @@ -6224,6 +6339,11 @@ icss-utils@^2.1.0: dependencies: postcss "^6.0.1" +ieee754@^1.1.12: + version "1.2.1" + resolved "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + ieee754@^1.1.4: version "1.1.13" resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" @@ -6947,6 +7067,11 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= +json-stringify-pretty-compact@^2.0.0: + version "2.0.0" + resolved "https://registry.npmmirror.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz#e77c419f52ff00c45a31f07f4c820c2433143885" + integrity sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ== + json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" @@ -7063,6 +7188,11 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" +lerc@^3.0.0: + version "3.0.0" + resolved "https://registry.npmmirror.com/lerc/-/lerc-3.0.0.tgz#36f36fbd4ba46f0abf4833799fff2e7d6865f5cb" + integrity sha512-Rm4J/WaHhRa93nCN2mwWDZFoRVF18G1f47C+kvQWyHGEZxFpTUi73p7lMVSAndyxGt6lJ2/CFbOcf9ra5p8aww== + less-loader@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e" @@ -7424,6 +7554,11 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" +mapbox-to-css-font@^2.4.1: + version "2.4.2" + resolved "https://registry.npmmirror.com/mapbox-to-css-font/-/mapbox-to-css-font-2.4.2.tgz#a9e31b363ad8ca881cd339ca99f2d2a6b02ea5dd" + integrity sha512-f+NBjJJY4T3dHtlEz1wCG7YFlkODEjFIYlxDdLIDMNpkSksqTt+l/d4rjuwItxuzkuMFvPyrjzV2lxRM4ePcIA== + math-expression-evaluator@^1.2.14: version "1.2.22" resolved "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.22.tgz#c14dcb3d8b4d150e5dcea9c68c8dad80309b0d5e" @@ -7619,6 +7754,11 @@ minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@~1.2.5: resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minimist@^1.2.6: + version "1.2.8" + resolved "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== + minipass-collect@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" @@ -8074,6 +8214,26 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== +ol-mapbox-style@^10.1.0: + version "10.7.0" + resolved "https://registry.npmmirror.com/ol-mapbox-style/-/ol-mapbox-style-10.7.0.tgz#8837912da2a16fbd22992d76cbc4f491c838b973" + integrity sha512-S/UdYBuOjrotcR95Iq9AejGYbifKeZE85D9VtH11ryJLQPTZXZSW1J5bIXcr4AlAH6tyjPPHTK34AdkwB32Myw== + dependencies: + "@mapbox/mapbox-gl-style-spec" "^13.23.1" + mapbox-to-css-font "^2.4.1" + ol "^7.3.0" + +ol@^7.3.0, ol@^7.4.0: + version "7.5.1" + resolved "https://registry.npmmirror.com/ol/-/ol-7.5.1.tgz#76e7a8b2cabf36124ce3123d22af08e7c4e86087" + integrity sha512-CFXDhO8YdQt7I+zwrGYSONo/ZM2oLr7vUvxqpLEUyy+USaQjUeE8L6FBOWIPboopGVhnSVYd5hdEirn9ifKBZQ== + dependencies: + earcut "^2.2.3" + geotiff "^2.0.7" + ol-mapbox-style "^10.1.0" + pbf "3.2.1" + rbush "^3.0.1" + omit.js@^1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/omit.js/-/omit.js-1.0.2.tgz#91a14f0eba84066dfa015bf30e474c47f30bc858" @@ -8274,6 +8434,11 @@ p-try@^2.0.0: resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== +pako@^2.0.4: + version "2.1.0" + resolved "https://registry.npmmirror.com/pako/-/pako-2.1.0.tgz#266cc37f98c7d883545d11335c00fbd4062c9a86" + integrity sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug== + pako@~1.0.5: version "1.0.11" resolved "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" @@ -8322,6 +8487,11 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5: pbkdf2 "^3.0.3" safe-buffer "^5.1.1" +parse-headers@^2.0.2: + version "2.0.5" + resolved "https://registry.npmmirror.com/parse-headers/-/parse-headers-2.0.5.tgz#069793f9356a54008571eb7f9761153e6c770da9" + integrity sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA== + parse-json@^2.2.0: version "2.2.0" resolved "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" @@ -8462,6 +8632,14 @@ path-type@^3.0.0: dependencies: pify "^3.0.0" +pbf@3.2.1: + version "3.2.1" + resolved "https://registry.npmmirror.com/pbf/-/pbf-3.2.1.tgz#b4c1b9e72af966cd82c6531691115cc0409ffe2a" + integrity sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ== + dependencies: + ieee754 "^1.1.12" + resolve-protobuf-schema "^2.1.0" + pbkdf2@^3.0.3: version "3.1.1" resolved "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94" @@ -9242,6 +9420,11 @@ promise@^7.1.1: dependencies: asap "~2.0.3" +protocol-buffers-schema@^3.3.1: + version "3.6.0" + resolved "https://registry.npmmirror.com/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz#77bc75a48b2ff142c1ad5b5b90c94cd0fa2efd03" + integrity sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw== + proxy-addr@~2.0.5: version "2.0.6" resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" @@ -9366,6 +9549,16 @@ querystringify@^2.1.1: resolved "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e" integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA== +quick-lru@^6.1.1: + version "6.1.2" + resolved "https://registry.npmmirror.com/quick-lru/-/quick-lru-6.1.2.tgz#e9a90524108629be35287d0b864e7ad6ceb3659e" + integrity sha512-AAFUA5O1d83pIHEhJwWCq/RQcRukCkn/NSm2QsTEMle5f2hP0ChI2+3Xb051PZCkLryI/Ir1MVKviT2FIloaTQ== + +quickselect@^2.0.0: + version "2.0.0" + resolved "https://registry.npmmirror.com/quickselect/-/quickselect-2.0.0.tgz#f19680a486a5eefb581303e023e98faaf25dd018" + integrity sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw== + raf@^3.4.0: version "3.4.1" resolved "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39" @@ -9403,6 +9596,13 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" +rbush@^3.0.1: + version "3.0.1" + resolved "https://registry.npmmirror.com/rbush/-/rbush-3.0.1.tgz#5fafa8a79b3b9afdfe5008403a720cc1de882ecf" + integrity sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w== + dependencies: + quickselect "^2.0.0" + read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" @@ -9531,6 +9731,11 @@ regenerator-runtime@^0.13.4: resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== +regenerator-runtime@^0.14.0: + version "0.14.0" + resolved "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" + integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA== + regenerator-transform@^0.10.0: version "0.10.1" resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" @@ -9773,6 +9978,13 @@ resolve-from@^4.0.0: resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== +resolve-protobuf-schema@^2.1.0: + version "2.1.0" + resolved "https://registry.npmmirror.com/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz#9ca9a9e69cf192bbdaf1006ec1973948aa4a3758" + integrity sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ== + dependencies: + protocol-buffers-schema "^3.3.1" + resolve-url-loader@^2.1.1: version "2.3.2" resolved "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-2.3.2.tgz#83bb9ebc392b66c563795eef22f078970357a26e" @@ -9898,7 +10110,7 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -rw@1, rw@^1.3.2: +rw@1, rw@^1.3.2, rw@^1.3.3: version "1.3.3" resolved "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q= @@ -9982,6 +10194,11 @@ schema-utils@^2.6.1, schema-utils@^2.6.5: ajv "^6.12.2" ajv-keywords "^3.4.1" +scrollparent@^2.0.1: + version "2.1.0" + resolved "https://registry.npmmirror.com/scrollparent/-/scrollparent-2.1.0.tgz#6cae915c953835886a6ba0d77fdc2bb1ed09076d" + integrity sha512-bnnvJL28/Rtz/kz2+4wpBjHzWoEzXhVg/TE8BeVGJHUqE8THNIRnDxDWMktwM+qahvlRdvlLdsQfYe+cuqfZeA== + select-hose@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" @@ -10264,6 +10481,16 @@ sockjs@0.3.20: uuid "^3.4.0" websocket-driver "0.6.5" +sort-asc@^0.1.0: + version "0.1.0" + resolved "https://registry.npmmirror.com/sort-asc/-/sort-asc-0.1.0.tgz#ab799df61fc73ea0956c79c4b531ed1e9e7727e9" + integrity sha512-jBgdDd+rQ+HkZF2/OHCmace5dvpos/aWQpcxuyRs9QUbPRnkEJmYVo81PIGpjIdpOcsnJ4rGjStfDHsbn+UVyw== + +sort-desc@^0.1.1: + version "0.1.1" + resolved "https://registry.npmmirror.com/sort-desc/-/sort-desc-0.1.1.tgz#198b8c0cdeb095c463341861e3925d4ee359a9ee" + integrity sha512-jfZacW5SKOP97BF5rX5kQfJmRVZP5/adDUTY8fCSPvNcXDVpUEe2pr/iKGlcyZzchRJZrswnp68fgk3qBXgkJw== + sort-keys@^1.0.0: version "1.1.2" resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" @@ -10271,6 +10498,14 @@ sort-keys@^1.0.0: dependencies: is-plain-obj "^1.0.0" +sort-object@^0.3.2: + version "0.3.2" + resolved "https://registry.npmmirror.com/sort-object/-/sort-object-0.3.2.tgz#98e0d199ede40e07c61a84403c61d6c3b290f9e2" + integrity sha512-aAQiEdqFTTdsvUFxXm3umdo04J7MRljoVGbBlkH7BgNsMvVNAJyGj7C/wV1A8wHWAJj/YikeZbfuCKqhggNWGA== + dependencies: + sort-asc "^0.1.0" + sort-desc "^0.1.1" + sortablejs@^1.10.1: version "1.10.2" resolved "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz#6e40364d913f98b85a14f6678f92b5c1221f5290" @@ -11019,6 +11254,11 @@ tsconfig-paths@^3.9.0: minimist "^1.2.0" strip-bom "^3.0.0" +tslib@2.3.0: + version "2.3.0" + resolved "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" + integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== + tslib@^1.10.0, tslib@^1.9.0: version "1.13.0" resolved "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" @@ -11437,6 +11677,11 @@ vue-ls@^3.2.0: resolved "https://registry.npmjs.org/vue-ls/-/vue-ls-3.2.1.tgz#25d1c75b3a51c17018129de607b44bb120a3385a" integrity sha512-JoZDpSu0qV5AM50vspEzOut2lcm8R0tr5WG99jMHh14qFXkUes3ZdmDMG/p8iSQVQpg0pd/svGwM9Nd7OI2oaw== +vue-observe-visibility@^0.4.4: + version "0.4.6" + resolved "https://registry.npmmirror.com/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz#878cb8ebcf3078e40807af29774e97105ebd519e" + integrity sha512-xo0CEVdkjSjhJoDdLSvoZoQrw/H2BlzB5jrCBKGZNXN2zdZgMuZ9BKrxXDjNP2AxlcCoKc8OahI3F3r3JGLv2Q== + vue-photo-preview@^1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/vue-photo-preview/-/vue-photo-preview-1.1.3.tgz#8ee62923e865d3cbaf010b07b0cc841892633028" @@ -11459,11 +11704,30 @@ vue-photo-preview@^1.1.3: webpack "^3.6.0" webpack-dev-server "^2.9.1" +vue-print-nb-jeecg@^1.0.12: + version "1.0.12" + resolved "https://registry.npmmirror.com/vue-print-nb-jeecg/-/vue-print-nb-jeecg-1.0.12.tgz#975e1dac3da8c9736ac81b82a2b099cafe1bb3df" + integrity sha512-jHyWm6/TxB1iU2nHL7upQdHVdxb1SJQ9n3XKeYTaruFdbSphLo1vDtTunS2qVCjupk8lui7FlF5rxxSNr0zjZg== + dependencies: + babel-plugin-transform-runtime "^6.23.0" + vue-ref@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/vue-ref/-/vue-ref-2.0.0.tgz#483084d732abed11da796778a8266a3af0ea1a9c" integrity sha512-uKNKpFOVeWNqS2mrBZqnpLyXJo5Q+vnkex6JvpENvhXHFNBW/SJTP8vJywLuVT3DpxwXcF9N0dyIiZ4/NpTexQ== +vue-resize@^0.4.5: + version "0.4.5" + resolved "https://registry.npmmirror.com/vue-resize/-/vue-resize-0.4.5.tgz#4777a23042e3c05620d9cbda01c0b3cc5e32dcea" + integrity sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg== + +vue-resize@^1.0.1: + version "1.0.1" + resolved "https://registry.npmmirror.com/vue-resize/-/vue-resize-1.0.1.tgz#c120bed4e09938771d622614f57dbcf58a5147ee" + integrity sha512-z5M7lJs0QluJnaoMFTIeGx6dIkYxOwHThlZDeQnWZBizKblb99GSejPnK37ZbNE/rVwDcYcHY+Io+AxdpY952w== + dependencies: + "@babel/runtime" "^7.13.10" + vue-router@^3.0.1: version "3.3.4" resolved "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz#4e38abc34a11c41b6c3d8244449a2e363ba6250b" @@ -11503,6 +11767,15 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0: resolved "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== +vue-virtual-scroller@^1.1.2: + version "1.1.2" + resolved "https://registry.npmmirror.com/vue-virtual-scroller/-/vue-virtual-scroller-1.1.2.tgz#b8a6362f177abf3f2149ce1eac18013c71fe353b" + integrity sha512-SkUyc7QHCJFB5h1Fya7LxVizlVzOZZuFVipBGHYoTK8dwLs08bIz/tclvRApYhksaJIm/nn51inzO2UjpGJPMQ== + dependencies: + scrollparent "^2.0.1" + vue-observe-visibility "^0.4.4" + vue-resize "^0.4.5" + vue@^2.4.4, vue@^2.5.17, vue@^2.5.3, vue@^2.6.10: version "2.6.11" resolved "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5" @@ -11569,6 +11842,11 @@ wcwidth@^1.0.1: dependencies: defaults "^1.0.3" +web-worker@^1.2.0: + version "1.2.0" + resolved "https://registry.npmmirror.com/web-worker/-/web-worker-1.2.0.tgz#5d85a04a7fbc1e7db58f66595d7a3ac7c9c180da" + integrity sha512-PgF341avzqyx60neE9DD+XS26MMNMoUQRz9NOZwW32nPQrF6p77f1htcnjBSEV8BGMKZ16choqUG4hyI0Hx7mA== + webpack-bundle-analyzer@^3.3.0: version "3.8.0" resolved "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz#ce6b3f908daf069fd1f7266f692cbb3bded9ba16" @@ -11909,6 +12187,11 @@ xe-utils@2.4.8: resolved "https://registry.yarnpkg.com/xe-utils/-/xe-utils-2.4.8.tgz#0efda3ca81f6b55f68a8a31e276fb17da59c98b3" integrity sha512-/95ZaQK9GJE/EYrpMv9lgKdkEMQwWv4a4TF4dddi4gSzZ33vp/rZvzJNNV9XknaOkMizK9IBSX8CB/nL+SAk0Q== +xml-utils@^1.0.2: + version "1.7.0" + resolved "https://registry.npmmirror.com/xml-utils/-/xml-utils-1.7.0.tgz#333ce391d8918f872aaf98d2cf90f9ef9b82bd0f" + integrity sha512-bWB489+RQQclC7A9OW8e5BzbT8Tu//jtAOvkYwewFr+Q9T9KDGvfzC1lp0pYPEQPEoPQLDkmxkepSC/2gIAZGw== + xregexp@^4.2.4: version "4.3.0" resolved "https://registry.npmjs.org/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50" @@ -12074,3 +12357,10 @@ yorkie@^2.0.0: is-ci "^1.0.10" normalize-path "^1.0.0" strip-indent "^2.0.0" + +zrender@5.4.4, zrender@^5.1.1: + version "5.4.4" + resolved "https://registry.npmmirror.com/zrender/-/zrender-5.4.4.tgz#8854f1d95ecc82cf8912f5a11f86657cb8c9e261" + integrity sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw== + dependencies: + tslib "2.3.0" From f442e5e7587f825663c10f89894eb3e5228f856a Mon Sep 17 00:00:00 2001 From: renpy Date: Tue, 29 Aug 2023 15:10:56 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E5=8F=B0=E7=AB=99=E6=9C=89=E6=95=88?= =?UTF-8?q?=E7=8E=87=E6=8E=A5=E5=8F=A3=E7=AD=89=E5=BE=85=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E6=9C=9F=E9=97=B4=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA,?= =?UTF-8?q?=E5=BE=97=E5=88=B0=E7=9B=B8=E5=BA=94=E4=B9=8B=E5=90=8E=E5=86=8D?= =?UTF-8?q?=E5=85=B3=E6=8E=89this.$message.loading('Loading=20station=20da?= =?UTF-8?q?ta,=20please=20wait...',=200);?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stationOperation/index.vue | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue index ffdbdbb..a2bb765 100644 --- a/src/views/stationOperation/index.vue +++ b/src/views/stationOperation/index.vue @@ -171,7 +171,7 @@ import DataListItem from './components/DataListItem.vue' import ScrollContainer from '@/components/ScrollContainer/index.vue' import { getAction } from '../../api/manage' import { cloneDeep } from 'lodash' - +const key= "updateList" export default { components: { Map, @@ -235,7 +235,7 @@ export default { this.dataList = cloneDeep(res) this.markerList = cloneDeep(res) this.markerList_clone = cloneDeep(res) - this.getDataProvisionEfficiency(this.markerList_clone) + this.getDataProvisionEfficiency(this.markerList_clone,"one") this.timer = setInterval(() => { setTimeout(() => { this.getDataProvisionEfficiency(this.markerList_clone) @@ -252,9 +252,12 @@ export default { }, // 查询台站数据提供率及有效率 - async getDataProvisionEfficiency(arr) { - try { - const res = await getAction('/stationOperation/getDataProvisionEfficiency') + async getDataProvisionEfficiency(arr, str) { + if (str) { + this.$message.loading({ content: 'Loading...', key, duration: 9 }) + } + getAction('/stationOperation/getDataProvisionEfficiency').then(res => { + str&&this.$message.success({ content: 'Loaded!', key, duration: 2 }) res.result.forEach(item => { arr.forEach(el => { if (parseInt(item.id) == el.stationId&&el.stationType!="Nuclear Facility"&&el.stationType!="NRL") { @@ -265,9 +268,9 @@ export default { }) this.orgStationList = res.result this.upDateStationList = res.result - } catch (error) { + }).catch (error=> { console.error(error) - } + }) }, // 获取已关注站点列表 From f4917341b6b46d6c953bbeff018ef5af6bebb027 Mon Sep 17 00:00:00 2001 From: renpy Date: Tue, 29 Aug 2023 15:47:01 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E7=AD=89=E5=BE=85=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9=EF=BC=8C=E5=8F=8A=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stationOperation/index.vue | 30 +++++++++++++++++----------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue index a2bb765..0a19a45 100644 --- a/src/views/stationOperation/index.vue +++ b/src/views/stationOperation/index.vue @@ -254,21 +254,27 @@ export default { // 查询台站数据提供率及有效率 async getDataProvisionEfficiency(arr, str) { if (str) { - this.$message.loading({ content: 'Loading...', key, duration: 9 }) + this.$message.loading({ content: 'Loading station data, please wait...', key, duration: 0 }) } getAction('/stationOperation/getDataProvisionEfficiency').then(res => { - str&&this.$message.success({ content: 'Loaded!', key, duration: 2 }) - res.result.forEach(item => { - arr.forEach(el => { - if (parseInt(item.id) == el.stationId&&el.stationType!="Nuclear Facility"&&el.stationType!="NRL") { - item.stationType = el.stationType - item.stationId = el.stationId - } + if (res.success) { + this.$message.destroy() + str&&this.$message.success({ content: 'Loaded!', key, duration: 2 }) + res.result.forEach(item => { + arr.forEach(el => { + if (parseInt(item.id) == el.stationId&&el.stationType!="Nuclear Facility"&&el.stationType!="NRL") { + item.stationType = el.stationType + item.stationId = el.stationId + } + }) }) - }) - this.orgStationList = res.result - this.upDateStationList = res.result - }).catch (error=> { + this.orgStationList = res.result + this.upDateStationList = res.result + } else { + this.$message.warning("This operation fails. Contact your system administrator") + } + }).catch(error => { + this.$message.destroy() console.error(error) }) }, From cf40e88018cdd510abf99c7160d1aa00d2443560 Mon Sep 17 00:00:00 2001 From: renpy Date: Tue, 29 Aug 2023 16:07:31 +0800 Subject: [PATCH 06/16] =?UTF-8?q?station=20=20=20=E5=8F=B3=E4=BE=A7=20Icon?= =?UTF-8?q?=20=E5=9C=A8=E9=9A=90=E8=97=8F=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=88=87=E6=8D=A2=EF=BC=8C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=BB=91=E5=87=BA=EF=BC=8C=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=86=8D=E7=82=B9=E4=B8=80=E6=AC=A1=EF=BC=88=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=8F=91=E7=BE=A4=E9=87=8C=E4=BA=86=EF=BC=89?= =?UTF-8?q?=EF=BC=9B=E9=9A=90=E8=97=8F=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9A=84=E9=80=89=E4=B8=AD=E6=95=88=E6=9E=9C?= =?UTF-8?q?=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stationOperation/components/MapMarker.vue | 10 ---------- src/views/stationOperation/components/MapPane.vue | 5 +++-- src/views/stationOperation/index.vue | 1 - 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/views/stationOperation/components/MapMarker.vue b/src/views/stationOperation/components/MapMarker.vue index 4dd9c4f..88e57a8 100644 --- a/src/views/stationOperation/components/MapMarker.vue +++ b/src/views/stationOperation/components/MapMarker.vue @@ -159,7 +159,6 @@ export default { // 初始化波纹 initRipples() { - console.log("xuanran",this.currList); this.currList // .filter( // stationInfo => @@ -171,7 +170,6 @@ export default { }, getRipple({ lon, lat, stationId, stationType, quality }) { - // console.log("lon, lat, stationId, stationType, quality",lon, lat, stationId, stationType, quality); const rippleDiv = document.createElement('div') rippleDiv.className = 'custom-ripple' if (quality == "excellent") { @@ -245,14 +243,6 @@ export default { } }, watch: { - // list: { - // // 数据变化时执行的逻辑代码 - // handler(newName, oldName) { - // console.log(newName); - // }, - // // 开启深度监听 - // deep: true - // } list() { this.map.getOverlays().clear() this.initMapPopup() diff --git a/src/views/stationOperation/components/MapPane.vue b/src/views/stationOperation/components/MapPane.vue index 4fa8f9c..fa4edc5 100644 --- a/src/views/stationOperation/components/MapPane.vue +++ b/src/views/stationOperation/components/MapPane.vue @@ -18,7 +18,7 @@
@@ -26,7 +26,7 @@
@@ -468,6 +468,7 @@ export default { // 面板改变 onPaneChange(active) { + this.showPane = true this.active = active const source = this.circleLayer.getSource() source.clear() // 清理图层 diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue index 0a19a45..5c82903 100644 --- a/src/views/stationOperation/index.vue +++ b/src/views/stationOperation/index.vue @@ -429,7 +429,6 @@ export default { ) this.markerList = this.originalDataList.filter(item => filterType.includes(item.stationType)) this.upDateStationList = this.orgStationList.filter(item => filterType.includes(item.stationType)) - console.log("ertyuiodfghj",this.upDateStationList); }, // 地图图标点击 From 14eb95081c6dd7b5f06f939538ef0caa741730c2 Mon Sep 17 00:00:00 2001 From: renpy Date: Tue, 29 Aug 2023 16:32:39 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=97?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=BC=B9=E7=AA=97=E5=9C=A8=E7=AD=89=E5=BE=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=EF=BC=8C=E5=BC=B9=E7=AA=97=E5=86=85=E5=A2=9E=E5=8A=A0=20loadin?= =?UTF-8?q?g...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stationOperation/components/MapPane.vue | 8 ++++++-- .../stationOperation/components/RealTimeDataChart.vue | 7 ++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/views/stationOperation/components/MapPane.vue b/src/views/stationOperation/components/MapPane.vue index fa4edc5..c07c513 100644 --- a/src/views/stationOperation/components/MapPane.vue +++ b/src/views/stationOperation/components/MapPane.vue @@ -233,7 +233,7 @@
@@ -419,7 +419,8 @@ export default { markerList: [], // 要在地图上展示的marker列表 - showPane: true + showPane: true, + spinLoading: false } }, created() { @@ -720,6 +721,7 @@ export default { // 获取数据接收状态列表 async getDataRecieveStatusList() { + this.spinLoading = true try { this.isGettingStatusList = true const { success, result, message } = await getAction( @@ -728,6 +730,7 @@ export default { userId: this.$store.getters.userInfo.id } ) + this.spinLoading = false if (success) { const statusList = [] result.forEach(item => { @@ -746,6 +749,7 @@ export default { this.$message.error(message) } } catch (error) { + this.spinLoading = false console.error(error) } finally { this.isGettingStatusList = false diff --git a/src/views/stationOperation/components/RealTimeDataChart.vue b/src/views/stationOperation/components/RealTimeDataChart.vue index 432814e..d971a7b 100644 --- a/src/views/stationOperation/components/RealTimeDataChart.vue +++ b/src/views/stationOperation/components/RealTimeDataChart.vue @@ -14,7 +14,9 @@
- + + + @@ -79,6 +81,9 @@ export default { title: { type: String }, + spinning: { + type: Boolean + }, list: { type: Array, default: () => [] From 469e67dd8671dc714dfd26e6e42cc89078b3b920 Mon Sep 17 00:00:00 2001 From: renpy Date: Tue, 29 Aug 2023 18:49:01 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=97?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=BC=B9=E7=AA=97loading=E6=95=88=E6=9E=9C?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomChart/index.vue | 1 + .../stationOperation/components/RealTimeDataChart.vue | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/CustomChart/index.vue b/src/components/CustomChart/index.vue index a785e99..e9c13db 100644 --- a/src/components/CustomChart/index.vue +++ b/src/components/CustomChart/index.vue @@ -75,5 +75,6 @@ export default { diff --git a/src/views/stationOperation/components/RealTimeDataChart.vue b/src/views/stationOperation/components/RealTimeDataChart.vue index d971a7b..ca78bef 100644 --- a/src/views/stationOperation/components/RealTimeDataChart.vue +++ b/src/views/stationOperation/components/RealTimeDataChart.vue @@ -1,5 +1,5 @@ From ec166fb43c0c42c611ebd39955c4cbd75ca713c4 Mon Sep 17 00:00:00 2001 From: renpy Date: Tue, 29 Aug 2023 19:16:41 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=8F=B0=E7=AB=99=E5=90=8E=EF=BC=8C=E6=B3=A2=E7=BA=B9=E4=BE=9D?= =?UTF-8?q?=E6=97=A7=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stationOperation/index.vue | 42 ++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue index 5c82903..7d0b611 100644 --- a/src/views/stationOperation/index.vue +++ b/src/views/stationOperation/index.vue @@ -212,7 +212,8 @@ export default { stationTypeList: [], treeData: [], // 台站树列表 - timer: null + timer: null, + updataFilterType: [] } }, created() { @@ -269,7 +270,26 @@ export default { }) }) this.orgStationList = res.result - this.upDateStationList = res.result + if (this.updataFilterType.length>0) { + this.upDateStationList = this.orgStationList.filter(item => this.updataFilterType.includes(item.stationType)) + } else { + this.upDateStationList = res.result + } + if (this.markerList.length > 0) { + let curList = [] + this.markerList.forEach(item => { + if (item.stationType!="Nuclear Facility" && item.stationType!="NRL") { + this.orgStationList.forEach(el => { + if (parseInt(el.id) == item.stationId) { + curList.push(el) + } + }) + } + }) + this.upDateStationList=curList + } else { + this.upDateStationList=[] + } } else { this.$message.warning("This operation fails. Contact your system administrator") } @@ -409,6 +429,23 @@ export default { // 修改地图上的marker列表 onChangeMarker(markerList) { this.markerList = markerList + let curList = [] + if (markerList.length>0) { + markerList.forEach(item => { + if (item.stationType!="Nuclear Facility" && item.stationType!="NRL") { + this.orgStationList.forEach(el => { + if (parseInt(el.id) == item.stationId) { + el.stationType = item.stationType + el.stationId = item.stationId + curList.push(el) + } + }) + } + }) + this.upDateStationList=curList + } else { + this.upDateStationList=[] + } }, // 是否绘制圆圈 @@ -421,6 +458,7 @@ export default { * 根据类型筛选地图上的marker列表 */ onFilterMarker({ filterType, filterDataQuality }) { + this.updataFilterType = filterType console.log( '%c [ filterType, filterDataQuality ]-343', 'font-size:13px; background:pink; color:#bf2c9f;', From 5b6428bac0222c224b3452ba5f866f4c5ba62f04 Mon Sep 17 00:00:00 2001 From: renpy Date: Wed, 30 Aug 2023 10:12:04 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8F=B3=E4=BE=A7?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F=E9=9A=90=E8=97=8F=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stationOperation/components/MapPane.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/stationOperation/components/MapPane.vue b/src/views/stationOperation/components/MapPane.vue index c07c513..7545875 100644 --- a/src/views/stationOperation/components/MapPane.vue +++ b/src/views/stationOperation/components/MapPane.vue @@ -20,7 +20,7 @@ @@ -485,6 +485,12 @@ export default { } }, + handleHide() { + this.showPane = !this.showPane + this.emitDrawCircle(1) + this.emitFilter() + }, + // 根据 Filter 筛选Marker emitFilter() { const filterType = this.filterList.filter(item => item.checked).map(item => item.type) From cbc576d15f6682cb5054c46b76492c18b8490eb5 Mon Sep 17 00:00:00 2001 From: renpy Date: Wed, 30 Aug 2023 10:37:36 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E7=8A=B6=E6=80=81=E7=AA=97=E5=8F=A3=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=97=E7=8A=B6=E6=80=81=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=89=93=E5=BC=80=E4=B9=8B=E5=90=8E=20loadin?= =?UTF-8?q?g=20=E6=95=88=E6=9E=9C=E4=B8=8D=E6=98=8E=E6=98=BE=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=92=99=E7=89=88=0B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomChart/index.vue | 1 - src/views/stationOperation/components/MapPane.vue | 7 ++++++- .../stationOperation/components/RealTimeDataChart.vue | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/CustomChart/index.vue b/src/components/CustomChart/index.vue index e9c13db..a785e99 100644 --- a/src/components/CustomChart/index.vue +++ b/src/components/CustomChart/index.vue @@ -75,6 +75,5 @@ export default { diff --git a/src/views/stationOperation/components/MapPane.vue b/src/views/stationOperation/components/MapPane.vue index 7545875..5706da2 100644 --- a/src/views/stationOperation/components/MapPane.vue +++ b/src/views/stationOperation/components/MapPane.vue @@ -236,6 +236,7 @@ +
@@ -420,7 +421,8 @@ export default { markerList: [], // 要在地图上展示的marker列表 showPane: true, - spinLoading: false + spinLoading: false, + maskVisi: false } }, created() { @@ -727,6 +729,7 @@ export default { // 获取数据接收状态列表 async getDataRecieveStatusList() { + this.maskVisi = true this.spinLoading = true try { this.isGettingStatusList = true @@ -736,6 +739,7 @@ export default { userId: this.$store.getters.userInfo.id } ) + this.maskVisi = false this.spinLoading = false if (success) { const statusList = [] @@ -755,6 +759,7 @@ export default { this.$message.error(message) } } catch (error) { + this.maskVisi = false this.spinLoading = false console.error(error) } finally { diff --git a/src/views/stationOperation/components/RealTimeDataChart.vue b/src/views/stationOperation/components/RealTimeDataChart.vue index ca78bef..1f72568 100644 --- a/src/views/stationOperation/components/RealTimeDataChart.vue +++ b/src/views/stationOperation/components/RealTimeDataChart.vue @@ -1,5 +1,5 @@ From a4e284711c26d174b1cd691c6d2b76d8c51795a1 Mon Sep 17 00:00:00 2001 From: renpy Date: Fri, 1 Sep 2023 11:17:46 +0800 Subject: [PATCH 12/16] =?UTF-8?q?station=20=E5=9C=B0=E5=9B=BEicon=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stationOperation/components/MapMarker.vue | 5 ++- .../components/markerPopupColumns.js | 36 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/views/stationOperation/components/MapMarker.vue b/src/views/stationOperation/components/MapMarker.vue index 88e57a8..b713e0a 100644 --- a/src/views/stationOperation/components/MapMarker.vue +++ b/src/views/stationOperation/components/MapMarker.vue @@ -226,7 +226,10 @@ export default { result.lon = decimalToDms(result.lon || result.longitude) result.lat = decimalToDms(result.lat || result.latitude, false) - this.currStationInfo = result + let params = this.currList.find(item => { + return item.stationId === result.stationId + }) + this.currStationInfo = {result,...params} } else { this.$message.error(message) } diff --git a/src/views/stationOperation/components/markerPopupColumns.js b/src/views/stationOperation/components/markerPopupColumns.js index b9febda..a7c35b4 100644 --- a/src/views/stationOperation/components/markerPopupColumns.js +++ b/src/views/stationOperation/components/markerPopupColumns.js @@ -116,6 +116,24 @@ export default { }, { label: 'TYPE', key: 'type' + }, { + label: 'USED', + key: 'used' + }, { + label: 'PHD', + key: 'phd' + }, { + label: 'PHDF', + key: 'phdf' + }, { + label: 'MET', + key: 'met' + }, { + label: 'SOH', + key: 'soh' + }, { + label: 'PHDF+MET+SOH', + key: 'phdMetSoh' }], [MarkerType.ImsRnStationG]: [{ label: 'COUNTRYCODE', @@ -153,6 +171,24 @@ export default { }, { label: 'TYPE', key: 'type' + }, { + label: 'USED', + key: 'used' + }, { + label: 'PHD', + key: 'phd' + }, { + label: 'PHDF', + key: 'phdf' + }, { + label: 'MET', + key: 'met' + }, { + label: 'SOH', + key: 'soh' + }, { + label: 'PHDF+MET+SOH', + key: 'phdMetSoh' }], [MarkerType.NRL]: [{ label: 'COUNTRYCODE', From aec35ab1e21a7f3bb35d9dc96254df5b29b42aa1 Mon Sep 17 00:00:00 2001 From: renpy Date: Fri, 1 Sep 2023 14:36:00 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=9C=A8=E4=B8=8A=E9=9D=A2=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E8=A6=81=E8=B7=9F=E9=9A=8F=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=0B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomChart/index.vue | 2 +- src/views/stationOperation/components/MapPane.vue | 3 +-- .../stationOperation/components/RealTimeDataChart.vue | 11 +++++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/components/CustomChart/index.vue b/src/components/CustomChart/index.vue index a785e99..efd420d 100644 --- a/src/components/CustomChart/index.vue +++ b/src/components/CustomChart/index.vue @@ -74,6 +74,6 @@ export default { diff --git a/src/views/stationOperation/components/MapPane.vue b/src/views/stationOperation/components/MapPane.vue index 5706da2..0774cc8 100644 --- a/src/views/stationOperation/components/MapPane.vue +++ b/src/views/stationOperation/components/MapPane.vue @@ -1173,8 +1173,7 @@ export default { right: 15px; width: calc(100% - 270px); height: 100%; - overflow: auto; - padding: 0 15px 10px; + padding: 0 0 10px 15px; border: 1px solid @borderColor; transition: width 0.3s cubic-bezier(0.075, 0.82, 0.165, 1); diff --git a/src/views/stationOperation/components/RealTimeDataChart.vue b/src/views/stationOperation/components/RealTimeDataChart.vue index 1f72568..73b7961 100644 --- a/src/views/stationOperation/components/RealTimeDataChart.vue +++ b/src/views/stationOperation/components/RealTimeDataChart.vue @@ -1,5 +1,5 @@