Merge branch 'dev'

ruoyi-ui/src/map/BMapPolygonEditor.vue

@@ -237,6 +237,14 @@
                 @click.stop="updateAreaInfo"
               />
             </el-tooltip>
+            <!-- 查看客户 -->
+            <el-tooltip placement="top" effect="light" content="查看客户">
+              <i
+                class="el-icon-user icon-area"
+                @click.stop="previewCustomer"
+              />
+            </el-tooltip>
+            <!-- 删除区域 -->
             <el-tooltip placement="top" effect="light" content="删除区域">
               <el-popconfirm
                 title="确定删除吗？"
@@ -271,6 +279,13 @@
         </div>
       </div>
     </transition>
+    <!-- 查看客户模态框 -->
+    <customer-modal
+      ref="customerModal"
+      cardType="featured"
+      :detailInfo="areaForm"
+      :btnType="'2'"
+    />
     <div class="search-box">
       <el-form size="small" class="myForm">
         <el-form-item style="width: 130px">
@@ -337,6 +352,7 @@ import { businessBelongList } from '@/views/grid/create/utils'
 import { mapGetters } from 'vuex'
 import { Message } from 'element-ui'
 import { isEmpty } from 'lodash'
+import CustomerModal from '@/views/grid/map/draw-area/customer-modal.vue'
 const polygonOptions = {
   strokeColor: '#5E87DB',
   strokeWeight: 3,
@@ -355,6 +371,9 @@ const labelOptions = {
 }
 export default {
   name: 'BMapPolygonEditor',
+  components: {
+    CustomerModal
+  },
   props: ['layerInfo'],
   data() {
     return {
@@ -1207,6 +1226,12 @@ export default {
       this.$store.dispatch('setIsDrawing', true)
       this.currentPolygon.enableEditing()
     },
+    /**
+     * 查看客户
+     */
+    previewCustomer() {
+      this.$refs.customerModal.onOpen()
+    },
     setForm(data) {
       this.areaForm = data
       this.visible = true

ruoyi-ui/src/map/BaiduHuiTu.vue

@@ -35,7 +35,7 @@ export default {
     initSdk(){
       this.sdk = new QuHuaSdk({
         ak: 'L7KaAZUYPVSD40nYT09rWWgIdZKUesiX',
-        webAk: 't6k6UC2IZR40Un8kkqM4RXlaQb4FulyM',
+        webAk: 'mokVj0S4sGE9av6NBwy8WHY0xnQsucbE',
         domId: 'box',
         defaultCenterCity: "杭州市", // 非必填
         _baseUrl: "http://158.234.96.76:5001/logisticsWeb-quhua-intranet", // 固定格式，必填
@@ -137,7 +137,7 @@ export default {
     onChange(){
       this.sdk = new QuHuaSdk({
         ak: 'L7KaAZUYPVSD40nYT09rWWgIdZKUesiX',
-        webAk: 't6k6UC2IZR40Un8kkqM4RXlaQb4FulyM',
+        webAk: 'mokVj0S4sGE9av6NBwy8WHY0xnQsucbE',
         domId: 'box',
         defaultCenterCity: "杭州市", // 非必填
         _baseUrl: "http://158.234.96.76:5001/logisticsWeb-quhua-intranet", // 固定格式，必填