update

package-lock.json

@@ -5922,7 +5922,7 @@
     },
     "babel-plugin-module-resolver": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/ba,bel-plugin-module-resolver-3.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz",
       "integrity": "sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==",
       "dev": true,
       "requires": {
@@ -6304,7 +6304,7 @@
     },
     "bignumber.js": {
       "version": "9.1.0",
-      "resolved": "https://registry.npmmirror.com/bignumber.js/-/bignumber.js-9.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.0.tgz",
       "integrity": "sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A=="
     },
     "bin-build": {
@@ -8438,7 +8438,7 @@
     },
     "crypto-js": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz",
       "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
     },
     "css": {
@@ -11189,200 +11189,6 @@
         "worker-rpc": "^0.1.0"
       }
     },
-    "fork-ts-checker-webpack-plugin-v5": {
-      "version": "npm:fork-ts-checker-webpack-plugin@5.2.1",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz",
-      "integrity": "sha512-SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "@babel/code-frame": "^7.8.3",
-        "@types/json-schema": "^7.0.5",
-        "chalk": "^4.1.0",
-        "cosmiconfig": "^6.0.0",
-        "deepmerge": "^4.2.2",
-        "fs-extra": "^9.0.0",
-        "memfs": "^3.1.2",
-        "minimatch": "^3.0.4",
-        "schema-utils": "2.7.0",
-        "semver": "^7.3.2",
-        "tapable": "^1.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "cosmiconfig": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-          "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@types/parse-json": "^4.0.0",
-            "import-fresh": "^3.1.0",
-            "parse-json": "^5.0.0",
-            "path-type": "^4.0.0",
-            "yaml": "^1.7.2"
-          }
-        },
-        "deepmerge": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-          "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-          "dev": true,
-          "optional": true
-        },
-        "fs-extra": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "at-least-node": "^1.0.0",
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^6.0.1",
-            "universalify": "^2.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "import-fresh": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-          "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "parent-module": "^1.0.0",
-            "resolve-from": "^4.0.0"
-          }
-        },
-        "jsonfile": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "graceful-fs": "^4.1.6",
-            "universalify": "^2.0.0"
-          }
-        },
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-          "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "error-ex": "^1.3.1",
-            "json-parse-even-better-errors": "^2.3.0",
-            "lines-and-columns": "^1.1.6"
-          }
-        },
-        "path-type": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-          "dev": true,
-          "optional": true
-        },
-        "resolve-from": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-          "dev": true,
-          "optional": true
-        },
-        "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "universalify": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-          "dev": true,
-          "optional": true
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "form-data": {
       "version": "2.3.3",
       "resolved": "https://registry.npm.taobao.org/form-data/download/form-data-2.3.3.tgz",
@@ -14827,7 +14633,7 @@
     },
     "json-bigint": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/json-bigint/-/json-bigint-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
       "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
       "requires": {
         "bignumber.js": "^9.0.0"

src/config/bigScreenConfig.js

@@ -21,57 +21,28 @@ export const appconfig = {
         "name": "离线影像服务",
         "type": "tiled",
         "config": {
-          "chinavec2d": {
-            "name": "中国电子地图",
-            "url": BASE_URL + "/services/map-citymap-3/rest/maps/citymap_yc"
-          }
+
         }
       },
       "scenes": {
         "name": "场景服务",
         "type": "scene",
         "config": {
-          // "wscj": {
-          //   "name": "污水厂",
-          //   "url": BASE_URL + "/services/3D-liduershuichang/rest/realspace"
-          // },
-          // "scj": {
-          //   "name": "水厂",
-          //   "url": BASE_URL + "/services/3D-BaiYinShuiChang/rest/realspace"
-          // },
-          "jzcj": {
-            "name": "建筑场景",
-            "url": BASE_URL + "/services/3D-TF_PAPN_BUILD-2/rest/realspace"
-          },
-          "gcgdcj": {
-            "name": "设计管网",
-            // "url": "/services/3D-hbyc_sj/rest/realspace"
-            "url": BASE_URL + "/services/3D-hbyc_sj_lx_20220829/rest/realspace"
-          },
+
         }
       },
       "maps": {
         "name": "地图服务",
         "type": "map",
         "config": {
-          "sjdt": {
-            "name": "设计管线",
-            "url": BASE_URL + "/services/map-sxgk_yc/rest/maps/hnyy_sj"
-          },
+
         }
       },
       "tiplayers": {
         "name": "数据服务",
         "type": "data",
         "config": {
-          "sjfw": {
-            "name": "宜昌数据服务",
-            "url": BASE_URL + "/services/data-sxgk_yc/rest/data"
-          },
-          "bjsmidfw": {
-            "name": "部件SMID查询",
-            "url": BASE_URL + "/services/map-sxgk_yc/rest/maps/hnyy_query"
-          },
+
         }
       },
       "geometry": {
@@ -85,26 +56,7 @@ export const appconfig = {
         "name": "专题地图服务",
         "type": "theme",
         "config": {
-          "sjtypedt": {
-            "isDisplay": "1",
-            "name": "管网施工状态专题图",
-            "url": BASE_URL + "/services/map-sxgk_yc/rest/maps/hnyy_pressure_dp"
-          },
-          "pcdtps": {
-            "isDisplay": "0",
-            "name": "质量验评专题图",
-            "url": BASE_URL + "/services/map-sxgk_yc/rest/maps/hnyy_zlyp"
-          },
-          "clpsgw": {
-            "isDisplay": "0",
-            "name": "存量排水管网",
-            "url": BASE_URL + "/services/map-sxgk_yc/rest/maps/hnyy_pc_ps_dp"
-          },
-          "sjpsgw": {
-            "isDisplay": "0",
-            "name": "设计排水管网",
-            "url": BASE_URL + "/services/map-sxgk_yc/rest/maps/hnyy_sj_lx_dp"
-          },
+
         }
       }
     }

src/views/groupPage/districtPageModules/customTools/projectPipeSpeedInfoCheck.vue

@@ -140,9 +140,7 @@ export default class ProjectPipeSpeedInfoCheck extends Vue {
     let t = {}
     t[this.active] = {
       style: { color: '#1989FA', fontWeight: 'bold' },
-      label: `${moment(
-        this.active !== this.timeSteps.length - 1 ? this.timeSteps[this.active][0] : this.timeSteps[this.active][1]
-      ).format('YYYY-MM-DD')}`
+      label: this.settings()
     }
     // t[0] = {
     //   style: { color: '#1989FA', fontWeight: 'bold' },
@@ -154,6 +152,24 @@ export default class ProjectPipeSpeedInfoCheck extends Vue {
     // }
     return t
   }
+  settings() {
+    let label = ''
+    switch (this.timeInterval) {
+      case 1:
+        label = `${moment(
+          this.active !== this.timeSteps.length - 1 ? this.timeSteps[this.active][0] : this.timeSteps[this.active][1]
+        ).format('YYYY/MM/DD')}`
+        break
+      default:
+        label =
+          `${moment(this.timeSteps[this.active][0]).format('YYYY/MM/DD')}` +
+          `至` +
+          `\n${moment(this.timeSteps[this.active][1]).format('YYYY/MM/DD')}`
+        break
+    }
+
+    return label
+  }
   //
   isFirst = true
   timeLag = []
@@ -455,6 +471,7 @@ export default class ProjectPipeSpeedInfoCheck extends Vue {
           console.log('地图查询结果', geoResult)
           //交互事件
           that.getCurrentInfo()
+          let promiseArr = []
           geoResult.originResult.recordsets.forEach((record) => {
             const features = record.features
             if (features.length > 1) {
@@ -467,26 +484,32 @@ export default class ProjectPipeSpeedInfoCheck extends Vue {
             const scanProj = _.find(cwpInfos, function (scanItem) {
               return scanItem.code === features[0]['fieldValues'][0]
             })
-
-            let labelText = dateRange.beginDate + '~' + dateRange.endDate
-
             let position = features[0].geometry.points[0]
-            // position = Cesium.Cartesian3.fromDegrees(position.x, position.y, position.z)
-            // that.addUnitBillboard({
-            //   id: scanProj.code,
-            //   name: scanProj.code,
-            //   text: labelText,
-            //   position: position,
-            //   scanProj: scanProj
-            // })
-            this.addEntity({
-              id: scanProj.code,
-              name: scanProj.code,
-              position: Cesium.Cartesian3.fromDegrees(position.x, position.y, position.z),
-              scanProj: scanProj
-            })
+            promiseArr.push(
+              new Promise((resolve, reject) => {
+                let isLoaded = this.addEntity({
+                  id: scanProj.code,
+                  name: scanProj.code,
+                  position: Cesium.Cartesian3.fromDegrees(position.x, position.y, position.z),
+                  scanProj: scanProj
+                })
+                if (isLoaded) {
+                  resolve(true)
+                } else {
+                  reject(false)
+                }
+              })
+            )
           })
-          that.isShowCompletion = true
+          Promise.all(promiseArr).then(
+            () => isCompleted(),
+            () => isCompleted()
+          )
+          function isCompleted() {
+            setTimeout(() => {
+              that.isShowCompletion = true
+            }, 500)
+          }
         }
         queryMapByAttribute({
           url: geourl,
@@ -534,6 +557,9 @@ export default class ProjectPipeSpeedInfoCheck extends Vue {
     entity.displayData = options.scanProj
     if (!gCustomDataSource.entities.getById(options.id)) {
       gCustomDataSource.entities.add(entity)
+      return true
+    } else {
+      return false
     }
   }
   /**
@@ -1126,7 +1152,7 @@ export default class ProjectPipeSpeedInfoCheck extends Vue {
       /deep/ .el-slider {
         width: 100%;
         .el-slider__marks-text {
-          white-space: nowrap;
+          white-space: pre-wrap;
         }
         .el-slider__button {
           border: 2px solid #04eaff;