update: 大屏接口

src/views/indexSun/indexModal.vue

@@ -13,10 +13,10 @@
                             :options="item.options"
                         />
                     </a-form-item>
-                    <a-form-item label="单位">
+                    <a-form-item label="单位" v-if="needDept">
                         <a-select placeholder="选择单位" @change="changeSecond" v-model:value="orgCode1" :options="option1" />
                     </a-form-item>
-                    <a-form-item label="部门">
+                    <a-form-item label="部门" v-if="needDept">
                         <a-select placeholder="选择部门" v-model:value="orgCode2" :options="option2" />
                     </a-form-item>
                     <slot name="searchSecond"></slot>
@@ -89,6 +89,9 @@
         apiParams: {
             type: Object,
         },
+        needDept: {
+            type: Boolean,
+        },
     });
     const loading = ref<boolean>(false);
     const formState = ref();
@@ -236,6 +239,7 @@
         formState.value = {
             ...formState.value,
             ...formRecord.value,
+            salvageUserDepart: orgCode2.value ? orgCode2.value : orgCode1.value ? orgCode1.value : '',
         };
         // registerTable.value.getRecords();
     }
@@ -243,14 +247,21 @@
     const { visible, closeDialog, openDialog } = useDialog({ title: dialogTitle.value });
 
     function handleClose() {
+        orgCode2.value = '';
+        orgCode1.value = '';
+        formState.value = {};
+        console.log(formState.value, formRecord.value, 'asjshj');
         formRecord.value = {};
         closeDialog();
     }
     function handleClickReset() {
+        orgCode2.value = '';
+        orgCode1.value = '';
         getField();
         formState.value = {
             ...formState.value,
             ...formRecord.value,
+            salvageUserDepart: '',
         };
         console.log(formState.value, formRecord.value);
     }
@@ -285,6 +296,7 @@
                 display: flex;
                 .ant-form-item {
                     flex: 1;
+                    max-width: 200px;
                     margin-bottom: 0 !important;
                 }
             }

src/views/indexSun/indexSun.api.ts

@@ -2,7 +2,9 @@ import { post, get } from '/@/api/request.ts';
 
 enum Api {
     statisticsNew = '/health-emergency/emergency/LargeScreenNew/statisticsNew',
+    oneL = '/health-emergency/emergency/LargeScreenNew/phoneListNew',
     twoL = '/health-emergency/emergency/tblHelpCenter/sicknessTypeStatistic',
+    twoLModal = '/health-emergency/emergency/order/list',
     threeL = '/health-emergency/emergency/LargeScreenNew/medicalPeopleNumStatistics',
     oneR = '/health-watch/watch/watchMonitorData/getMonitorList',
     threeR = '/health-emergency/emergency/LargeScreenNew/medicalAbnormalStatistics',
@@ -18,6 +20,8 @@ enum Api {
 
 export const statisticsNewApi = (params) => post(Api.statisticsNew, params);
 export const twoLApi = (params) => get(Api.twoL, params);
+export const twoLModalApi = (params) => get(Api.twoLModal, params);
+export const oneLApi = (params) => post(Api.oneL, params);
 export const threeLApi = (params) => post(Api.threeL, params);
 export const oneRApi = (params) => get(Api.oneR, params);
 export const threeRApi = (params) => post(Api.threeR, params);

src/views/indexSun/indexSun.ts

@@ -1,6 +1,6 @@
 import * as echarts from 'echarts';
 import { legend1, legend2, legend3, legend4, legend5 } from '/@/components/xianMap/xianMapHooks.ts';
-import { normalTypeList, SexType, sexTypeList } from '/@/utils/settings.ts';
+import { initatorTypee, normalTypeList, SexType, sexTypeList, sexTypeListNew } from '/@/utils/settings.ts';
 export const legend1 = new URL('/@/assets/img/legend1.png', import.meta.url).href;
 export const legend2 = new URL('/@/assets/img/legend5.png', import.meta.url).href;
 export const legend3 = new URL('/@/assets/img/legend3.png', import.meta.url).href;
@@ -182,38 +182,45 @@ const columns1 = [
 const columns2 = [
     {
         title: '被救助人',
-        dataIndex: 'realName',
-        key: 'realName',
+        dataIndex: 'salvageUserName',
+        key: 'salvageUserName',
     },
     {
         title: '单位',
-        dataIndex: 'realName',
-        key: 'realName',
+        dataIndex: 'salvageUserSecondDepart',
+        key: 'salvageUserSecondDepart',
     },
     {
         title: '部门',
-        dataIndex: 'realName',
-        key: 'realName',
+        dataIndex: 'salvageUserDepart',
+        key: 'salvageUserDepart',
     },
     {
         title: '性别',
-        dataIndex: 'realName',
-        key: 'realName',
+        dataIndex: 'salvageUserSex_dictText',
+        key: 'salvageUserSex_dictText',
     },
     {
         title: '救助方式',
-        dataIndex: 'realName',
-        key: 'realName',
+        dataIndex: 'initiatorType',
+        key: 'initiatorType',
+        customRender: ({ text }) => {
+            if (text === '0') {
+                return '120';
+            } else if (text === '1') {
+                return '应急就医';
+            }
+        },
     },
     {
         title: '救助时间',
-        dataIndex: 'realName',
-        key: 'realName',
+        dataIndex: 'createTime',
+        key: 'createTime',
     },
     {
         title: '联系电话',
-        dataIndex: 'realName',
-        key: 'realName',
+        dataIndex: 'salvageUserMobile',
+        key: 'salvageUserMobile',
     },
 ];
 
@@ -238,26 +245,26 @@ const fromList = [
 const fromList2 = [
     {
         label: '救助人',
-        field: 'realName',
+        field: 'salvageUserName',
         type: 'input',
         placeholder: '请输入',
         defaultValue: '',
     },
     {
         label: '性别',
-        field: 'sex',
+        field: 'salvageUserSex',
         type: 'select',
         placeholder: '请选择性别',
-        options: sexTypeList,
-        defaultValue: SexType.all,
+        options: sexTypeListNew,
+        defaultValue: '',
     },
     {
         label: '救助方式',
-        field: 'sex',
+        field: 'initiatorType',
         type: 'select',
         placeholder: '请选择性别',
-        options: sexTypeList,
-        defaultValue: SexType.all,
+        options: initatorTypee,
+        defaultValue: '',
     },
 ];
 
@@ -473,6 +480,12 @@ export function twoRform(type) {
             options: normalTypeList,
             defaultValue: type,
         },
+        {
+            label: '单位',
+            field: 'departName',
+            type: 'input',
+            placeholder: '请输入单位',
+        },
     ];
 }
 export const towRcolumns = [towRcolumn1, towRcolumn2, towRcolumn3];