update 调整位置为空时的文字样式,调整表格组件

This commit is contained in:
zk
2024-05-21 16:11:13 +08:00
parent 8c7e4a6e91
commit 062afc3d71
5 changed files with 10 additions and 8 deletions
+3 -3
View File
@@ -43,7 +43,8 @@
</div> </div>
<div class="con-item"> <div class="con-item">
<span>发生地点</span> <span>发生地点</span>
<span>{{ userInfo?.address || userInfo?.gpsErrorMsg }}</span> <span v-if="userInfo?.address">{{ userInfo?.address }}</span>
<span style="color: #eb3636" v-else>{{ userInfo?.gpsErrorMsg }}</span>
</div> </div>
</div> </div>
</template> </template>
@@ -72,7 +73,7 @@
const classOption = ref({ const classOption = ref({
step: 0.3, // 速度 step: 0.3, // 速度
}); });
const openInfor = ref<boolean>(false); const openInfor = ref<boolean>(false); //弹窗显示
const userInfo = ref({ const userInfo = ref({
realName: '', realName: '',
orgName1: '', orgName1: '',
@@ -210,7 +211,6 @@
.police-con { .police-con {
color: #ffffff; color: #ffffff;
background-color: #00152b; background-color: #00152b;
border: 1px solid #129bff;
padding: 2% 0 2% 5%; padding: 2% 0 2% 5%;
.con-item { .con-item {
@@ -112,7 +112,7 @@
} }
const { refreshState } = useRefresh(PAGE_SWITCH, () => { const { refreshState } = useRefresh(PAGE_SWITCH, () => {
interval(); // interval();
}); });
onUnmounted(() => { onUnmounted(() => {
clearInterval(timer.value); clearInterval(timer.value);
@@ -12,6 +12,7 @@
<template v-if="column.customRender && isFunction(column.customRender)"> <template v-if="column.customRender && isFunction(column.customRender)">
{{ column.customRender({ column, record, index, text }) }} {{ column.customRender({ column, record, index, text }) }}
</template> </template>
<slot v-else-if="column.slot" :name="column.slot" v-bind="{ column, record, index, text } || {}"></slot>
<template v-else> <template v-else>
{{ text }} {{ text }}
</template> </template>
@@ -72,6 +73,7 @@
async function getRecords() { async function getRecords() {
try { try {
dataSource.value = [];
tableLoading.value = true; tableLoading.value = true;
const { code, result } = await props.api({ ...props.apiParams, pageSize: pageSize.value, pageNo: current.value }); const { code, result } = await props.api({ ...props.apiParams, pageSize: pageSize.value, pageNo: current.value });
if (code == 200) { if (code == 200) {
@@ -9,7 +9,7 @@
<div v-for="item in detailLeft" :key="item.key"> <div v-for="item in detailLeft" :key="item.key">
<template v-if="item.customRender"> <template v-if="item.customRender">
<span class="info-label">{{ item.name }}</span> <span class="info-label">{{ item.name }}</span>
<span class="info-value"> {{ item.customRender(item.value) }}</span> <span class="info-value" v-html="item.customRender(item.value)"> </span>
</template> </template>
<template v-else> <template v-else>
<span class="info-label">{{ item.name }}</span> <span class="info-label">{{ item.name }}</span>
@@ -147,7 +147,7 @@ export function useAlarmDetail() {
if (record?.lat) { if (record?.lat) {
return `${record.lat},${record.lon}`; return `${record.lat},${record.lon}`;
} else { } else {
return '未知位置'; return `<span style="color: #eb3636;">${record?.gpsErrorMsg || ''}</span>`;
} }
}, },
}, },