update

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

src/views/indexSun.vue

@@ -647,8 +647,8 @@
         firstFormOne.value = [];
         const params = {
             centerId: centerId.value,
-            // startDate: '2000-01-01',
+            startDate: '2000-01-01',
-            // endDate: '2030-12-31',
+            endDate: '2030-12-31',
         };
         indexModalTitle.value = '今日应急';
         modalApi.value = todayEmergencyListApi;

src/views/indexSun/centerMap.vue

@@ -757,11 +757,12 @@
         }
 
         :deep(.modal-box) {
-            width: 330px;
+            width: 480px !important;
             padding: 10px 20px;
             display: flex;
             flex-direction: column;
             justify-content: space-around;
+            margin-bottom: 10px;
 
             .top-left-a-right {
                 width: 48px;
@@ -773,9 +774,10 @@
             .modal-item {
                 display: flex;
                 justify-content: space-between;
+                margin-bottom: 5px;
 
                 .item-one {
-                    width: 48%;
+                    width: 180px;
                 }
 
                 .item-two {
@@ -787,6 +789,7 @@
             .modal-btn {
                 display: flex;
                 justify-content: center;
+                margin-bottom: 5px;
 
                 .view-btn {
                     padding: 5px;
@@ -807,6 +810,20 @@
             width: 330px;
             height: 110px;
         }
+        :deep(.modal-box-special) {
+            > div {
+                &:first-child {
+                    margin-bottom: 5px;
+                }
+                &:not(:first-child) {
+                    margin-bottom: 10px;
+                }
+
+                .item-two {
+                    padding-right: 5px;
+                }
+            }
+        }
         .hospital-list {
             position: absolute;
             bottom: 160px;

src/views/indexSun/indexSun.ts

@@ -144,9 +144,17 @@ export function infoContent(res: any) {
                 <span class="item-two">${res.orgName ? res.orgName : '--'}</span>
             </div>
             <div class="modal-item" style="margin: 5px 0">
-                <span class="item-one">关爱人数：</span>
+                <span class="item-one">管理员：</span>
+                <span class="item-two">${res.manageName ? res.manageName : '--'}</span>
+            </div>
+            <div class="modal-item" style="margin: 5px 0">
+                <span class="item-one">管理员电话：</span>
                 <span class="item-two">${res.loveNum ? res.loveNum : '--'}</span>
             </div>
+            <div class="modal-item" style="margin: 5px 0">
+                <span class="item-one">关爱人数：</span>
+                <span class="item-two">${res.managePhone ? res.managePhone : '--'}</span>
+            </div>
             <div class="modal-item" style="margin: 0 0 5px 0;">
                 <span class="item-one">电话：</span>
                 <span class="item-two">${res.mobile ? res.mobile : '--'}</span>
@@ -190,6 +198,18 @@ export function infoContent4(res: any) {
                 <span class="item-one">AED名称：</span>
                 <span class="item-two">${res.name ? res.name : '--'}</span>
             </div>
+            <div class="modal-item">
+                <span class="item-one">单位：</span>
+                <span class="item-two">${res.orgName ? res.orgName : '--'}</span>
+            </div>
+            <div class="modal-item"> 
+                <span class="item-one">管理员：</span>
+                <span class="item-two">${res.manageName ? res.manageName : '--'}</span>
+            </div>
+            <div class="modal-item">
+                <span class="item-one">管理员电话：</span>
+                <span class="item-two">${res.managePhone ? res.managePhone : '--'}</span>
+            </div>
             <div class="modal-item">
                 <div class="item-one">地点：</div>
                 <div class="item-two" style="text-align: right">${res.address || '--'}</div>
@@ -198,7 +218,7 @@ export function infoContent4(res: any) {
 }
 export function infoContentSpecial(res: any) {
     return `
-        <div class="modal-box" style="width: 400px !important;height: auto !important;line-height: 2.5">
+        <div class="modal-box modal-box-special" style="width: 400px !important;height: auto !important;">
             <div style="text-align: center;color: #5CFBFF;display: flex;align-items: center;justify-content: center">
                 <div class="top-left-a-right" style="transform: rotate(180deg)"></div>
                 <div style="margin: 0 10px;font-size: 16px">${res.type === '1' ? '油田医院' : res.type === '4' ? 'AED' : '健康小屋'}</div>
@@ -875,8 +895,7 @@ export const oneRNewColumns = [
         title: '应急方式',
         dataIndex: 'emergencyType',
         key: 'emergencyType',
-        width: 90,
+        customRender: ({ text, record }) => {
-        customRender: ({ text }) => {
             switch (text) {
                 case '0':
                     return '120';
@@ -885,7 +904,7 @@ export const oneRNewColumns = [
                 case '2':
                     return '云坐席';
                 case '3':
-                    return '终端报警';
+                    return `终端报警${record?.eventType_dictText ? `（${record?.eventType_dictText}）` : ''}`;
                 default:
                     return '-';
             }

src/views/indexSun/oneRightNew.vue

@@ -19,21 +19,28 @@
                     <div style="display: flex; color: #ffffff">
                         <div class="emer-item-d">
                             <div>性别/年龄：</div>
-                            <div class="emer-item-d-t">{{ getSex(userData.sex) }}/{{ userData.age || '-' }}</div>
+                            <div class="emer-item-d-t">{{ getSex(userData?.sex) }}/{{ userData?.age || '-' }}</div>
                         </div>
                         <div class="emer-item-d">
                             <div>应急方式：</div>
-                            <div class="emer-item-d-t">{{ getTypeName(userData.emergencyType) }}</div>
+                            <div class="emer-item-d-t">
+                                {{ getTypeName(userData?.emergencyType) }}
+                                {{
+                                    userData?.eventType_dictText
+                                        ? `（${userData?.eventType_dictText}${userData?.abnormalValue ? `：${userData?.abnormalValue}）` : ''}`
+                                        : ''
+                                }}
+                            </div>
                         </div>
                     </div>
                     <div style="display: flex; color: #ffffff">
                         <div class="emer-item-d">
                             <div>单位：</div>
-                            <div class="emer-item-d-t">{{ userData.departName }}</div>
+                            <div class="emer-item-d-t">{{ userData?.departName }}</div>
                         </div>
                         <div class="emer-item-d">
                             <div>手机号码：</div>
-                            <div class="emer-item-d-t">{{ userData.phone }}</div>
+                            <div class="emer-item-d-t">{{ userData?.phone }}</div>
                         </div>
                     </div>
                     <div class="emer-item-d" v-if="userData?.emergencyType != 2">
@@ -62,9 +69,15 @@
                     </div>
                     <div>
                         <div class="emer-info-title">急救人员</div>
-                        <template v-if="props.userData?.lifeguardName && props.userData?.lifeguardPhone">
+                        <template v-if="props.userData?.lifeguardName || props.userData?.lifeguardName2">
-                            <div style="color: #ffffff">{{ props.userData?.lifeguardName }}</div>
+                            <div style="display: flex">
+                                <div style="color: #ffffff; margin-right: 5px">{{ props.userData?.lifeguardName }}</div>
                                 <div style="color: #ffffff">{{ props.userData?.lifeguardPhone }}</div>
+                            </div>
+                            <div style="display: flex">
+                                <div style="color: #ffffff; margin-right: 5px">{{ props.userData?.lifeguardName2 }}</div>
+                                <div style="color: #ffffff">{{ props.userData?.lifeguardPhone2 }}</div>
+                            </div>
                         </template>
                         <template v-else>
                             <div class="no-data"> 暂未配置急救人员 <img :src="pointPng" alt="" /></div>