From 5c068566178912fd3d484fee22c2d84c8efe5949 Mon Sep 17 00:00:00 2001
From: liukewei <huamar123>
Date: Tue, 26 Dec 2023 10:04:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E5=AE=BD=E5=BA=A6=20=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E9=A3=8E=E9=99=A9=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE=E6=97=A0=E6=B3=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EhsRiskServiceImpl.java       | 18 ++++++++++++++----
 ruoyi-ui/src/layout/components/AppMain.vue     |  4 ++--
 ruoyi-ui/src/views/ehs/ehsRisk/index.vue       |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsRisk/service/impl/EhsRiskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/ehsRisk/service/impl/EhsRiskServiceImpl.java
index 3daf822..fe58778 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsRisk/service/impl/EhsRiskServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsRisk/service/impl/EhsRiskServiceImpl.java
@@ -36,12 +36,22 @@ public class EhsRiskServiceImpl extends ServiceImpl<EhsRiskMapper, EhsRisk> impl
 		EhsRisk ehsRisk = ehsRiskMapper.selectEhsRiskByRiskId(riskId);
 		// 风险点位置
 		String[] riskLocationArr = ehsRisk.getRiskLocation().split(";");
-		ehsRisk.setRiskLocation1(riskLocationArr[0]);// 村 (社区)
-		ehsRisk.setRiskLocation2(riskLocationArr[1]);// 位置
+		if(riskLocationArr.length==2) {
+			ehsRisk.setRiskLocation1(riskLocationArr[0]);// 村 (社区)
+			ehsRisk.setRiskLocation2(riskLocationArr[1]);// 位置
+		}else {
+			ehsRisk.setRiskLocation1(riskLocationArr[0]);// 村 (社区)
+			ehsRisk.setRiskLocation2("");// 位置
+		}
 		// 涉及群众数量
 		String[] peopleNumArr = ehsRisk.getPeopleQuantity().split(";");
-		ehsRisk.setPeopleQuantity1(peopleNumArr[0]);// 户
-		ehsRisk.setPeopleQuantity2(peopleNumArr[1]);// 人
+		if(peopleNumArr.length==2) {
+			ehsRisk.setPeopleQuantity1(peopleNumArr[0]);// 户
+			ehsRisk.setPeopleQuantity2(peopleNumArr[1]);// 人
+		}else {
+			ehsRisk.setPeopleQuantity1(peopleNumArr[0]);// 户
+			ehsRisk.setPeopleQuantity2("");// 人
+		}
 		return ehsRisk;
 	}
 
diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue
index a25c562..75b3d04 100644
--- a/ruoyi-ui/src/layout/components/AppMain.vue
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@@ -60,8 +60,8 @@ export default {
 }
 
 ::-webkit-scrollbar {
-  width: 6px;
-  height: 6px;
+  width: 10px;
+  height: 12px;
 }
 
 ::-webkit-scrollbar-track {
diff --git a/ruoyi-ui/src/views/ehs/ehsRisk/index.vue b/ruoyi-ui/src/views/ehs/ehsRisk/index.vue
index 256a898..cd81454 100644
--- a/ruoyi-ui/src/views/ehs/ehsRisk/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsRisk/index.vue
@@ -227,7 +227,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="ehsRiskList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="ehsRiskList" @selection-change="handleSelectionChange" max-height="550" style="width: 100%">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="" align="center" prop="riskId" />-->
       <el-table-column label="风险点等级" align="center" prop="riskGrade">