update 调整大屏各个模块参数及样式

src/views/components/emergencyDialog.vue

@@ -45,7 +45,7 @@
     .police-con {
         color: #ffffff;
         background-color: #00152b;
-        border: 1px solid #129bff;
+        //border: 1px solid #129bff;
         padding: 2% 0 2% 5%;
 
         .sub-text {
@@ -72,4 +72,4 @@
             }
         }
     }
-</style>
+</style>

src/views/components/employeeDialog.vue

@@ -26,7 +26,7 @@
                 </div>
                 <div class="con-item">
                     <span>发生地点：</span>
-                    <span>{{ userInfo?.address }}</span>
+                    <span>{{ userInfo?.address || userInfo?.gpsErrorMsg }}</span>
                 </div>
             </div>
         </template>
@@ -57,7 +57,7 @@
     .police-con {
         color: #ffffff;
         background-color: #00152b;
-        border: 1px solid #129bff;
+        //border: 1px solid #129bff;
         padding: 2% 0 2% 5%;
 
         .sub-text {
@@ -84,4 +84,4 @@
             }
         }
     }
-</style>
+</style>

src/views/components/phoneDialog/phoneDialog.vue

@@ -0,0 +1,119 @@
+<template>
+    <Dialog :openVis="visible" width="50%" :title="title" @close="closeDialog" :maskClosable="false">
+        <template #container>
+            <div v-if="useForm" class="form-container">
+                <Form :model="formRecord" :label-width="100" v-bind="formItemLayout">
+                    <a-form-item label="性别">
+                        <a-select v-model:value="formRecord.sex" placeholder="请选择" :options="sexTypeList"></a-select>
+                    </a-form-item>
+                </Form>
+            </div>
+            <BasicTable
+                ref="registerTable"
+                class="table-container"
+                :key="visible"
+                :columns="columns"
+                :api="getPhoneList"
+                :apiParams="formState"
+            ></BasicTable>
+        </template>
+    </Dialog>
+</template>
+<script setup lang="ts">
+    import { computed, nextTick, ref, watch } from 'vue';
+    import Dialog from '/@/components/dialog/Dialog.vue';
+    import { useDialog } from '/@/views/components/dialogHooks.ts';
+    import BasicTable from '/@/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue';
+    import { Form } from 'ant-design-vue';
+    import { SexType, sexTypeList } from '/@/utils/settings.ts';
+    import { getPhoneList } from '/@/views/yinChuan/yinChuan.api.ts';
+
+    const props = defineProps({
+        record: Object,
+        title: String,
+        useForm: Boolean,
+        labelCol: Object,
+        wrapperCol: Object,
+        setting: Object,
+        phoneType: String,
+    });
+    const formItemLayout = {
+        labelCol: {
+            style: { width: '100px' },
+            ...props.labelCol,
+        },
+        wrapperCol: {
+            span: 6,
+            ...props.wrapperCol,
+        },
+    };
+
+    const columns = [
+        {
+            title: '姓名',
+            dataIndex: 'realName',
+            key: 'realName',
+        },
+        {
+            title: '单位',
+            dataIndex: 'departName',
+            key: 'departName',
+        },
+        {
+            title: '部门',
+            dataIndex: 'orgName',
+            key: 'orgName',
+        },
+        {
+            title: '性别',
+            dataIndex: 'sex_dictText',
+            key: 'sex_dictText',
+        },
+        {
+            title: '时间',
+            dataIndex: 'time',
+            key: 'time',
+        },
+        {
+            title: '电话',
+            dataIndex: 'phone',
+            key: 'phone',
+        },
+    ];
+    const formRecord = ref({
+        sex: SexType.all,
+    });
+    const formState = computed(() => ({
+        ...formRecord.value,
+        dataType: props.setting.dataType,
+        phoneType: props.phoneType,
+        showType: '0',
+    }));
+    const { visible, title, closeDialog, openDialog } = useDialog({ title: props.title });
+    const registerTable = ref();
+    watch(
+        props,
+        () => {
+            registerTable.value?.getRecords();
+        }
+        // {
+        //     immediate: true,
+        // }
+    );
+    defineExpose({
+        openDialog,
+    });
+</script>
+<style scoped lang="less">
+    .form-container {
+        margin: 10px 0;
+    }
+
+    .table-container {
+        margin: 0 10px;
+    }
+
+    :deep(.ant-form-item-label) > label {
+        color: #fff;
+    }
+</style>

src/views/index.vue

@@ -9,7 +9,7 @@
         </div>
         <div class="body-d">
             <div class="body-d-left">
-                <one-l :refreshState="refreshState" />
+                <one-l :setting="setting" :refreshState="refreshState" @handleClick="handlePhoneDialog" />
                 <two-l :refreshState="refreshState" />
                 <three-l :refreshState="refreshState" />
             </div>
@@ -17,7 +17,7 @@
                 <china-map />
             </div>
             <div class="body-d-right">
-                <one-r :refreshState="refreshState" />
+                <one-r :setting="setting" :refreshState="refreshState" />
                 <two-r :refreshState="refreshState" />
                 <three-r :key="refreshState" />
             </div>
@@ -25,28 +25,32 @@
         <div class="bottom-d"></div>
         <EmployeeDialog ref="employeeDialogRef" :record="socketData" />
         <EmergencyDialog ref="emergencyDialogRef" :record="emergencyData" />
+        <PhoneDialog ref="phoneDialogRef" :title="phoneDialogTitle" :useForm="true" :setting="setting" :phoneType="phoneType" />
     </div>
 </template>
 <script setup lang="ts">
     import { onUnmounted, ref, watch, nextTick } from 'vue';
-    import OneL from '../components/body-d-left/oneL.vue';
-    import TwoL from '../components/body-d-left/twoL.vue';
-    import ThreeL from '../components/body-d-left/threeL.vue';
-    import OneR from '../components/body-d-right/oneR.vue';
-    import TwoR from '../components/body-d-right/twoR.vue';
-    import ThreeR from '../components/body-d-right/threeR.vue';
-    import ChinaMap from '../components/chinaMap/chinaMap.vue';
+    import OneL from '/@/components/body-d-left/oneL.vue';
+    import TwoL from '/@/components/body-d-left/twoL.vue';
+    import ThreeL from '/@/components/body-d-left/threeL.vue';
+    import OneR from '/@/components/body-d-right/oneR.vue';
+    import TwoR from '/@/components/body-d-right/twoR.vue';
+    import ThreeR from '/@/components/body-d-right/threeR.vue';
+    import ChinaMap from '/@/components/chinaMap/chinaMap.vue';
     import EmployeeDialog from '/@/views/components/employeeDialog.vue';
     import EmergencyDialog from '/@/views/components/emergencyDialog.vue';
     import { useTopTime } from '/@/utils/utils.ts';
     import { basicPath, emergencyPath, useSocket } from '/@/utils/socket.ts';
     import { useRefresh } from '/@/hooks/autoRefresh';
     import { DEFAULT_TIME } from '/@/hooks/autoRefresh/pageRefreshTime.ts';
+    import { DataType, getSettings } from '/@/utils/settings.ts';
+    import PhoneDialog from '/@/views/components/phoneDialog/phoneDialog.vue';
 
     const { refreshState } = useRefresh(DEFAULT_TIME);
     const dayTimeO = ref();
     const dayTimeT = ref();
     const interval = ref(1);
+    const setting = getSettings(DataType.xian);
 
     function init() {
         getTime();
@@ -98,6 +102,27 @@
 
         clearInterval(interval.value);
     });
+    const phoneDialogTitle = ref('呼入电话');
+    const phoneDialogRef = ref();
+    //0:处置 1:处理 2:呼入 3:全部
+    const phoneType = ref('');
+
+    //呼入电话、受理电话弹窗
+    function handlePhoneDialog(item) {
+        const { name, key } = item;
+        nextTick(() => {
+            //呼入电话
+            if (key == 'gross') {
+                phoneType.value = '2';
+            }
+            //受理电话
+            if (key == 'alerdyreceive') {
+                phoneType.value = '1';
+            }
+            phoneDialogTitle.value = name;
+            phoneDialogRef.value.openDialog();
+        });
+    }
 
     // function test() {
     //     let nVal = {
@@ -134,7 +159,7 @@
     .outer {
         height: 100%;
         box-sizing: border-box;
-        background: url('../assets/images/bg.png') no-repeat;
+        background: url('/@/assets/images/bg.png') no-repeat;
         background-size: 100% 100%;
     }
 
@@ -143,7 +168,7 @@
         line-height: 80px;
         display: flex;
         padding-bottom: 9px;
-        background: url('../assets/images/top-title.png') no-repeat;
+        background: url('/@/assets/images/top-title.png') no-repeat;
         background-size: 100% 100%;
 
         .title-d-left,
@@ -212,4 +237,4 @@
         background: url('../assets/images/bottom-b.png') no-repeat;
         background-size: 100% 100%;
     }
-</style>
+</style>