1.应急救援抢险物资模块，物资名称录入完成，查询功能优化，重置bug修复

2.风险管理模块，修改时风险点位置和涉及群众数量回显失败bug修复
3.企业基本信息模块列表展示bug修改(企业现状列表展示为0,1;优化为停业,正常经营)

ruoyi-ui/src/assets/materialClass.json

@@ -17,13 +17,13 @@
     "value": "v1-5",
     "label": "防护网"
   }, {
-    "value": "jiaohu",
+    "value": "v1-6",
     "label": "安全带"
   }, {
-    "value": "v1-6",
+    "value": "v1-7",
     "label": "安全钩"
   }, {
-    "value": "v1-7",
+    "value": "v1-8",
     "label": "救生绳"
   }
   ]
@@ -32,36 +32,81 @@
     "value": "v2",
     "label": "个人防护物资和装备",
     "children": [{
-      "value": "v2-2",
+      "value": "v2-1",
       "label": "消防头盔"
     }, {
-      "value": "v2-3",
+      "value": "v2-2",
       "label": "消防手套"
     }, {
-      "value": "v2-4",
+      "value": "v2-3",
       "label": "消防靴"
     }, {
-      "value": "v2-5",
+      "value": "v2-4",
       "label": "避火服(防火服)"
     }, {
-      "value": "v2-6",
+      "value": "v2-5",
       "label": "隔热服"
     }, {
-      "value": "v2-7",
+      "value": "v2-6",
       "label": "防毒面罩"
     }, {
-      "value": "v2-8",
+      "value": "v2-7",
       "label": "救生衣"
     }, {
-      "value": "v2-9",
+      "value": "v2-8",
       "label": "反光背心"
     }, {
-      "value": "v2-10",
+      "value": "v2-9",
       "label": "氧气(空气)呼吸器"
     }, {
-      "value": "v2-11",
+      "value": "v2-10",
       "label": "呼吸器充填泵"
     }
     ]
+  },
+  {
+    "value" : "v3",
+    "label": "现场应急通信装备",
+    "children": [{
+      "value": "v3-1",
+      "label": "应急通信指挥车"
+    },{
+      "value": "v3-2",
+      "label": "救灾无线通信系统"
+    }, {
+      "value": "v3-3",
+      "label": "特种环境话音通信装置"
+    }, {
+      "value": "v3-4",
+      "label": "对讲机"
+    }, {
+      "value": "v3-5",
+      "label": "卫星电话"
+    }
+    ]
+  },
+  {
+    "value" : "v4",
+    "label": "救援保障装备",
+    "children": [{
+      "value": "v4-1",
+      "label": "应急装备和物资保障车"
+    },{
+      "value": "v4-2",
+      "label": "多功能充气发电照明车"
+    }, {
+      "value": "v4-3",
+      "label": "无人机"
+    }, {
+      "value": "v4-4",
+      "label": "发电机"
+    }, {
+      "value": "v4-5",
+      "label": "移动电缆"
+    }, {
+      "value": "v4-6",
+      "label": "照明灯具"
+    }
+    ]
   }
 ]

ruoyi-ui/src/assets/materialClass2.json

@@ -0,0 +1,103 @@
+[{
+    "value" : "v1",
+    "label": "抢险物料",
+    "children": [{
+      "value": "v1-1",
+      "label": "块石"
+    },{
+      "value": "v1-2",
+      "label": "铅丝"
+    }, {
+      "value": "v1-3",
+      "label": "铅丝笼网片"
+    }, {
+      "value": "v1-4",
+      "label": "钢管"
+    }, {
+      "value": "v1-5",
+      "label": "无土沙袋"
+    }
+    ]
+  },
+  {
+    "value" : "v2",
+    "label": "查险抢险设备器材",
+    "children": [{
+      "value": "v2-1",
+      "label": "小型挖掘机"
+    },{
+      "value": "v2-2",
+      "label": "推土机"
+    }, {
+      "value": "v2-3",
+      "label": "铲车"
+    }, {
+      "value": "v2-4",
+      "label": "便携式打桩机"
+    }, {
+      "value": "v2-5",
+      "label": "排涝设备"
+    }, {
+      "value": "v2-6",
+      "label": "发电照明一体机"
+    }, {
+      "value": "v2-7",
+      "label": "移动升降照明灯"
+    }, {
+      "value": "v2-8",
+      "label": "管涌探测仪"
+    }
+    ]
+  },
+  {
+    "value" : "v3",
+    "label": "救生物资设备器材",
+    "children": [{
+      "value": "v3-1",
+      "label": "救生衣"
+    },{
+      "value": "v3-2",
+      "label": "救生圈"
+    }, {
+      "value": "v3-3",
+      "label": "冲锋舟"
+    }, {
+      "value": "v3-4",
+      "label": "橡皮艇"
+    }, {
+      "value": "v3-5",
+      "label": "救生抛投器"
+    }, {
+      "value": "v3-6",
+      "label": "水陆两栖救援舟"
+    }, {
+      "value": "v3-7",
+      "label": "水上救生遥控机器人"
+    }, {
+      "value": "v3-8",
+      "label": "搜救强性磁铁组合"
+    }, {
+      "value": "v3-9",
+      "label": "潜水设备"
+    }
+    ]
+  },
+  {
+    "value" : "v4",
+    "label": "抗旱物资设备",
+    "children": [{
+      "value": "v4-1",
+      "label": "打井机"
+    },{
+      "value": "v4-2",
+      "label": "洗井机"
+    }, {
+      "value": "v4-3",
+      "label": "净水设备"
+    }, {
+      "value": "v4-4",
+      "label": "送水车"
+    }
+    ]
+  }
+]

ruoyi-ui/src/assets/materialClass3.json

@@ -0,0 +1,175 @@
+[{
+    "value" : "v1",
+    "label": "防火车辆",
+    "children": [{
+      "value": "v1-1",
+      "label": "通信指挥车"
+    },{
+      "value": "v1-2",
+      "label": "运兵车"
+    }, {
+      "value": "v1-3",
+      "label": "巡护摩托车"
+    }, {
+      "value": "v1-4",
+      "label": "消防水车"
+    }, {
+      "value": "v1-5",
+      "label": "物资运输车"
+    }
+    ]
+  },
+  {
+    "value" : "v2",
+    "label": "通信指挥器材类",
+    "children": [{
+      "value": "v2-1",
+      "label": "车载台"
+    },{
+      "value": "v2-2",
+      "label": "移动中继台"
+    }, {
+      "value": "v2-3",
+      "label": "卫星定位仪"
+    }, {
+      "value": "v2-4",
+      "label": "望远镜"
+    }, {
+      "value": "v2-5",
+      "label": "地形图和林相图"
+    }
+    ]
+  },
+  {
+    "value" : "v3",
+    "label": "野外生存用品",
+    "children": [{
+      "value": "v3-1",
+      "label": "指挥帐篷"
+    },{
+      "value": "v3-2",
+      "label": "便携帐篷"
+    }, {
+      "value": "v3-3",
+      "label": "羽绒睡袋"
+    }, {
+      "value": "v3-4",
+      "label": "防潮褥垫"
+    }, {
+      "value": "v3-5",
+      "label": "气垫床"
+    }, {
+      "value": "v3-6",
+      "label": "急救包"
+    }, {
+      "value": "v3-7",
+      "label": "药品盒"
+    }, {
+      "value": "v3-8",
+      "label": "野战食品"
+    }
+    ]
+  },
+  {
+    "value" : "v4",
+    "label": "基本灭火装备",
+    "children": [{
+      "value": "v4-1",
+      "label": "灭火机"
+    },{
+      "value": "v4-2",
+      "label": "灭火水枪"
+    }, {
+      "value": "v4-3",
+      "label": "二号工具"
+    }, {
+      "value": "v4-4",
+      "label": "移动水泵灭火系统"
+    }, {
+      "value": "v4-5",
+      "label": "油锯"
+    }, {
+      "value": "v4-6",
+      "label": "割灌机"
+    }, {
+      "value": "v4-7",
+      "label": "清火组合工具"
+    }, {
+      "value": "v4-8",
+      "label": "油桶"
+    }, {
+      "value": "v4-9",
+      "label": "点火器"
+    }, {
+      "value": "v4-10",
+      "label": "小型发电机"
+    }, {
+      "value": "v4-11",
+      "label": "砍刀"
+    }, {
+      "value": "v4-12",
+      "label": "大斧"
+    }, {
+      "value": "v4-13",
+      "label": "铁锨"
+    }, {
+      "value": "v4-14",
+      "label": "泡沫灭火剂"
+    }, {
+      "value": "v4-15",
+      "label": "火场侦查无人机"
+    }, {
+      "value": "v4-16",
+      "label": "头灯"
+    }, {
+      "value": "v4-17",
+      "label": "手电"
+    }
+    ]
+  },
+  {
+    "value" : "v5",
+    "label": "基本防护装备",
+    "children": [{
+      "value": "v5-1",
+      "label": "消防头盔"
+    },{
+      "value": "v5-2",
+      "label": "阻燃服装"
+    }, {
+      "value": "v5-3",
+      "label": "逃生面罩"
+    }, {
+      "value": "v5-4",
+      "label": "防扎鞋"
+    }, {
+      "value": "v5-5",
+      "label": "阻燃手套"
+    }, {
+      "value": "v5-6",
+      "label": "防烟眼镜"
+    }, {
+      "value": "v5-7",
+      "label": "避火罩"
+    }
+    ]
+  },
+  {
+    "value" : "v6",
+    "label": "基本生活用品",
+    "children": [{
+      "value": "v6-1",
+      "label": "作训服"
+    },{
+      "value": "v6-2",
+      "label": "生活备品"
+    }, {
+      "value": "v6-3",
+      "label": "大小背包"
+    }, {
+      "value": "v6-4",
+      "label": "棉大衣"
+    }
+    ]
+  }
+]

ruoyi-ui/src/assets/materialClass4.json

@@ -0,0 +1,127 @@
+[{
+  "value" : "v1",
+  "label": "安置类",
+  "children": [{
+    "value": "v1-1",
+    "label": "12㎡单帐篷"
+  },{
+    "value": "v1-2",
+    "label": "12㎡棉帐篷"
+  }, {
+    "value": "v1-3",
+    "label": "折叠床"
+  }, {
+    "value": "v1-4",
+    "label": "折叠桌椅"
+  }, {
+    "value": "v1-5",
+    "label": "睡袋"
+  }
+  ]
+}, {
+  "value" : "v2",
+  "label": "被服类",
+  "children": [{
+    "value": "v2-1",
+    "label": "棉被"
+  },{
+    "value": "v2-2",
+    "label": "棉褥"
+  }, {
+    "value": "v2-3",
+    "label": "棉大衣"
+  }, {
+    "value": "v2-4",
+    "label": "防寒服"
+  }, {
+    "value": "v2-5",
+    "label": "棉衣"
+  }, {
+    "value": "v2-6",
+    "label": "单衣库(迷彩服)"
+  }, {
+    "value": "v2-7",
+    "label": "冲锋衣"
+  }, {
+    "value": "v2-8",
+    "label": "毛毯"
+  }, {
+    "value": "v2-9",
+    "label": "毛巾被"
+  }, {
+    "value": "v2-10",
+    "label": "雨衣"
+  }, {
+    "value": "v2-11",
+    "label": "雨鞋"
+  }
+  ]
+}, {
+  "value" : "v3",
+  "label": "装具类",
+  "children": [{
+    "value": "v3-1",
+    "label": "帐篷照明灯"
+  },{
+    "value": "v3-2",
+    "label": "应急灯/场地照明灯"
+  }, {
+    "value": "v3-3",
+    "label": "1.5千瓦应急发电机"
+  }, {
+    "value": "v3-4",
+    "label": "3千瓦应急发电机"
+  }, {
+    "value": "v3-5",
+    "label": "手提式强光手电"
+  }, {
+    "value": "v3-6",
+    "label": "净水设备/净水机"
+  }, {
+    "value": "v3-7",
+    "label": "软体贮水罐"
+  }, {
+    "value": "v3-8",
+    "label": "家庭应急包"
+  }, {
+    "value": "v3-9",
+    "label": "救生衣"
+  }, {
+    "value": "v3-10",
+    "label": "救生圈"
+  }
+  ]
+}, {
+  "value" : "v4",
+  "label": "食品或其他类",
+  "children": [{
+    "value": "v4-1",
+    "label": "方便面"
+  },{
+    "value": "v4-2",
+    "label": "方便食品"
+  }, {
+    "value": "v4-3",
+    "label": "自热食品"
+  }, {
+    "value": "v4-4",
+    "label": "食用油"
+  }, {
+    "value": "v4-5",
+    "label": "大米"
+  }, {
+    "value": "v4-6",
+    "label": "面粉"
+  }, {
+    "value": "v4-7",
+    "label": "挂面"
+  }, {
+    "value": "v4-8",
+    "label": "矿泉水"
+  }, {
+    "value": "v4-9",
+    "label": "火腿肠"
+  }
+  ]
+}
+]

ruoyi-ui/src/views/ehs/ehsEnterprise/index.vue

@@ -209,7 +209,6 @@
       <el-table-column label="注册资本" align="center" prop="registeredCapital" />
       <el-table-column label="营业执照核定的经营范围" align="center" prop="businessScope" />
       <el-table-column label="企业实际从事的经营项目" align="center" prop="businessProjects" />
-      <el-table-column label="企业现状" align="center" prop="enterpriseStatus" />
       <el-table-column label="分管安全副职姓名" align="center" prop="safetyManagerName" />
       <el-table-column label="分管安全副职电话" align="center" prop="safetyManagerTel" />
       <el-table-column label="备注" align="center" prop="remark" />

ruoyi-ui/src/views/ehs/ehsMaterial/index.vue

@@ -20,24 +20,38 @@
             :value="dict.value"
           ></el-option>
         </el-select>
+      </el-form-item
+      >
+      <el-form-item label="物资名称"   prop="classSecond">
+        <el-cascader style="width:500px"
+                     v-model="queryParams.materialNameId"
+                     :options="options"
+                     :props="{ multiple: false, checkStrictly: true }"
+                     @change="handleQueryChange"></el-cascader>
       </el-form-item>
-      <el-form-item label="类别"   prop="classSecond">
+<!--      <el-form-item label="类别"   prop="classSecond">
 
         <el-cascader style="width:500px"
                      v-model="queryParams.materialNameId"
                      :options="options"
                      :props="{ multiple: false, checkStrictly: true }"
                      @change="handleQueryChange"></el-cascader>
-      </el-form-item>
+      </el-form-item>-->
 
-      <el-form-item label="物资名称" prop="materialName">
+<!--      <el-form-item label="物资名称" prop="materialName">
         <el-input
           v-model="queryParams.materialName"
           placeholder="请输入物资名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
+
+
+
+
+
+
       <!--<el-form-item label="规格/参数" prop="materialSpecs">
         <el-input
           v-model="queryParams.materialSpecs"
@@ -332,14 +346,17 @@
   import {listAllDept } from "@/api/system/dept";
   import {addEhsMaterialDetail,listEhsMaterialDetail, updateEhsMaterialDetail , delEhsMaterialDetail} from "@/api/ehs/EhsMaterialDetail";
   import { getDicts } from "@/api/system/dict/data";
-  import options from '../../../assets/materialClass';
+  import material1 from '../../../assets/materialClass.json';
+  import material2 from '../../../assets/materialClass2.json';
+  import material3 from '../../../assets/materialClass3.json';
+  import material4 from '../../../assets/materialClass4.json';
   export default {
     name: "EhsMaterial",
    // dicts: ['material_class_1','material_class_2','material_class_3','material_class_4'],
 
     data() {
       return {
-        options:options,
+        options:material1,
         curDict:[],
         // 遮罩层
         loading: true,
@@ -432,6 +449,15 @@
       this.getListAllDept();
       this.deptShow = this.$store.state.user.parentId==0 ?true :false;
       console.log(this.curDict);
+      if (this.materialClass == 1){
+        this.options = material1;
+      }else if (this.materialClass == 2){
+        this.options = material2;
+      }else if (this.materialClass == 3){
+        this.options = material3;
+      }else if (this.materialClass == 4){
+        this.options = material4;
+      }
     },
 
     methods: {
@@ -513,6 +539,8 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.queryParams.materialNameId = null;
+        this.queryParams.materialName = null;
         this.resetForm("queryForm");
         this.handleQuery();
       },

ruoyi-ui/src/views/ehs/ehsRisk/index.vue

@@ -390,7 +390,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="村级责任人" prop="region"> </el-form-item>
+        <el-form-item label="乡级责任人" prop="region"> </el-form-item>
         <el-row>
           <el-col :span="8">
             <el-form-item label="姓名" prop="villageName1">
@@ -621,6 +621,14 @@
           this.form = response.data;
           this.open = true;
           this.title = "修改风险信息";
+          // 风险点位置回显
+          const split1 = response.data.riskLocation.split(";")
+          this.form.riskLocation1 = split1[0];
+          this.form.riskLocation2 = split1[1];
+          // 涉及群众数量回显
+          const split2 = response.data.peopleQuantity.split(";")
+          this.form.peopleQuantity1 = split2[0];
+          this.form.peopleQuantity2 = split2[1];
         });
       },
       /** 提交按钮 */