diff --git a/src/api/cs-device-boot/csLedger.ts b/src/api/cs-device-boot/csLedger.ts
index fee1f35..36b93bf 100644
--- a/src/api/cs-device-boot/csLedger.ts
+++ b/src/api/cs-device-boot/csLedger.ts
@@ -31,4 +31,11 @@ export function getCldTree() {
method: 'POST'
})
}
+//报表树
+export function lineTree() {
+ return createAxios({
+ url: '/cs-device-boot/csLedger/lineTree',
+ method: 'POST'
+ })
+}
diff --git a/src/components/tree/govern/csLedgerLineTree.vue b/src/components/tree/govern/csLedgerLineTree.vue
new file mode 100644
index 0000000..a935065
--- /dev/null
+++ b/src/components/tree/govern/csLedgerLineTree.vue
@@ -0,0 +1,179 @@
+
+
+
+
+
diff --git a/src/views/govern/reportCore/lineReport/index.vue b/src/views/govern/reportCore/lineReport/index.vue
index 1d02c25..123cc46 100644
--- a/src/views/govern/reportCore/lineReport/index.vue
+++ b/src/views/govern/reportCore/lineReport/index.vue
@@ -2,11 +2,12 @@
-
+ @pointTypeChange="pointTypeChange"
+ >
@@ -134,14 +135,14 @@ import { onMounted, ref, provide } from 'vue'
import 'splitpanes/dist/splitpanes.css'
import { Splitpanes, Pane } from 'splitpanes'
import TableStore from '@/utils/tableStore'
-import PointTree from '@/components/tree/pqs/pointTree.vue'
+
import TableHeader from '@/components/table/header/index.vue'
import { useDictData } from '@/stores/dictData'
import { mainHeight } from '@/utils/layout'
-import pointTreeWx from '@/components/tree/govern/pointTreeWx.vue'
+
import { genFileId, ElMessage, ElNotification } from 'element-plus'
import type { UploadProps, UploadUserFile } from 'element-plus'
-import CloudDeviceEntryTree from '@/components/tree/govern/cloudDeviceEntryTree.vue'
+import pointTree from '@/components/tree/govern/pointTree.vue'
import { getLineExport } from '@/api/harmonic-boot/cockpit/cockpit'
defineOptions({
name: 'TransientReport/monitoringpointReport'
@@ -189,8 +190,10 @@ onMounted(() => {
size.value = Math.round((180 / dom.offsetHeight) * 100)
}
})
-
-const handleNodeClick = (data: any, node: any) => {
+const pointTypeChange = (val: any, obj: any) => {
+ handleNodeClick(obj)
+}
+const handleNodeClick = (data: any,) => {
dotList.value = data
}
// 上传
@@ -209,7 +212,7 @@ const choose = (files: any) => {
//生成报告
const exportEvent = () => {
- if (dotList.value?.level != 4) {
+ if (dotList.value?.level != 3) {
return ElMessage.warning('请选择监测点进行报告生成!')
}
let a = ''
diff --git a/src/views/govern/reportCore/report/index.vue b/src/views/govern/reportCore/report/index.vue
index 82cd83c..ace02c8 100644
--- a/src/views/govern/reportCore/report/index.vue
+++ b/src/views/govern/reportCore/report/index.vue
@@ -2,11 +2,12 @@
-
+ @pointTypeChange="pointTypeChange"
+ >
@@ -67,14 +68,14 @@ import { onMounted, ref, provide } from 'vue'
import 'splitpanes/dist/splitpanes.css'
import { Splitpanes, Pane } from 'splitpanes'
import TableStore from '@/utils/tableStore'
-import PointTree from '@/components/tree/pqs/pointTree.vue'
+
import TableHeader from '@/components/table/header/index.vue'
import { useDictData } from '@/stores/dictData'
import { mainHeight } from '@/utils/layout'
-import pointTreeWx from '@/components/tree/govern/pointTreeWx.vue'
+
import { genFileId, ElMessage, ElNotification } from 'element-plus'
import type { UploadProps, UploadUserFile } from 'element-plus'
-import CloudDeviceEntryTree from '@/components/tree/govern/cloudDeviceEntryTree.vue'
+import pointTree from '@/components/tree/govern/pointTree.vue'
import { exportModel } from '@/api/cs-harmonic-boot/datatrend'
defineOptions({
name: 'harmonic-boot/report/word'
@@ -104,8 +105,10 @@ onMounted(() => {
size.value = Math.round((180 / dom.offsetHeight) * 100)
}
})
-
-const handleNodeClick = (data: any, node: any) => {
+const pointTypeChange = (val: any, obj: any) => {
+ handleNodeClick(obj)
+}
+const handleNodeClick = (data: any) => {
dotList.value = data
}
// 上传
@@ -124,7 +127,7 @@ const choose = (files: any) => {
// 生成
const exportEvent = () => {
console.log('🚀 ~ exportEvent ~ dotList.value:', dotList.value)
- if (dotList.value?.level != 4) {
+ if (dotList.value?.level != 3) {
return ElMessage.warning('请选择监测点进行报告生成!')
}
let form = new FormData()
diff --git a/src/views/govern/reportCore/statisticsWx/index_ypt.vue b/src/views/govern/reportCore/statisticsWx/index_ypt.vue
index f816b90..4bb98f4 100644
--- a/src/views/govern/reportCore/statisticsWx/index_ypt.vue
+++ b/src/views/govern/reportCore/statisticsWx/index_ypt.vue
@@ -5,13 +5,14 @@
-
+ @pointTypeChange="pointTypeChange"
+ >
@@ -66,7 +67,7 @@ import { exportExcel } from '@/views/system/reportForms/export.js'
import 'splitpanes/dist/splitpanes.css'
import DatePicker from '@/components/form/datePicker/time.vue'
import { Splitpanes, Pane } from 'splitpanes'
-import CloudDeviceEntryTree from '@/components/tree/govern/cloudDeviceEntryTree.vue'
+import pointTree from '@/components/tree/govern/pointTree.vue'
// import data from './123.json'
defineOptions({
name: 'govern/reportCore/statisticsWx/index'
@@ -143,7 +144,6 @@ onMounted(() => {
})
})
-
const stencil = (val: any) => {
templatePolicy.value = val.filter((item: any) => item.excelType != '4')
Template.value = templatePolicy.value[0]
@@ -153,9 +153,12 @@ const stencil = (val: any) => {
const changetype = (val: any) => {
reportForm.value = val.reportForm
}
+const pointTypeChange = (val: any, obj: any) => {
+ handleNodeClick(obj)
+}
-const handleNodeClick = (data: any, node: any) => {
- if (data?.level == 4) {
+const handleNodeClick = (data: any) => {
+ if (data?.level == 3) {
dotList.value = data
setTimeout(() => {
tableStore.index()
diff --git a/src/views/govern/reportForms/index.vue b/src/views/govern/reportForms/index.vue
index 77dcbe4..d7a2a94 100644
--- a/src/views/govern/reportForms/index.vue
+++ b/src/views/govern/reportForms/index.vue
@@ -186,9 +186,11 @@ const tableStore: any = new TableStore({
loadCallback: () => {
tableRef.value.getRef().setCurrentRow(tableStore.table.data[0])
- currentChange({
- row: tableStore.table.data[0]
- })
+ menuListId.value = tableStore.table.data[0].id
+ // currentChange({
+ // row: tableStore.table.data[0]
+ // })
+ getTemplate()
}
})
@@ -259,10 +261,12 @@ const getTemplate = () => {
pageSize: 10000
}).then(res => {
templateList.value = res.data
+ currentChange({
+ row: { id: menuListId.value }
+ })
})
}
onMounted(() => {
- getTemplate()
tableStore.index()
})
diff --git a/src/views/govern/reportForms/luckysheet.vue b/src/views/govern/reportForms/luckysheet.vue
index e8cf2a5..783758b 100644
--- a/src/views/govern/reportForms/luckysheet.vue
+++ b/src/views/govern/reportForms/luckysheet.vue
@@ -18,7 +18,7 @@