diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 1d463be..4b9c432 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -53,7 +53,7 @@ } ).then(() => { window.localStorage.removeItem(localTitel.value) - emits('confirm', checkAllList.value) + emits('confirm', checkAllList.value?.filter((item: any) => item.isRequired !== false)) dialogFormVisible.value = false }) diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 1d463be..4b9c432 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -53,7 +53,7 @@ } ).then(() => { window.localStorage.removeItem(localTitel.value) - emits('confirm', checkAllList.value) + emits('confirm', checkAllList.value?.filter((item: any) => item.isRequired !== false)) dialogFormVisible.value = false }) diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index 2d9836d..00ebcb0 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -65,6 +65,7 @@ else { // console.log('无存储', props.configTitle, props.columns) props.edit(props.columns.filter((item: any) => item.isRequired !== false)) + // console.log(props.columns.filter((item: any) => item.isRequired !== false), '1111') } diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 1d463be..4b9c432 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -53,7 +53,7 @@ } ).then(() => { window.localStorage.removeItem(localTitel.value) - emits('confirm', checkAllList.value) + emits('confirm', checkAllList.value?.filter((item: any) => item.isRequired !== false)) dialogFormVisible.value = false }) diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index 2d9836d..00ebcb0 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -65,6 +65,7 @@ else { // console.log('无存储', props.configTitle, props.columns) props.edit(props.columns.filter((item: any) => item.isRequired !== false)) + // console.log(props.columns.filter((item: any) => item.isRequired !== false), '1111') } diff --git a/src/router/routes.ts b/src/router/routes.ts index a18912c..0f37e24 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -55,6 +55,7 @@ meta: { title: () => useSettingsStore().dashboard.title, breadcrumb: false, + }, }, ], diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue index 1d463be..4b9c432 100644 --- a/src/components/TableContainer/configColumnsDialog.vue +++ b/src/components/TableContainer/configColumnsDialog.vue @@ -53,7 +53,7 @@ } ).then(() => { window.localStorage.removeItem(localTitel.value) - emits('confirm', checkAllList.value) + emits('confirm', checkAllList.value?.filter((item: any) => item.isRequired !== false)) dialogFormVisible.value = false }) diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index 2d9836d..00ebcb0 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -65,6 +65,7 @@ else { // console.log('无存储', props.configTitle, props.columns) props.edit(props.columns.filter((item: any) => item.isRequired !== false)) + // console.log(props.columns.filter((item: any) => item.isRequired !== false), '1111') } diff --git a/src/router/routes.ts b/src/router/routes.ts index a18912c..0f37e24 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -55,6 +55,7 @@ meta: { title: () => useSettingsStore().dashboard.title, breadcrumb: false, + }, }, ], diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue index 5c9f1cf..a234ca2 100644 --- a/src/views/home/leakage/index.vue +++ b/src/views/home/leakage/index.vue @@ -13,6 +13,7 @@ import indexDB from '@/utils/indexDB' import { treeToArr } from '@/utils/structure' import { getLeakageListPage, getLeakageList } from '@/api/home/leakage/index' +import { isRequired } from '@/utils/validate' // 表格标识 地图或普通 const mapRef = ref() const tableFlag = ref('map') @@ -42,10 +43,13 @@ const columns = ref([ { text: '监测对象', value: 'typeName', align: 'center', width: '120' }, { text: '位号', value: 'tagNumber', align: 'center', width: '140' }, + { text: '编号', value: 'ledgerCode', align: 'center', width: '140', isRequired: false }, { text: '名称', value: 'ledgerName', align: 'center' }, - { text: '浓度', value: 'monitorValue', align: 'center', width: '110', isCustom: true }, - { text: '地址', value: 'place', align: 'center' }, { text: '管理单位', value: 'deptName', align: 'center' }, + { text: '产权单位', value: 'propertyOwner', align: 'center', isRequired: false }, + { text: '管理方式', value: 'manageType', align: 'center', isRequired: false }, + { text: '地址', value: 'place', align: 'center' }, + { text: '浓度', value: 'monitorValue', align: 'center', width: '110', isCustom: true }, { text: '电量', value: 'cell', align: 'center', width: '100' }, { text: '监控状态', value: 'onlineStateName', align: 'center', width: '110', isCustom: true }, { text: '最新时间', value: 'logTime', align: 'center', width: '180' }, @@ -530,7 +534,7 @@ {{ scope.row.monitorValue }} {{ scope.row.monitorValue }} {{ scope.row.watchObjectName === + v-if="scope.row.monitorValue && scope.row.monitorValue !== '0.00'">{{ scope.row.typeName === '场站' ? 'PPM.M' : '%LEL' }} @@ -565,18 +569,21 @@