diff --git a/public/favicon4.ico b/public/favicon4.ico new file mode 100644 index 00000000..4b9d53a2 Binary files /dev/null and b/public/favicon4.ico differ diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue index 2a574a7c..fe89b578 100644 --- a/src/components/table/header/index.vue +++ b/src/components/table/header/index.vue @@ -182,7 +182,7 @@ const handlerHeight = () => { } } const computedSearchRow = () => { - if (!headerForm.value.$el) return + if (!headerForm.value?.$el) return // 清空headerFormSecond.value.$el下的元素 while (headerFormSecond.value.$el.firstChild) { headerForm.value.$el.appendChild(headerFormSecond.value.$el.firstChild) diff --git a/src/components/tree/index.vue b/src/components/tree/index.vue index e16feaed..16b72413 100644 --- a/src/components/tree/index.vue +++ b/src/components/tree/index.vue @@ -59,7 +59,7 @@ effect="customized" placement="bottom-start" :offset="0" - v-if=" data.level == 6" + v-if="data.level == 6" > \ No newline at end of file + diff --git a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/regionalAssessment.vue b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/regionalAssessment.vue index c58bbcc2..e2967f50 100644 --- a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/regionalAssessment.vue +++ b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/regionalAssessment.vue @@ -85,7 +85,7 @@ const tableStore = new TableStore({ publicHeight: 65, isWebPaging: true, method: 'POST', - filename: '监测点台账', + filename: '区域级评估', column: [ { title: '序号', diff --git a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue index 76ad75ee..9d31f266 100644 --- a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue +++ b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue @@ -79,7 +79,7 @@ const tableStore = new TableStore({ publicHeight: 65, isWebPaging: true, method: 'POST', - filename: '监测点台账', + filename: '敏感及重要用户评估', column: [ { title: '序号', diff --git a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/index.vue b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/index.vue index 0935d7ce..b1823036 100644 --- a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/index.vue +++ b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/index.vue @@ -12,7 +12,7 @@ - + @@ -33,7 +33,7 @@ defineOptions({ const activeTab = ref('pollutionReport') const monitoringPointTabRef = ref() const substationTabRef = ref() - +const userEvaluationRef = ref() const handleTabChange = (tabName: string) => { if (tabName === 'pollutionReport' && monitoringPointTabRef.value) { monitoringPointTabRef.value.refresh() @@ -47,11 +47,21 @@ watch( if (route.fullPath.includes('harmonic-boot/qydetailedAnalysis/pollutionReport')) { let type = (route.query.type as string) || 'null' if (type == 'null') { + } else if (type == '1') { + activeTab.value = 'pollutionReport' + setTimeout(() => { + monitoringPointTabRef.value.refresh((route.query.name as string) || 'null') + }, 500) } else if (type == '2') { activeTab.value = 'anotherReport' - substationTabRef.value.refresh((route.query.statisticalType as string) || 'null') + setTimeout(() => { + substationTabRef.value.refresh((route.query.statisticalType as string) || 'null') + }, 500) } else if (type == '4') { activeTab.value = '4' + setTimeout(() => { + userEvaluationRef.value.setSearchValue((route.query.name as string) || '') + }, 500) } } }, diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue index 2bedb5aa..cdf5cae5 100644 --- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue +++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue @@ -494,10 +494,10 @@ watch( let type = (route.query.type as string) || 'null' if (type == 'null') { } else if (type == '1') { - nextTick(() => { + setTimeout(() => { tableStore.table.params.searchValue = (route.query.name as string) || '' - tableStore.index() - }) + tableStore.index() + }, 500) } } }, diff --git a/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue b/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue index 567d1369..981e7845 100644 --- a/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue +++ b/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue @@ -152,11 +152,7 @@ @@ -488,10 +484,10 @@ watch( let type = (route.query.type as string) || 'null' if (type == 'null') { } else if (type == '1') { - nextTick(() => { + setTimeout(() => { tableStore.table.params.searchValue = (route.query.name as string) || '' - tableStore.index() - }) + tableStore.index() + }, 500) } } }, diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue index 27c99fa8..6bf82be2 100644 --- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue +++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue @@ -35,7 +35,7 @@ - + @@ -64,7 +64,7 @@ import { defineOptions, watch, onMounted, ref, nextTick } from 'vue' import 'splitpanes/dist/splitpanes.css' import { Splitpanes, Pane } from 'splitpanes' import PointTree from '@/components/tree/pqs/pointTree.vue' -import { useMonitoringPoint } from '@/stores/monitoringPoint' + import { mainHeight } from '@/utils/layout' import Wentaizonghepinggu from './wentaizonghepinggu/index.vue' import Wentaizhibiaohegelv from './wentaizhibiaohegelv/index.vue' @@ -77,7 +77,8 @@ import { useRoute } from 'vue-router' import StatisticalReport from './statisticalReport/index.vue' const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei' import router from '@/router' - +import { useMonitoringPoint } from '@/stores/monitoringPoint' +import { id } from 'element-plus/es/locale' defineOptions({ name: 'harmonic-boot/monitor/online' }) @@ -140,19 +141,42 @@ watch( if (route.fullPath.includes('harmonic-boot/monitor/online')) { let type = (route.query.type as string) || 'null' let lineId = (route.query.id as string) || 'null' - console.log('🚀 ~ type:', type) if (type == 'null') { } else { setTimeout(() => { monitoringPoint.setValue('lineId', lineId) + // + // pointTree.value.tree activeName.value = type + setTimeout(() => { + pointTree.value.scrollToNode(lineId) + + monitoringPoint.setValue('lineName', findNodeByTreeId(pointTree.value.tree, lineId).alias) + }, 500) }, 1000) } } }, { deep: true, immediate: true } ) +// 递归函数(同上) +const findNodeByTreeId = (treeData: any, id: any) => { + for (const node of treeData) { + if (node.id == id) return node + if (node.children && Array.isArray(node.children) && node.children.length) { + const found: any = findNodeByTreeId(node.children, id) + if (found) return found + } + } + return null +} +// 调用示例 +const getTargetNode = () => { + const targetId = '9b7adecf588b4110acb7018f297592a7' + const node = findNodeByTreeId(treeData.value, targetId) + console.log('Vue中找到的节点:', node) +} const changeTab = (e: string) => { activeName.value = e } diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue index aa350159..f2d0504e 100644 --- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue +++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue @@ -140,11 +140,11 @@ const exportReport = () => { loading.value = true let form = new FormData() form.append('isUrl', false) - form.append('lineIndex', dotList.value.id) + form.append('lineIndex', monitoringPoint.state.lineId) form.append('startTime', TableHeaderRef.value.datePickerRef.timeValue[0]) form.append('endTime', TableHeaderRef.value.datePickerRef.timeValue[1]) form.append('type', 0) - form.append('name', dotList.value.name) + form.append('name', monitoringPoint.state.lineName.split('>').pop()) ElMessage({ message: '下载报告中,请稍等.....', duration: 1000 @@ -159,7 +159,7 @@ const exportReport = () => { const link = document.createElement('a') // 创建a标签 link.href = url link.download = - dotList.value.name + + monitoringPoint.state.lineName.split('>').pop() + TableHeaderRef.value.datePickerRef.timeValue[0] + '_' + TableHeaderRef.value.datePickerRef.timeValue[1] // 设置下载的文件名 diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue index e5a01b97..69669f1a 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue @@ -1,15 +1,16 @@ @@ -121,7 +130,7 @@ const analysis = () => { name: '', data: first10Items.map((item: any) => item.projectName.split('(')[0].trim()), axisLabel: { - rotate: 30 // 核心:倾斜 45 度(推荐 30/45/60,角度太大易读性差) + rotate: 20 // 核心:倾斜 45 度(推荐 30/45/60,角度太大易读性差) } }, grid: { @@ -171,16 +180,25 @@ const setColor = val => { ? '#00B07D' : '' } -const echartClick = (res:any) => { - router.push({ +const echartClick = (res: any) => { + router.push({ name: 'harmonic-boot/qydetailedAnalysis/pollutionReport', query: { type: '4', + name: res.name, + t: Date.now() + } + }) +} +const clickAttribute = (row: any) => { + router.push({ + name: 'harmonic-boot/qydetailedAnalysis/pollutionReport', + query: { + type: '1', + name: row.row.lineName, t: Date.now() } }) - console.log("🚀 ~ echartClick ~ res:", res) - } defineExpose({ open }) diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/propInfo.vue b/src/views/pqs/qualityInspeection/panorama/components/details/propInfo.vue index d83e3ef6..4baf8116 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/propInfo.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/propInfo.vue @@ -2,9 +2,16 @@
- + +
@@ -19,8 +26,8 @@ v-loading="loading" :row-config="{ isCurrent: true, isHover: true }" :columnConfig="{ resizable: true }" - @current-change="currentChangeEvent" - style="z-index: 0;" + @cell-click="currentChangeEvent" + style="z-index: 0" > @@ -28,6 +35,11 @@ + + + @@ -40,9 +52,10 @@ import { defaultAttribute } from '@/components/table/defaultAttribute' import { Close } from '@element-plus/icons-vue' const emit = defineEmits(['flyTo']) const value = ref('') -const tableRef=ref() +const tableRef = ref() const dataList = ref([]) const loading = ref(false) +const powerFlag = ref('0') const open = (data: any) => { dataList.value = [] loading.value = true @@ -99,11 +112,11 @@ function filterDataByKeyword(data, keyword) { }) }) } -const currentChangeEvent=()=>{ +const currentChangeEvent = () => { // tableRef.value.getCurrentRecord() - console.log("🚀 ~ currentChangeEvent ~ tableRef.value.getCurrentRecord():", tableRef.value.getCurrentRecord()) - let data=tableRef.value.getCurrentRecord() - emit('flyTo',{ coordinate: [data.lng, data.lat] }, 16) + console.log('🚀 ~ currentChangeEvent ~ tableRef.value.getCurrentRecord():', tableRef.value.getCurrentRecord()) + let data = tableRef.value.getCurrentRecord() + emit('flyTo', { coordinate: [data.lng, data.lat] }, 16) } const show = ref(false) diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue b/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue index 83536d0d..dc309bdd 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue @@ -496,7 +496,7 @@ const jump = () => { name: 'harmonic-boot/qydetailedAnalysis/pollutionReport', query: { type: '2', - statisticalType:contaminate.value, + statisticalType: contaminate.value, t: Date.now() } }) @@ -536,5 +536,7 @@ defineExpose({ open }) .text-style { cursor: pointer; text-decoration: underline; + text-decoration-color: var(--el-color-primary); + text-underline-offset: 4px; } diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/transientDetails.vue b/src/views/pqs/qualityInspeection/panorama/components/details/transientDetails.vue index 3efa7ae4..bc7725bc 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/transientDetails.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/transientDetails.vue @@ -1,7 +1,14 @@