From 096730ba7ac32d00530d623274abc63258b2c413 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Mon, 15 Sep 2025 11:36:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=BA=93=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=20=E6=89=93=E5=BC=80=E5=B0=B1=E8=83=BD?=
 =?UTF-8?q?=E7=9C=8B=E8=A7=86=E9=A2=91=20=E8=A7=86=E9=A2=91=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=20=E6=92=AD=E6=94=BE=20100%=20=E9=9A=90=E6=82=A3?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=20=E7=BB=91=E5=AE=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/apply/viewRisk.vue            | 27 ++++++++++++++++++++-------
 pages/apply/viewVideo.vue           | 10 ++++------
 pages/apply/viewVideoplyplayer.nvue |  4 ++--
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/pages/apply/viewRisk.vue b/pages/apply/viewRisk.vue
index 47b1dfa..10369c4 100644
--- a/pages/apply/viewRisk.vue
+++ b/pages/apply/viewRisk.vue
@@ -31,21 +31,23 @@
 								<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.CHECKCONTENT" name="1">
-											<u-form-item label="检查内容" prop="CHECKCONTENT" borderBottom>
+										<uni-collapse-item :title="(index+1) + '. ' + item.CHECKCONTENT"
+											name="1">
+											<u-form-item label="检查内容" prop="Nav_Contents.CHECKCONTENT" borderBottom>
 												<!-- <u--input disabled disabledColor="#fff" v-model="item.CHECKCONTENT"
 													border="none" inputAlign="right"></u--input> -->
 
-												<u--textarea disabled disabledColor="#fff" v-model="item.CHECKCONTENT"
-													border="none" inputAlign="right" autoHeight></u--textarea>
+												<u--textarea disabled disabledColor="#fff"
+													v-model="item.Nav_Contents.CHECKCONTENT" border="none"
+													inputAlign="right" autoHeight></u--textarea>
 											</u-form-item>
 											<u-form-item v-if="model.ISDOWN=='是'" label="区域" prop="Nav_RiskArea.NAME"
 												borderBottom>
 												<u--input disabled disabledColor="#fff" v-model="item.Nav_RiskArea.NAME"
 													border="none" inputAlign="right"></u--input>
 											</u-form-item>
-											<u-form-item label="地址" prop="ADDRESS" borderBottom>
-												<u--input disabled disabledColor="#fff" v-model="item.ADDRESS"
+											<u-form-item label="地址" prop="HIDDEN_PLACE" borderBottom>
+												<u--input disabled disabledColor="#fff" v-model="item.HIDDEN_PLACE"
 													border="none" inputAlign="right"></u--input>
 											</u-form-item>
 											<u-form-item label="上报时间" prop="CREATE_TIME" borderBottom>
@@ -152,11 +154,22 @@
 					this.model.ISDOWN == '否' || this.model.ISDOWN == '') ? false : true))
 				json.IgnoreDataRule = true
 				json.Limit = 20
-				json.SelectField = ["CHECKCONTENT", "ADDRESS", "CREATE_TIME", "Nav_RiskArea.NAME"]
+				json.SelectField = ["Nav_Contents.CHECKCONTENT", "HIDDEN_PLACE", "CREATE_TIME", "Nav_RiskArea.NAME"]
 				PagedRisk(json).then(res => {
 					if (res.IsSuccessful) {
 						// this.model.ListShow = res.Data
 						this.total = res.TotalCount
+						res.Data.forEach(e => {
+							if (e.Nav_Contents && e.Nav_Contents.CHECKCONTENT) {
+								if (e.Nav_Contents.CHECKCONTENT.length > 15) {
+									e.CHECKCONTENT = e.Nav_Contents.CHECKCONTENT.substring(0, 15)+'...'
+								} else {
+									e.CHECKCONTENT = e.Nav_Contents.CHECKCONTENT
+								}
+							} else {
+								e.CHECKCONTENT = ''
+							}
+						})
 						if (paginate) {
 							this.model.ListShow = this.model.ListShow.concat(res.Data)
 						} else {
diff --git a/pages/apply/viewVideo.vue b/pages/apply/viewVideo.vue
index 80e4835..b229d75 100644
--- a/pages/apply/viewVideo.vue
+++ b/pages/apply/viewVideo.vue
@@ -134,6 +134,7 @@
 				this.model.RISK_AREA_ID = option.RISK_AREA_ID // 'FA89F8DA-0B46-4665-A8DD-3675829F6D6F'
 			this.OrgId = option.OrgId // 'B043B28B-BBC3-C452-6052-4FBA1457ABFA'
 			if (this.model.RISK_AREA_ID != undefined && this.model.RISK_AREA_ID != '') {
+				
 				// this.PagedCheckMain()//扫二维码 默认赋值
 				const json = initFilter(this.OrgId, null, "NAME", 0, 1);
 				json.IgnoreDataRule = true
@@ -144,13 +145,10 @@
 						this.model.RISK_AREA_NAME = res.Data[0].NAME
 					}
 				})
+				
+				this.pageIndex = 0
+				this.PagedVideo();
 			}
-			// var player = polyvPlayer({
-			// 	wrap: "#player",
-			// 	width: 400,
-			// 	height: 300,
-			// 	vid: vid, //云点播平台的视频唯一id。
-			// });
 		},
 		// mounted() {
 		// 	this.loadPlayerScript(this.loadPlayer);
diff --git a/pages/apply/viewVideoplyplayer.nvue b/pages/apply/viewVideoplyplayer.nvue
index 930058a..7e4d0aa 100644
--- a/pages/apply/viewVideoplyplayer.nvue
+++ b/pages/apply/viewVideoplyplayer.nvue
@@ -41,7 +41,8 @@
 				const polyvPlayer = window.polyvPlayer;
 				this.player = polyvPlayer({
 					wrap: '#player',
-					width: 300,
+					// width: 300,
+					with: '100%' ,
 					height: 300,
 					vid: this.vid,
 				});
@@ -121,5 +122,4 @@
 	.demo-ruleForm-thr>>>.u-cell__title-text {
 		font-size: 14px;
 	}
-
 </style>
\ No newline at end of file