diff --git a/src/components/cockpit/governanceReport/index.vue b/src/components/cockpit/governanceReport/index.vue index 993a89b..12e6f1d 100644 --- a/src/components/cockpit/governanceReport/index.vue +++ b/src/components/cockpit/governanceReport/index.vue @@ -1,15 +1,37 @@ - + - - + + - + @@ -43,7 +65,7 @@ const prop = defineProps({ h: { type: [String, Number] }, width: { type: [String, Number] }, height: { type: [String, Number] }, - timeKey: { type: Array as () => string[] }, + timeKey: { type: Array as () => string[] }, timeValue: { type: Object }, interval: { type: Number } }) @@ -59,13 +81,21 @@ const idList = ref() // 监测对象 const initListByIds = () => { getListByIds({}).then((res: any) => { - if (res.data.length > 0) { + if (res.data?.length > 0) { idList.value = res.data if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) { tableStore.table.params.sensitiveUserId = idList.value[0].id } templateListData() + } else { + querySysExcel({}).then(res => { + templateList.value = res.data.filter(item => item.excelType == 4) + if (!tableStore.table.params.tempId && templateList.value?.length > 0) { + tableStore.table.params.tempId = templateList.value[0].id + } + }) + tableStore.table.loading = false } }) } diff --git a/src/components/cockpit/listOfMainMonitoringPoints/index.vue b/src/components/cockpit/listOfMainMonitoringPoints/index.vue index 84dea16..024d351 100644 --- a/src/components/cockpit/listOfMainMonitoringPoints/index.vue +++ b/src/components/cockpit/listOfMainMonitoringPoints/index.vue @@ -150,6 +150,7 @@ const indicatorList = ref() const initLineList = async () => { cslineList({}).then(res => { + setTime() if (res.data.length == 0) { lineShow.value = false return (tableStore.table.loading = false) diff --git a/src/components/tree/govern/deviceTree.vue b/src/components/tree/govern/deviceTree.vue index 4472a64..d16ec3a 100644 --- a/src/components/tree/govern/deviceTree.vue +++ b/src/components/tree/govern/deviceTree.vue @@ -140,7 +140,7 @@ const info = (type?: string) => { if (type == '2') { //初始化选中 - treRef.value?.treeRef4.setCurrentKey(arr4[0].id) + treRef.value?.treeRef4.setCurrentKey(arr4[0]?.id) // 注册父组件事件 emit('init', { level: 2, @@ -150,7 +150,7 @@ const info = (type?: string) => { return } if (arr.length > 0) { - treRef.value.treeRef1.setCurrentKey(arr[0].id) + treRef.value.treeRef1.setCurrentKey(arr[0]?.id) // 注册父组件事件 emit('init', { level: 2, @@ -158,7 +158,7 @@ const info = (type?: string) => { }) return } else if (arr2.length > 0) { - treRef.value.treeRef2.setCurrentKey(arr2[0].id) + treRef.value.treeRef2.setCurrentKey(arr2[0]?.id) // 注册父组件事件 emit('init', { level: 2, diff --git a/src/components/tree/govern/getMarketList.vue b/src/components/tree/govern/getMarketList.vue index d0d6846..439e99c 100644 --- a/src/components/tree/govern/getMarketList.vue +++ b/src/components/tree/govern/getMarketList.vue @@ -19,9 +19,11 @@ getMarketList().then((res: any) => { color: 'royalblue' } }) + console.log("🚀 ~ royalblue:") + emit('selectUser', tree.value[0]) nextTick(() => { - treRef.value.treeRef.setCurrentKey(tree.value[0].id) + treRef.value.treeRef.setCurrentKey(tree.value[0]?.id) }) } }) diff --git a/src/components/tree/govern/officialUserTree.vue b/src/components/tree/govern/officialUserTree.vue index 8412ec3..e6da327 100644 --- a/src/components/tree/govern/officialUserTree.vue +++ b/src/components/tree/govern/officialUserTree.vue @@ -21,7 +21,7 @@ getFormalUserList().then((res: any) => { }) emit('selectUser', tree.value[0]) nextTick(() => { - treRef.value.treeRef.setCurrentKey(tree.value[0].id) + treRef.value.treeRef.setCurrentKey(tree.value[0]?.id) }) } }) diff --git a/src/views/govern/alarm/index.vue b/src/views/govern/alarm/index.vue index 4cb7ee1..892beae 100644 --- a/src/views/govern/alarm/index.vue +++ b/src/views/govern/alarm/index.vue @@ -7,15 +7,15 @@ - + - + diff --git a/src/views/govern/device/disposition/index.vue b/src/views/govern/device/disposition/index.vue index 2926be9..de2e3ec 100644 --- a/src/views/govern/device/disposition/index.vue +++ b/src/views/govern/device/disposition/index.vue @@ -1,12 +1,10 @@ - + - - 绑定工程 - + 绑定工程 {{ user.name }} @@ -29,18 +27,36 @@ - - + + - + " + height="500px" + style="width: 100%" + > @@ -77,6 +93,7 @@ const filterText = ref('') const tableRef = ref() const selectUser = (e: any) => { + if (e == undefined) return (loading.value = false) user.value = e loading.value = true queryByUseId({ diff --git a/src/views/govern/device/officialUser/index.vue b/src/views/govern/device/officialUser/index.vue index c77be8d..8fc2e9a 100644 --- a/src/views/govern/device/officialUser/index.vue +++ b/src/views/govern/device/officialUser/index.vue @@ -171,6 +171,7 @@ const defaultProps = { label: 'name' } const selectUser = (e: any) => { + if (e == undefined) return (loading.value = false) user.value = e loading.value = true diff --git a/src/views/govern/device/tourist/index.vue b/src/views/govern/device/tourist/index.vue index 01eb7c4..089db13 100644 --- a/src/views/govern/device/tourist/index.vue +++ b/src/views/govern/device/tourist/index.vue @@ -28,7 +28,7 @@ import { mainHeight } from '@/utils/layout' import { getVisitorConfig, updateVisitorConfig } from '@/api/cs-device-boot/user' import { ref, onMounted } from 'vue' import { ElMessage } from 'element-plus' -import { debounce } from 'lodash-es' +import { debounce } from 'lodash-es' const pageHeight = mainHeight(60) const loading = ref(true) const defaultCheckedKeys: any = ref([]) @@ -36,7 +36,7 @@ const tableData = ref([]) const treeRef = ref(null) const ignoreCheckChange = ref(false) const checkChange = (data: any) => { - console.log('🚀 ~ checkChange ~ data:', data) + if (data == undefined) return (loading.value = false) if (data.data.pName == '便携式设备') { if (ignoreCheckChange.value) { ignoreCheckChange.value = false // 清除标记,不影响后续正常触发 @@ -57,7 +57,7 @@ const checkChange = (data: any) => { updateVisitorConfigs() } } -const updateVisitorConfigs = debounce (() => { +const updateVisitorConfigs = debounce(() => { const result = Array.from(new Set(defaultCheckedKeys.value)) updateVisitorConfig( result.map(item => { @@ -70,7 +70,7 @@ const updateVisitorConfigs = debounce (() => { getVisitorConfigs() } }) -},500) +}, 500) const getVisitorConfigs = () => { getVisitorConfig().then((res: any) => { if (res.code === 'A0000') {