Merge remote-tracking branch 'origin/main' into main

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(";");
+		if(riskLocationArr.length==2) {
 			ehsRisk.setRiskLocation1(riskLocationArr[0]);// 村 (社区)
 			ehsRisk.setRiskLocation2(riskLocationArr[1]);// 位置
+		}else {
+			ehsRisk.setRiskLocation1(riskLocationArr[0]);// 村 (社区)
+			ehsRisk.setRiskLocation2("");// 位置
+		}
 		// 涉及群众数量
 		String[] peopleNumArr = ehsRisk.getPeopleQuantity().split(";");
+		if(peopleNumArr.length==2) {
 			ehsRisk.setPeopleQuantity1(peopleNumArr[0]);// 户
 			ehsRisk.setPeopleQuantity2(peopleNumArr[1]);// 人
+		}else {
+			ehsRisk.setPeopleQuantity1(peopleNumArr[0]);// 户
+			ehsRisk.setPeopleQuantity2("");// 人
+		}
 		return ehsRisk;
 	}
 

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 {

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">