vue2-client 1.14.29 → 1.14.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.14.29",
+  "version": "1.14.30",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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/XReport/print.js

@@ -1,186 +1,186 @@
-// print.js
-
-export function printElement (elementToPrint) {
-  // 创建一个新的浏览器窗口
-  const printWindow = window.open('', '_blank', 'height=1024,width=768')
-  // 设置新窗口的文档内容
-  printWindow.document.write(`
-    <html>
-      <head>
-        <title>Print</title>
-        <style>
-          @page {
-            size: auto;
-            margin: 0mm;
-          }
-          html, body {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            height: 100%;
-          }
-          #print-container {
-            display: none
-          }
-          .img{
-            width: 95%;
-            height: 180px;
-            object-fit: cover;
-          }
-          .reportMain {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            padding: 15px;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              margin-bottom: 1%;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-              text-align: center;
-            }
-          }
-          .reportMainForDisplay {
-            text-align: center;
-            margin: 10% auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            padding: 15px;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-around;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .reportMainNoPadding {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .tools{
-            position: fixed;
-            right: 2%;
-            text-align: right;
-            width: 60%;
-            cursor: pointer;
-            .toolsItem{
-              width: 15%;
-              margin-right: 3%;
-              display: inline-block;
-            }
-          }
-        </style>
-      </head>
-      <body>
-        <!-- 将需要打印的元素内容复制到新窗口中 -->
-        ${elementToPrint.innerHTML}
-      </body>
-    </html>
-  `)
-  // 延迟执行打印，以确保新窗口的内容已加载完成
-  printWindow.document.close() // 关闭文档流，确保内容完全加载
-  setTimeout(() => {
-    printWindow.print() // 调用打印方法
-    printWindow.close()
-  }, 500) // 延迟500毫秒后执行打印
-}
+// print.js
+
+export function printElement (elementToPrint) {
+  // 创建一个新的浏览器窗口
+  const printWindow = window.open('', '_blank', 'height=1024,width=768')
+  // 设置新窗口的文档内容
+  printWindow.document.write(`
+    <html>
+      <head>
+        <title>Print</title>
+        <style>
+          @page {
+            size: auto;
+            margin: 0mm;
+          }
+          html, body {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+          }
+          #print-container {
+            display: none
+          }
+          .img{
+            width: 95%;
+            height: 180px;
+            object-fit: cover;
+          }
+          .reportMain {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            padding: 15px;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              margin-bottom: 1%;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+              text-align: center;
+            }
+          }
+          .reportMainForDisplay {
+            text-align: center;
+            margin: 10% auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            padding: 15px;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-around;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .reportMainNoPadding {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .tools{
+            position: fixed;
+            right: 2%;
+            text-align: right;
+            width: 60%;
+            cursor: pointer;
+            .toolsItem{
+              width: 15%;
+              margin-right: 3%;
+              display: inline-block;
+            }
+          }
+        </style>
+      </head>
+      <body>
+        <!-- 将需要打印的元素内容复制到新窗口中 -->
+        ${elementToPrint.innerHTML}
+      </body>
+    </html>
+  `)
+  // 延迟执行打印，以确保新窗口的内容已加载完成
+  printWindow.document.close() // 关闭文档流，确保内容完全加载
+  setTimeout(() => {
+    printWindow.print() // 调用打印方法
+    printWindow.close()
+  }, 500) // 延迟500毫秒后执行打印
+}

package/src/base-client/components/his/XTitle/README.md

@@ -22,7 +22,7 @@ XTitle 是一个多功能的标题组件，可以显示标题文本或按钮，
 
 ### 配置参数格式
 
-XTitle 组件通过一个字符串参数进行配置
+XTitle 组件通过一个字符串参数进行配置 
 
 各部分说明：
 

package/src/utils/map-utils.js

@@ -1,47 +1,47 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap (secretKey, key) {
-  if (!Amap) {
-    window._AMapSecurityConfig = {
-      securityJsCode: secretKey
-    }
-    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
-    AMapLoader.reset()
-    Amap = await AMapLoader.load({
-      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
-        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
-        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-      AMapUI: {
-        version: '1.1', // AMapUI 缺省 1.1
-        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
-      }
-    })
-  }
-  return Amap
-}
-
-async function getGDMap (address) {
-  new (await GetGDMap()).Geocoder({
-    radius: 500 // 范围，默认：500
-  }).getLocation(address, function (status, result) {
-    if (status === 'complete' && result.geocodes.length) {
-      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-    } else {
-      // eslint-disable-next-line prefer-promise-reject-errors
-      throw new Error('根据经纬度查询地址失败')
-    }
-  })
-}
-
-async function GetLocation (address) {
-  return new Promise((resolve, reject) => {
-    try {
-      resolve(getGDMap(address))
-    } catch (e) {
-      reject(e)
-    }
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap (secretKey, key) {
+  if (!Amap) {
+    window._AMapSecurityConfig = {
+      securityJsCode: secretKey
+    }
+    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
+    AMapLoader.reset()
+    Amap = await AMapLoader.load({
+      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
+        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
+        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      AMapUI: {
+        version: '1.1', // AMapUI 缺省 1.1
+        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
+      }
+    })
+  }
+  return Amap
+}
+
+async function getGDMap (address) {
+  new (await GetGDMap()).Geocoder({
+    radius: 500 // 范围，默认：500
+  }).getLocation(address, function (status, result) {
+    if (status === 'complete' && result.geocodes.length) {
+      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+    } else {
+      // eslint-disable-next-line prefer-promise-reject-errors
+      throw new Error('根据经纬度查询地址失败')
+    }
+  })
+}
+
+async function GetLocation (address) {
+  return new Promise((resolve, reject) => {
+    try {
+      resolve(getGDMap(address))
+    } catch (e) {
+      reject(e)
+    }
+  })
+}
+export { GetGDMap, GetLocation }

package/src/utils/request.js

@@ -160,7 +160,8 @@ function loadInterceptors () {
     if (['post'].includes(config.method.toLowerCase()) && v4SessionKey &&
       !config.url.includes('/logic/openapi/') &&
       !config.url.includes('devApi') &&
-      !config.url.includes('auth/login')) {
+      !config.url.includes('auth/login') &&
+      config.url.includes('api/af-')) {
       if (config.data && !(config.data instanceof FormData)) {
         config.data = {
           encrypted: EncryptUtil.AESEncryptCBC(config.data, v4SessionKey)