diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsLawEnforcementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsLawEnforcementController.java index 5cb5589..161c0ff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsLawEnforcementController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsLawEnforcementController.java @@ -121,7 +121,7 @@ public class EhsLawEnforcementController extends BaseController { public void importTemplate(HttpServletResponse response) throws IOException { List teamWorkerList = new ArrayList<>(); // 获取企业类别字典数据 - List enterpriseTypeData = dictTypeService.selectDictDataByType("enterprise_type"); + List enterpriseTypeData = dictTypeService.selectDictDataByType("enterprise_category"); String[] header = {"单位名称#", "地址#", diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsHiddenDanger/domain/EhsHiddenDanger.java b/ruoyi-system/src/main/java/com/ruoyi/ehsHiddenDanger/domain/EhsHiddenDanger.java index ef1d1ae..e01a375 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/ehsHiddenDanger/domain/EhsHiddenDanger.java +++ b/ruoyi-system/src/main/java/com/ruoyi/ehsHiddenDanger/domain/EhsHiddenDanger.java @@ -75,7 +75,7 @@ public class EhsHiddenDanger extends BaseEntity /** 整改责任人 */ @Excel(name = "整改责任人") - private Long principalName; + private String principalName; /** 整改照片 */ @Excel(name = "整改照片") diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsDocTransferMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsDocTransferMapper.xml index c604f49..0201c9d 100644 --- a/ruoyi-system/src/main/resources/mapper/ehs/EhsDocTransferMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsDocTransferMapper.xml @@ -48,7 +48,6 @@ SELECT t.* FROM ehs_document d,ehs_doc_transfer t WHERE d.id = t.document_id AND d.id = #{id} - order by t.transfer_time desc diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsHiddenDangerMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsHiddenDangerMapper.xml index 390c718..3c2da28 100644 --- a/ruoyi-system/src/main/resources/mapper/ehs/EhsHiddenDangerMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsHiddenDangerMapper.xml @@ -64,6 +64,7 @@ and hidden_danger_grade = #{hiddenDangerGrade} and hidden_danger_type = #{hiddenDangerType} and FIND_IN_SET( #{assistDept}, assist_dept ) + and area_id = #{areaId} AND diff --git a/ruoyi-ui/src/assets/materialClass5.json b/ruoyi-ui/src/assets/materialClass5.json new file mode 100644 index 0000000..34c19ff --- /dev/null +++ b/ruoyi-ui/src/assets/materialClass5.json @@ -0,0 +1,151 @@ +[{ + "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": "v1-6", + "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" : "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": "面粉" + }, { + "value": "v4-7", + "label": "挂面" + }, { + "value": "v4-8", + "label": "矿泉水" + }, { + "value": "v4-9", + "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": "便携式远距离烟花爆竹探测仪" + } + ] +}, { + "value" : "v7", + "label": "工贸监管", + "children": [{ + "value": "v7-1", + "label": "红外测温仪" + } + ] +} +] diff --git a/ruoyi-ui/src/assets/materialClass6.json b/ruoyi-ui/src/assets/materialClass6.json new file mode 100644 index 0000000..9d78faa --- /dev/null +++ b/ruoyi-ui/src/assets/materialClass6.json @@ -0,0 +1,28 @@ +[{ + "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": "v1-6", + "label": "强光手电筒" + }, { + "value": "v1-7", + "label": "口哨" + } + ] +} +] diff --git a/ruoyi-ui/src/assets/materialClass7.json b/ruoyi-ui/src/assets/materialClass7.json new file mode 100644 index 0000000..e8a895f --- /dev/null +++ b/ruoyi-ui/src/assets/materialClass7.json @@ -0,0 +1,34 @@ +[{ + "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": "v1-6", + "label": "注药注水器械" + }, { + "value": "v1-7", + "label": "喷烟机" + }, { + "value": "v1-8", + "label": "喷雾机" + }, { + "value": "v1-9", + "label": "粉碎机" + } + ] +} +] diff --git a/ruoyi-ui/src/assets/materialClass8.json b/ruoyi-ui/src/assets/materialClass8.json new file mode 100644 index 0000000..6731748 --- /dev/null +++ b/ruoyi-ui/src/assets/materialClass8.json @@ -0,0 +1,75 @@ +[{ + "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": "v2-9", + "label": "通风设备" + }, { + "value": "v2-10", + "label": "锐边保护垫" + }, { + "value": "v2-11", + "label": "液压机动泵" + }, { + "value": "v2-12", + "label": "手动泵" + }, { + "value": "v2-13", + "label": "液压扩张器" + }, { + "value": "v2-14", + "label": "液压剪扩器" + }, { + "value": "v2-15", + "label": "液压剪切器" + }, { + "value": "v2-16", + "label": "液压撑顶器" + } + ] +} +] diff --git a/ruoyi-ui/src/views/ehs/ehsDocument/index.vue b/ruoyi-ui/src/views/ehs/ehsDocument/index.vue index 369454e..fc9db45 100644 --- a/ruoyi-ui/src/views/ehs/ehsDocument/index.vue +++ b/ruoyi-ui/src/views/ehs/ehsDocument/index.vue @@ -386,7 +386,11 @@ export default { // 表单参数 form: {}, // 表单校验 - rules: {}, + rules: { + docName: [ + { required: true, message: "公文名称不能为空", trigger: "blur" } + ], + }, }; }, created() { diff --git a/ruoyi-ui/src/views/ehs/ehsEnterprise/index.vue b/ruoyi-ui/src/views/ehs/ehsEnterprise/index.vue index dfd5aea..829670a 100644 --- a/ruoyi-ui/src/views/ehs/ehsEnterprise/index.vue +++ b/ruoyi-ui/src/views/ehs/ehsEnterprise/index.vue @@ -446,6 +446,9 @@ export default { enterpriseScale: [ { required: true, message: "不能为空", trigger: "change" } ], + leaderTel: [ + { pattern:/^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/, message: "联系电话必须是手机或固话(区号-固话)", trigger: "change" } + ], safetyManagerTel: [ { pattern:/^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/, message: "联系电话必须是手机或固话(区号-固话)", trigger: "change" } ], diff --git a/ruoyi-ui/src/views/ehs/ehsFloodDroughtTeam/index.vue b/ruoyi-ui/src/views/ehs/ehsFloodDroughtTeam/index.vue index 51b4337..aa95c9f 100644 --- a/ruoyi-ui/src/views/ehs/ehsFloodDroughtTeam/index.vue +++ b/ruoyi-ui/src/views/ehs/ehsFloodDroughtTeam/index.vue @@ -219,6 +219,9 @@ export default { form: {}, // 表单校验 rules: { + teamName: [ + { required: true, message: "队伍名称不能为空", trigger: "blur" } + ], }, // teamId id: "", diff --git a/ruoyi-ui/src/views/ehs/ehsFloodDroughtWorker/index.vue b/ruoyi-ui/src/views/ehs/ehsFloodDroughtWorker/index.vue index 57684d9..db3f64c 100644 --- a/ruoyi-ui/src/views/ehs/ehsFloodDroughtWorker/index.vue +++ b/ruoyi-ui/src/views/ehs/ehsFloodDroughtWorker/index.vue @@ -181,7 +181,7 @@ - + @@ -283,6 +283,12 @@ export default { form: {}, // 表单校验 rules: { + phone: [ + { pattern:/^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/, message: "联系方式必须是手机或固话(区号-固话)", trigger: "change" } + ], + workerName: [ + { required: true, message: "人员姓名不能为空", trigger: "blur" } + ], } }; }, diff --git a/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue b/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue index 554e47c..f8d8573 100644 --- a/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue +++ b/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue @@ -117,7 +117,7 @@ /> - + - - + + @@ -256,7 +256,7 @@ - + @@ -316,6 +316,12 @@ export default { form: {}, // 表单校验 rules: { + workerName: [ + { required: true, message: "人员姓名不能为空", trigger: "blur" } + ], + phone: [ + { pattern:/^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/, message: "联系方式必须是手机或固话(区号-固话)", trigger: "change" } + ], } }; }, diff --git a/ruoyi-ui/src/views/ehs/ehsRisk/index.vue b/ruoyi-ui/src/views/ehs/ehsRisk/index.vue index 20d730e..6f53263 100644 --- a/ruoyi-ui/src/views/ehs/ehsRisk/index.vue +++ b/ruoyi-ui/src/views/ehs/ehsRisk/index.vue @@ -488,18 +488,24 @@ riskGrade: [ { required: true, message: "风险点等级不能为空", trigger: "change" } ], - riskLocation1: [ - { required: true, message: "位置不能为空", trigger: "change" } + riskLocation: [ + { required: true, message: "风险点位置不能为空", trigger: "change" } ], - riskLocation2: [ + /* riskLocation1: [ { required: true, message: "位置不能为空", trigger: "change" } - ], - peopleQuantity1: [ + ], */ + /* riskLocation2: [ + { required: true, message: "位置不能为空", trigger: "change" } + ], */ + peopleQuantity: [ { required: true, message: "涉及群众数量不能为空", trigger: "change" } ], - peopleQuantity2: [ + /* peopleQuantity1: [ { required: true, message: "涉及群众数量不能为空", trigger: "change" } - ], + ], */ + /* peopleQuantity2: [ + { required: true, message: "涉及群众数量不能为空", trigger: "change" } + ], */ reportAddressType: [ { required: true, message: "风险点类型不能为空", trigger: "change" } ], @@ -507,19 +513,22 @@ { required: true, message: "乡级责任人姓名不能为空", trigger: "blur" } ], villageTel: [ - { required: true, message: "乡级责任人联系电话不能为空", trigger: "blur" } + { required: true, message: "乡级责任人联系电话不能为空", trigger: "blur" }, + { pattern:/^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/, message: "联系电话必须是手机或固话(区号-固话)", trigger: "change" } ], villageName1: [ { required: true, message: "村级责任人姓名不能为空", trigger: "blur" } ], villageTel1: [ - { required: true, message: "村级责任人联系电话不能为空", trigger: "blur" } + { required: true, message: "村级责任人联系电话不能为空", trigger: "blur" }, + { pattern:/^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/, message: "联系电话必须是手机或固话(区号-固话)", trigger: "change" } ], inspectionName: [ { required: true, message: "巡查责任人姓名不能为空", trigger: "blur" } ], inspectionTel: [ - { required: true, message: "巡查责任人电话不能为空", trigger: "blur" } + { required: true, message: "巡查责任人电话不能为空", trigger: "blur" }, + { pattern:/^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/, message: "联系电话必须是手机或固话(区号-固话)", trigger: "change" } ] } };