update 弹窗增加手机号字段,增加预警详情弹窗

This commit is contained in:
zk
2024-07-08 15:22:03 +08:00
parent b732e3ab64
commit e367d13c78
10 changed files with 166 additions and 15 deletions
@@ -9,8 +9,7 @@
:rowClassName="(record, index) => (index % 2 === 1 ? 'table-default' : 'table-striped')"
>
<template #bodyCell="{ column, record, index, text }">
<template v-if="column.customRender && isFunction(column.customRender)">
{{ column.customRender({ column, record, index, text }) }}
<template v-if="column.customRender && isFunction(column.customRender)" v-html="column.customRender({ column, record, index, text })">
</template>
<slot v-else-if="column.slot" :name="column.slot" v-bind="{ column, record, index, text } || {}"></slot>
<template v-else>
@@ -4,8 +4,9 @@
<div class="user-info-modal" style="display: flex">
<div style="width: 23%; padding: 0 20px 20px" class="fff">
<div style="margin-bottom: 10px; font-weight: bold"> 员工姓名{{ infoData?.username }}</div>
<div style="margin-bottom: 10px; font-weight: bold"> 员工工号{{ infoData?.workNo }} </div>
<div style="margin-bottom: 10px; font-weight: bold"> 员工工号{{ infoData?.workNo }}</div>
<div style="margin-bottom: 10px; font-weight: bold"> 工具编码{{ infoData?.watchNo }}</div>
<div style="margin-bottom: 10px; font-weight: bold"> 手机号码{{ infoData?.phone }}</div>
<div style="margin-bottom: 10px; font-weight: bold"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ infoData?.unit }} </div>
<div style="margin-bottom: 10px; font-weight: bold">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ infoData?.department }}
@@ -150,7 +150,10 @@
function drawMarker(data: any) {
const { lon, lat } = data;
if (!lon || !lat) return;
if (!lon || !lat) {
Map.clearMarker();
return;
}
Map.createMarker(data);
}
</script>
@@ -129,16 +129,21 @@ export function useAlarmDetail() {
value: '',
key: 'realName',
},
{
name: '部门名称',
value: '',
key: 'orgName',
},
{
name: '手机号码',
value: '',
key: 'phone',
},
{
name: '工具编码',
value: '',
key: 'watchNo',
},
{
name: '单位名称',
value: '',
key: 'orgName2',
},
{
name: '位置',
value: '',
@@ -154,9 +159,9 @@ export function useAlarmDetail() {
]);
const detailRight = ref([
{
name: '部门名称',
name: '单位名称',
value: '',
key: 'orgName',
key: 'orgName2',
},
{
name: '事件类型',
@@ -275,6 +280,13 @@ export const columns = [
key: 'watchNo',
ellipsis: true,
},
{
title: '手机号码',
dataIndex: 'phone',
align: 'center',
key: 'phone',
ellipsis: true,
},
{
title: '心率(次/分)',
dataIndex: 'heartRate',