update

1.根据新疆反馈(12.22)，修改相关问题

src/assets/mapUtils/map.ts

@@ -25,6 +25,8 @@ export const Map = {
     driving: null,
     walking: null,
     mapDriverOrWalkLoading: false,
+    layerGroup: null,
+    layerData: null,
     /**
      * @desc 地图舒适化
      * @param el dom元素 id选择器
@@ -60,6 +62,18 @@ export const Map = {
                         this.drawOutLine();
                     }
                 });
+                const satellite = new AMap.TileLayer.Satellite({
+                    zIndex: 11,
+                });
+
+                const roadNet = new AMap.TileLayer.RoadNet({
+                    zIndex: 12,
+                });
+                this.layerData = { satellite, roadNet };
+                this.layerGroup = new AMap.LayerGroup([satellite, roadNet]);
+                this.layerGroup.setMap(this.map);
+                satellite.hide();
+                roadNet.hide();
                 resolve();
             });
         });

src/views/indexSun.vue

@@ -64,7 +64,7 @@
                     />
                 </div>
                 <div class="sun-body-right-three">
-                    <two-new-r :center-id="centerId" :bKey="`two-n-r-${count}`" @handle-view="handleTwoNewRClick" />
+                    <two-new-r ref="twoNewR" :center-id="centerId" :bKey="`two-n-r-${count}`" @handle-view="handleTwoNewRClick" />
                 </div>
             </div>
         </div>
@@ -99,7 +99,10 @@
                 </template>
             </template>
             <template v-if="column.dataIndex === 'cz'">
-                <a-button type="link" @click="forHelp(record)">求助信息</a-button>
+                <a-button type="link" @click="forHelp(record, false)">求助信息</a-button>
+            </template>
+            <template v-if="column.dataIndex === 'gName'">
+                <a-button type="link" @click="openRBModal(record)">{{ record?.name }}</a-button>
             </template>
         </template>
     </IndexModal>
@@ -200,6 +203,7 @@
     const showMapBottom = ref(false);
     const userData = ref<object>({});
     const centerMapRef = ref();
+    const twoNewR = ref();
     const otherLoading = ref<boolean>(false);
 
     onMounted(() => {
@@ -225,6 +229,10 @@
         }
     });
 
+    function openRBModal(item: any) {
+        twoNewR.value.handlePolice(item);
+    }
+
     const getTime = () => {
         dateInfo.value = {
             day: dayjs().format('YYYY年MM月DD日'),
@@ -238,7 +246,7 @@
         }
     );
 
-    async function forHelp(record: any) {
+    async function forHelp(record: any, showBottomInfo = true) {
         indexModalRef.value.closeDialog();
         record['lat'] = record?.latitude;
         record['lon'] = record?.longitude;
@@ -260,7 +268,7 @@
             showRestB.value = false;
             userData.value = record;
         }
-        await confirmHelp(record);
+        await confirmHelp(record, showBottomInfo);
     }
 
     function toOther() {
@@ -399,7 +407,7 @@
     const hospitalList = ref([]); //医院列表
     const showHospitalList = ref(false);
 
-    async function confirmHelp(data: any) {
+    async function confirmHelp(data: any, showBottomInfo = true) {
         showMapBottom.value = false;
         Map.driveLine && Map.driveLine.clear();
         try {
@@ -414,7 +422,7 @@
         userData.value = data;
         if (!data.lon || !data.lat) {
             centerMapRef.value.newResetMap();
-            showMapBottom.value = data?.emergencyType != 2;
+            showMapBottom.value = data?.emergencyType != 2 && showBottomInfo;
             return;
         }
         Map.removeOverlayGroup();

src/views/indexSun/centerMap.vue

@@ -72,6 +72,14 @@
                 <div> 未获取到当前求助信息的位置信息 </div>
             </div>
         </div>
+
+        <div class="t-c-d">
+            <a-button-group style="display: flex; flex-direction: column">
+                <a-button :class="[nowC === '' ? 'select-button' : '']" @click="tC('')">默认地图</a-button>
+                <a-button :class="[nowC === 'satellite' ? 'select-button' : '']" @click="tC('satellite')">卫星地图</a-button>
+                <a-button :class="[nowC === 'roadNet' ? 'select-button' : '']" @click="tC('roadNet')">标准地图</a-button>
+            </a-button-group>
+        </div>
     </div>
 </template>
 <script setup lang="ts">
@@ -143,6 +151,28 @@
     let placeSearch: any = null;
     let sListen: any = null;
     let eListen: any = null;
+    const nowC = ref('');
+    const mapMapStyle1 = 'amap://styles/darkblue';
+    const mapMapStyle2 = 'amap://styles/normal';
+    function tC(type: any) {
+        if (!nowC.value && type) {
+            Map.layerData[type].show();
+        }
+        if (nowC.value && !type) {
+            Map.layerData[nowC.value].hide();
+        }
+        if (nowC.value && type) {
+            Map.layerData[nowC.value].hide();
+            Map.layerData[type].show();
+        }
+        if (type === 'roadNet') {
+            Map.map.setMapStyle(mapMapStyle2);
+        } else {
+            Map.map.setMapStyle(mapMapStyle1);
+        }
+        nowC.value = type;
+    }
+
     watch(
         () => props.showHospitalList,
         (v) => {
@@ -907,6 +937,23 @@
         padding: 0 6px;
     }
 
+    .t-c-d {
+        position: absolute;
+        top: 55px;
+        right: 5px;
+
+        button {
+            background: #082147;
+            border-color: #082147;
+            color: #fff;
+        }
+
+        .select-button {
+            background: #073063 !important;
+            color: #00ccff !important;
+        }
+    }
+
     :deep(.amap-sug-result) {
         background: #002e64 !important;
     }

src/views/indexSun/emerModal.vue

@@ -3,7 +3,7 @@
         <template #container>
             <Form style="width: 100%">
                 <div style="width: 100%">
-                    <Row style="display: flex; flex-wrap: wrap; width: 100%; align-items: center">
+                    <Row style="display: flex; flex-wrap: wrap; width: 100%; align-items: center; margin-top: 10px">
                         <Col :span="6">
                             <a-form-item label="被救助人">
                                 <a-input
@@ -212,6 +212,7 @@
         formState.value = {
             orgCode: orgCode2.value || orgCode1.value,
             realName: name.value,
+            initiatorType: initiatorType.value,
             type: initForm.value.type,
             search: initForm.value.search,
             createTimeStart: dateTime.value && dateTime.value.length > 0 ? dateTime.value[0] : '',

src/views/indexSun/heartModal.vue

@@ -3,7 +3,7 @@
         <template #container>
             <Form style="width: 100%">
                 <div style="width: 100%">
-                    <Row style="display: flex; flex-wrap: wrap; width: 100%; align-items: center">
+                    <Row style="display: flex; flex-wrap: wrap; width: 100%; align-items: center; margin-top: 10px">
                         <Col :span="8">
                             <a-form-item label="姓名">
                                 <a-input

src/views/indexSun/indexSun.ts

@@ -712,8 +712,9 @@ export const twoRNewColumns = [
     },
     {
         title: '姓名',
-        dataIndex: 'name',
-        key: 'name',
+        dataIndex: 'gName',
+        key: 'gName',
+        slot: 'gName',
     },
     {
         title: '性别',

src/views/indexSun/twoNewR.vue

@@ -25,7 +25,7 @@
                 </template>
             </div>
         </div>
-        <Dialog :openVis="openInfor" width="40%" title="关爱人员详情" @close="handlePoliceClose">
+        <Dialog :openVis="openInfo" width="40%" title="关爱人员详情" @close="handlePoliceClose">
             <template #container>
                 <div class="police-con" style="position: relative" :class="[themeType]">
                     <div
@@ -75,7 +75,7 @@
     const { themeType } = useTheme();
     const step = ref(0.2);
     const scrollList = ref<any[]>([]);
-    const openInfor = ref<boolean>(false); //弹窗显示
+    const openInfo = ref<boolean>(false); //弹窗显示
     const userInfo = ref<any>({});
 
     const filedList = reactive(list);
@@ -112,7 +112,7 @@
     }
 
     function handlePolice(item: any) {
-        openInfor.value = true;
+        openInfo.value = true;
         showSping.value = true;
         userInfo.value = {};
         loveTrendByOneApi({ anYanUserId: item?.empId, idNo: item?.idNo })
@@ -129,13 +129,17 @@
     }
 
     function handlePoliceClose() {
-        openInfor.value = false;
+        openInfo.value = false;
         step.value = 0.2;
     }
 
     function handleView() {
         emit('handleView');
     }
+
+    defineExpose({
+        handlePolice,
+    });
 </script>
 <style lang="less" scoped>
     .one-r-box {