From c3049a1e371401ea1f32504c451c47e50063d41a Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Mon, 2 Sep 2024 09:34:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BA=BA=E5=91=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hr/archives/archivescont.vue        |  3 +-
 .../hr/archives/basicinformation/discTest.vue |  1 +
 .../basicinformation/personalityTest.vue      | 46 ++++++++++++++++++-
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/views/hr/archives/archivescont.vue b/src/views/hr/archives/archivescont.vue
index ffc00b4..72ad308 100644
--- a/src/views/hr/archives/archivescont.vue
+++ b/src/views/hr/archives/archivescont.vue
@@ -19,8 +19,7 @@ import EducationalExperience from "@/views/hr/archives/basicinformation/educatio
 import InnerWork from "@/views/hr/archives/basicinformation/innerwork.vue";	//集团内部工作履历
 import OutsideWork from "@/views/hr/archives/basicinformation/outsideWork.vue";			//集团外部工作履历
 import Editpwd from "@/views/hr/archives/basicinformation/editpwd.vue";			//修改登陆密码
-import CharacterColor from "@/views/hr/archives/basicinformation/charactercolor.vue"; //性格色彩
-import DiscTest from "@/views/hr/archives/basicinformation/discTest.vue"; //DISC测试结果
+
 import Rewardsandpunishments from "@/views/hr/archives/basicinformation/rewardsandpunishments.vue";	//奖惩记录
 import Appraisalrecord from "@/views/hr/archives/basicinformation/appraisalrecord.vue";				//考评记录
 import Talentinventory from "@/views/hr/archives/basicinformation/talentinventory.vue";				//人才盘点
diff --git a/src/views/hr/archives/basicinformation/discTest.vue b/src/views/hr/archives/basicinformation/discTest.vue
index 1b08cfb..33f9164 100644
--- a/src/views/hr/archives/basicinformation/discTest.vue
+++ b/src/views/hr/archives/basicinformation/discTest.vue
@@ -27,6 +27,7 @@ const discdrawRadar = ref(null)
 
 //页面加载前先获取测试数据
 onBeforeMount(()=>{
+	console.log("页面加载前先获取测试数据",props.usercont)
 	let sendData = {
 		id:props.usercont.number.toString()
 	}
diff --git a/src/views/hr/archives/basicinformation/personalityTest.vue b/src/views/hr/archives/basicinformation/personalityTest.vue
index 67648c6..d489a23 100644
--- a/src/views/hr/archives/basicinformation/personalityTest.vue
+++ b/src/views/hr/archives/basicinformation/personalityTest.vue
@@ -19,9 +19,53 @@ const props = defineProps({
 		}
 	} 
 });
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-30 14:52:29
+@ 功能: 判断现实哪种测验结果
+*/
+const isTestShouw = (val:number) => {
+    // console.log("判断现实哪种测验结果",props.usercont.isColorTrue)
+    switch (props.usercont.isColorTrue) {
+        case 1:
+            if(val == 1){
+                return true
+            }else{
+                return false
+            }
+            break;
+        case 3:
+            if(val == 2){
+                return true
+            }else{
+                return false
+            }
+            break;
+        case 4:
+            if(val == 3){
+                return false
+            }else{
+                return true
+            }
+            break;
+        case 5:
+            if(val == 3){
+                return true
+            }else{
+                return false
+            }
+            break;
+        default:
+            return false
+            break;
+    }
+}
 </script>
 <template>
-	<div>{{usercont}}</div>
+	<div>
+		<CharacterColor v-if="isTestShouw(1)" :usercont="props.usercont" :tabsid="props.tabsid" />
+		<DiscTest v-if="isTestShouw(2)" :usercont="props.usercont" :tabsid="props.tabsid" />
+	</div>
 </template>
 <style  lang='scss' scoped>