update: 新疆大屏

src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue

@@ -15,7 +15,6 @@
             <template v-else>
                 {{ text }}
             </template>
-
             <slot name="bodyCell" v-bind="{ column, record, index, text } || {}"></slot>
         </template>
     </a-table>
@@ -113,8 +112,8 @@
 <style scoped lang="less">
     :deep(.ant-table-thead > tr > th) {
         color: var(--tableFontColor) !important;
-        background: var(--tableHeadBg) !important;
-        border-top: 1px solid var(--tableHeadBg) !important;
+        background: #073063 !important;
+        border-top: 1px solid #073063 !important;
         border-bottom: none;
         padding: 9px 9px;
         text-align: center;

src/components/secondaryScreen/secondMap/secondMapHooks.ts

@@ -24,7 +24,7 @@ export function useDepart() {
     async function getOptionData() {
         const { result = [], code } = await allSecondaryDeparts();
         if (code == 200) {
-            let res = [{ departName: '长庆油田', orgCode: 'A01' }, ...result];
+            let res = [...result];
             setOption(res);
         }
     }

src/components/xianMap/xianMapApi.ts

@@ -2,10 +2,12 @@ import { get } from '/@/api/request.ts';
 
 export enum Api {
     allList = '/health-emergency/emergency/tblAmbulanceGps/getAllList',
+    allListNew = '/health-emergency/emergency/LargeScreenNew/map',
     getAmbulanceList = '/health-emergency/emergency/tblAmbulanceGps/getAmbulanceList',
 }
 
 // 获取所有资源
 export const getAllList = (params) => get(Api.allList, params);
+export const getAllListNew = (params) => get(Api.allListNew, params);
 //获取救护车GPS信息
 export const getAmbulanceList = (params) => get(Api.getAmbulanceList, params);

src/components/xianMap/xianMapHooks.ts

@@ -1,44 +1,72 @@
-import { getAllList, getAmbulanceList } from '/@/components/xianMap/xianMapApi.ts';
+import { getAllList, getAllListNew, getAmbulanceList } from '/@/components/xianMap/xianMapApi.ts';
+
+// export enum TabType {
+//     all = '', //所有资源
+//     youTianYiYuan = '1', //油田医院
+//     heZuoYiYuan = '2', //合作医院
+//     yiLiaoDian = '3', //医疗点
+//     jiuHuChe = '5', //救护车
+//     zhiShengJi = '4', //直升机
+//     diFangYiYuan = '6', //地方医院
+// }
+//
+// export const tabList = [
+//     {
+//         name: '所有资源',
+//         type: TabType.all,
+//     },
+//     {
+//         name: '油田医院',
+//         type: TabType.youTianYiYuan,
+//     },
+//     {
+//         name: '医疗点',
+//         type: TabType.yiLiaoDian,
+//     },
+//     {
+//         name: '救护车',
+//         type: TabType.jiuHuChe,
+//     },
+//     {
+//         name: '合作医院',
+//         type: TabType.heZuoYiYuan,
+//     },
+//     {
+//         name: '地方医院',
+//         type: TabType.diFangYiYuan,
+//     },
+//     // {
+//     //     name: '直升机',
+//     //     type: TabType.zhiShengJi,
+//     // },
+//     {
+//         name: '急救路线',
+//     },
+// ];
 
 export enum TabType {
     all = '', //所有资源
     youTianYiYuan = '1', //油田医院
-    heZuoYiYuan = '2', //合作医院
-    yiLiaoDian = '3', //医疗点
+    jianKangXiaoWu = '2', //健康小屋
     jiuHuChe = '5', //救护车
-    zhiShengJi = '4', //直升机
-    diFangYiYuan = '6', //地方医院
 }
-
 export const tabList = [
     {
         name: '所有资源',
         type: TabType.all,
     },
     {
-        name: '油田医院',
-        type: TabType.youTianYiYuan,
+        name: '健康小屋',
+        type: TabType.jianKangXiaoWu,
     },
     {
-        name: '医疗点',
-        type: TabType.yiLiaoDian,
+        name: '油田医院',
+        type: TabType.youTianYiYuan,
     },
     {
         name: '救护车',
         type: TabType.jiuHuChe,
     },
-    {
-        name: '合作医院',
-        type: TabType.heZuoYiYuan,
-    },
-    {
-        name: '地方医院',
-        type: TabType.diFangYiYuan,
-    },
-    // {
-    //     name: '直升机',
-    //     type: TabType.zhiShengJi,
-    // },
     {
         name: '急救路线',
     },
@@ -101,13 +129,10 @@ export function aircraftContent() {
 }
 
 export function mapApiSwitch(type, params: any) {
-    const basicParams = {
-        lat: 34, //纬度34
-        lon: 108, //经度
-    };
     // 全部 油田 医疗点 合作医院
-    if ([TabType.all, TabType.youTianYiYuan, TabType.yiLiaoDian, TabType.heZuoYiYuan, TabType.jiuHuChe, TabType.jiuHuChe].includes(type)) {
-        return getAllList({ ...basicParams, ...params });
+    if ([TabType.all, TabType.youTianYiYuan, TabType.jianKangXiaoWu, TabType.jiuHuChe].includes(type)) {
+        // return getAllList({ ...params });
+        return getAllListNew({ ...params });
     }
     // if ([TabType.jiuHuChe].includes(type)) {
     //     return getAmbulanceList({});