From 90ee75b39f2201b7bd3725d4db3fdbd109462519 Mon Sep 17 00:00:00 2001
From: Alioo <ali1996110@163.com>
Date: 星期一, 24 二月 2025 15:08:18 +0800
Subject: [PATCH] !90 Merge branch 'develop1.0' into develop_alioo Merge pull request !90 from Alioo/develop_alioo
---
zhitan-vue/src/views/energyconservation/projectmanage/projectmanage/projectManage.vue | 1 -
zhitan-vue/src/views/modelconfiguration/indexwarehouse/indexWarehouse.vue | 5 +++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zhitan-vue/src/views/energyconservation/projectmanage/projectmanage/projectManage.vue b/zhitan-vue/src/views/energyconservation/projectmanage/projectmanage/projectManage.vue
index 72cb99b..5cb9f23 100644
--- a/zhitan-vue/src/views/energyconservation/projectmanage/projectmanage/projectManage.vue
+++ b/zhitan-vue/src/views/energyconservation/projectmanage/projectmanage/projectManage.vue
@@ -40,7 +40,6 @@
<el-table-column prop="completionTime" label="瀹屾垚鏃堕棿" show-overflow-tooltip align="center" />
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" show-overflow-tooltip align="center" />
<el-table-column prop="remark" label="澶囨敞" show-overflow-tooltip align="center" />
-
<el-table-column label="鎿嶄綔" width="300" align="center">
<template #default="scope">
<!-- <el-button link type="primary" icon="Files" @click=""> 闄勪欢 </el-button> -->
diff --git a/zhitan-vue/src/views/modelconfiguration/indexwarehouse/indexWarehouse.vue b/zhitan-vue/src/views/modelconfiguration/indexwarehouse/indexWarehouse.vue
index 39fe733..a39fc47 100644
--- a/zhitan-vue/src/views/modelconfiguration/indexwarehouse/indexWarehouse.vue
+++ b/zhitan-vue/src/views/modelconfiguration/indexwarehouse/indexWarehouse.vue
@@ -65,7 +65,7 @@
<treeNodeModal
ref="treeNodeModalRef"
@getList="getTreeList"
- modelCode="JCZBK_CODE"
+ :modelCode="modelCode"
@addTreeList="addTreeList"
@addTreeSelectList="addTreeSelectList"
/>
@@ -83,6 +83,7 @@
let treeRef = ref()
let tab = ref(1)
let treeData = ref([])
+const modelCode = proxy.$route.query.modelCode || "JCZBK_CODE"
const defaultProps = ref({
children: "children",
@@ -113,7 +114,7 @@
let statisticalIndicatorManagementRef = ref(null)
//鑾峰彇鏍戝垪琛�
function getTreeList() {
- treeList({ modelCode: "JCZBK_CODE" }).then((res) => {
+ treeList({ modelCode: proxy.$route.query.modelCode || "JCZBK_CODE" }).then((res) => {
let { data } = res
treeData.value = data
let chooseNode = null
--
Gitblit v1.9.3