From cdc9a135fb70a8ac9a71a52d37e4236bd5915a22 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Sat, 25 Oct 2025 09:29:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3=E3=80=81=E9=A3=8E=E9=99=A9?=
 =?UTF-8?q?=20=E6=9F=A5=E7=9C=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/apply/viewEvaluation.vue | 13 ++++++++++---
 pages/apply/viewRisk.vue       | 10 +++++-----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/pages/apply/viewEvaluation.vue b/pages/apply/viewEvaluation.vue
index 2875951..0720109 100644
--- a/pages/apply/viewEvaluation.vue
+++ b/pages/apply/viewEvaluation.vue
@@ -31,11 +31,17 @@
 								<uni-collapse :border="false" accordion>
 									<uni-card style="margin-bottom: 5px;" margin="0" spacing="0" :is-shadow="false"
 										v-for="(item, index) in model.ListShow">
-										<uni-collapse-item :title="(index+1) + '. ' + item.Nav_RiskName.NAME" name="1">
-											<u-form-item label="风险名称" prop="Nav_RiskName.NAME" borderBottom>
+										<uni-collapse-item :title="(index+1) + '. ' + item.RISK_NAME" name="1">
+										<!-- <uni-collapse-item :title="(index+1) + '. ' + item.Nav_RiskName.NAME" name="1"> -->
+											<!-- <u-form-item label="风险名称" prop="Nav_RiskName.NAME" borderBottom>
 												<u--textarea disabled disabledColor="#fff"
 													v-model="item.Nav_RiskName.NAME" border="none" inputAlign="right"
 													autoHeight></u--textarea>
+											</u-form-item> -->
+											<u-form-item label="风险名称" prop="RISK_NAME" borderBottom>
+												<u--textarea disabled disabledColor="#fff"
+													v-model="item.RISK_NAME" border="none" inputAlign="right"
+													autoHeight></u--textarea>
 											</u-form-item>
 											<u-form-item label="风险描述" prop="RISK_DESCRIPTION" borderBottom>
 												<u--textarea disabled disabledColor="#fff"
@@ -161,7 +167,8 @@
 					this.model.ISDOWN == '否' || this.model.ISDOWN == '') ? false : true))
 				json.IgnoreDataRule = true
 				json.Limit = this.pageSize
-				json.SelectField = ["Nav_RiskName.NAME", 'EVALUATE_LEVEL', 'Nav_Type.NAME', 'EMERGENCY',
+				// "Nav_RiskName.NAME",
+				json.SelectField = ['RISK_NAME','EVALUATE_LEVEL', 'Nav_Type.NAME', 'EMERGENCY',
 					'RISK_DESCRIPTION', 'Nav_Details.MEASURES_NAME'
 				]
 				PagedEvaluateRisk(json).then(res => {
diff --git a/pages/apply/viewRisk.vue b/pages/apply/viewRisk.vue
index a0a43cc..fe5cf90 100644
--- a/pages/apply/viewRisk.vue
+++ b/pages/apply/viewRisk.vue
@@ -186,7 +186,7 @@
 					this.model.ISDOWN == '否' || this.model.ISDOWN == '') ? false : true))
 				json.IgnoreDataRule = true
 				json.Limit = 20
-				json.SelectField = ['HIDDEN_DESCRIPTION', 'RECTIFICATION_MEASURES',
+				json.SelectField = ['Nav_Question.DESCREPTION', 'RECTIFICATION_MEASURES',
 					'Nav_RectifyPhotoas.Nav_ImgFile.FILE_PATH', 'Nav_Contents.CHECKCONTENT', 'RECITIFY_TIME',
 					'HIDDEN_LEVEL', 'HIDDEN_PLACE', 'CREATE_TIME', 'Nav_RiskArea.NAME', 'Nav_RecitifyUser.NAME',
 					'Nav_AcceptUser.NAME', 'Nav_ImplementUser.NAME'
@@ -197,11 +197,11 @@
 						this.total = res.TotalCount
 						var FILE_PATH = ''
 						res.Data.forEach(e => {
-							if (e.HIDDEN_DESCRIPTION != null && e.HIDDEN_DESCRIPTION != undefined) {
-								if (e.HIDDEN_DESCRIPTION.length > 15) {
-									e.HIDDEN_DESCRIPTION = e.HIDDEN_DESCRIPTION.substring(0, 15) + '...'
+							if (e.Nav_Question != null && e.Nav_Question.DESCREPTION != null && e.Nav_Question.DESCREPTION != undefined) {
+								if (e.Nav_Question.DESCREPTION.length > 15) {
+									e.HIDDEN_DESCRIPTION = e.Nav_Question.DESCREPTION.substring(0, 15) + '...'
 								} else {
-									e.HIDDEN_DESCRIPTION = e.HIDDEN_DESCRIPTION
+									e.HIDDEN_DESCRIPTION = e.Nav_Question.DESCREPTION
 								}
 							} else {
 								e.HIDDEN_DESCRIPTION = ''