renkang/xj-screen
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source 
1.修改弹窗结构
This commit is contained in:
weixin
2024-10-28 17:53:23 +08:00
parent 68047001d1
commit af8fe6ca21
4 changed files with 145 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/body-d-right/oneR.vue
+56 -28
View File
@@ -21,35 +21,58 @@
<Dialog :openVis="openInfor" width="30%" title="健康报警员工信息" @close="handlePoliceClose">
<template #container>
<div class="police-con" :class="[themeType]">
<div class="con-item">
<div>姓名：</div>
<div>{{ userInfo?.realName }}</div>
<Row style="font-size: 14px; font-weight: bold"> 个人信息 </Row>
<Row>
<Col :span="8">姓名：{{ userInfo?.realName || '--' }}</Col>
<Col :span="8">性别：{{ userInfo?.sex_dictText || '--' }}</Col>
<Col :span="8">年龄：{{ userInfo?.age || '--' }}</Col>
</Row>
<Row>
<Col :span="8">二级单位：{{ userInfo?.orgName2 || '--' }}</Col>
<Col :span="8">部门：{{ userInfo?.orgName || '--' }}</Col>
<Col :span="8">手机号码：{{ userInfo?.phone || '--' }}</Col>
</Row>
<Row style="font-size: 14px; font-weight: bold"> 健康信息 </Row>
<Row> 异常事件：{{ userInfo?.eventType_dictText || '--' }} </Row>
<Row>
<Col :span="8">异常值：{{ userInfo?.dataValue || '--' }}</Col>
<Col :span="16">发生时间：{{ userInfo?.warnTime || '--' }}</Col>
</Row>
<div style="display: flex">
<div style="width: 67px">发生地点：</div>
<div style="width: calc(100% - 67px); display: flex; overflow-wrap: anywhere">
{{ userInfo?.address || userInfo?.gpsErrorMsg || '--' }}
</div>
<div class="con-item">
<div>二级单位：</div>
<div>{{ userInfo?.orgName1 }}</div>
</div>
<div class="con-item">
<div>手机号码：</div>
<div>{{ userInfo?.phone }}</div>
</div>
<div class="con-item">
<div>异常事件：</div>
<div>{{ userInfo?.eventType_dictText }}</div>
</div>
<div class="con-item">
<div>异常值：</div>
<div>{{ userInfo?.dataValue }}</div>
</div>
<div class="con-item">
<div>发生时间：</div>
<div>{{ userInfo?.warnTime }}</div>
</div>
<div class="con-item">
<div>发生地点：</div>
<div v-if="userInfo?.address">{{ userInfo?.address }} </div>
<div style="color: #eb3636" v-else>{{ userInfo?.gpsErrorMsg }}</div>
</div>
<!-- <div class="con-item">-->
<!-- <div>姓名：</div>-->
<!-- <div>{{ userInfo?.realName }}</div>-->
<!-- </div>-->
<!-- <div class="con-item">-->
<!-- <div>二级单位：</div>-->
<!-- <div>{{ userInfo?.orgName1 }}</div>-->
<!-- </div>-->
<!-- <div class="con-item">-->
<!-- <div>手机号码：</div>-->
<!-- <div>{{ userInfo?.phone }}</div>-->
<!-- </div>-->
<!-- <div class="con-item">-->
<!-- <div>异常事件：</div>-->
<!-- <div>{{ userInfo?.eventType_dictText }}</div>-->
<!-- </div>-->
<!-- <div class="con-item">-->
<!-- <div>异常值：</div>-->
<!-- <div>{{ userInfo?.dataValue }}</div>-->
<!-- </div>-->
<!-- <div class="con-item">-->
<!-- <div>发生时间：</div>-->
<!-- <div>{{ userInfo?.warnTime }}</div>-->
<!-- </div>-->
<!-- <div class="con-item">-->
<!-- <div>发生地点：</div>-->
<!-- <div v-if="userInfo?.address">{{ userInfo?.address }} </div>-->
<!-- <div style="color: #eb3636" v-else>{{ userInfo?.gpsErrorMsg }}</div>-->
<!-- </div>-->
</div>
</template>
</Dialog>
@@ -67,6 +90,7 @@
import { DataType } from '/@/utils/settings.ts';
import { useTheme } from '/@/hooks/theme/useTheme.ts';
import { message } from 'ant-design-vue';
import { Row, Col } from 'ant-design-vue';
const props = defineProps({
setting: Object,
@@ -208,7 +232,8 @@
}
.police-con {
padding: 2% 0 2% 5%;
padding: 2% 5% 2% 5%;
display: grid;
.con-item {
padding: 1.3% 0;
@@ -225,6 +250,9 @@
}
}
}
.ant-row {
margin-bottom: 10px;
}
</style>
<!--<style lang="less">-->
<!-- .dialog-con {-->
src/views/centralScreen/centralScreen.vue
+4 -4
View File
@@ -7,7 +7,7 @@
{{ dayTimeO }}
</div>
<div class="title-d-middle">
<span>{{ title }}应急就医服务中心</span>
<span>{{ title }}</span>
<span class="phone">({{ phone }})</span>
</div>
<div class="title-d-right"> 累计运行时间：{{ dayTimeT }}</div>
@@ -87,7 +87,7 @@
const dayTimeO = ref();
const dayTimeT = ref();
const interval = ref(1);
const title = ref(simpleName || '' + '应急就医服务中心');
const title = ref((simpleName || '') + '应急就医服务中心');
const phone = ref(centerTel || '0951-6805199');
const screenPath = ref('');
@@ -424,13 +424,13 @@
background: url('/@/assets/images/bottom-b.png') no-repeat;
background-size: 100% 100%;
}
.central-screen-body-left {
.central-screen-body-left-s {
width: calc(100% / 6) !important;
}
.body-d-middle {
width: calc(100% * 2 / 3) !important;
}
.body-d-right {
.body-d-right-s {
width: calc(100% / 6) !important;
}
</style>
src/views/centralScreen/components/terminalAlarm.vue
+61 -29
View File
@@ -21,35 +21,58 @@
<Dialog :openVis="openInfor" width="30%" title="健康报警员工信息" @close="handlePoliceClose">
<template #container>
<div class="police-con" :class="[themeType]">
<div class="con-item">
<div>姓名：</div>
<div>{{ userInfo?.realName }}</div>
<Row style="font-size: 14px; font-weight: bold"> 个人信息 </Row>
<Row>
<Col :span="8">姓名：{{ userInfo?.realName || '--' }}</Col>
<Col :span="8">性别：{{ userInfo?.sex_dictText || '--' }}</Col>
<Col :span="8">年龄：{{ userInfo?.age || '--' }}</Col>
</Row>
<Row>
<Col :span="8">二级单位：{{ userInfo?.orgName2 || '--' }}</Col>
<Col :span="8">部门：{{ userInfo?.orgName || '--' }}</Col>
<Col :span="8">手机号码：{{ userInfo?.phone || '--' }}</Col>
</Row>
<Row style="font-size: 14px; font-weight: bold"> 健康信息 </Row>
<Row> 异常事件：{{ userInfo?.eventType_dictText || '--' }} </Row>
<Row>
<Col :span="8">异常值：{{ userInfo?.dataValue || '--' }}</Col>
<Col :span="16">发生时间：{{ userInfo?.warnTime || '--' }}</Col>
</Row>
<div style="display: flex">
<div style="width: 67px">发生地点：</div>
<div style="width: calc(100% - 67px); display: flex; overflow-wrap: anywhere">
{{ userInfo?.address || userInfo?.gpsErrorMsg || '--' }}
</div>
<div class="con-item">
<div>二级单位：</div>
<div>{{ userInfo?.orgName1 }}</div>
</div>
<div class="con-item">
<div>手机号码：</div>
<div>{{ userInfo?.phone }}</div>
</div>
<div class="con-item">
<div>异常事件：</div>
<div>{{ userInfo?.eventType_dictText }}</div>
</div>
<div class="con-item">
<div>异常值：</div>
<div>{{ userInfo?.dataValue }}</div>
</div>
<div class="con-item">
<div>发生时间：</div>
<div>{{ userInfo?.warnTime }}</div>
</div>
<div class="con-item">
<div>发生地点：</div>
<div v-if="userInfo?.address">{{ userInfo?.address }}</div>
<div style="color: #eb3636" v-else>{{ userInfo?.gpsErrorMsg }}</div>
</div>
<!-- <div class="con-item">-->
<!-- <div>姓名：</div>-->
<!-- <div>{{ userInfo?.realName }}</div>-->
<!-- </div>-->
<!-- <div class="con-item">-->
<!-- <div>二级单位：</div>-->
<!-- <div>{{ userInfo?.orgName1 }}</div>-->
<!-- </div>-->
<!-- <div class="con-item">-->
<!-- <div>手机号码：</div>-->
<!-- <div>{{ userInfo?.phone }}</div>-->
<!-- </div>-->
<!-- <div class="con-item">-->
<!-- <div>异常事件：</div>-->
<!-- <div>{{ userInfo?.eventType_dictText }}</div>-->
<!-- </div>-->
<!-- <div class="con-item">-->
<!-- <div>异常值：</div>-->
<!-- <div>{{ userInfo?.dataValue }}</div>-->
<!-- </div>-->
<!-- <div class="con-item">-->
<!-- <div>发生时间：</div>-->
<!-- <div>{{ userInfo?.warnTime }}</div>-->
<!-- </div>-->
<!-- <div class="con-item">-->
<!-- <div>发生地点：</div>-->
<!-- <div v-if="userInfo?.address">{{ userInfo?.address }}</div>-->
<!-- <div style="color: #eb3636" v-else>{{ userInfo?.gpsErrorMsg }}</div>-->
<!-- </div>-->
</div>
</template>
</Dialog>
@@ -66,7 +89,7 @@
import { caching, useSession } from '/@/hooks/autoRefresh/caching.ts';
import { DataType } from '/@/utils/settings.ts';
import { useTheme } from '/@/hooks/theme/useTheme.ts';
import { message } from 'ant-design-vue';
import { Col, message, Row } from 'ant-design-vue';
import { useUserStore } from '/@/store/modules/user.ts';
const props = defineProps({
@@ -121,7 +144,13 @@
async function getScrollList() {
try {
let orgCodeList = userStore.getCenterInfo?.serviceScope;
const { code, result } = await getMonitorList({ pageSize: 10, pageNo: 1, orgCode: props.setting?.orgCode, orgCodeList });
let codeList = '';
if (orgCodeList) {
codeList = orgCodeList + ',' + props.setting?.orgCode;
} else {
codeList = props.setting?.orgCode;
}
const { code, result } = await getMonitorList({ pageSize: 10, pageNo: 1, orgCodeList: codeList });
if (code == 200) {
setSession(RIGHT_KEY1_NEW, JSON.stringify(result.records));
scrollList.value = result.records;
@@ -223,6 +252,9 @@
}
}
}
.ant-row {
margin-bottom: 10px;
}
</style>
<!--<style lang="less">-->
<!-- .dialog-con {-->
src/views/yinChuan/componetns/emergencyData/components/emergencyDataDialog.vue
+22 -14
View File
@@ -90,6 +90,18 @@
import { Dropdown } from 'ant-design-vue';
const columns = [
{
title: '二级单位',
dataIndex: 'secondDepart',
key: 'secondDepart',
width: 120,
},
{
title: '三级单位',
dataIndex: 'thirdDepart',
key: 'secondDepart',
width: 120,
},
{
title: '姓名',
dataIndex: 'patientName',
@@ -100,38 +112,32 @@
title: '性别',
dataIndex: 'gender_dictText',
key: 'gender_dictText',
width: 80,
width: 45,
},
{
title: '年龄',
dataIndex: 'age',
key: 'age',
width: 80,
},
{
title: '二级单位',
dataIndex: 'secondDepart',
key: 'secondDepart',
width: 120,
width: 45,
},
{
title: '联系电话',
dataIndex: 'phone',
key: 'phone',
width: 120,
width: 110,
},
{
title: '病人MPDS类型',
dataIndex: 'mpdsCategoryId_dictText',
key: 'mpdsCategoryId_dictText',
width: 120,
width: 110,
},
{
title: '生命体征',
dataIndex: 'tz',
key: 'tz',
slot: 'tz',
width: 80,
width: 75,
},
{
title: '病情判断',
@@ -143,11 +149,13 @@
title: '到达现场时间',
dataIndex: 'arriveSceneTime',
key: 'arriveSceneTime',
width: 180,
},
{
title: '发病地点',
dataIndex: 'attackAddress',
key: 'attackAddress',
width: 220,
// customRender: ({ record }) => {
// if (record?.address) {
// return record?.address;
@@ -160,9 +168,9 @@
const { visible, closeDialog, openDialog } = useDialog({ title: '急救列表' });
function openDia() {
openDialog();
nextTick(() => {
registerTable.value?.getRecords();
});
// nextTick(() => {
// registerTable.value?.getRecords();
// });
}
const registerTable = ref();
defineExpose({