diff --git a/src/pages/views/WatershedOneMap/newPart/mingquSz.vue b/src/pages/views/WatershedOneMap/newPart/mingquSz.vue index 533402e..cd47523 100644 --- a/src/pages/views/WatershedOneMap/newPart/mingquSz.vue +++ b/src/pages/views/WatershedOneMap/newPart/mingquSz.vue @@ -10,13 +10,7 @@
- - +
- - + +
@@ -144,7 +145,16 @@ allData.treesData = res.data; } }; - + const override = ({ option }) => { + allData.parentId = option.pid; + allData.curentId = option.key; + allData.treeId = option.id; + getTableData(); + if (option.children) { + return "toggleExpand"; + } + return "default"; + }; // 获取表格数据 const getTableData = async () => { let pramas = { @@ -166,13 +176,11 @@ }; //树节点点击事件 const nodeProps = ({ option }) => { + + return { - onClick() { - allData.parentId = option.pid; - allData.curentId = option.key; - allData.treeId = option.id; - getTableData(); - }, + + }; }; onMounted(() => { @@ -186,6 +194,7 @@ getTableData, GetIndexTree, nodeProps, + override, }; }, }; diff --git a/src/pages/views/WatershedOneMap/newPart/mingquSz.vue b/src/pages/views/WatershedOneMap/newPart/mingquSz.vue index 533402e..cd47523 100644 --- a/src/pages/views/WatershedOneMap/newPart/mingquSz.vue +++ b/src/pages/views/WatershedOneMap/newPart/mingquSz.vue @@ -10,13 +10,7 @@
- - + +
@@ -144,7 +145,16 @@ allData.treesData = res.data; } }; - + const override = ({ option }) => { + allData.parentId = option.pid; + allData.curentId = option.key; + allData.treeId = option.id; + getTableData(); + if (option.children) { + return "toggleExpand"; + } + return "default"; + }; // 获取表格数据 const getTableData = async () => { let pramas = { @@ -166,13 +176,11 @@ }; //树节点点击事件 const nodeProps = ({ option }) => { + + return { - onClick() { - allData.parentId = option.pid; - allData.curentId = option.key; - allData.treeId = option.id; - getTableData(); - }, + + }; }; onMounted(() => { @@ -186,6 +194,7 @@ getTableData, GetIndexTree, nodeProps, + override, }; }, }; diff --git a/src/pages/views/performance/statisticalAna.vue b/src/pages/views/performance/statisticalAna.vue index b118c9d..ecb909e 100644 --- a/src/pages/views/performance/statisticalAna.vue +++ b/src/pages/views/performance/statisticalAna.vue @@ -138,7 +138,7 @@ }, setup() { const allData = reactive({ - selectyear: String(new Date().getFullYear()), + selectyear: '', yearOptions: [], getyear: '2022', orgValue: 1, @@ -350,11 +350,14 @@ label: item.performName, }); }); + allData.selectyear = allData.yearOptions[0].value; + allData.getyear = allData.yearOptions[0].value; + changeyear(); } } onMounted(() => { getYear(); - changeyear(); + }); return { ...toRefs(allData),