From 52aaef90028427126c15f7296ba1bd1efa52a86d Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Fri, 17 Nov 2023 10:53:51 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=2012797=20=E9=9A=90=E6=82=A3?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E9=80=89=E6=8B=A9"=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E9=9A=90=E6=82=A3"=E5=90=8E=20=E5=BA=94=E8=AF=A5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8B=E9=9D=A2=E6=89=80=E6=9C=89=E7=9A=84=E9=9A=90?=
 =?UTF-8?q?=E6=82=A3=20=E9=80=89=E6=8B=A9=E2=80=9C=E4=BA=BA=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8D=E5=AE=89=E5=85=A8=E5=9B=A0=E7=B4=A0=E2=80=9D=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8B=E9=9D=A2=E7=9A=84=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E7=9A=84=E9=9A=90=E6=82=A3=20=E6=B3=A8=E6=84=8F=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E6=90=9C=E7=B4=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/evaluation/branch_hazard_assessment/index.vue      | 5 ++++-
 .../branch_hazard_assessment/components/evaluation.vue       | 1 +
 .../keyproject_evaluation/branch_hazard_assessment/index.vue | 2 +-
 .../personnel_evaluation_status/components/hidden_list.vue   | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/evaluation/branch_hazard_assessment/index.vue b/src/views/evaluation/branch_hazard_assessment/index.vue
index 92425b1..5261b4e 100644
--- a/src/views/evaluation/branch_hazard_assessment/index.vue
+++ b/src/views/evaluation/branch_hazard_assessment/index.vue
@@ -1,6 +1,9 @@
 <template>
   <div>
-    <component :is="activeName" />
+    <List v-show="activeName=='List'"/>
+    <Evaluation v-if="activeName=='Evaluation'"/>
+    <HiddenInfo v-if="activeName=='HiddenInfo'"/>
+    <!--    <component :is="activeName" />-->
   </div>
 </template>
 
diff --git a/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue b/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue
index d665dc3..03460a9 100644
--- a/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue
+++ b/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue
@@ -65,6 +65,7 @@
             <Treeselect
               :options="hiddenTypeList"
               :normalizer="normalizer"
+              :disable-branch-nodes="true"
               v-model="searchForm.HIDDENTYPE"
               placeholder="请选择隐患类型"
               no-options-text="暂无数据"
diff --git a/src/views/keyproject_evaluation/branch_hazard_assessment/index.vue b/src/views/keyproject_evaluation/branch_hazard_assessment/index.vue
index ae855b1..5e38916 100644
--- a/src/views/keyproject_evaluation/branch_hazard_assessment/index.vue
+++ b/src/views/keyproject_evaluation/branch_hazard_assessment/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <List v-if="activeName=='List'"/>
+    <List v-show="activeName=='List'"/>
     <Evaluation v-if="activeName=='Evaluation'"/>
     <KeyProjectHidden v-if="activeName=='KeyProjectHidden'" active-name="Evaluation"/>
   </div>
diff --git a/src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue b/src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue
index daf9e7e..f7f545c 100644
--- a/src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue
+++ b/src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue
@@ -36,6 +36,7 @@
             <Treeselect
               :options="hiddenTypeList"
               :normalizer="normalizer"
+              :disable-branch-nodes="true"
               v-model="searchForm.HIDDENTYPE"
               placeholder="请选择隐患类型"
               no-options-text="暂无数据"