npm - vue2-client - Versions diffs - 1.14.32 → 1.14.34 - Mend

vue2-client 1.14.32 → 1.14.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.14.32",
+  "version": "1.14.34",
   "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 CHANGED Viewed

@@ -118,7 +118,7 @@ export default {
       // 生成地址串中省市区街道信息禁止修改
       readOnlyDivisions: false,
       // cur 位置
-      curPosition: null,
+      curPosition: [108.878703, 34.223701],
       searchFlag: false,
     }
   },
@@ -291,7 +291,7 @@ export default {
       this.addressObj.address = addressMatch ? addressMatch[1].trim() : null
       const label = labelMatch ? labelMatch[1].trim() : null
-      this.addressObj.address = this.mergeAddressAndLabel(this.addressObj.address, label)
+      this.addressObj.address = this.addressObj.address != null ? this.mergeAddressAndLabel(this.addressObj.address, label) : labelMatch[1].trim()
       this.addressObj.lng_lat = coordinatesMatch ? coordinatesMatch[1] : ''
       // 更新地图中心和标记位置
@@ -436,7 +436,7 @@ export default {
 #addressSearchCombobox_map {
   margin: 1% 0;
   width: 100%;
-  height: 600px;
+  height: 50vh;
   text-align: center
 }

package/src/base-client/components/common/XReport/print.js CHANGED Viewed

@@ -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/common/XReportGrid/XReportTrGroup.vue CHANGED Viewed

@@ -25,7 +25,7 @@
           </template>
           <template v-else-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select' ,'x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders'].includes(cell.slotType)">
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select' ,'x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -63,7 +63,7 @@
           </template>
           <template v-else-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select','x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders'].includes(cell.slotType)">
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select','x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -124,7 +124,8 @@ export default {
     XTitle: () => import('@vue2-client/base-client/components/his/XTitle/XTitle.vue'),
     XSelect: () => import('@vue2-client/base-client/components/his/XSelect/XSelect.vue'),
     XTreeRows: () => import('@vue2-client/base-client/components/his/XTreeRows/XTreeRows.vue'),
-    XThreeTestOrders: () => import('@vue2-client/base-client/components/his/threeTestOrders/threeTestOrders.vue')
+    XThreeTestOrders: () => import('@vue2-client/base-client/components/his/threeTestOrders/threeTestOrders.vue'),
+    XShiftSchedule: () => import('@vue2-client/base-client/components/his/XShiftSchedule/XShiftSchedule.vue')
   },
   props: {
     // 每一行的配置

package/src/base-client/components/his/XShiftSchedule/XShiftSchedule.vue ADDED Viewed

@@ -0,0 +1,261 @@
+<template>
+  <a-table
+    :columns="columns"
+    :data-source="data"
+    :rowSelection="rowSelection"
+  >
+    <span slot="time" class="time-title">
+      <span>上</span>
+      <span>下</span>
+      <span>晚</span>
+    </span>
+    <template slot="Monday" slot-scope="text, record">
+      <div class="time-title">
+        <a-button v-for="(item, index) in record.Monday" :key="index" @click="handleShiftChange('Monday', index, record)">{{item === 1 || item === '1' ? '坐诊' : '休息'}}</a-button>
+      </div>
+    </template>
+    <template slot="Tuesday" slot-scope="text, record">
+      <div class="time-title">
+        <a-button v-for="(item, index) in record.Tuesday" :key="index" @click="handleShiftChange('Tuesday', index, record)">{{item === 1 || item === '1' ? '坐诊' : '休息'}}</a-button>
+      </div>
+    </template>
+    <template slot="Wednesday" slot-scope="text, record">
+      <div class="time-title">
+        <a-button v-for="(item, index) in record.Wednesday" :key="index" @click="handleShiftChange('Wednesday', index, record)">{{item === 1 || item === '1' ? '坐诊' : '休息'}}</a-button>
+      </div>
+    </template>
+    <template slot="Thursday" slot-scope="text, record">
+      <div class="time-title">
+        <a-button v-for="(item, index) in record.Thursday" :key="index" @click="handleShiftChange('Thursday', index, record)">{{item === 1 || item === '1' ? '坐诊' : '休息'}}</a-button>
+      </div>
+    </template>
+    <template slot="Friday" slot-scope="text, record">
+      <div class="time-title">
+        <a-button v-for="(item, index) in record.Friday" :key="index" @click="handleShiftChange('Friday', index, record)">{{item === 1 || item === '1' ? '坐诊' : '休息'}}</a-button>
+      </div>
+    </template>
+    <template slot="Saturday" slot-scope="text, record">
+      <div class="time-title">
+        <a-button v-for="(item, index) in record.Saturday" :key="index" @click="handleShiftChange('Saturday', index, record)">{{item === 1 || item === '1' ? '坐诊' : '休息'}}</a-button>
+      </div>
+    </template>
+    <template slot="Sunday" slot-scope="text, record">
+      <div class="time-title">
+        <a-button v-for="(item, index) in record.Sunday" :key="index" @click="handleShiftChange('Sunday', index, record)">{{item === 1 || item === '1' ? '坐诊' : '休息'}}</a-button>
+      </div>
+    </template>
+    <template slot="sk_limit"  slot-scope="text, record">
+      <a-input-number id="inputNumber" v-model="record.sk_limit" :min="1" :max="100" />
+    </template>
+  </a-table>
+</template>
+<script>
+import { runLogic } from '@vue2-client/services/api/common'
+const columns = [
+  {
+    title: '科室',
+    dataIndex: 'dept',
+    key: 'dept',
+    scopedSlots: { customRender: 'dept' },
+    align: 'center'
+  },
+  {
+    title: '人员',
+    dataIndex: 'personnel',
+    key: 'personnel',
+    align: 'center'
+  },
+  {
+    title: '职位',
+    dataIndex: 'position',
+    key: 'position',
+    align: 'center'
+  },
+  {
+    title: '上/下/晚',
+    dataIndex: 'time',
+    key: 'time',
+    scopedSlots: { customRender: 'time' },
+    align: 'center'
+  },
+  {
+    title: '周一',
+    key: 'Monday',
+    dataIndex: 'Monday',
+    scopedSlots: { customRender: 'Monday' },
+    align: 'center'
+  },
+  {
+    title: '周二',
+    key: 'Tuesday',
+    dataIndex: 'Tuesday',
+    scopedSlots: { customRender: 'Tuesday' },
+    align: 'center'
+  },
+  {
+    title: '周三',
+    key: 'Wednesday',
+    dataIndex: 'Wednesday',
+    scopedSlots: { customRender: 'Wednesday' },
+    align: 'center'
+  },
+  {
+    title: '周四',
+    key: 'Thursday',
+    dataIndex: 'Thursday',
+    scopedSlots: { customRender: 'Thursday' },
+    align: 'center'
+  },
+  {
+    title: '周五',
+    key: 'Friday',
+    dataIndex: 'Friday',
+    scopedSlots: { customRender: 'Friday' },
+    align: 'center'
+  },
+  {
+    title: '周六',
+    key: 'Saturday',
+    dataIndex: 'Saturday',
+    scopedSlots: { customRender: 'Saturday' },
+    align: 'center'
+  },
+  {
+    title: '周日',
+    key: 'Sunday',
+    dataIndex: 'Sunday',
+    scopedSlots: { customRender: 'Sunday' },
+    align: 'center'
+  },
+  {
+    title: '排班数',
+    key: 'sk_limit',
+    dataIndex: 'sk_limit',
+    scopedSlots: { customRender: 'sk_limit' },
+    align: 'center'
+  }
+]
+export default {
+  data () {
+    return {
+      data: [],
+      columns,
+      weekDate: [],
+      // 选中的行键值集合
+      selectedRows: [],
+      // 选中的行信息集合
+      selectedRowKeys: []
+    }
+  },
+  computed: {
+    rowSelection () {
+      return {
+        selectedRowKeys: this.selectedRowKeys,
+        onChange: (selectedRowKeys, selectedRows) => {
+          this.onSelectChange(selectedRowKeys, selectedRows)
+        }
+      }
+    }
+  },
+  mounted () {
+    this.init()
+  },
+  methods: {
+    handleShiftChange (day, index, record) {
+      // 找到当前记录在data中的索引
+      const dataIndex = this.data.findIndex(item => item.id === record.id)
+      if (dataIndex === -1) return
+      // 获取当前状态
+      const currentValue = record[day][index]
+      const newValue = currentValue === 1 || currentValue === '1' ? 0 : 1
+      // 更新按钮显示
+      this.$set(record[day], index, newValue)
+      // 同步更新data中的数据
+      this.$set(this.data[dataIndex][day], index, newValue)
+      console.log('当前操作的行数据：', this.data[dataIndex])
+    },
+    onSelectChange (selectedRowKeys, selectedRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = selectedRows
+      console.log('selectedRows changed: ', selectedRows)
+    },
+    // 获取选中的行数据
+    getSelectedRowData () {
+      return this.selectedRows
+    },
+    getAllTable() {
+      return this.data
+    },
+    init () {
+      runLogic('shiftSchedulingLOGIC', {}, 'af-his').then(res => {
+        if (res && Array.isArray(res)) {
+          let key = 0
+          this.data = res.map(item => {
+            // 转换排班数据格式
+            const scheduleData = {
+              key: key++,
+              id: item.id,
+              dept: item.dept,
+              personnel: item.personnel,
+              position: item.position || '',
+              selected_id: item.selected_id,
+              sk_limit: item.sk_limit || 0,
+              Monday: [
+                item.f_monday_am === '1' ? 1 : 0,
+                item.f_monday_pm === '1' ? 1 : 0,
+                item.f_monday_evening === '1' ? 1 : 0
+              ],
+              Tuesday: [
+                item.f_tuesday_am === '1' ? 1 : 0,
+                item.f_tuesday_pm === '1' ? 1 : 0,
+                item.f_tuesday_evening === '1' ? 1 : 0
+              ],
+              Wednesday: [
+                item.f_wednesday_am === '1' ? 1 : 0,
+                item.f_wednesday_pm === '1' ? 1 : 0,
+                item.f_wednesday_evening === '1' ? 1 : 0
+              ],
+              Thursday: [
+                item.f_thursday_am === '1' ? 1 : 0,
+                item.f_thursday_pm === '1' ? 1 : 0,
+                item.f_thursday_evening === '1' ? 1 : 0
+              ],
+              Friday: [
+                item.f_friday_am === '1' ? 1 : 0,
+                item.f_friday_pm === '1' ? 1 : 0,
+                item.f_friday_evening === '1' ? 1 : 0
+              ],
+              Saturday: [
+                item.f_saturday_am === '1' ? 1 : 0,
+                item.f_saturday_pm === '1' ? 1 : 0,
+                item.f_saturday_evening === '1' ? 1 : 0
+              ],
+              Sunday: [
+                item.f_sunday_am === '1' ? 1 : 0,
+                item.f_sunday_pm === '1' ? 1 : 0,
+                item.f_sunday_evening === '1' ? 1 : 0
+              ]
+            }
+            return scheduleData
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped type="less">
+.time-title {
+  display: flex !important;
+  flex-direction: column !important;
+  align-items: center !important;
+}
+::v-deep .ant-table-thead > tr > th,
+::v-deep .ant-table-tbody > tr > td {
+  padding: 8px 16px !important;
+  overflow-wrap: break-word;
+}
+</style>

package/src/base-client/components/his/XShiftSchedule/dome.vue ADDED Viewed

@@ -0,0 +1,23 @@
+<template>
+  <XShiftSchedule>
+  </XShiftSchedule>
+</template>
+<script>
+import XShiftSchedule from './XShiftSchedule.vue'
+export default {
+  components: {
+    XShiftSchedule
+  },
+  data () {
+    return {}
+  }
+}
+</script>
+<style scoped lang="less">
+</style>

package/src/pages/userInfoDetailManage/index.vue CHANGED Viewed

@@ -143,8 +143,8 @@ export default {
       handler () {
         if (this.userInfo) {
           console.log('userinfo', this.userInfo)
-          this.openUserBtnShow = this.userInfo.f_meter_type.includes('物联网表')
-          this.valveBtnShow = this.userInfo.f_meter_type.includes('物联网表') && this.userInfo.f_user_state !== '停用'
+          this.openUserBtnShow = this.userInfo.f_meter_type.includes('物联网表') && this.login?.r.includes('开户权限')
+          this.valveBtnShow = this.userInfo.f_meter_type.includes('物联网表') && this.userInfo.f_user_state !== '停用' && this.login?.r.includes('开关阀权限')
         }
       },
       deep: true
@@ -277,7 +277,7 @@ export default {
   },
   mounted () {},
   computed: {
-    ...mapState('account', { currUser: 'user' }),
+    ...mapState('account', { currUser: 'user',login: 'login' }),
     ...mapState('setting', { isMobile: 'isMobile' })
   }
 }

package/src/utils/map-utils.js CHANGED Viewed

@@ -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 }