vue2-client 1.14.28 → 1.14.30

package/package.json

@@ -1,108 +1,108 @@
-{
-  "name": "vue2-client",
-  "version": "1.14.28",
-  "private": false,
-  "scripts": {
-    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
-    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
-    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
-    "serve:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
-    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
-    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
-    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
-    "serve:runtime": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode runtime",
-    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
-    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint",
-    "build:preview": "vue-cli-service build --mode preview",
-    "lint:nofix": "vue-cli-service lint --no-fix",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@afwenming123/vue-easy-tree": "^1.0.1",
-    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/g2plot": "^2.4.31",
-    "@hufe921/canvas-editor": "^0.9.49",
-    "@microsoft/fetch-event-source": "^2.0.1",
-    "@vue/babel-preset-jsx": "^1.4.0",
-    "animate.css": "^4.1.1",
-    "ant-design-vue": "^1.7.8",
-    "axios": "^0.27.2",
-    "clipboard": "^2.0.11",
-    "core-js": "^3.33.0",
-    "crypto-js": "^4.1.1",
-    "date-fns": "^2.29.3",
-    "default-passive-events": "^2.0.0",
-    "dotenv": "^16.3.1",
-    "echarts": "^5.5.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^11.7.0",
-    "html2canvas": "^1.4.1",
-    "js-base64": "^3.7.5",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.3.2",
-    "jspdf": "^2.5.1",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.debounce": "^4",
-    "lodash.get": "^4.4.2",
-    "marked": "^4",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "qs": "^6.11.2",
-    "regenerator-runtime": "^0.14.0",
-    "videojs-contrib-hls": "^5.15.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.7.14",
-    "vue-codemirror": "4.0.6",
-    "vue-draggable-resizable": "^2",
-    "vue-i18n": "^8.28.2",
-    "vue-json-viewer": "^2.2.22",
-    "vue-router": "^3.6.5",
-    "vue-video-player": "^5.0.2",
-    "vue-virtual-scroller": "^1.1.2",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2",
-    "xlsx": "0.18.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^7.0.0",
-    "@babel/core": "^7.22.20",
-    "@babel/eslint-parser": "^7.22.15",
-    "@babel/preset-env": "^7.22.20",
-    "@vue/cli-plugin-babel": "^5.0.8",
-    "@vue/cli-plugin-eslint": "^5.0.8",
-    "@vue/cli-service": "^5.0.8",
-    "@vue/eslint-config-standard": "^8.0.1",
-    "@vue/test-utils": "^1.3.6",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "compression-webpack-plugin": "^10.0.0",
-    "css-minimizer-webpack-plugin": "^5.0.1",
-    "deepmerge": "^4.3.1",
-    "eslint": "^8.51.0",
-    "eslint-plugin-vue": "^9.17.0",
-    "fast-deep-equal": "^3.1.3",
-    "ignore-loader": "^0.1.2",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-transform-stub": "^2.0.0",
-    "less-loader": "^6.2.0",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.5.0",
-    "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-jest": "^4.0.1",
-    "vue-template-compiler": "^2.7.14",
-    "webpack": "^5.88.2",
-    "webpack-theme-color-replacer": "^1.4.7",
-    "whatwg-fetch": "^3.6.19"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead",
-    "not ie 11"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.14.30",
+  "private": false,
+  "scripts": {
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
+    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
+    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
+    "serve:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
+    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
+    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
+    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
+    "serve:runtime": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode runtime",
+    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
+    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint",
+    "build:preview": "vue-cli-service build --mode preview",
+    "lint:nofix": "vue-cli-service lint --no-fix",
+    "test": "jest"
+  },
+  "dependencies": {
+    "@afwenming123/vue-easy-tree": "^1.0.1",
+    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
+    "@antv/g2plot": "^2.4.31",
+    "@hufe921/canvas-editor": "^0.9.49",
+    "@microsoft/fetch-event-source": "^2.0.1",
+    "@vue/babel-preset-jsx": "^1.4.0",
+    "animate.css": "^4.1.1",
+    "ant-design-vue": "^1.7.8",
+    "axios": "^0.27.2",
+    "clipboard": "^2.0.11",
+    "core-js": "^3.33.0",
+    "crypto-js": "^4.1.1",
+    "date-fns": "^2.29.3",
+    "default-passive-events": "^2.0.0",
+    "dotenv": "^16.3.1",
+    "echarts": "^5.5.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^11.7.0",
+    "html2canvas": "^1.4.1",
+    "js-base64": "^3.7.5",
+    "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.3.2",
+    "jspdf": "^2.5.1",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.debounce": "^4",
+    "lodash.get": "^4.4.2",
+    "marked": "^4",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "qs": "^6.11.2",
+    "regenerator-runtime": "^0.14.0",
+    "videojs-contrib-hls": "^5.15.0",
+    "viser-vue": "^2.4.8",
+    "vue": "^2.7.14",
+    "vue-codemirror": "4.0.6",
+    "vue-draggable-resizable": "^2",
+    "vue-i18n": "^8.28.2",
+    "vue-json-viewer": "^2.2.22",
+    "vue-router": "^3.6.5",
+    "vue-video-player": "^5.0.2",
+    "vue-virtual-scroller": "^1.1.2",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.6.2",
+    "xlsx": "0.18.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^7.0.0",
+    "@babel/core": "^7.22.20",
+    "@babel/eslint-parser": "^7.22.15",
+    "@babel/preset-env": "^7.22.20",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
+    "@vue/eslint-config-standard": "^8.0.1",
+    "@vue/test-utils": "^1.3.6",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "compression-webpack-plugin": "^10.0.0",
+    "css-minimizer-webpack-plugin": "^5.0.1",
+    "deepmerge": "^4.3.1",
+    "eslint": "^8.51.0",
+    "eslint-plugin-vue": "^9.17.0",
+    "fast-deep-equal": "^3.1.3",
+    "ignore-loader": "^0.1.2",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "jest-transform-stub": "^2.0.0",
+    "less-loader": "^6.2.0",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.5.0",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
+    "vue-jest": "^4.0.1",
+    "vue-template-compiler": "^2.7.14",
+    "webpack": "^5.88.2",
+    "webpack-theme-color-replacer": "^1.4.7",
+    "whatwg-fetch": "^3.6.19"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead",
+    "not ie 11"
+  ]
+}

package/src/base-client/components/common/AddressSearchCombobox/AddressSearchCombobox.vue

@@ -29,7 +29,9 @@
       title="地址选择"
       @ok="selected"
       :zIndex="m_index"
-      :destroyOnClose="true">
+      :destroyOnClose="true"
+      width="70%"
+    >
       <div class="certain-category-search-wrapper">
         <a-auto-complete
           style="right: 0px;width: 90%;z-index:2;margin-top:2%;"
@@ -189,15 +191,92 @@ export default {
         radius: 500 // 范围，默认：500
       })
       this.map.addControl(new (aMap).ToolBar()) // 初始化工具插件
-      // 初始化窗体
-      /* this.infoWindow = new (aMap).InfoWindow({
-        anchor: 'bottom-center',
-        isCustom: false, // 使用自定义窗体
-        autoMove: true,
-        content: '',
-        showShadow: true,
-        offset: new (aMap).Pixel(0, -25)
-      }) */
+
+      // 等待地图加载完成
+      this.map.on('complete', () => {
+        // 获取地图中心点
+        const center = this.map.getCenter()
+
+        // 创建标记对象 - 使用默认样式
+        this.marker = new (aMap).Marker({
+          position: [center.lng, center.lat], // 使用地图中心点作为初始位置
+          map: this.map // 直接在地图创建时添加标记
+        })
+
+        // 获取中心点地址信息
+        this.geocoder.getAddress(center, (status, result) => {
+          if (status === 'complete' && result.info === 'OK') {
+            const addressComponent = result.regeocode.addressComponent
+            this.divisions.province = addressComponent.province
+            this.divisions.city = addressComponent.city
+            this.divisions.district = addressComponent.district
+            this.divisions.township = addressComponent.township
+            this.divisions.towncode = addressComponent.towncode
+            this.divisions.street = addressComponent.street
+
+            // 获取小区信息
+            if (result.regeocode.aois && result.regeocode.aois.length) {
+              this.divisions.area = result.regeocode.aois[0].name
+            } else if (result.regeocode.pois && result.regeocode.pois.length) {
+              this.divisions.area = result.regeocode.pois[0].name
+            }
+
+            this.divisions.str = `${addressComponent.province}${addressComponent.city}${addressComponent.district}${addressComponent.township}`
+
+            if (this.divisions.str && result.regeocode.formattedAddress.startsWith(this.divisions.str)) {
+              this.readOnlyDivisions = true
+            }
+
+            this.addressObj.address = result.regeocode.formattedAddress
+            this.addressObj.lng_lat = `${center.lng},${center.lat}`
+          }
+        })
+      })
+
+      // 添加地图点击事件
+      this.map.on('click', (e) => {
+        const lnglat = e.lnglat
+        this.curPosition = lnglat
+
+        // 更新标记位置
+        this.marker.setPosition([lnglat.lng, lnglat.lat])
+
+        // 将地图中心移动到点击位置
+        this.map.setCenter([lnglat.lng, lnglat.lat])
+
+        // 获取点击位置的地址信息
+        this.geocoder.getAddress(lnglat, (status, result) => {
+          if (status === 'complete' && result.info === 'OK') {
+            const addressComponent = result.regeocode.addressComponent
+            this.divisions.province = addressComponent.province
+            this.divisions.city = addressComponent.city
+            this.divisions.district = addressComponent.district
+            this.divisions.township = addressComponent.township
+            this.divisions.towncode = addressComponent.towncode
+            this.divisions.street = addressComponent.street
+
+            // 获取小区信息
+            if (result.regeocode.aois && result.regeocode.aois.length) {
+              this.divisions.area = result.regeocode.aois[0].name
+            } else if (result.regeocode.pois && result.regeocode.pois.length) {
+              this.divisions.area = result.regeocode.pois[0].name
+            }
+
+            this.divisions.str = `${addressComponent.province}${addressComponent.city}${addressComponent.district}${addressComponent.township}`
+
+            if (this.divisions.str && result.regeocode.formattedAddress.startsWith(this.divisions.str)) {
+              this.readOnlyDivisions = true
+            }
+
+            if (!this.searchFlag) {
+              this.addressObj.address = result.regeocode.formattedAddress
+              this.addressObj.lng_lat = `${lnglat.lng},${lnglat.lat}`
+            } else {
+              this.searchFlag = false
+            }
+          }
+        })
+      })
     },
     onSelect (value) {
       // 选中地址后不触发更新坐标
@@ -214,7 +293,11 @@ export default {
       const label = labelMatch ? labelMatch[1].trim() : null
       this.addressObj.address = this.mergeAddressAndLabel(this.addressObj.address, label)
       this.addressObj.lng_lat = coordinatesMatch ? coordinatesMatch[1] : ''
-      this.map.setCenter(this.addressObj.lng_lat.split(','))
+
+      // 更新地图中心和标记位置
+      const [lng, lat] = this.addressObj.lng_lat.split(',')
+      this.map.setCenter([lng, lat])
+      this.marker.setPosition([lng, lat])
     },
     mergeAddressAndLabel (address, label = '') {
       // 从地址的末尾开始匹配标签的开头部分
@@ -337,53 +420,10 @@ export default {
           GetGDMap(this.gaode_secret_key, this.gaode_key).then(aMap => {
             this.initMap(aMap)
             this.mapAutocomplete = new (aMap).AutoComplete({
-              // city 限定城市，默认全国
               city: '全国',
               dragEnable: true,
               animateEnable: false
             })
-            this.positionPicker = new window.AMapUI.PositionPicker({
-              mode: 'dragMap',
-              map: this.map
-            })
-            this.positionPicker.on('success', (positionResult) => {
-              console.log(positionResult)
-              console.log(positionResult.position)
-              this.curPosition = positionResult.position
-              // 设置 行政区划信息
-              if (positionResult?.regeocode?.addressComponent) {
-                const { addressComponent } = positionResult?.regeocode
-                this.divisions.province = addressComponent.province
-                this.divisions.city = addressComponent.city
-                this.divisions.district = addressComponent.district
-                this.divisions.township = addressComponent.township
-                this.divisions.towncode = addressComponent.towncode
-                this.divisions.street = addressComponent.street
-                // 试着获取小区
-                if (positionResult?.regeocode?.aois && positionResult?.regeocode?.aois.length) {
-                  // 取第一个当做小区
-                  this.divisions.area = positionResult?.regeocode?.aois[0]?.name
-                } else if (positionResult?.regeocode?.pois && positionResult?.regeocode?.pois.length) {
-                  // 取第一个当做小区
-                  this.divisions.area = positionResult?.regeocode?.pois[0]?.name
-                }
-                this.divisions.str =
-                  `${addressComponent.province}${addressComponent.city}${addressComponent.district}${addressComponent.township}`
-              }
-              if (this.divisions.str && positionResult.address.startsWith(this.divisions.str)) {
-                // 如果 省市区信息和获取到的地址的前缀一致 那么省市区前缀禁止修改只能修改后面的 通过 onchange事件拦截
-                this.readOnlyDivisions = true
-              }
-              if (!this.searchFlag) {
-                this.addressObj.address = positionResult.address
-                this.addressObj.lng_lat = `${positionResult.position.lng},${positionResult.position.lat}`
-              } else {
-                this.searchFlag = false
-              }
-            })
-            this.positionPicker.on('fail', function (positionResult) {
-            })
-            this.positionPicker.start()
           })
         })
       }
@@ -396,7 +436,7 @@ export default {
 #addressSearchCombobox_map {
   margin: 1% 0;
   width: 100%;
-  height: 400px;
+  height: 600px;
   text-align: center
 }
 

package/src/base-client/components/common/AmapMarker/index.js

@@ -1,3 +1,3 @@
-import AmapPointRendering from './AmapPointRendering'
-
-export default AmapPointRendering
+import AmapPointRendering from './AmapPointRendering'
+
+export default AmapPointRendering

package/src/base-client/components/common/XDetailsView/index.js

@@ -1,3 +1,3 @@
-import XDetailsView from './XDetailsView'
-
-export default XDetailsView
+import XDetailsView from './XDetailsView'
+
+export default XDetailsView

package/src/base-client/components/common/XFormGroupDetails/index.js

@@ -1,3 +1,3 @@
-import XFormGroupDetails from './XFormGroupDetails'
-
-export default XFormGroupDetails
+import XFormGroupDetails from './XFormGroupDetails'
+
+export default XFormGroupDetails