Merge branch 'deng' of http://101.43.41.9:13000/xzzn/SIPAIIS_WMS_JSSW into deng

# Conflicts:
#	src/main/java/com/sipai/controller/equipment/MaintenancePlanController.java

pom.xml

@@ -21,6 +21,12 @@
         <!-- 数据<E695B0>?-->
     </properties>
     <dependencies>
+
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>5.4.0</version>
+        </dependency>
         <!-- spring核心<E6A0B8>?-->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -781,11 +787,11 @@
             <version>1.6.1</version>
         </dependency>
         <!-- jna -->
-        <dependency>
-            <groupId>net.java.dev.jna</groupId>
-            <artifactId>jna</artifactId>
-            <version>1.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>net.java.dev.jna</groupId>-->
+<!--            <artifactId>jna</artifactId>-->
+<!--            <version>1.0</version>-->
+<!--        </dependency>-->
         <!-- jna examples -->
         <dependency>
             <groupId>net.java.dev.jna</groupId>
@@ -796,6 +802,14 @@
     <build>
         <finalName>TGLW</finalName>
         <resources>
+<!--            <resource>-->
+<!--                <directory>libs/win64</directory>-->
+<!--                <targetPath>win64</targetPath>-->
+<!--                <includes>-->
+<!--                    <include>*.dll</include>-->
+<!--                </includes>-->
+<!--                <filtering>false</filtering>-->
+<!--            </resource>-->
             <resource>
                 <directory>src/main/java</directory>
                 <includes>

src/main/java/com/sipai/activiti/Test.java

@@ -1,9 +0,0 @@
-package com.sipai.activiti;
-
-public class Test {
-    public static void main(String[] args) {
-        int a = 3;
-        int b = 3;
-        System.out.println(a % b);
-    }
-}

src/main/java/com/sipai/controller/alarm/AlarmPointController.java

@@ -369,7 +369,9 @@ public class AlarmPointController {
                 this.mPointService.updateLalarmmin(alarmPoint.getUnitId(), mPoint.getMpointcode());
 //				mPoint.setLalarmmin(null);
             }
-//			this.mPointService.update2(alarmPoint.getUnitId(),mPoint);
+            // Enable TriggerAlarm to allow ScadaAlarmJob to process this MPoint
+            mPoint.setTriggeralarm("1");
+            this.mPointService.update2(alarmPoint.getUnitId(), mPoint);
         }
 
         if (code == Result.SUCCESS) {

src/main/java/com/sipai/controller/alarm/ProAlarmController.java

@@ -197,16 +197,15 @@ public class ProAlarmController {
 //        Iterator<String> sIterator = jsonObject.keys();
 
         JSONArray arr = new JSONArray();
-        List<XServer> allxServerList = this.xServerService.selectListByWhere(" where 1=1 ");
-        for (XServer xServer :
-                allxServerList) {
+//        List<XServer> allxServerList = this.xServerService.selectListByWhere(" where 1=1 ");
+//        for (XServer xServer : allxServerList) {
 //            if (jsonObject.get(xServer.getBizid()) != null) {
 //                String code_value = jsonObject.get(xServer.getBizid()).toString();
 //                code_value = code_value + ",data_stop_alarm";
 //                code_value = code_value.replace(",", "','");
 //                List<ProAlarm> list = this.proAlarmService.selectListByWhere(xServer.getBizid(), wherestr + " and point_code in ('" + code_value + "')"
 //                        + orderstr);
-            List<ProAlarm> list = this.proAlarmService.selectListByWhere(xServer.getBizid(), wherestr + orderstr);
+            List<ProAlarm> list = this.proAlarmService.selectListByWhere(companyId, wherestr + orderstr);
 //                System.out.println(wherestr + " and point_code in ('" + code_value + "')");
                 if (list != null && list.size() > 0) {
                     for (int i = 0; i < list.size(); i++) {
@@ -249,7 +248,7 @@ public class ProAlarmController {
                 }
 //            }
 
-        }
+//        }
         model.addAttribute("result", arr);
         return new ModelAndView("result");
     }

src/main/java/com/sipai/controller/document/DataController.java

@@ -327,13 +327,13 @@ public class DataController {
              fileIds = fileIds.replace(",","','");
 	    	 wherestr += " and (id in ('"+fileIds+"') or filename like '%"+fileName+"%') ";
 		 }
-	     if(request.getParameter("masterId")!=null && !request.getParameter("masterId").isEmpty()){
-			    String masterId = request.getParameter("masterId");
-			    masterId = masterId.replace(",","','");
-				wherestr += " and masterid in ('"+masterId+"')";
-		 }else if(request.getParameter("equipmentId") == null){
-			    wherestr += " and masterid in ('')";
-		 }
+//	     if(request.getParameter("masterId")!=null && !request.getParameter("masterId").isEmpty()){
+//			    String masterId = request.getParameter("masterId");
+//			    masterId = masterId.replace(",","','");
+//				wherestr += " and masterid in ('"+masterId+"')";
+//		 }else if(request.getParameter("equipmentId") == null){
+//			    wherestr += " and masterid in ('')";
+//		 }
 	     if(request.getParameter("equipmentId")!=null && !request.getParameter("equipmentId").isEmpty()){
 	    	    String fileIds = this.equipmentFileService.getFileIds(request.getParameter("equipmentId"));
 	    	    fileIds = fileIds.replace(",","','");

src/main/java/com/sipai/controller/equipment/EquipmentCardController.java

@@ -2217,12 +2217,27 @@ public class EquipmentCardController {
                                      HttpServletResponse response, Model model) throws IOException {
         String wherestr = " where 1=1 ";
         String unitId = request.getParameter("unitId");
+        if (unitId == null || unitId.isEmpty()) {
+            unitId = request.getParameter("companyId");
+        }
         String search_name = request.getParameter("search_name");
+        if (search_name == null || search_name.trim().isEmpty()) {
+            search_name = request.getParameter("equipmentName");
+        }
         String processSectionId = request.getParameter("processSectionId");
+        if (processSectionId == null || processSectionId.trim().isEmpty() || "undefined".equals(processSectionId)) {
+            processSectionId = request.getParameter("processSection");
+        }
         String equipmentClassId = request.getParameter("equipmentClassId");
+        if (equipmentClassId == null || equipmentClassId.trim().isEmpty() || "undefined".equals(equipmentClassId)) {
+            equipmentClassId = request.getParameter("search_pid1");
+        }
         String equipmentLevel = request.getParameter("equipmentLevel");
         String equipmentClassCode = request.getParameter("equipmentClassCode");//类似竹一的计量表   该页面仅显示一种设备类型的
         String ids = request.getParameter("ids");//页面勾选的设备id
+        if (ids == null || ids.trim().isEmpty()) {
+            ids = request.getParameter("equipmentIds");
+        }
 
         if (unitId != null && !unitId.isEmpty()) {
             //获取公司下所有子节点
@@ -2272,6 +2287,26 @@ public class EquipmentCardController {
 
 //        System.out.println(wherestr);
 
+        if (ids != null && !ids.trim().isEmpty()) {
+            // 兼容前端可能携带的首尾逗号与空白，确保仅导出选中设备。
+            String[] idArr = ids.split(",");
+            StringBuilder selectedIds = new StringBuilder();
+            for (String id : idArr) {
+                if (id != null) {
+                    String trimmedId = id.trim();
+                    if (!trimmedId.isEmpty()) {
+                        if (selectedIds.length() > 0) {
+                            selectedIds.append("','");
+                        }
+                        selectedIds.append(trimmedId);
+                    }
+                }
+            }
+            if (selectedIds.length() > 0) {
+                wherestr += " and id in ('" + selectedIds + "') ";
+            }
+        }
+
         List<EquipmentCard> equipmentCards = this.equipmentCardService.selectListByWhere(wherestr);
         //导出文件到指定目录,兼容Linux
         this.equipmentCardService.downloadEquipmentExcel(response, equipmentCards);
@@ -5696,6 +5731,14 @@ public class EquipmentCardController {
      * @param model
      * @return
      */
+//    ├── Water Plant (水厂)
+//│   ├── Process Section A (工艺段)  ← Previously lost
+//│   ├── Process Section B (工艺段)  ← Previously lost
+//│   ├── Pump Station 1 (泵站)       ← Was overwriting above
+//│   │   ├── Process Section C (工艺段)
+//│   │   └── Process Section D (工艺段)
+//│   └── Pump Station 2 (泵站)
+//            │       └── Process Section E (工艺段)
     @RequestMapping("/getProcessSection4EquipmentCardTree.do")
     public String getProcessSection4EquipmentCardTree(HttpServletRequest request, Model model) {
         String unitId = request.getParameter("unitId");

src/main/java/com/sipai/controller/equipment/MaintenancePlanController.java

@@ -37,6 +37,7 @@ import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.impl.pvm.process.ActivityImpl;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
@@ -356,7 +357,9 @@ public class MaintenancePlanController {
         model.addAttribute("nowDate", CommUtil.nowDate());
         String maintenancePlanId = pInstance.getBusinessKey();
         List<BusinessUnitAudit> list = this.businessUnitAuditService.selectListByWhere("where businessId = '" + maintenancePlanId + "' order by insdt desc ");
-        model.addAttribute("businessUnitAudit", list.get(0));
+        if (CollectionUtils.isNotEmpty(list)){
+            model.addAttribute("businessUnitAudit", list.get(0));
+        }
         MaintenancePlan maintenancePlan = this.maintenancePlanService.selectById(maintenancePlanId);
         model.addAttribute("maintenancePlan", maintenancePlan);
         EquipmentPlan equipmentPlan = this.equipmentPlanService.selectById(maintenancePlanId);

src/main/java/com/sipai/controller/maintenance/EquipmentPlanController.java

@@ -279,10 +279,8 @@ public class EquipmentPlanController {
             if (company != null) {
                 model.addAttribute("companyName", company.getSname());
             }
-            User user = userService.getUserById(equipmentPlan.getAuditId());
-            if (user != null) {
-                model.addAttribute("userName", user.getCaption());
-            }
+            String userNames = userService.getUserNamesByUserIds(equipmentPlan.getAuditId());
+            model.addAttribute("userName", userNames);
             EquipmentPlanType equipmentPlanType_big = equipmentPlanTypeService.selectById(equipmentPlan.getPlanTypeBig());
             if (equipmentPlanType_big != null) {
                 model.addAttribute("planTypeBigName", equipmentPlanType_big.getName());
@@ -308,10 +306,8 @@ public class EquipmentPlanController {
             if (company != null) {
                 model.addAttribute("companyName", company.getSname());
             }
-            User user = userService.getUserById(equipmentPlan.getAuditId());
-            if (user != null) {
-                model.addAttribute("userName", user.getCaption());
-            }
+            String userNames = userService.getUserNamesByUserIds(equipmentPlan.getAuditId());
+            model.addAttribute("userName", userNames);
             EquipmentPlanType equipmentPlanType_big = equipmentPlanTypeService.selectById(equipmentPlan.getPlanTypeBig());
             if (equipmentPlanType_big != null) {
                 model.addAttribute("planTypeBigName", equipmentPlanType_big.getName());
@@ -422,10 +418,8 @@ public class EquipmentPlanController {
             if (company != null) {
                 model.addAttribute("companyName", company.getSname());
             }
-            User user = userService.getUserById(equipmentPlan.getAuditId());
-            if (user != null) {
-                model.addAttribute("userName", user.getCaption());
-            }
+            String userNames = userService.getUserNamesByUserIds(equipmentPlan.getAuditId());
+            model.addAttribute("userName", userNames);
             EquipmentPlanType equipmentPlanType_big = equipmentPlanTypeService.selectById(equipmentPlan.getPlanTypeBig());
             if (equipmentPlanType_big != null) {
                 model.addAttribute("planTypeBigName", equipmentPlanType_big.getName());

src/main/java/com/sipai/controller/pipeline/PipelineDataController.java

@@ -123,7 +123,9 @@ public class PipelineDataController {
     @RequestMapping("/deletes.do")
     public String dodeletes(HttpServletRequest request, Model model,
             @RequestParam(value = "ids") String ids) {
-        int result = this.pipelineDataService.deleteByWhere("where id in (" + ids + ")");
+        // 移除末尾逗号，防止SQL语法错误
+        String cleanIds = ids.replaceAll("[,\\s]+$", "").replaceAll("^[,\\s]+", "");
+        int result = this.pipelineDataService.deleteByWhere("where id in (" + cleanIds + ")");
         model.addAttribute("result", result);
         return "result";
     }

src/main/java/com/sipai/controller/report/RptCreateController.java

@@ -374,6 +374,16 @@ public class RptCreateController {
     @RequestMapping("/doadd.do")
     public String doadd(HttpServletRequest request, Model model) {
         User cu = (User) request.getSession().getAttribute("cu");
+        String rptsetId = request.getParameter("rptsetId");
+
+        // 权限验证：检查用户是否有报表生成权限
+        if (rptsetId != null && !rptsetId.isEmpty()) {
+            if (!this.rptCreateService.checkGeneratePermission(rptsetId, cu)) {
+                model.addAttribute("result", "{\"res\":\"您没有该报表的生成权限\",\"msg\":\"您没有该报表的生成权限\"}");
+                return "result";
+            }
+        }
+
         request.setAttribute("userId", cu.getId());
         request.setAttribute("userName", cu.getCaption());
         request.setAttribute("id", CommUtil.getUUID());
@@ -432,6 +442,14 @@ public class RptCreateController {
         String rptsetId = request.getParameter("rptsetId");
         int result = 0;
 
+        // 权限验证：检查用户是否有报表生成权限
+        if (rptCreate.getRptsetId() != null && !rptCreate.getRptsetId().isEmpty()) {
+            if (!this.rptCreateService.checkGeneratePermission(rptCreate.getRptsetId(), cu)) {
+                model.addAttribute("result", "{\"res\":\"您没有该报表的生成权限\",\"msg\":\"您没有该报表的生成权限\"}");
+                return new ModelAndView("result");
+            }
+        }
+
         RptInfoSet rptInfoSet = rptInfoSetService.selectById(rptCreate.getRptsetId());
         if (rptInfoSet != null) {
             //日报
@@ -545,6 +563,15 @@ public class RptCreateController {
         User cu = (User) request.getSession().getAttribute("cu");
         String rptsetId = request.getParameter("rptsetId");
         int result = 0;
+
+        // 权限验证：检查用户是否有报表生成权限
+        if (rptCreate.getRptsetId() != null && !rptCreate.getRptsetId().isEmpty()) {
+            if (!this.rptCreateService.checkGeneratePermission(rptCreate.getRptsetId(), cu)) {
+                model.addAttribute("result", "{\"res\":\"您没有该报表的生成权限\",\"msg\":\"您没有该报表的生成权限\"}");
+                return new ModelAndView("result");
+            }
+        }
+
         RptInfoSet rptInfoSet = rptInfoSetService.selectById(rptCreate.getRptsetId());
         if (rptInfoSet != null) {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -750,13 +777,26 @@ public class RptCreateController {
     @RequestMapping("/getSheet.do")
     public String getSheet(HttpServletRequest request, Model model,
                            @RequestParam(value = "id") String id) {
+        String path = "";
+        String name = "";
         Result_Report result1 = new Result_Report();
         RptCreate rptCreate = this.rptCreateService.selectById(id);
         if (rptCreate != null) {//报表生成中的预览
+            // 优先使用数据库中存储的文件路径，如果没有则构造路径（兼容旧数据）
+            if (rptCreate.getAbspath() != null && !rptCreate.getAbspath().isEmpty()) {
+                path = rptCreate.getAbspath();
+            } else {
+                path = rptCreate.getRptname() + rptCreate.getId() + ".xls";
+            }
+            // 获取文件扩展名
+            String extension = ".xls";
+            if (path.toLowerCase().endsWith(".xlsx")) {
+                extension = ".xlsx";
+            }
+            String sourcePath = rptCreate.getRptname() + extension;
             List<RptInfoSetSheet> list = rptInfoSetSheetService.selectListByWhere("where rptInfoSet_id = '" + rptCreate.getRptsetId() + "'");
             try {
-                String sourcePath = rptCreate.getRptname();
-                byte[] isb = commonFileService.getInputStreamBytes(FileNameSpaceEnum.RptCreateFile.getNameSpace(), CommUtil.fixRptCreateFileName(rptCreate.getRptname() + rptCreate.getId()));
+                byte[] isb = commonFileService.getInputStreamBytes(FileNameSpaceEnum.RptCreateFile.getNameSpace(), path);
                 if (isb == null || isb.length == 0) {
                     result1 = Result_Report.failed("文件不存在或已被删除");
                     model.addAttribute("result", CommUtil.toJson(result1));
@@ -774,7 +814,7 @@ public class RptCreateController {
                 List<RptInfoSetSheet> list = rptInfoSetSheetService.selectListByWhere("where rptInfoSet_id = '" + rptInfoSetFile.getMasterid() + "'");
                 try {
                     String sourcePath = "";
-                    String path = rptInfoSetFile.getAbspath();
+                    path = rptInfoSetFile.getAbspath();
 //                    path = path.replaceAll("\\.xlsx", "").replaceAll("\\.xls", "");
 //                    byte[] isb = commonFileService.getInputStreamBytes(FileNameSpaceEnum.RptInfoSetFile.getNameSpace(), CommUtil.fixRptCreateFileName(path));
                     byte[] isb = commonFileService.getInputStreamBytes(FileNameSpaceEnum.RptInfoSetFile.getNameSpace(), path);
@@ -850,8 +890,18 @@ public class RptCreateController {
             String name = "";
             RptCreate rptCreate = this.rptCreateService.selectById(id);
             if (rptCreate != null) {
-                path = rptCreate.getRptname() + rptCreate.getId() + ".xls";
-                name = rptCreate.getRptname() + ".xls";
+                // 优先使用数据库中存储的文件路径，如果没有则构造路径（兼容旧数据）
+                if (rptCreate.getAbspath() != null && !rptCreate.getAbspath().isEmpty()) {
+                    path = rptCreate.getAbspath();
+                } else {
+                    path = rptCreate.getRptname() + rptCreate.getId() + ".xls";
+                }
+                // 获取文件扩展名
+                String extension = ".xls";
+                if (path.toLowerCase().endsWith(".xlsx")) {
+                    extension = ".xlsx";
+                }
+                name = rptCreate.getRptname() + extension;
             }
             byte[] bytes = commonFileService.getInputStreamBytes(FileNameSpaceEnum.RptCreateFile.getNameSpace(), path);
             if (bytes == null || bytes.length == 0) {

src/main/java/com/sipai/controller/report/RptDayLogController.java

@@ -122,7 +122,14 @@ public class RptDayLogController {
 			@RequestParam(value = "rptdt") String rptdt) throws IOException {
 		User cu = (User) request.getSession().getAttribute("cu");
 		String userId = cu.getId();
-		
+
+		// 权限验证：检查用户是否有填报权限
+//		if (!this.rptDayLogService.checkInputPermission(rptdeptId, cu)) {
+//			Result result = Result.failed("您没有该报表的填报权限");
+//			model.addAttribute("result", CommUtil.toJson(result));
+//			return "result";
+//		}
+
 		JSONObject jsonObject = this.rptDayLogService.getJson(null,rptdeptId,rptdt,userId);
 
 		Result result = Result.success(jsonObject);
@@ -149,6 +156,14 @@ public class RptDayLogController {
 			@RequestParam(value = "rptdeptId") String rptdeptId) throws IOException {
 		User cu = (User) request.getSession().getAttribute("cu");
 		String userId = cu.getId();
+		
+		// 权限验证：检查用户是否有填报权限
+		if (!this.rptDayLogService.checkInputPermission(rptdeptId, cu)) {
+			Result result = Result.failed("您没有该报表的填报权限");
+			model.addAttribute("result", CommUtil.toJson(result));
+			return "result";
+		}
+		
 		JSONObject jsonObject = this.rptDayLogService.getJson(id,rptdeptId,null,userId);
 		model.addAttribute("rptDayLog", jsonObject);
 //		return "/report/reportdetail";
@@ -191,11 +206,19 @@ public class RptDayLogController {
 	}
 	
 	@RequestMapping("/dosave.do")
-	public String dosave(HttpServletRequest request,Model model){
+	public ModelAndView dosave(HttpServletRequest request,Model model){
 		User cu = (User) request.getSession().getAttribute("cu");
 		String userId = cu.getId();
 		String json = request.getParameter("json");
 		JSONObject jsonObject = JSONObject.fromObject(json);
+		
+		// 权限验证：检查用户是否有填报权限
+		String rptdeptId = (String) jsonObject.get("rptdeptId");
+		if (!this.rptDayLogService.checkInputPermission(rptdeptId, cu)) {
+			model.addAttribute("result", "{\"res\":\"您没有该报表的填报权限\",\"msg\":\"您没有该报表的填报权限\"}");
+			return new ModelAndView("result");
+		}
+		
 		if (jsonObject.get("id")==null||jsonObject.get("id").equals("")) {
 			jsonObject.put("id", CommUtil.getUUID());
 		}
@@ -206,12 +229,12 @@ public class RptDayLogController {
 			e.printStackTrace();
 			Result result = Result.failed("插入失败");
 			model.addAttribute("result", CommUtil.toJson(result));
-			return "result";
+			return new ModelAndView("result");
 		}
 		
 		Result result = Result.success(null);
 		model.addAttribute("result", CommUtil.toJson(result));
-		return "result";
+		return new ModelAndView("result");
 	}
 	
 	@RequestMapping("/onekeyAudit.do")//一键审核
@@ -228,6 +251,29 @@ public class RptDayLogController {
 	@RequestMapping("/dodeletes.do")
 	public String dodels(HttpServletRequest request,Model model,
 			@RequestParam(value="ids") String ids){
+//		User cu = (User) request.getSession().getAttribute("cu");
+//		String userId = cu.getId();
+		
+		// 获取rptdeptId，假设从参数或第一个ID推断
+//		String rptdeptId = request.getParameter("rptdeptId");
+//		if (rptdeptId == null || rptdeptId.isEmpty()) {
+//			// 如果没有提供rptdeptId，从第一个ID获取
+//			String[] idArray = ids.split(",");
+//			if (idArray.length > 0) {
+//				RptDayLog rptDayLog = this.rptDayLogService.selectById(idArray[0]);
+//				if (rptDayLog != null) {
+//					rptdeptId = rptDayLog.getRptdeptId();
+//				}
+//			}
+//		}
+		
+		// 权限验证：检查用户是否有生成权限
+//		if (!this.rptDayLogService.checkGeneratePermission(rptdeptId, cu)) {
+//			Result result = Result.failed("您没有该报表的删除权限，无法删除");// 生成权限=删除权限
+//			model.addAttribute("result", CommUtil.toJson(result));
+//			return "result";
+//		}
+		
 		String[] idArray = ids.split(",");
 		try {
 			for (int i = 0; i < idArray.length; i++) {
@@ -268,6 +314,14 @@ public class RptDayLogController {
 		@RequestParam(value = "rptdeptId", required=false) String rptdeptId) {
     	User cu = (User) request.getSession().getAttribute("cu");
 		String userId = cu.getId();
+		
+		// 权限验证：检查用户是否有填报权限
+		if (!this.rptDayLogService.checkInputPermission(rptdeptId, cu)) {
+			Result result = Result.failed("您没有该报表的填报权限");
+			model.addAttribute("result", CommUtil.toJson(result));
+			return "result";
+		}
+		
 		MultipartRequest multipartRequest = (MultipartRequest)request;
 		
 		List<MultipartFile> fileList = multipartRequest.getFiles("filelist");

src/main/java/com/sipai/controller/safety/SafetyCheckComprehensiveController.java

@@ -36,6 +36,7 @@ import java.util.UUID;
 
 /**
  * 综合检查
+ *
  * @author lt
  */
 @Controller
@@ -125,11 +126,13 @@ public class SafetyCheckComprehensiveController {
     @RequestMapping("/save.do")
     @ResponseBody
     @Transactional(rollbackFor = Exception.class)
-    public Result save(HttpServletRequest request, SafetyCheckComprehensive bean, MultipartFile file) throws Exception {
+    public Result save(HttpServletRequest request, SafetyCheckComprehensive bean, MultipartFile[] multipartFiles) throws Exception {
         User cu = (User) request.getSession().getAttribute("cu");
         bean.setId(UUID.randomUUID().toString());
-        if (file.getSize() > 0) {
-            safetyFilesService.upload(request, null, SafetyFunctionEnum.SAFETY_CHECK_COMPREHENSIVE.getId(), SafetyCheckStatusEnum.APPLY.getId(), bean.getId());
+        if (multipartFiles != null) {
+            for (MultipartFile file : multipartFiles) {
+                safetyFilesService.upload(request, file, SafetyFunctionEnum.SAFETY_CHECK_COMPREHENSIVE.getId(), SafetyCheckStatusEnum.APPLY.getId(), bean.getId());
+            }
         }
         bean.setCheckCode(safetySeqService.code(request, SafetyFunctionEnum.SAFETY_CHECK_COMPREHENSIVE));
         if (bean.getCheckResult() == SafetyCheckResultEnum.OK.getId()) {
@@ -153,8 +156,8 @@ public class SafetyCheckComprehensiveController {
     @RequestMapping("/saveApply.do")
     @ResponseBody
     @Transactional(rollbackFor = Exception.class)
-    public Result saveApply(HttpServletRequest request, SafetyCheckComprehensive bean, MultipartFile file) throws Exception {
-        if(StringUtils.isEmpty(bean.getDutyUserId())){
+    public Result saveApply(HttpServletRequest request, SafetyCheckComprehensive bean, MultipartFile[] file) throws Exception {
+        if (StringUtils.isEmpty(bean.getDutyUserId())) {
             return Result.failed("整改负责人不能为空！");
         }
 
@@ -178,8 +181,8 @@ public class SafetyCheckComprehensiveController {
                     SafetyCheckStatusEnum.RESPONSE.getTaskTitle(),
                     bean.getDutyUserId(),  // 当前节点审批人
                     bean.getDutyUserName(),  // 当前节点审批人
-                    null, // 抄送人
-                    null,// 抄送人
+                    bean.getCopyUserId(), // 抄送人
+                    bean.getCopyUserName(),// 抄送人
                     null);
         }
         return Result.success();
@@ -232,7 +235,7 @@ public class SafetyCheckComprehensiveController {
     @ResponseBody
     @Transactional(rollbackFor = Exception.class)
     public Result apply(HttpServletRequest request, SafetyCheckComprehensive bean) throws IOException, ServiceException {
-        if(StringUtils.isEmpty(bean.getDutyUserId())){
+        if (StringUtils.isEmpty(bean.getDutyUserId())) {
             return Result.failed("整改负责人不能为空！");
         }
         update(request, bean);
@@ -336,7 +339,7 @@ public class SafetyCheckComprehensiveController {
     @ResponseBody
     @Transactional(rollbackFor = Exception.class)
     public Result response(HttpServletRequest request, SafetyCheckComprehensive bean, String processInstanceId) throws IOException, ServiceException {
-        if(StringUtils.isEmpty(bean.getConfirmUserId())){
+        if (StringUtils.isEmpty(bean.getConfirmUserId())) {
             return Result.failed("验证人不能为空！");
         }
 
@@ -374,10 +377,9 @@ public class SafetyCheckComprehensiveController {
     @Transactional(rollbackFor = Exception.class)
     public Result response(HttpServletRequest request, SafetyCheckComprehensive bean, String processInstanceId, int pass) throws IOException, ServiceException {
 
-        safetyCheckActivityService.audit(bean.getConfirmUserId(), processInstanceId, pass);
-
         //通过
         if (pass == 1) {
+            safetyCheckActivityService.audit(bean.getConfirmUserId(), processInstanceId, pass);
             bean.setStatus(SafetyCheckStatusEnum.COMPLETE.getId());
             service.update(bean);
 
@@ -388,7 +390,7 @@ public class SafetyCheckComprehensiveController {
                     bean.getConfirmUserName(),
                     bean.getCopyUserId(),
                     bean.getCopyUserName(),
-                    SafetyCheckStatusEnum.COMPLETE.getTaskRecordPass( bean.getConfirmUserName()));
+                    SafetyCheckStatusEnum.COMPLETE.getTaskRecordPass(bean.getConfirmUserName()));
             safetyFlowTaskService.saveWorkFlowRecord(true,
                     bean.getId(),
                     "结束",
@@ -400,6 +402,7 @@ public class SafetyCheckComprehensiveController {
         }
         //不通过
         else {
+            safetyCheckActivityService.audit(bean.getDutyUserId(), processInstanceId, pass);
             bean.setStatus(SafetyCheckStatusEnum.APPLY.getId());
             service.update(bean);
             safetyFlowTaskService.saveWorkFlowRecord(true,

src/main/java/com/sipai/controller/safety/SafetyCheckDaylyController.java

@@ -211,7 +211,8 @@ public class SafetyCheckDaylyController {
     @ResponseBody
     @Transactional(rollbackFor = Exception.class)
     public Result saveApply(HttpServletRequest request, SafetyCheckDayly bean, MultipartFile file) throws Exception {
-        if(StringUtils.isEmpty(bean.getDutyUserId())){
+        if(bean.getCheckResult() != 1 && StringUtils.isEmpty(bean.getDutyUserId())){
+            // 弱智东西，不相符的才需要整改负责人
             return Result.failed("整改负责人不能为空！");
         }
 
@@ -235,8 +236,8 @@ public class SafetyCheckDaylyController {
                     SafetyCheckStatusEnum.RESPONSE.getTaskTitle(),
                     bean.getDutyUserId(),  // 当前节点审批人
                     bean.getDutyUserName(),  // 当前节点审批人
-                    null, // 抄送人
-                    null,// 抄送人
+                    bean.getCopyUserId(), // 抄送人
+                    bean.getCopyUserName(),// 抄送人
                     null);
 
         }
@@ -372,10 +373,9 @@ public class SafetyCheckDaylyController {
     @Transactional(rollbackFor = Exception.class)
     public Result response(HttpServletRequest request, SafetyCheckDayly bean, String processInstanceId, int pass) throws IOException, ServiceException {
 
-        safetyCheckActivityService.audit(bean.getConfirmUserId(), processInstanceId, pass);
-
         //通过
         if (pass == 1) {
+            safetyCheckActivityService.audit(bean.getConfirmUserId(), processInstanceId, pass);
             bean.setStatus(SafetyCheckStatusEnum.COMPLETE.getId());
             safetyCheckDaylyService.update(bean);
 
@@ -399,6 +399,7 @@ public class SafetyCheckDaylyController {
         }
         //不通过
         else {
+            safetyCheckActivityService.audit(bean.getDutyUserId(), processInstanceId, pass);
             bean.setStatus(SafetyCheckStatusEnum.APPLY.getId());
             safetyCheckDaylyService.update(bean);
             safetyFlowTaskService.saveWorkFlowRecord(true,

src/main/java/com/sipai/controller/safety/SafetyCheckSpecialController.java

@@ -197,8 +197,8 @@ public class SafetyCheckSpecialController {
                     SafetyCheckStatusEnum.RESPONSE.getTaskTitle(),
                     bean.getDutyUserId(),  // 当前节点审批人
                     bean.getDutyUserName(),  // 当前节点审批人
-                    null, // 抄送人
-                    null,// 抄送人
+                    bean.getCopyUserId(), // 抄送人
+                    bean.getCopyUserName(),// 抄送人
                     null);
         }
         return Result.success();
@@ -393,10 +393,9 @@ public class SafetyCheckSpecialController {
     @Transactional(rollbackFor = Exception.class)
     public Result response(HttpServletRequest request, SafetyCheckSpecial bean, String processInstanceId, int pass) throws IOException, ServiceException {
 
-        safetyCheckActivityService.audit(bean.getConfirmUserId(), processInstanceId, pass);
-
         //通过
         if (pass == 1) {
+            safetyCheckActivityService.audit(bean.getConfirmUserId(), processInstanceId, pass);
             bean.setStatus(SafetyCheckStatusEnum.COMPLETE.getId());
             service.update(bean);
 
@@ -419,6 +418,7 @@ public class SafetyCheckSpecialController {
         }
         //不通过
         else {
+            safetyCheckActivityService.audit(bean.getDutyUserId(), processInstanceId, pass);
             bean.setStatus(SafetyCheckStatusEnum.APPLY.getId());
             service.update(bean);
             safetyFlowTaskService.saveWorkFlowRecord(true,

src/main/java/com/sipai/controller/safety/SafetyEducationTraineeController.java

@@ -66,7 +66,7 @@ public class SafetyEducationTraineeController {
      **/
     @RequestMapping("/add.do")
     public String add(HttpServletRequest request, Model model) throws Exception {
-        String educationCode =safetySeqService.code(request,SafetyFunctionEnum.EDUCATION_TRAINEE);
+        String educationCode = safetySeqService.code(request, SafetyFunctionEnum.EDUCATION_TRAINEE);
         model.addAttribute("educationCode", educationCode);
         return "safety/EducationTraineeAdd";
     }
@@ -82,9 +82,10 @@ public class SafetyEducationTraineeController {
         SafetyEducationTrainee educationTrainee = safetyEducationTraineeService.selectById(id);
         SafetyFiles file = safetyFilesService.selectById(educationTrainee.getFileId());
         model.addAttribute("bean", educationTrainee);
-        model.addAttribute("fileName", file==null?"":file.getOriginalFileName());
+        model.addAttribute("fileName", file == null ? "" : file.getOriginalFileName());
         return "safety/EducationTraineeEdit";
     }
+
     /**
      * 跳转至编辑弹窗
      *
@@ -96,9 +97,10 @@ public class SafetyEducationTraineeController {
         SafetyEducationTrainee educationTrainee = safetyEducationTraineeService.selectById(id);
         SafetyFiles file = safetyFilesService.selectById(educationTrainee.getFileId());
         model.addAttribute("bean", educationTrainee);
-        model.addAttribute("fileName",file==null?"":file.getOriginalFileName());
+        model.addAttribute("fileName", file == null ? "" : file.getOriginalFileName());
         return "safety/EducationTraineeView";
     }
+
     /**
      * 获取分页列表信息
      *
@@ -169,24 +171,24 @@ public class SafetyEducationTraineeController {
     @RequestMapping("/update.do")
     @ResponseBody
     @Transactional(rollbackFor = Exception.class)
-    public Result update(HttpServletRequest request,SafetyEducationTrainee bean, MultipartFile file) throws IOException, ParseException {
+    public Result update(HttpServletRequest request, SafetyEducationTrainee bean, MultipartFile file) throws IOException, ParseException {
 
         if (!safetyEducationTraineeService.timeRangeCheck(bean)) {
             return Result.failed("培训有效期早于培训日期！");
         }
         SafetyEducationTrainee oldBean = safetyEducationTraineeService.selectById(bean.getId());
         //如果文件id是空的，代表用户重新上传的文件，先删除原来的文件，然后再上传新文件。
-        if (StringUtils.isEmpty(bean.getFileId())&&file.getSize()>0) {
-            List<SafetyFiles> fileBeanList = safetyFilesService.upload(request,file, SafetyFunctionEnum.EDUCATION_TRAINEE.getId(), null, bean.getId());
+        if (StringUtils.isEmpty(bean.getFileId()) && file.getSize() > 0) {
+            List<SafetyFiles> fileBeanList = safetyFilesService.upload(request, file, SafetyFunctionEnum.EDUCATION_TRAINEE.getId(), null, bean.getId());
             bean.setFileId(fileBeanList.get(0).getId());
             safetyEducationTraineeService.update(bean);
             // 删除原来的附件记录
             safetyFilesService.deleteById(oldBean.getFileId());
-        } else if (StringUtils.isEmpty(bean.getFileId())  && file.getSize()==0) {
+        } else if (StringUtils.isEmpty(bean.getFileId()) && file.getSize() == 0) {
             bean.setFileId(null);
             safetyEducationTraineeService.update(bean);
-            safetyFilesService.deleteById(oldBean.getFileId());
-        }else {
+//            safetyFilesService.deleteById(oldBean.getFileId());
+        } else {
             safetyEducationTraineeService.update(bean);
         }
         return Result.success();
@@ -210,6 +212,7 @@ public class SafetyEducationTraineeController {
         }
         return Result.success();
     }
+
     /**
      * 删除附件
      *
@@ -223,8 +226,8 @@ public class SafetyEducationTraineeController {
         SafetyEducationTrainee bean = safetyEducationTraineeService.selectById(id);
         safetyFilesService.deleteById(bean.getFileId());
         bean.setFileId("");
-        int row =  safetyEducationTraineeService.update(bean);
-        if (row!=0) {
+        int row = safetyEducationTraineeService.update(bean);
+        if (row != 0) {
             return Result.success();
         }
         return Result.failed("删除失败！");

src/main/java/com/sipai/controller/safety/SafetyExternalCertificateController.java

@@ -343,8 +343,6 @@ public class SafetyExternalCertificateController {
         int result = 0;
         for (String id : ids) {
             result += service.deleteById(id);
-        }
-        for (String id : ids) {
             safetyFilesService.deleteByBizId(id);
         }
         model.addAttribute("result", result);

src/main/java/com/sipai/controller/safety/StaffArchivesController.java

@@ -170,6 +170,16 @@ public class StaffArchivesController {
             return "result";
         }
 
+        // 更新用户的所属部门
+        String pid = request.getParameter("pid");
+        if(StringUtils.isNotBlank(pid)){
+            User user = this.userService.getUserById(safetyStaffArchives.getUserid());
+            if(user != null){
+                user.setPid(pid);
+                this.userService.updateUserById(user);
+            }
+        }
+
         this.staffArchivesService.save(safetyStaffArchives);
         model.addAttribute("result", CommUtil.toJson(Result.success()));
         return "result";
@@ -195,6 +205,16 @@ public class StaffArchivesController {
             return "result";
         }
 
+        // 更新用户的所属部门
+        String pid = request.getParameter("pid");
+        if(StringUtils.isNotBlank(pid)){
+            User user = this.userService.getUserById(safetyStaffArchives.getUserid());
+            if(user != null){
+                user.setPid(pid);
+                this.userService.updateUserById(user);
+            }
+        }
+
         int result = this.staffArchivesService.update(safetyStaffArchives);
         model.addAttribute("result", CommUtil.toJson(Result.success()));
         return "result";

src/main/java/com/sipai/controller/timeefficiency/PatrolModelController.java

@@ -227,7 +227,7 @@ public class PatrolModelController {
 		User cu=(User)request.getSession().getAttribute("cu");
 		String companyId = request.getParameter("bizId");
 		String type = request.getParameter("type");
-		List<PatrolModel> list = this.patrolModelService.selectListByWhere("where unit_id = '"+companyId+"' and type='"+type+"' order by insdt");
+		List<PatrolModel> list = this.patrolModelService.selectListByWhere("where unit_id = '"+companyId+"' order by insdt");
         ArrayList<Select2> list4select2 = new ArrayList<Select2>();
         for (int i=0;i<list.size();i++){
         	Select2 select2 = new Select2();

src/main/java/com/sipai/controller/user/ProcessSectionController.java

@@ -242,10 +242,20 @@ public class ProcessSectionController {
     @RequestMapping("/getProcessSection4Select.do")
     public String getProcessSection4Select(HttpServletRequest request, Model model) {
         String companyId = request.getParameter("companyId"); // 默认查询JSBZ???
-        Company company = this.companyService.selectByPrimaryKey(companyId);
+        // companyId在不同页面可能来自tb_unit或tb_company，统一兼容两种来源
+        Unit unit = this.unitService.getUnitById(companyId);
+        String unitType = null;
+        if (unit != null) {
+            unitType = unit.getType();
+        } else if (companyId != null && !companyId.isEmpty()) {
+            Company company = this.unitService.getCompById(companyId);
+            if (company != null) {
+                unitType = company.getType();
+            }
+        }
 
         String wherestr = "where 1=1 and active='" + CommString.Active_True + "' ";
-        if (company != null && company.getType().equals(CommString.UNIT_TYPE_COMPANY)) { //  "C";//公司
+        if (CommString.UNIT_TYPE_COMPANY.equals(unitType)) { //  "C";//公司
             String bizs = "";//公司下属所有厂id
             List<Unit> blist = this.unitService.getParentCompanyChildrenBizByUnitid(companyId);
             if (blist != null && blist.size() > 0) {
@@ -257,7 +267,7 @@ public class ProcessSectionController {
             }
             bizs = bizs.replace(",", "','");
             wherestr += " and (unit_id='" + ProcessSection.UnitId_Sys + "' or (code not in (select code from tb_process_section where unit_id='" + ProcessSection.UnitId_Sys + "')) and  unit_id in ('" + bizs + "') ) ";
-        } else if (company != null && company.getType().equals(CommString.UNIT_TYPE_BIZ)) { // B 水厂
+        } else if (CommString.UNIT_TYPE_BIZ.equals(unitType)) { // B 水厂
             wherestr += " and unit_id='" + companyId + "' ";
         }
         if (request.getParameter("search_name") != null && !request.getParameter("search_name").isEmpty()) {
@@ -272,13 +282,16 @@ public class ProcessSectionController {
             for (int i = 0; i < processSections.size(); i++) {
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("id", processSections.get(i).getCode());
-                if (company != null && company.getType().equals(CommString.UNIT_TYPE_COMPANY)) { //  "C";//公司
+                if (CommString.UNIT_TYPE_COMPANY.equals(unitType)) { //  "C";//公司
                     if (!processSections.get(i).getUnitId().equals(ProcessSection.UnitId_Sys)) {
                         jsonObject.put("text", processSections.get(i).getSname() + "(" + processSections.get(i).getCompanySname() + ")");
                     } else {
                         jsonObject.put("text", processSections.get(i).getSname());
                     }
-                } else if (company != null && company.getType().equals(CommString.UNIT_TYPE_BIZ)) { //  "B";//水厂
+                } else if (CommString.UNIT_TYPE_BIZ.equals(unitType)) { //  "B";//水厂
+                    jsonObject.put("text", processSections.get(i).getSname());
+                } else {
+                    // 兜底，避免前端下拉出现有id无text导致显示为空
                     jsonObject.put("text", processSections.get(i).getSname());
                 }
 

src/main/java/com/sipai/controller/user/RoleController.java

@@ -213,6 +213,9 @@ public class RoleController {
         JSONArray json = JSONArray.fromObject(list);
         model.addAttribute("json", json);
         model.addAttribute("roleid", roleid);
+        if(request.getParameter("bizid") != null && !request.getParameter("bizid").isEmpty()){
+            model.addAttribute("companyId", request.getParameter("bizid"));
+        }
         return "user/roleUser";
     }
 

src/main/java/com/sipai/controller/user/UserController.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.*;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.activiti.engine.RepositoryService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -852,11 +853,13 @@ public class UserController {
     public String userForSelectByCompany(HttpServletRequest request, Model model) {
         String userIds = request.getParameter("userIds");
         String jobIds = request.getParameter("jobIds");
+        String displayDept = request.getParameter("displayDept");
         if (userIds != null && !userIds.isEmpty()) {
-            List<User> list = this.userService.selectListByWhere("where id in ('" + userIds.replace(",", "','") + "') order by CHARINDEX(','+ id +',','," + userIds + ",')");
+            List<User> list = this.userService.selectListByWhere("where id in ('" + userIds.replace(",", "','") + "') order by CHARINDEX(','+ id +',',','" + userIds + ",')");
             model.addAttribute("users", JSONArray.fromObject(list));
         }
         model.addAttribute("jobIds", jobIds);
+        model.addAttribute("displayDept", displayDept);
         return "user/userForSelectByCompany";
     }
 
@@ -864,6 +867,9 @@ public class UserController {
     public String getUsersByIds(HttpServletRequest request, Model model) {
         String userIds = request.getParameter("userIds");
         List<User> list = this.userService.selectListByWhere("where id in ('" + userIds.replace(",", "','") + "') order by CHARINDEX(','+ id +',','," + userIds + ",')");
+        if (CollectionUtils.isNotEmpty(list)){
+            list = list.stream().filter(u -> StringUtils.isNotBlank(u.getId())).collect(toList());
+        }
         JSONArray json = JSONArray.fromObject(list);
         model.addAttribute("result", json);
         return "result";
@@ -1255,6 +1261,7 @@ public class UserController {
             model.addAttribute("users", JSONArray.fromObject(list));
         }
         model.addAttribute("jobIds", jobIds);
+        model.addAttribute("displayDept", request.getParameter("displayDept"));
         return "user/userForSelectByWorkOrder";
     }
 
@@ -1454,6 +1461,7 @@ public class UserController {
             model.addAttribute("users", JSONArray.fromObject(list));
         }
         model.addAttribute("jobIds", jobIds);
+        model.addAttribute("displayDept", request.getParameter("displayDept"));
         return "user/userSelectLayer";
     }
 

src/main/java/com/sipai/controller/work/KPIPointController.java

@@ -89,11 +89,26 @@ public class KPIPointController {
 //        List<MPointHistory> lists = mPointHistoryService.selectListByTableAWhere("tb_mp_11_GNJ1_F","MeasureDT='2016-01-10 10:16:57'");
 //       int dd= mPointHistoryService.deleteByTableAWhere("tb_mp_11_GNJ1_F","MeasureDT='2016-01-10 10:16:57'");
         for (int i=0; i < list.size(); i++) {
-        	ProcessSection processSection = this.processSectionService.selectById(list.get(i).getProcesssectionid());
+			String rawBizId = list.get(i).getBizid();
+			ProcessSection processSection = this.processSectionService.selectById(list.get(i).getProcesssectionid());
+			if (processSection == null && list.get(i).getProcesssectionid() != null && !list.get(i).getProcesssectionid().isEmpty()) {
+				// KPI里历史数据存在按code保存工艺段的场景，优先按厂区code匹配，再回退到系统库
+				List<ProcessSection> processSectionList = this.processSectionService.selectSimpleListByWhere(
+						"where code='" + list.get(i).getProcesssectionid() + "' and unit_id='" + rawBizId + "' "
+				);
+				if (processSectionList == null || processSectionList.isEmpty()) {
+					processSectionList = this.processSectionService.selectSimpleListByWhere(
+							"where code='" + list.get(i).getProcesssectionid() + "' and unit_id='" + ProcessSection.UnitId_Sys + "' "
+					);
+				}
+				if (processSectionList != null && !processSectionList.isEmpty()) {
+					processSection = processSectionList.get(0);
+				}
+			}
 			if (processSection != null) {
 				list.get(i).setProcessectionname(processSection.getName());
 			}
-			Company company = this.unitService.getCompById(list.get(i).getBizid());
+			Company company = this.unitService.getCompById(rawBizId);
 			if (company != null) {
 				list.get(i).setBizid(company.getName());
 			}

src/main/java/com/sipai/controller/work/MPointController.java

@@ -514,6 +514,21 @@ public class MPointController {
                     mp.setProcessSection(processSections.get(0));
                 }
             }
+            // 取redis点位数据最新值，没有就是0
+            for (MPoint mPoint : list) {
+                String id = mPoint.getId();
+                int num = mPoint.getId().hashCode() % 25;
+                RMapCache<String, String> map_redis_data = redissonClient.getMapCache(CommString.RedisMpointFlag + num);
+                if (map_redis_data.get(id) != null && !"".equals(map_redis_data.get(id))) {
+                    String[] str = map_redis_data.get(id).split(";");
+                    if (str.length >= 3 && str[1] != null && !str[1].isEmpty() && !"null".equals(str[1])) {
+                        mPoint.setParmvalue(new BigDecimal(str[1]));
+                        mPoint.setMeasuredt(str[2]);
+                    } else {
+                        mPoint.setParmvalue(BigDecimal.ZERO);
+                    }
+                }
+            }
             PageInfo<MPoint> pi = new PageInfo<MPoint>(list);
             JSONArray json = JSONArray.fromObject(list);
             result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}";
@@ -1607,7 +1622,7 @@ public class MPointController {
                 mPointExpandService.update(mPoint.getBizid(), mPointExpand);
             } else {
                 MPointExpand mPointExpand2 = new MPointExpand();
-                mPointExpand2.setId(CommUtil.getUUID());
+//                mPointExpand2.setId(CommUtil.getUUID());
                 mPointExpand2.setInsdt(CommUtil.nowDate());
                 mPointExpand2.setExplain(explain);
                 mPointExpand2.setMeasurePointId(mPoint.getId());
@@ -4137,8 +4152,15 @@ public class MPointController {
                 for (int i = 0; i < ids.length; i++) {
                     com.alibaba.fastjson.JSONObject jsonObject2 = new com.alibaba.fastjson.JSONObject();
 
-                    //通过es查询bizid
-                    MPoint mPoint_es = mPointService.selectById(ids[i]);
+                    //通过数据库查询测点（优先通过unitId和测点编码查询）
+                    MPoint mPoint_es = mPointService.selectById(unitId, ids[i]);
+                    if (mPoint_es == null) {
+                        // 尝试通过测点编码查询
+                        List<MPoint> mPointList = mPointService.selectListByWhere(unitId, "where mpointcode='" + ids[i] + "'");
+                        if (mPointList != null && mPointList.size() > 0) {
+                            mPoint_es = mPointList.get(0);
+                        }
+                    }
                     if (mPoint_es != null) {
                         unitId = mPoint_es.getBizid();
 

src/main/java/com/sipai/controller/work/SchedulingController.java

@@ -133,6 +133,9 @@ public class SchedulingController {
     public String doadd(HttpServletRequest request, Model model,
                         @RequestParam(value = "date") String date) {
         model.addAttribute("date", date.substring(0, 10));
+        if(request.getParameter("bizid") != null && !request.getParameter("bizid").isEmpty()){
+            model.addAttribute("bizid", request.getParameter("bizid"));
+        }
         return "work/schedulingAdd";
     }
 
@@ -142,6 +145,9 @@ public class SchedulingController {
         String wherestr = " where s.id = '" + schedulingId + "'";
         List<Scheduling> scheduling = this.schedulingService.selectCalenderListByWhere(wherestr);
         model.addAttribute("scheduling", scheduling.get(0));
+        if(request.getParameter("bizid") != null && !request.getParameter("bizid").isEmpty()){
+            model.addAttribute("bizid", request.getParameter("bizid"));
+        }
         return "work/schedulingEdit";
     }
 
@@ -475,7 +481,7 @@ public class SchedulingController {
             JSONArray array = new JSONArray();
             String[] workpeopleids = scheduling.getWorkpeople().split(",");
             if (workpeopleids != null && workpeopleids.length > 0) {
-                if (!workpeopleids[0].equals("")) {
+                if (!userId.equals(workpeopleids[0])) {
                     for (int i = 0; i < workpeopleids.length; i++) {
                         if (!userId.equals(workpeopleids[i])) {
                             JSONObject object = new JSONObject();
@@ -1150,6 +1156,10 @@ public class SchedulingController {
             }
         }
 
+        // 获取交班表单数据
+        List<GroupContentFormData> formDataList = this.groupContentFormDataService.selectListByWhere(" where schedulingId='" + schedulingId + "' ");
+        model.addAttribute("formDataList", formDataList);
+
         model.addAttribute("scheduling", scheduling);
         return "work/schedulingView";
     }

src/main/java/com/sipai/entity/safety/SafetyStaffArchivesVo.java

@@ -22,6 +22,10 @@ public class SafetyStaffArchivesVo extends SafetyStaffArchives {
      * 性别翻译
      */
     private String sexText;
+    /**
+     * 所属部门ID
+     */
+    private String pid;
     /**
      * 所属部门
      */

src/main/java/com/sipai/mapper/safety/SafetyStaffArchivesMapper.xml

@@ -28,6 +28,7 @@
         <result column="caption" property="caption" jdbcType="VARCHAR"/>
         <result column="sex" property="sex" jdbcType="VARCHAR"/>
         <result column="sexText" property="sexText" jdbcType="VARCHAR"/>
+        <result column="pid" property="pid" jdbcType="VARCHAR"/>
         <result column="deptName" property="deptName" jdbcType="VARCHAR"/>
     </resultMap>
 
@@ -164,6 +165,7 @@
           u.caption,
           u.sex,
           (case when u.sex='0' then '女' else '男' end) as sexText,
+          u.pid,
           uu.name as deptName
         from tb_safety_staff_archives ssa
         INNER JOIN tb_user u ON ssa.userid = u.id
@@ -178,6 +180,7 @@
           u.caption,
           u.sex,
         (case when u.sex='0' then '女' else '男' end) as sexText,
+        u.pid,
         uu.name as deptName
         from tb_safety_staff_archives ssa
         INNER JOIN tb_user u ON ssa.userid = u.id

src/main/java/com/sipai/mapper/scada/MPointDataMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.sipai.mapper.scada.MPointDataMapper">
+<mapper namespace="scada.MPointDataMapper">
   <resultMap id="BaseResultMap" type="com.sipai.entity.scada.MPointData" >
     <id column="ItemID" property="itemId" jdbcType="BIGINT" />
     <result column="ParmValue" property="parmValue" jdbcType="DECIMAL" />

src/main/java/com/sipai/mapper/scada/MPointExpandMapper.xml

@@ -22,17 +22,14 @@
     where id = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.sipai.entity.scada.MPointExpand" >
-    insert into TB_MeasurePoint_Expand (id, insdt, insuser, 
+    insert into TB_MeasurePoint_Expand (insdt, insuser,
       measure_point_id, explain)
-    values (#{id,jdbcType=VARCHAR}, #{insdt,jdbcType=TIMESTAMP}, #{insuser,jdbcType=VARCHAR}, 
+    values (#{insdt,jdbcType=TIMESTAMP}, #{insuser,jdbcType=VARCHAR},
       #{measurePointId,jdbcType=VARCHAR}, #{explain,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.sipai.entity.scada.MPointExpand" >
     insert into TB_MeasurePoint_Expand
     <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        id,
-      </if>
       <if test="insdt != null" >
         insdt,
       </if>
@@ -47,9 +44,6 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        #{id,jdbcType=VARCHAR},
-      </if>
       <if test="insdt != null" >
         #{insdt,jdbcType=TIMESTAMP},
       </if>

src/main/java/com/sipai/mapper/scada/WaterVolumeLJLLMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.sipai.mapper.scada.WaterVolumeLJLLMapper">
+<mapper namespace="scada.WaterVolumeLJLLMapper">
   <resultMap id="BaseResultMap" type="com.sipai.entity.scada.WaterVolumeLJLL" >
     <id column="ItemID" property="itemId" jdbcType="BIGINT" />
     <result column="ParmValue" property="parmValue" jdbcType="DECIMAL" />

src/main/java/com/sipai/service/activiti/WorkflowProcessDefinitionService.java

@@ -362,9 +362,22 @@ public class WorkflowProcessDefinitionService {
     	String pvmTransitionId = "";
     	for (WorkTask workTask : list) {
     		PvmTransition item=this.getTransition(processDefId, taskDefId,workTask.getId(),pvmTransitionId);
+    		if (item == null) {
+    			// 未找到对应路径时默认标记为通过路径，继续处理其他任务
+    			workTask.setPassFlag(true);
+    			continue;
+    		}
     		pvmTransitionId = item.getId();
     		String conditionText=String.valueOf(item.getProperty("conditionText"));
-    		if (conditionText!=null && conditionText.contains("!"+CommString.ACTI_KEK_Condition)) {
+    		// 检测退回路径：支持多种条件表达式格式
+    		// ${!pass} / ${pass == false} / ${pass==false} / ${pass != true} / ${pass!=true}
+    		boolean isRejectPath = conditionText != null && (
+    				conditionText.contains("!"+CommString.ACTI_KEK_Condition) ||
+    				conditionText.contains(CommString.ACTI_KEK_Condition+" == false") ||
+    				conditionText.contains(CommString.ACTI_KEK_Condition+"==false") ||
+    				conditionText.contains(CommString.ACTI_KEK_Condition+" != true") ||
+    				conditionText.contains(CommString.ACTI_KEK_Condition+"!=true"));
+    		if (isRejectPath) {
     			workTask.setPassFlag(false);
             }else{
             	workTask.setPassFlag(true);

src/main/java/com/sipai/service/base/CommonFileServiceImpl.java

@@ -20,9 +20,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -351,6 +354,8 @@ public class CommonFileServiceImpl implements CommonFileService {
             String errorMsg = e.getMessage();
             if (errorMsg != null && errorMsg.contains("NoSuchKey")) {
                 logger.error("MinIO文件不存在: bucketName={}, objectName={}", nameSpace, filePath);
+            } else if (errorMsg != null && errorMsg.contains("NoSuchBucket")) {
+                logger.error("MinIO存储桶不存在: bucketName={}, objectName={}", nameSpace, filePath);
             } else {
                 logger.error("获取MinIO文件失败: bucketName={}, objectName={}, 错误: {}", nameSpace, filePath, errorMsg, e);
             }
@@ -375,12 +380,12 @@ public class CommonFileServiceImpl implements CommonFileService {
         try {
             // 安全获取文件名（自动检测编码）
             fileName = getSafeFileName(item);
-            
+
             // 生成MinIO安全的对象名称
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
             String timestamp = dateFormat.format(new Date());
             filePath = generateMinioObjectName(fileName, timestamp);
-            
+
             InputStream in = item.getInputStream();
             String contentType = item.getContentType();
             minioTemplate.makeBucket(nameSpace);
@@ -389,7 +394,7 @@ public class CommonFileServiceImpl implements CommonFileService {
             CommonFile commonFile = new CommonFile();
             commonFile.setId(CommUtil.getUUID());
             commonFile.setMasterid(masterId);
-            // 20210105 YYJ 用于文件表绑定资料节点用字段 tb_doc_file内和masterId一样
+            // 20210105 YYJ 用于文件表绑定<EFBFBD><EFBFBD>料节点用字段 tb_doc_file内和masterId一样
 //			commonFile.setPid(masterId);
             commonFile.setFilename(fileName);  // 保存原始文件名用于显示
             commonFile.setType(contentType);
@@ -398,6 +403,19 @@ public class CommonFileServiceImpl implements CommonFileService {
             commonFile.setAbspath(filePath);   // 保存MinIO对象名称
             commonFile.setInsdt(CommUtil.nowDate());
             commonFile.setSize((int) item.getSize());
+            // 获取当前用户ID并设置
+            try {
+                ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+                if (attributes != null) {
+                    HttpServletRequest request = attributes.getRequest();
+                    User cu = (User) request.getSession().getAttribute("cu");
+                    if (cu != null) {
+                        commonFile.setInsuser(cu.getId());
+                    }
+                }
+            } catch (Exception e) {
+                logger.warn("无法获取当前用户信息: {}", e.getMessage());
+            }
             res = this.insertByTable(tableName, commonFile);
         } catch (Exception e) {
             logger.error("Failed to update file to MinIO for masterId: {}", masterId, e);

src/main/java/com/sipai/service/business/BusinessUnitAuditService.java

@@ -112,17 +112,24 @@ public class BusinessUnitAuditService implements CommService<BusinessUnitAudit>{
                 }
 				List<HistoricActivityInstance>  list=historyService.createHistoricActivityInstanceQuery().processInstanceId(entity.getProcessid()).activityId(wortTaskId)
 						.orderByHistoricActivityInstanceStartTime().desc().list();
-				if (list != null && list.size()>0) {
-					variables.put(CommString.ACTI_KEK_Assignee, list.get(0).getAssignee());
-					if(entity.getAuditopinion()!=null && !entity.getAuditopinion().isEmpty()){
-		        		taskService.addComment(entity.getTaskid(), entity.getProcessid(), entity.getAuditopinion());
-		        	}
-				}else {
-					variables.put(CommString.ACTI_KEK_Assignee, businessUnitAdapter.getInsuser());
-					if(entity.getAuditopinion()!=null && !entity.getAuditopinion().isEmpty()){
-		        		taskService.addComment(entity.getTaskid(), entity.getProcessid(), entity.getAuditopinion());
-		        	}
+				// 优先取历史记录中的 assignee；若 assignee 为空（候选人任务未签收），则查 BusinessUnitAudit 记录获取实际提交人
+				String targetAssignee = null;
+				if (list != null && list.size() > 0) {
+					targetAssignee = list.get(0).getAssignee();
 				}
+				if (targetAssignee == null && !wortTaskId.isEmpty()) {
+					// 历史 assignee 为空时，从 BusinessUnitAudit 记录中查找该步骤的实际提交人
+					List<BusinessUnitAudit> previousAuditList = this.selectListByWhere(
+							"where businessid='" + entity.getBusinessid() + "' and taskdefinitionkey='" + wortTaskId + "' order by insdt desc");
+					if (previousAuditList != null && previousAuditList.size() > 0) {
+						targetAssignee = previousAuditList.get(0).getInsuser();
+					}
+				}
+				// 设置退回目标处理人（若仍为空则由流程变量 userIds 确定候选人，不再回退到工单创建人）
+				variables.put(CommString.ACTI_KEK_Assignee, targetAssignee);
+				if(entity.getAuditopinion()!=null && !entity.getAuditopinion().isEmpty()){
+		        	taskService.addComment(entity.getTaskid(), entity.getProcessid(), entity.getAuditopinion());
+		        }
 			}
 			//int res=0;
 	        taskService.complete(entity.getTaskid(), variables);
@@ -141,17 +148,24 @@ public class BusinessUnitAuditService implements CommService<BusinessUnitAudit>{
 				BusinessUnitRecord businessUnitRecord = new BusinessUnitRecord(entity);
 				if(entity.getPassstatus()){
 					//通过
-					if(variables.get(CommString.ACTI_KEK_Candidate_Users)!=null){
-						businessUnitRecord.sendMessage(variables.get(CommString.ACTI_KEK_Candidate_Users).toString(),"");
+					String candidateUsers = variables.get(CommString.ACTI_KEK_Candidate_Users) != null
+							? variables.get(CommString.ACTI_KEK_Candidate_Users).toString() : null;
+					if(candidateUsers != null && !candidateUsers.isEmpty()){
+						// 有下一步接收人，通知下一步处理人
+						businessUnitRecord.sendMessage(candidateUsers, "");
+					}else if(variables.get(CommString.ACTI_KEK_AssigneeList) != null){
+						// 会签
+						businessUnitRecord.sendMessage(entity.getTargetusers(), "");
 					}else{
-					    //会签
-	                    if(variables.get(CommString.ACTI_KEK_AssigneeList)!=null){
-                        businessUnitRecord.sendMessage(entity.getTargetusers(),"");
-	                    }
+						// 最后一步，无下一步处理人，通知当前提交人（完成确认）
+						if(entity.getInsuser() != null && !entity.getInsuser().isEmpty()){
+							businessUnitRecord.sendMessage(entity.getInsuser(), "");
+						}
 					}
 				}else{
-					if(variables.get(CommString.ACTI_KEK_Assignee)!=null){
-						businessUnitRecord.sendMessage(variables.get(CommString.ACTI_KEK_Assignee).toString(),"");
+					// 退回：通知目标处理人（排除空值，避免错误发送）
+					if(variables.get(CommString.ACTI_KEK_Assignee) != null){
+						businessUnitRecord.sendMessage(variables.get(CommString.ACTI_KEK_Assignee).toString(), "");
 					}
 				}
 

src/main/java/com/sipai/service/equipment/EquipmentCardService.java

@@ -8424,7 +8424,13 @@ public class EquipmentCardService implements CommService<EquipmentCard> {
                     }
                 }
                 if (childlist.size() > 0) {
-                    mp.put("nodes", childlist);
+                    // 保留已有的nodes（如工艺段），将子单元添加到现有nodes中
+                    List<Map<String, Object>> existingNodes = (List<Map<String, Object>>) mp.get("nodes");
+                    if (existingNodes != null && existingNodes.size() > 0) {
+                        existingNodes.addAll(childlist);
+                    } else {
+                        mp.put("nodes", childlist);
+                    }
                     getTreeList4ProcessSection(childlist, list);
                 }
             }
@@ -8491,7 +8497,13 @@ public class EquipmentCardService implements CommService<EquipmentCard> {
                     }
                 }
                 if (childlist.size() > 0) {
-                    mp.put("nodes", childlist);
+                    // 保留已有的nodes（如设备类型），将子单元添加到现有nodes中
+                    List<Map<String, Object>> existingNodes = (List<Map<String, Object>>) mp.get("nodes");
+                    if (existingNodes != null && existingNodes.size() > 0) {
+                        existingNodes.addAll(childlist);
+                    } else {
+                        mp.put("nodes", childlist);
+                    }
                     getTreeList4EquipmentClass(childlist, list);
                 }
             }

src/main/java/com/sipai/service/report/RptCreateService.java

@@ -2,6 +2,7 @@ package com.sipai.service.report;
 
 import com.sipai.entity.business.BusinessUnitAudit;
 import com.sipai.entity.report.RptCreate;
+import com.sipai.entity.user.User;
 import org.xmlpull.v1.XmlPullParserException;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -45,4 +46,11 @@ public interface RptCreateService {
 
     //改变状态
     public abstract int updateStatus(String id);
+
+    /** 检查用户是否有报表生成权限
+     * @param rptInfoSetId 报表配置id
+     * @param user 当前用户
+     * @return true=有权限, false=无权限
+     */
+    public abstract boolean checkGeneratePermission(String rptInfoSetId, User user);
 }

src/main/java/com/sipai/service/report/RptDayLogService.java

@@ -60,4 +60,18 @@ public interface RptDayLogService {
      * @return
      */
 	public abstract Result onekeyAudit(String ids ,User cu,String rptdeptId);
+
+	/** 检查用户是否有填报权限
+	 * @param rptdeptId 填报配置id
+	 * @param user 当前用户
+	 * @return true=有权限, false=无权限
+	 */
+	public abstract boolean checkInputPermission(String rptdeptId, User user);
+	
+	/** 检查用户是否有生成权限
+	 * @param rptdeptId 填报配置id
+	 * @param user 当前用户
+	 * @return true=有权限, false=无权限
+	 */
+	public abstract boolean checkGeneratePermission(String rptdeptId, User user);
 }

src/main/java/com/sipai/service/report/RptInfoSetService.java

@@ -71,6 +71,14 @@ public interface RptInfoSetService {
      * @return
      */
     public abstract String getRptInfoSetIds(String userId, String unitId, String type);
+    
+    /**
+     * 检查用户是否有生成权限
+     * @param rptInfoSetId 报表配置ID
+     * @param user 用户
+     * @return true=有权限, false=无权限
+     */
+    public abstract boolean checkGeneratePermission(String rptInfoSetId, com.sipai.entity.user.User user);
 
     /**
      *

src/main/java/com/sipai/service/report/impl/RptCreateServiceImpl.java

@@ -13,6 +13,7 @@ import com.sipai.entity.report.*;
 import com.sipai.entity.scada.MPoint;
 import com.sipai.entity.scada.TempReport;
 import com.sipai.entity.user.User;
+import com.sipai.entity.user.UserJob;
 import com.sipai.entity.work.GroupDetail;
 import com.sipai.entity.work.Scheduling;
 import com.sipai.service.activiti.WorkflowProcessDefinitionService;
@@ -24,6 +25,7 @@ import com.sipai.service.report.*;
 import com.sipai.service.scada.MPointService;
 import com.sipai.service.scada.TempReportService;
 import com.sipai.service.user.UserService;
+import com.sipai.service.user.UserJobService;
 import com.sipai.service.work.GroupDetailService;
 import com.sipai.service.work.SchedulingService;
 import com.sipai.tools.*;
@@ -46,6 +48,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.xmlpull.v1.XmlPullParserException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Resource;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -70,6 +74,7 @@ import static org.apache.poi.ss.usermodel.CellType.FORMULA;
 @Service("rptCreateService")
 //@Service
 public class RptCreateServiceImpl implements RptCreateService {
+    private static final Logger logger = LoggerFactory.getLogger(RptCreateServiceImpl.class);
     @Resource
     private RptCreateDao rptCreateDao;
     @Resource
@@ -104,6 +109,8 @@ public class RptCreateServiceImpl implements RptCreateService {
     private BusinessUnitHandleDetailService businessUnitHandleDetailService;
     @Resource
     private GroupDetailService groupDetailService;
+    @Resource
+    private UserJobService userJobService;
 
     @Override
     public RptCreate selectById(String id) {
@@ -393,7 +400,7 @@ public class RptCreateServiceImpl implements RptCreateService {
             }
         }
         Row row2 = sheet.getRow(row);
-        HSSFCell cell = (HSSFCell) row2.getCell(column);
+        Cell cell = row2.getCell(column);
         return list;
     }
 
@@ -830,6 +837,20 @@ public class RptCreateServiceImpl implements RptCreateService {
 //        System.out.println("rptdt==============================================================" + rptdt);
         String rpttype = rptInfoSet.getRpttype();//报表类型
         String bucketName = "rptinfosetfile";
+        String endtype = ".xls"; // 默认文件扩展名
+        
+        // 首先确保report bucket存在
+        try {
+            MinioClient minioClient = new MinioClient(minioProp.getEndPoint(), minioProp.getAccessKey(), minioProp.getSecretKey());
+            boolean isExist = minioClient.bucketExists("report");
+            if (!isExist) {
+                minioClient.makeBucket("report");
+                logger.info("Created MinIO bucket: report");
+            }
+        } catch (Exception e) {
+            logger.error("Failed to create report bucket", e);
+        }
+        
         List<RptInfoSetFile> filelist = this.rptInfoSetFileService.selectListByWhere(" where masterid='" + rptInfoSet.getId() + "' ");
         String path = "";
         try {
@@ -840,52 +861,59 @@ public class RptCreateServiceImpl implements RptCreateService {
                 rptInfoSetFile.setAbspath(obj);
             }
         } catch (Exception e) {
-            System.out.println(e);
+            logger.error("Failed to get template file from MinIO", e);
+        }
+        if (filelist == null || filelist.size() == 0) {
+            logger.error("No template file configured for report: {}", rptInfoSet.getId());
+            return null;
         }
         if (filelist != null && filelist.size() > 0) {
             // 设定Excel文件所在路径
             String excelFileName = filelist.get(0).getAbspath();
             // 读取Excel文件内容
-            HSSFWorkbook workbook = null;
+            Workbook workbook = null;
             FileInputStream inputStream = null;
             byte[] bytes_m = commonFileService.getInputStreamBytes(FileNameSpaceEnum.RptInfoSetFile.getNameSpace(), path);
+            // Check if bytes_m is null or empty
+            if (bytes_m == null || bytes_m.length == 0) {
+                logger.error("Excel template file is empty or not found: {}", path);
+                return null;
+            }
             // 直接从本地文件创建Workbook, 从输入流创建Workbook
             InputStream ins = new ByteArrayInputStream(bytes_m);
-            // 构建Workbook对象, 只读Workbook对象
+            // 构建Workbook对象, 只读Workbook对象 - use WorkbookFactory to support both .xls and .xlsx
             try {
-                workbook = new HSSFWorkbook(ins);
+                workbook = WorkbookFactory.create(ins);
             } catch (IOException e) {
+                logger.error("Failed to create workbook from file: " + path, e);
                 e.printStackTrace();
             }
-            String endtype = ".xls";
+            // 更新文件扩展名（根据模板文件）
+            endtype = path.toLowerCase().endsWith(".xlsx") ? ".xlsx" : ".xls";
             // 生成一个样式，用在表格数据
-            HSSFCellStyle listStyle = null;
-            if (endtype.equals(".xls")) {
-                listStyle = workbook.createCellStyle();
-                // 设置这些样式
-                listStyle.setBorderBottom(BorderStyle.THIN);
-                listStyle.setBorderLeft(BorderStyle.THIN);
-                listStyle.setBorderRight(BorderStyle.THIN);
-                listStyle.setBorderTop(BorderStyle.THIN);
-                listStyle.setAlignment(HorizontalAlignment.CENTER);//水平居中
-                listStyle.setVerticalAlignment(VerticalAlignment.CENTER);//垂直居中
-                //listStyle.setWrapText(false);//不自动换行
-                //listStyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("0.00"));//设置格式
-            }
+            CellStyle listStyle = null;
+            listStyle = workbook.createCellStyle();
+            // 设置这些样式
+            listStyle.setBorderBottom(BorderStyle.THIN);
+            listStyle.setBorderLeft(BorderStyle.THIN);
+            listStyle.setBorderRight(BorderStyle.THIN);
+            listStyle.setBorderTop(BorderStyle.THIN);
+            listStyle.setAlignment(HorizontalAlignment.CENTER);//水平居中
+            listStyle.setVerticalAlignment(VerticalAlignment.CENTER);//垂直居中
+            //listStyle.setWrapText(false);//不自动换行
+            //listStyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("0.00"));//设置格式
             // 生成一个样式，用在表格数据    修改过的数据
-            HSSFCellStyle listStyle2 = null;
-            if (endtype.equals(".xls")) {
-                listStyle2 = workbook.createCellStyle();
-                // 设置这些样式
-                listStyle2.setBorderBottom(BorderStyle.THIN);
-                listStyle2.setBorderLeft(BorderStyle.THIN);
-                listStyle2.setBorderRight(BorderStyle.THIN);
-                listStyle2.setBorderTop(BorderStyle.THIN);
-                listStyle2.setAlignment(HorizontalAlignment.CENTER);//水平居中
-                listStyle2.setVerticalAlignment(VerticalAlignment.CENTER);//垂直居中
-                listStyle2.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-                listStyle2.setFillForegroundColor(IndexedColors.GREEN.getIndex());
-            }
+            CellStyle listStyle2 = null;
+            listStyle2 = workbook.createCellStyle();
+            // 设置这些样式
+            listStyle2.setBorderBottom(BorderStyle.THIN);
+            listStyle2.setBorderLeft(BorderStyle.THIN);
+            listStyle2.setBorderRight(BorderStyle.THIN);
+            listStyle2.setBorderTop(BorderStyle.THIN);
+            listStyle2.setAlignment(HorizontalAlignment.CENTER);//水平居中
+            listStyle2.setVerticalAlignment(VerticalAlignment.CENTER);//垂直居中
+            listStyle2.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+            listStyle2.setFillForegroundColor(IndexedColors.GREEN.getIndex());
             List<RptSpSet> rptSpSetlist = this.rptSpSetService.selectListByWhere(" where pid='" + rptInfoSet.getId() + "' and (active !='" + CommString.Active_False_CH + "' or active is null) order by morder asc");
             if (rptSpSetlist != null && rptSpSetlist.size() > 0) {
                 for (int s = 0; s < rptSpSetlist.size(); s++) {
@@ -993,10 +1021,10 @@ public class RptCreateServiceImpl implements RptCreateService {
                     if (spname != null && spname.equals(RptSpSet.RptSpSet_Type_Confirm)) { //接班人 类型
                         for (int ws = 0; ws < workbook.getNumberOfSheets(); ws++) {//获取每个Sheet表
                             if (workbook.getSheetName(ws).equals(rptSpSetlist.get(s).getSheet())) {
-                                HSSFSheet sheet = workbook.getSheetAt(ws);
-                                HSSFRow row = sheet.getRow(posy - 1);
+                                Sheet sheet = workbook.getSheetAt(ws);
+                                Row row = sheet.getRow(posy - 1);
                                 if (row != null) {
-                                    HSSFCell cell_d = row.getCell(posx - 1);
+                                    Cell cell_d = row.getCell(posx - 1);
                                     if (cell_d != null) {
                                         //插入日志表
                                         RptLog rptLog = new RptLog();
@@ -1029,10 +1057,10 @@ public class RptCreateServiceImpl implements RptCreateService {
                     } else if (spname != null && spname.equals(RptSpSet.RptSpSet_Type_Rptdt)) {//日期 类型
                         for (int ws = 0; ws < workbook.getNumberOfSheets(); ws++) {//获取每个Sheet表
                             if (workbook.getSheetName(ws).equals(rptSpSetlist.get(s).getSheet())) {
-                                HSSFSheet sheet = workbook.getSheetAt(ws);
-                                HSSFRow row = sheet.getRow(posy - 1);
+                                Sheet sheet = workbook.getSheetAt(ws);
+                                Row row = sheet.getRow(posy - 1);
                                 if (row != null) {
-                                    HSSFCell cell_d = row.getCell(posx - 1);
+                                    Cell cell_d = row.getCell(posx - 1);
                                     if (cell_d != null) {
                                         try {
                                             cell_d.setCellStyle(cell_d.getCellStyle());
@@ -1058,10 +1086,10 @@ public class RptCreateServiceImpl implements RptCreateService {
                     } else if (spname != null && spname.equals(RptSpSet.RptSpSet_Type_BanZhang)) {//值班班长 类型
                         for (int ws = 0; ws < workbook.getNumberOfSheets(); ws++) {//获取每个Sheet表
                             if (workbook.getSheetName(ws).equals(rptSpSetlist.get(s).getSheet())) {
-                                HSSFSheet sheet = workbook.getSheetAt(ws);
-                                HSSFRow row = sheet.getRow(posy - 1);
+                                Sheet sheet = workbook.getSheetAt(ws);
+                                Row row = sheet.getRow(posy - 1);
                                 if (row != null) {
-                                    HSSFCell cell_d = row.getCell(posx - 1);
+                                    Cell cell_d = row.getCell(posx - 1);
                                     if (cell_d != null) {
                                         //插入日志表
                                         RptLog rptLog = new RptLog();
@@ -1094,10 +1122,10 @@ public class RptCreateServiceImpl implements RptCreateService {
                     } else if (spname != null && spname.equals(RptSpSet.RptSpSet_Type_ZuYuan)) { //值班组员 类型
                         for (int ws = 0; ws < workbook.getNumberOfSheets(); ws++) {//获取每个Sheet表
                             if (workbook.getSheetName(ws).equals(rptSpSetlist.get(s).getSheet())) {
-                                HSSFSheet sheet = workbook.getSheetAt(ws);
-                                HSSFRow row = sheet.getRow(posy - 1);
+                                Sheet sheet = workbook.getSheetAt(ws);
+                                Row row = sheet.getRow(posy - 1);
                                 if (row != null) {
-                                    HSSFCell cell_d = row.getCell(posx - 1);
+                                    Cell cell_d = row.getCell(posx - 1);
                                     if (cell_d != null) {
                                         //插入日志表
                                         RptLog rptLog = new RptLog();
@@ -1134,12 +1162,12 @@ public class RptCreateServiceImpl implements RptCreateService {
                         for (int r = 0; r < rpttemplist.size(); r++) {
                             for (int ws = 0; ws < workbook.getNumberOfSheets(); ws++) {//获取每个Sheet表
                                 if (workbook.getSheetName(ws).equals(rptSpSetlist.get(s).getSheet())) {
-                                    HSSFSheet sheet = workbook.getSheetAt(ws);
-                                    HSSFRow row = sheet.getRow(rpttemplist.get(r).getColposy() - 1);
+                                    Sheet sheet = workbook.getSheetAt(ws);
+                                    Row row = sheet.getRow(rpttemplist.get(r).getColposy() - 1);
                                     if (row != null) {
                                         Cell cell_d = row.getCell(rpttemplist.get(r).getColposx() - 1);
                                         if (cell_d != null) {
-                                            HSSFCellStyle cellStyle = row.getCell(rpttemplist.get(r).getColposx() - 1).getCellStyle();
+                                            CellStyle cellStyle = row.getCell(rpttemplist.get(r).getColposx() - 1).getCellStyle();
 //                                            HSSFCellStyle cellStyle_r = row.getCell(rpttemplist.get(r).getColposx() - 1).getCellStyle();
                                             try {
                                                 /**
@@ -1286,9 +1314,9 @@ public class RptCreateServiceImpl implements RptCreateService {
                          */
                         List<RptLog> list = rptLogService.selectListByWhere("where creat_id = '" + rptCreate.getId() + "'");
                         for (RptLog rptLog : list) {
-                            HSSFSheet sheet = workbook.getSheet(rptLog.getSheet());
+                            Sheet sheet = workbook.getSheet(rptLog.getSheet());
                             if (rptLog.getPosyE() != null && !rptLog.getPosyE().equals("") && sheet != null) {
-                                HSSFRow row = sheet.getRow(Integer.parseInt(rptLog.getPosyE()) - 1);
+                                Row row = sheet.getRow(Integer.parseInt(rptLog.getPosyE()) - 1);
                                 if (row != null) {
                                     Cell cell_d = row.getCell(Integer.parseInt(rptLog.getPosxE()) - 1);
                                     if (cell_d != null) {
@@ -1369,6 +1397,10 @@ public class RptCreateServiceImpl implements RptCreateService {
                     //删除文件  只保留minio中的文件
                     File file = new File(file3);//根据指定的文件名创建File对象
                     file.delete();
+                    
+                    // 保存文件路径到数据库
+                    rptCreate.setAbspath(showname + endtype);
+                    rptCreateDao.updateByPrimaryKeySelective(rptCreate);
                 } catch (NoSuchAlgorithmException e) {
                     e.printStackTrace();
                 } catch (IOException e) {
@@ -1907,4 +1939,54 @@ public class RptCreateServiceImpl implements RptCreateService {
         return false;
     }
 
+    /**
+     * 检查用户是否有报表生成权限
+     * @param rptInfoSetId 报表配置id
+     * @param user 当前用户
+     * @return true=有权限, false=无权限
+     */
+    @Override
+    public boolean checkGeneratePermission(String rptInfoSetId, User user) {
+        if (user == null || rptInfoSetId == null || rptInfoSetId.isEmpty()) {
+            return false;
+        }
+        
+        // 管理员默认有权限
+        if ("emp01".equals(user.getId())) {
+            return true;
+        }
+        
+        // 获取报表配置信息
+        RptInfoSet rptInfoSet = rptInfoSetService.selectById4Simple(rptInfoSetId);
+        if (rptInfoSet == null) {
+            return false;
+        }
+        
+        String userId = user.getId();
+        
+        // 检查用户是否在createusers列表中
+        String createusers = rptInfoSet.getCreateusers();
+        if (createusers != null && !createusers.isEmpty()) {
+            if (createusers.contains(userId)) {
+                return true;
+            }
+        }
+        
+        // 检查用户岗位是否在generate_position列表中
+        String generatePosition = rptInfoSet.getGeneratePosition();
+        if (generatePosition != null && !generatePosition.isEmpty()) {
+            // 获取用户的所有岗位
+            List<UserJob> userJobs = userJobService.selectListByWhere(" where userid='" + userId + "'");
+            if (userJobs != null && !userJobs.isEmpty()) {
+                for (UserJob userJob : userJobs) {
+                    if (generatePosition.contains(userJob.getJobid())) {
+                        return true;
+                    }
+                }
+            }
+        }
+        
+        return false;
+    }
+
 }

src/main/java/com/sipai/service/report/impl/RptDayLogServiceImpl.java

@@ -10,16 +10,19 @@ import com.sipai.entity.scada.MPoint;
 import com.sipai.entity.scada.MPointExpand;
 import com.sipai.entity.scada.MPointHistory;
 import com.sipai.entity.user.User;
+import com.sipai.entity.user.UserJob;
 import com.sipai.service.msg.MsgService;
 import com.sipai.service.msg.MsgServiceImpl;
 import com.sipai.service.msg.MsgTypeService;
 import com.sipai.service.report.RptDayLogService;
 import com.sipai.service.report.RptDayValSetService;
 import com.sipai.service.report.RptDeptSetService;
+import com.sipai.service.report.RptInfoSetService;
 import com.sipai.service.scada.MPointExpandService;
 import com.sipai.service.scada.MPointHistoryService;
 import com.sipai.service.scada.MPointService;
 import com.sipai.service.user.UserService;
+import com.sipai.service.user.UserJobService;
 import com.sipai.tools.CommUtil;
 import com.sipai.tools.SpringContextUtil;
 import net.sf.json.JSONArray;
@@ -65,6 +68,11 @@ public class RptDayLogServiceImpl implements RptDayLogService {
     private MsgTypeService msgtypeService;
 	@Resource
 	private MPointExpandService mPointExpandService;
+	@Resource
+	private UserJobService userJobService;
+	
+	@Resource
+	private RptInfoSetService rptInfoSetService;
 	
 	@Override
 	public RptDayLog selectById(String id) {
@@ -877,5 +885,88 @@ public class RptDayLogServiceImpl implements RptDayLogService {
         Result result = Result.success(1);
         return result;
     }
-	
+
+	@Override
+	public boolean checkInputPermission(String rptdeptId, User user) {
+		if (rptdeptId == null || user == null) {
+			return false;
+		}
+		
+		RptDeptSet rptDeptSet = this.rptDeptSetService.selectById(rptdeptId);
+		if (rptDeptSet == null) {
+			return false;
+		}
+		
+		Integer roleType = rptDeptSet.getRoleType();
+		String inputuser = rptDeptSet.getInputuser();
+		String inputjob = rptDeptSet.getInputjob();
+		String userId = user.getId();
+		
+		// role_type=2: 不控制权限，所有人都可以填报
+		if (roleType != null && roleType == 2) {
+			return true;
+		}
+		
+		// role_type 为 null 或空字符串: 允许所有人
+		if (roleType == null || roleType == 0 && (inputuser == null || inputuser.isEmpty()) 
+				|| roleType == 1 && (inputjob == null || inputjob.isEmpty())) {
+			return true;
+		}
+		
+		// role_type=0: 按用户控制权限
+		if (roleType == 0) {
+			if (inputuser != null && !inputuser.isEmpty()) {
+				// 检查当前用户ID是否在inputuser中
+				String[] userIds = inputuser.split(",");
+				for (String uid : userIds) {
+					if (userId.equals(uid.trim())) {
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+		
+		// role_type=1: 按岗位控制权限
+		if (roleType == 1) {
+			if (inputjob != null && !inputjob.isEmpty()) {
+				// 获取当前用户的所有岗位
+				List<UserJob> userJobs = this.userJobService.selectListByWhere("where userid = '" + userId + "'");
+				if (userJobs != null && !userJobs.isEmpty()) {
+					String[] jobIds = inputjob.split(",");
+					for (UserJob userJob : userJobs) {
+						String userJobId = userJob.getJobid();
+						for (String jobId : jobIds) {
+							if (userJobId != null && userJobId.equals(jobId.trim())) {
+								return true;
+							}
+						}
+					}
+				}
+			}
+			return false;
+		}
+		
+		return false;
+	}
+
+	@Override
+	public boolean checkGeneratePermission(String rptdeptId, User user) {
+		if (rptdeptId == null || user == null) {
+			return false;
+		}
+		
+		RptDeptSet rptDeptSet = this.rptDeptSetService.selectById(rptdeptId);
+		if (rptDeptSet == null) {
+			return false;
+		}
+		
+		String rptInfoSetId = rptDeptSet.getBizId(); // 假设bizId是RptInfoSet的ID
+		if (rptInfoSetId == null || rptInfoSetId.isEmpty()) {
+			return false;
+		}
+		
+		return this.rptInfoSetService.checkGeneratePermission(rptInfoSetId, user);
+	}
+
 }

src/main/java/com/sipai/service/report/impl/RptInfoSetServiceImpl.java

@@ -615,4 +615,49 @@ public class RptInfoSetServiceImpl implements RptInfoSetService {
         }
         return list_result;
     }
+
+    @Override
+    public boolean checkGeneratePermission(String rptInfoSetId, User user) {
+        if (rptInfoSetId == null || user == null) {
+            return false;
+        }
+        
+        RptInfoSet rptInfoSet = this.selectById(rptInfoSetId);
+        if (rptInfoSet == null) {
+            return false;
+        }
+        
+        String userId = user.getId();
+        String createusers = rptInfoSet.getCreateusers();
+        String generatePosition = rptInfoSet.getGeneratePosition();
+        
+        // 检查createusers
+        if (createusers != null && !createusers.isEmpty()) {
+            String[] userIds = createusers.split(",");
+            for (String uid : userIds) {
+                if (userId.equals(uid.trim())) {
+                    return true;
+                }
+            }
+        }
+        
+        // 检查generatePosition
+        if (generatePosition != null && !generatePosition.isEmpty()) {
+            // 获取当前用户的所有岗位
+            List<UserJob> userJobs = userJobService.selectListByWhere("where userid = '" + userId + "'");
+            if (userJobs != null && !userJobs.isEmpty()) {
+                String[] jobIds = generatePosition.split(",");
+                for (UserJob userJob : userJobs) {
+                    String userJobId = userJob.getJobid();
+                    for (String jobId : jobIds) {
+                        if (userJobId != null && userJobId.equals(jobId.trim())) {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+        
+        return false;
+    }
 }

src/main/java/com/sipai/service/safety/SafetyCheckActivityService.java

@@ -47,12 +47,22 @@ public class SafetyCheckActivityService {
         if (processDefinitions == null || processDefinitions.size() == 0) {
             return Result.failed(company.getName() + "缺少该流程定义。");
         }
+        // 防止重复发起：若该业务已有运行中的流程实例，则跳过，避免创建双倍待办任务
+        List<org.activiti.engine.runtime.ProcessInstance> existingInstances = workflowService.getRuntimeService()
+                .createProcessInstanceQuery()
+                .processDefinitionKey(processKey)
+                .processInstanceBusinessKey(bizId)
+                .active()
+                .list();
+        if (existingInstances != null && !existingInstances.isEmpty()) {
+            return Result.success();
+        }
         // 启动流程实例
         // 设置网关条件
         Map<String, Object> map = new HashMap<>();
         map.put(CommString.ACTI_KEK_Condition, 1);
         map.put(CommString.ACTI_KEK_Assignee, applyUserId);
-        map.put(CommString.ACTI_KEK_Candidate_Users, applyUserId);
+        map.put(CommString.ACTI_KEK_Candidate_Users, "");
 
         // 启动流程
         ProcessInstance processInstance = workflowService.startWorkflow(
@@ -71,7 +81,7 @@ public class SafetyCheckActivityService {
         Map<String, Object> map2 = new HashMap<>();
         map2.put(CommString.ACTI_KEK_Condition, 1);
         map2.put(CommString.ACTI_KEK_Assignee, nextUserId);
-        map2.put(CommString.ACTI_KEK_Candidate_Users, nextUserId);
+        map2.put(CommString.ACTI_KEK_Candidate_Users, "");
         workflowService.getTaskService().complete(task.getId(), map2);
 
         return Result.success();
@@ -84,13 +94,16 @@ public class SafetyCheckActivityService {
      * @Date: 2022/10/10
      **/
     public Result audit(String nextUserId, String processInstanceId, int pass) {
-        Task task =
-                workflowService.getTaskService().createTaskQuery().processInstanceId(processInstanceId).singleResult();
+        List<Task> tasks = workflowService.getTaskService().createTaskQuery().processInstanceId(processInstanceId).active().list();
+        if (tasks == null || tasks.isEmpty()) {
+            return Result.failed("No active task found for process instance: " + processInstanceId);
+        }
         Map<String, Object> map = new HashMap<>();
         map.put(CommString.ACTI_KEK_Condition, pass);
         map.put(CommString.ACTI_KEK_Assignee, nextUserId);
-        map.put(CommString.ACTI_KEK_Candidate_Users, nextUserId);
-        workflowService.getTaskService().complete(task.getId(), map);
+        map.put(CommString.ACTI_KEK_Candidate_Users, "");
+        // 只完成第一个任务，防止多任务场景下指数级创建待办（如因重复发起导致有多个并发任务时）
+        workflowService.getTaskService().complete(tasks.get(0).getId(), map);
         return Result.success();
     }
 

src/main/java/com/sipai/service/safety/SafetyFilesService.java

@@ -101,6 +101,9 @@ public class SafetyFilesService implements CommService<SafetyFiles> {
             MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
             List<MultipartFile> files = multipartRequest.getFiles("file");
             for (MultipartFile mfile : files) {
+                if (mfile == null || mfile.getSize() == 0) {
+                    continue;
+                }
                 String suffix = mfile.getOriginalFilename().substring(mfile.getOriginalFilename().lastIndexOf("."));
 
                 //判断保存文件的路径是否存在

src/main/java/com/sipai/service/safety/SafetyFlowTaskService.java

@@ -100,44 +100,65 @@ public class SafetyFlowTaskService implements CommService<SafetyFlowTask> {
             String copyNames,
             String record) throws ServiceException {
 
-        SafetyFlowTask safetyFlowTask;
+        SafetyFlowTask safetyFlowTask = null;
         List<SafetyFlowTask> list = selectListByWhere(" where biz_id='" + bizId + "' order by create_time desc");
-        if (list != null && list.size() != 0 && list.get(0).getTaskName().equals(taskTitle)) {
-            safetyFlowTask = list.get(0);
-            safetyFlowTask.setIsDone(true);
-            safetyFlowTask.setCopy(copyNames);
-            safetyFlowTask.setDoneTime(DateUtil.toStr(null, new Date()));
-            update(safetyFlowTask);
-        } else if (list != null && list.size() != 0 && !list.get(0).getTaskName().equals(taskTitle)) {
-            safetyFlowTask = list.get(0);
-            safetyFlowTask.setIsDone(true);
-            safetyFlowTask.setCopy(copyNames);
-            safetyFlowTask.setDoneTime(DateUtil.toStr(null, new Date()));
-            update(safetyFlowTask);
-
-            safetyFlowTask = new SafetyFlowTask();
-
-            safetyFlowTask.setId(UUID.randomUUID().toString());
-            safetyFlowTask.setBizId(bizId);
-            safetyFlowTask.setTaskName(taskTitle);
-            safetyFlowTask.setIsDone(isDone);
-            safetyFlowTask.setDoneTime(isDone ? DateUtil.toStr(null, new Date()) : null);
-            safetyFlowTask.setAuditor(auditorName);
-            safetyFlowTask.setCopy(copyNames);
-            save(safetyFlowTask);
-
-        } else {
-            safetyFlowTask = new SafetyFlowTask();
-
-            safetyFlowTask.setId(UUID.randomUUID().toString());
-            safetyFlowTask.setBizId(bizId);
-            safetyFlowTask.setTaskName(taskTitle);
-            safetyFlowTask.setIsDone(isDone);
-            safetyFlowTask.setDoneTime(isDone ? DateUtil.toStr(null, new Date()) : null);
-            safetyFlowTask.setAuditor(auditorName);
-            safetyFlowTask.setCopy(copyNames);
-            save(safetyFlowTask);
+        
+        // 查找是否已存在相同taskTitle的记录
+        SafetyFlowTask existingTask = null;
+        if (list != null && !list.isEmpty()) {
+            for (SafetyFlowTask task : list) {
+                if (task.getTaskName().equals(taskTitle)) {
+                    existingTask = task;
+                    break;
+                }
+            }
         }
+        
+        if (isDone) {
+            // 标记任务为完成
+            if (existingTask != null) {
+                // 更新已存在的记录
+                existingTask.setIsDone(true);
+                existingTask.setCopy(copyNames);
+                existingTask.setDoneTime(DateUtil.toStr(null, new Date()));
+                update(existingTask);
+                safetyFlowTask = existingTask;
+            } else {
+                // 创建新的完成记录
+                safetyFlowTask = new SafetyFlowTask();
+                safetyFlowTask.setId(UUID.randomUUID().toString());
+                safetyFlowTask.setBizId(bizId);
+                safetyFlowTask.setTaskName(taskTitle);
+                safetyFlowTask.setIsDone(true);
+                safetyFlowTask.setDoneTime(DateUtil.toStr(null, new Date()));
+                safetyFlowTask.setAuditor(auditorName);
+                safetyFlowTask.setCopy(copyNames);
+                save(safetyFlowTask);
+            }
+        } else {
+            // 创建待处理任务
+            if (existingTask == null) {
+                // 不存在才创建
+                safetyFlowTask = new SafetyFlowTask();
+                safetyFlowTask.setId(UUID.randomUUID().toString());
+                safetyFlowTask.setBizId(bizId);
+                safetyFlowTask.setTaskName(taskTitle);
+                safetyFlowTask.setIsDone(false);
+                safetyFlowTask.setDoneTime(null);
+                safetyFlowTask.setAuditor(auditorName);
+                safetyFlowTask.setCopy(copyNames);
+                save(safetyFlowTask);
+            } else {
+                // 已存在，重置为待处理状态（用于流程回退后重新处理）
+                existingTask.setIsDone(false);
+                existingTask.setDoneTime(null);
+                existingTask.setAuditor(auditorName);
+                existingTask.setCopy(copyNames);
+                update(existingTask);
+                safetyFlowTask = existingTask;
+            }
+        }
+        
         if (StringUtils.isNotEmpty(record)) {
             SafetyFlowTaskDetail safetyFlowTaskDetail = new SafetyFlowTaskDetail();
             safetyFlowTaskDetail.setId(UUID.randomUUID().toString());

src/main/java/com/sipai/service/scada/MPointService.java

@@ -1474,7 +1474,7 @@ public class MPointService {
                     if (DateUtil.isCellDateFormatted(cell)) {
                         //用于转化为日期格式
                         Date d = cell.getDateCellValue();
-                        SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+                        SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                         String cellDate = formater.format(d);
                         return cellDate;
                     } else {
@@ -1510,7 +1510,7 @@ public class MPointService {
                     if (DateUtil.isCellDateFormatted(cell)) {
                         //用于转化为日期格式
                         Date d = cell.getDateCellValue();
-                        SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+                        SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                         String cellDate = formater.format(d);
                         return cellDate;
                     } else {
@@ -1661,7 +1661,7 @@ public class MPointService {
                 for (int i = minCellNum; i < maxCellNum; i++) {
                     HSSFCell mpidCell = mpidRow.getCell(i);
                     String mpidStr = getStringVal(mpidCell);
-                    MPoint mPoint = this.selectByWhere(unitId, "where MPointCode like '%" + mpidStr + "%' or ParmName like '%" + mpidStr + "%' ");
+                    MPoint mPoint = this.selectByWhere(unitId, "where MPointCode = '"+ mpidStr+"'");
                     if (mPoint != null) {
                         String mpid = mPoint.getMpointcode();
                         MPointHistory mPointHistory = new MPointHistory();

src/main/java/com/sipai/service/sparepart/SewageService.java

@@ -32,18 +32,18 @@ import java.util.List;
 import static org.apache.poi.ss.usermodel.CellType.STRING;
 
 @Service
-public class SewageService implements CommService<Sewage>{
-	@Resource
-	private SewageDao SewageDao;
-	@Resource
-	private UnitService unitService;
-	@Resource
-	private CompanyService companyService;
-	@Resource
-	private ProcessSectionService processSectionService;
+public class SewageService implements CommService<Sewage> {
+    @Resource
+    private SewageDao SewageDao;
+    @Resource
+    private UnitService unitService;
+    @Resource
+    private CompanyService companyService;
+    @Resource
+    private ProcessSectionService processSectionService;
     @Resource
     private SewageInputService sewageInputService;
-    
+
     @Resource
     private JsywPointService jsywPointService;
 
@@ -62,84 +62,86 @@ public class SewageService implements CommService<Sewage>{
         }
         return null;
     }
-	
-	@Override
-	public Sewage selectById(String id) {
-		Sewage sewage = SewageDao.selectByPrimaryKey(id);
+
+    @Override
+    public Sewage selectById(String id) {
+        Sewage sewage = SewageDao.selectByPrimaryKey(id);
         sewage.setCompany(this.unitService.getCompById(sewage.getUnitId()));
         ProcessSection processSection = this.getProcessSectionByStoredValue(sewage.getProcessSectionId());
         if (processSection != null) {
             sewage.setProcessSection(processSection);
         }
-		List<SewageInput> sewageInputList = this.sewageInputService.selectListByWhere("where sewage_id='"+sewage.getContractNumber()+"' order by insdt");
-        if(sewageInputList!=null && sewageInputList.size()>0){
+        List<SewageInput> sewageInputList = this.sewageInputService.selectListByWhere("where sewage_id='" + sewage.getContractNumber() + "' order by insdt");
+        if (sewageInputList != null && sewageInputList.size() > 0) {
             sewage.set_input(true);
-        }else{
+        } else {
             sewage.set_input(false);
         }
-        List<JsywPoint> jsywPointList = this.jsywPointService.selectListByWhere("where psname='"+sewage.getName()+"' order by update_date");
-        if(jsywPointList!=null && jsywPointList.size()>0){
+        List<JsywPoint> jsywPointList = this.jsywPointService.selectListByWhere("where psname='" + sewage.getName() + "' order by update_date");
+        if (jsywPointList != null && jsywPointList.size() > 0) {
             sewage.set_point(true);
-        }else{
+        } else {
             sewage.set_point(false);
         }
-		return sewage;
-	}
-	
-	@Override
-	public int deleteById(String id) {
-		return SewageDao.deleteByPrimaryKey(id);
-	}
-	
-	@Override
-	public int save(Sewage sewage) {
-		return SewageDao.insert(sewage);
-	} 
-	
-	@Override
-	public int update(Sewage sewage) {
-		return SewageDao.updateByPrimaryKeySelective(sewage);
-	}
+        return sewage;
+    }
 
-	@Override
-	public List<Sewage> selectListByWhere(String wherestr) {
-		Sewage sewage = new Sewage();
-		sewage.setWhere(wherestr);
-		List<Sewage> list = SewageDao.selectListByWhere(sewage);
-		for (Sewage item : list) {
-			item.setCompany(this.unitService.getCompById(item.getUnitId()));
-			ProcessSection processSection = this.getProcessSectionByStoredValue(item.getProcessSectionId());
-			if (processSection != null) {
-				item.setProcessSection(processSection);
-			}
-			List<SewageInput> sewageInputList = this.sewageInputService.selectListByWhere4Pure("where sewage_id='"+item.getContractNumber()+"' order by insdt");
-			if(sewageInputList!=null && sewageInputList.size()>0){
-			    item.set_input(true);
-			}else{
+    @Override
+    public int deleteById(String id) {
+        return SewageDao.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int save(Sewage sewage) {
+        return SewageDao.insert(sewage);
+    }
+
+    @Override
+    public int update(Sewage sewage) {
+        return SewageDao.updateByPrimaryKeySelective(sewage);
+    }
+
+    @Override
+    public List<Sewage> selectListByWhere(String wherestr) {
+        Sewage sewage = new Sewage();
+        sewage.setWhere(wherestr);
+        List<Sewage> list = SewageDao.selectListByWhere(sewage);
+        for (Sewage item : list) {
+            item.setCompany(this.unitService.getCompById(item.getUnitId()));
+            ProcessSection processSection = this.getProcessSectionByStoredValue(item.getProcessSectionId());
+            if (processSection != null) {
+                item.setProcessSection(processSection);
+            }
+            List<SewageInput> sewageInputList = this.sewageInputService.selectListByWhere4Pure("where sewage_id='" + item.getContractNumber() + "' order by insdt");
+            if (sewageInputList != null && sewageInputList.size() > 0) {
+                item.set_input(true);
+            } else {
                 item.set_input(false);
-			}
-            List<JsywPoint> jsywPointList = this.jsywPointService.selectListByWhere("where psname='"+item.getName()+"' order by update_date");
-            if(jsywPointList!=null && jsywPointList.size()>0){
+            }
+            List<JsywPoint> jsywPointList = this.jsywPointService.selectListByWhere("where psname='" + item.getName() + "' order by update_date");
+            if (jsywPointList != null && jsywPointList.size() > 0) {
                 item.set_point(true);
-            }else{
+            } else {
                 item.set_point(false);
             }
-		}
-		return list;
-	}
-	@Override
-	public int deleteByWhere(String wherestr) {
-		Sewage sewage = new Sewage();
-		sewage.setWhere(wherestr);
-		return SewageDao.deleteByWhere(sewage);
-	}
+        }
+        return list;
+    }
+
+    @Override
+    public int deleteByWhere(String wherestr) {
+        Sewage sewage = new Sewage();
+        sewage.setWhere(wherestr);
+        return SewageDao.deleteByWhere(sewage);
+    }
+
     public List<Sewage> selectDistinctCityByWhere(String wherestr) {
         Sewage sewage = new Sewage();
         sewage.setWhere(wherestr);
         List<Sewage> list = SewageDao.selectDistinctCityByWhere(sewage);
         return list;
     }
-	
+
     /**
      * xls文件数据转换
      *
@@ -154,24 +156,26 @@ public class SewageService implements CommService<Sewage>{
                 return cell.getCellFormula();
             case NUMERIC:
 
-                    //判断是否为日期类型
-                    if (DateUtil.isCellDateFormatted(cell)) {
-                        //用于转化为日期格式
-                        Date d = cell.getDateCellValue();
-                        SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
-                        String cellDate = formater.format(d);
-                        return cellDate;
-                    } else {
-                        cell.setCellType(STRING);
-                        return cell.getStringCellValue();
-                    }
+                //判断是否为日期类型
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    //用于转化为日期格式
+                    Date d = cell.getDateCellValue();
+                    SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
+                    String cellDate = formater.format(d);
+                    return cellDate;
+                } else {
+                    cell.setCellType(STRING);
+                    return cell.getStringCellValue();
+                }
 
             case STRING:
                 return cell.getStringCellValue();
             default:
                 return null;
         }
-    }    private String getBizId(String bizName) {
+    }
+
+    private String getBizId(String bizName) {
         String bizId = "";
         List<Company> CompanyList = this.companyService.selectListByWhere("where sname = '" + bizName + "' or name = '" + bizName + "' ");
         if (CompanyList != null && CompanyList.size() > 0) {
@@ -201,20 +205,20 @@ public class SewageService implements CommService<Sewage>{
                 int maxCellNum = row.getLastCellNum();//最后一列
 
                 Sewage sewage = new Sewage();
-                
+
                 HSSFCell cell = row.getCell(1);
-                if (getStringVal(cell)==null) {
-					continue;
-				}
+                if (getStringVal(cell) == null) {
+                    continue;
+                }
                 sewage.setContractNumber(getStringVal(cell));
-                
+
                 cell = row.getCell(2);
                 System.out.println(getStringVal(cell));
                 sewage.setContractOrder(Integer.parseInt(getStringVal(cell)));
-                
+
                 cell = row.getCell(3);
                 sewage.setName(getStringVal(cell));
-                
+
                 cell = row.getCell(4);
                 sewage.setAddress(getStringVal(cell));
                 cell = row.getCell(5);
@@ -224,10 +228,10 @@ public class SewageService implements CommService<Sewage>{
                 cell = row.getCell(7);
                 sewage.setPhone(getStringVal(cell));
                 cell = row.getCell(8);
-    			List<ProcessSection> processSectionList = this.processSectionService.selectListByWhere("where name = '"+getStringVal(cell)+"' and unit_id = 'JSBZ'");
-    			if (processSectionList.size()>0) {
-                    sewage.setProcessSectionId(processSectionList.get(0)==null?"":processSectionList.get(0).getCode());
-    			}
+                List<ProcessSection> processSectionList = this.processSectionService.selectListByWhere("where name = '" + getStringVal(cell) + "' and unit_id = 'JSBZ'");
+                if (processSectionList.size() > 0) {
+                    sewage.setProcessSectionId(processSectionList.get(0) == null ? "" : processSectionList.get(0).getCode());
+                }
                 cell = row.getCell(9);
                 sewage.setUnitId(this.getBizId(getStringVal(cell)));
                 cell = row.getCell(10);
@@ -241,7 +245,7 @@ public class SewageService implements CommService<Sewage>{
                 cell = row.getCell(14);
                 sewage.setPermit(getStringVal(cell));
                 cell = row.getCell(15);
-                sewage.setDisplacement(Integer.parseInt((getStringVal(cell)==null?"0":getStringVal(cell))));
+                sewage.setDisplacement(Integer.parseInt((getStringVal(cell) == null ? "0" : getStringVal(cell))));
                 cell = row.getCell(16);
                 sewage.setStandard(getStringVal(cell));
                 cell = row.getCell(17);
@@ -254,30 +258,30 @@ public class SewageService implements CommService<Sewage>{
                 sewage.setAttribute(getStringVal(cell));
                 cell = row.getCell(27);
                 sewage.setRemark(getStringVal(cell));
-                
+
 //                sewage.setVentNum(ventNum);
-                
+
                 sewage.setId(CommUtil.getUUID());
 
-                List<Sewage> selectListByWhere = this.selectListByWhere("where contract_number = '"+sewage.getContractNumber()+"'");
-                if (selectListByWhere!=null&&selectListByWhere.size()>0) {
-                	sewage.setId(selectListByWhere.get(0).getId());
-	                
-	                int result = this.update(sewage);
-	                if (result == 1) {
-	                    sumNum++;
-	                } else {
-	                    failNum++;
-	                }
-				}else {
-	                
-	                int result = this.save(sewage);
-	                if (result == 1) {
-	                    sumNum++;
-	                } else {
-	                    failNum++;
-	                }
-				}
+                List<Sewage> selectListByWhere = this.selectListByWhere("where contract_number = '" + sewage.getContractNumber() + "'");
+                if (selectListByWhere != null && selectListByWhere.size() > 0) {
+                    sewage.setId(selectListByWhere.get(0).getId());
+
+                    int result = this.update(sewage);
+                    if (result == 1) {
+                        sumNum++;
+                    } else {
+                        failNum++;
+                    }
+                } else {
+
+                    int result = this.save(sewage);
+                    if (result == 1) {
+                        sumNum++;
+                    } else {
+                        failNum++;
+                    }
+                }
 
             }
         }
@@ -293,8 +297,8 @@ public class SewageService implements CommService<Sewage>{
         return result;
     }
 
-	public void outExcelFun(HttpServletResponse response) throws IOException {
-        String fileName = "金山排海工程有限公司纳管企业表.xls";
+    public void outExcelFun(HttpServletResponse response) throws IOException {
+        String fileName = "金山卫污水厂纳管企业表.xls";
         String title = "纳管企业";
         // 声明一个工作薄
         HSSFWorkbook workbook = new HSSFWorkbook();
@@ -372,7 +376,7 @@ public class SewageService implements CommService<Sewage>{
 
         //产生表格表头
         String excelTitleStr = "序号,合同编号,合同顺序,单位名称,单位地址,合同到期日,联系人,联系电话,*所属泵站,*所属车间,排污许可证编号,雨、污水管平面图,环评报告/登记表/批复,所属行业,排水许可证（编号）复印件/申请表,实际日排量（吨/天）,排放标准（排水许可证）,管网所有权单位,统一社会信用代码,地址位置（经纬度）,接入管网坐标-经度（度）,接入管网坐标-经度（分）,接入管网坐标-经度（秒）,接入管网坐标-纬度（度）,接入管网坐标-纬度（分）,接入管网坐标-纬度（秒）,管网属性（分流/合流）,备注";
-        
+
         String[] excelTitle = excelTitleStr.split(",");
         HSSFRow row = sheet.createRow(1);
         row.setHeight((short) 800);
@@ -418,17 +422,17 @@ public class SewageService implements CommService<Sewage>{
         handRow.setHeight((short) 500);
         HSSFCell cell = handRow.createCell(0);
         cell.setCellStyle(headStyle);
-        cell.setCellValue("金山排海工程有限公司纳管企业表");
+        cell.setCellValue("金山卫污水厂纳管企业表");
         // 说明
 //        HSSFCell smcell = handRow.createCell(5);
 //        smcell.setCellStyle(tipStyle);
 //        smcell.setCellValue("注:日期格式(xxxx-xx-xx或xxxx/xx/xx), 班组类型，班组, 班次(根据系统配置名称填写)，模式（填写巡检菜单里面的巡检模式） 排版日期，班组类型，班组，班次，模式都为必填项（集控班组可不填模式）。");
 
-    	List<Sewage> list = this.selectListByWhere("where 1=1 order by contract_order asc");
-    	int n = 1;
+        List<Sewage> list = this.selectListByWhere("where 1=1 order by contract_order asc");
+        int n = 1;
         if (list != null && list.size() > 0) {
             for (int i = 0; i < list.size(); i++) {
-            	Sewage sewage = list.get(i);
+                Sewage sewage = list.get(i);
                 HSSFRow listrow1 = sheet.createRow(i + 2);
                 listrow1.setHeight((short) 400);
                 HSSFCell listcell0 = listrow1.createCell(0);
@@ -441,7 +445,7 @@ public class SewageService implements CommService<Sewage>{
 
                 HSSFCell listcell2 = listrow1.createCell(2);
                 listcell2.setCellStyle(listStyle);
-                listcell2.setCellValue(sewage.getContractOrder());
+                listcell2.setCellValue(sewage.getContractOrder() == null ? 1 : sewage.getContractOrder());
 
                 HSSFCell listcell3 = listrow1.createCell(3);
                 listcell3.setCellStyle(listStyle);
@@ -501,7 +505,7 @@ public class SewageService implements CommService<Sewage>{
 
                 HSSFCell listcell15 = listrow1.createCell(15);
                 listcell15.setCellStyle(listStyle);
-                listcell15.setCellValue((sewage.getDisplacement()==null?0:sewage.getDisplacement()));
+                listcell15.setCellValue((sewage.getDisplacement() == null ? 0 : sewage.getDisplacement()));
 
                 HSSFCell listcell16 = listrow1.createCell(16);
                 listcell16.setCellStyle(listStyle);
@@ -572,31 +576,33 @@ public class SewageService implements CommService<Sewage>{
             workbook.close();
         }
     }
-	/**
+
+    /**
      * 获取树，三层结构，processSection为根节点，sewage为子节点
-     * @方法名:getTreeList 
-     * @参数 @param 
-     * @参数 @return  
+     *
+     * @方法名:getTreeList
+     * @参数 @param
+     * @参数 @return
      * @返回类型 String
      */
     public String getTreeList(List<Sewage> list) {
         JSONArray list_result = new JSONArray();
-        if(list!=null && list.size()>0){
+        if (list != null && list.size() > 0) {
             String processSectionId = null;
             String unitId = null;
             JSONObject root_childs = new JSONObject();
             JSONArray root_childlist = new JSONArray();
             JSONObject childs = new JSONObject();
             JSONArray childlist = new JSONArray();
-            for(int i=0;i<list.size();i++){
+            for (int i = 0; i < list.size(); i++) {
                 Sewage sewage = list.get(i);
-                if(unitId==null || unitId.isEmpty()){
+                if (unitId == null || unitId.isEmpty()) {
                     unitId = sewage.getUnitId();
                     Company company = sewage.getCompany();
-                    if(company != null){
+                    if (company != null) {
                         root_childs.put("id", company.getId());
                         root_childs.put("text", company.getName());
-                    }else{
+                    } else {
                         root_childs.put("id", unitId);
                         //没有关联Company或者unitId不存在
                         root_childs.put("text", "无区域数据");
@@ -604,8 +610,8 @@ public class SewageService implements CommService<Sewage>{
                     root_childs.put("pid", "-1");
                     root_childs.put("type", "unit");
                 }
-                if(!unitId.equals(sewage.getUnitId())){
-                  //向当前根节点添加所有子节点
+                if (!unitId.equals(sewage.getUnitId())) {
+                    //向当前根节点添加所有子节点
                     childs.put("nodes", childlist);
                     root_childlist.add(childs);
                     root_childs.put("nodes", root_childlist);
@@ -618,10 +624,10 @@ public class SewageService implements CommService<Sewage>{
                     //初始设置根节点
                     unitId = sewage.getUnitId();
                     Company company = sewage.getCompany();
-                    if(company != null){
+                    if (company != null) {
                         root_childs.put("id", company.getId());
                         root_childs.put("text", company.getName());
-                    }else{
+                    } else {
                         root_childs.put("id", unitId);
                         //没有关联Company或者unitId不存在
                         root_childs.put("text", "无区域数据");
@@ -631,15 +637,15 @@ public class SewageService implements CommService<Sewage>{
                     //初始设置根节点
                     processSectionId = null;
                 }
-                if(processSectionId==null || processSectionId.isEmpty()){
+                if (processSectionId == null || processSectionId.isEmpty()) {
                     //初始设置根节点
                     processSectionId = sewage.getProcessSectionId();
                     ProcessSection processSection = sewage.getProcessSection();
-                    if(processSection != null){
+                    if (processSection != null) {
                         childs.put("id", processSection.getCode());
                         childs.put("text", processSection.getName());
-                    }else{
-                        if(processSectionId.isEmpty()){
+                    } else {
+                        if (processSectionId.isEmpty()) {
                             processSectionId = "error";
                         }
                         childs.put("id", processSectionId);
@@ -648,9 +654,9 @@ public class SewageService implements CommService<Sewage>{
                     }
                     childs.put("pid", unitId);
                     childs.put("type", "processSection");
-                    
+
                 }
-                if(processSectionId.equals(sewage.getProcessSectionId())){
+                if (processSectionId.equals(sewage.getProcessSectionId())) {
                     //设置子节点sewage
                     JSONObject child = new JSONObject();
                     child.put("id", sewage.getId());
@@ -658,7 +664,7 @@ public class SewageService implements CommService<Sewage>{
                     child.put("pid", processSectionId);
                     child.put("type", "sewage");
                     childlist.add(child);
-                }else{
+                } else {
                     //向当前根节点添加所有子节点
                     childs.put("nodes", childlist);
                     root_childlist.add(childs);
@@ -668,11 +674,11 @@ public class SewageService implements CommService<Sewage>{
                     //初始设置根节点
                     processSectionId = sewage.getProcessSectionId();
                     ProcessSection processSection = sewage.getProcessSection();
-                    if(processSection != null){
+                    if (processSection != null) {
                         childs.put("id", processSection.getCode());
                         childs.put("text", processSection.getName());
-                    }else{
-                        if(processSectionId.isEmpty()){
+                    } else {
+                        if (processSectionId.isEmpty()) {
                             processSectionId = "error";
                         }
                         childs.put("id", processSectionId);
@@ -688,7 +694,7 @@ public class SewageService implements CommService<Sewage>{
                     child.put("type", "sewage");
                     childlist.add(child);
                 }
-                if((i+1)==list.size()){
+                if ((i + 1) == list.size()) {
                     //最后子节点结束时，向当前根节点添加所有子节点
                     childs.put("nodes", childlist);
                     root_childlist.add(childs);

src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsServiceImpl.java

@@ -132,6 +132,7 @@ public class PatrolContentsServiceImpl implements PatrolContentsService {
                         jsonObject.put("id", list3.get(j).getId());
                         jsonObject.put("name", list3.get(j).getContents());
                         jsonObject.put("text", list3.get(j).getContents());
+                        jsonObject.put("contentsDetail", list3.get(j).getContentsDetail());
                         jsonObject.put("type", TimeEfficiencyCommStr.PatrolEquipment_Equipment);
                         jsonObject.put("icon", TimeEfficiencyCommStr.PatrolContents);
                         jsonArrayEqu.add(jsonObject);

src/main/webapp/JS/activiti/workflow.js

@@ -346,6 +346,10 @@ var processSelectNodeForHandle = function(taskId){
 		//选择下一节点，先选择审核结果，再选择节点
 		$.post(ext.contextPath + "/activiti/workflow/getRoutesForSelect2.do", {taskId:taskId,passFlag:passFlag}, function(data) {
 			$("#routeNum").empty();
+			if (!data || data.length === 0) {
+				console.warn('getRoutesForSelect2: no routes found for passFlag=' + passFlag);
+				return;
+			}
 			var selelct = $("#routeNum").select2({
 				data: data,
 				placeholder:'请先选择审核结果',//默认文字提示
@@ -374,6 +378,10 @@ var processSelectNodeForHandle = function(taskId){
 	})
 	selectResult.val('').trigger("change");
 	$.post(ext.contextPath + "/activiti/workflow/getRoutesForSelect2.do", {taskId:taskId,passFlag:true}, function(data) {
+		if (!data || data.length === 0) {
+			console.warn('getRoutesForSelect2: no routes found for passFlag=true');
+			return;
+		}
 		var selelct = $("#routeNum").select2({
 			data: data,
 			placeholder:'请先选择审核结果',//默认文字提示

src/main/webapp/JS/comm.js

@@ -870,7 +870,7 @@ function openModal(modalId) {
             }
 
         }
-    })
+    });
 };
 
 /**
@@ -1060,6 +1060,12 @@ $(function () {
     });
     //FastClick.attach(document.body);
 
+    // 解决嵌套模态框中输入框无法获得焦点的问题
+    // 禁用Bootstrap模态框的enforceFocus，允许嵌套模态框中的输入框正常工作
+    if ($.fn.modal && $.fn.modal.Constructor) {
+        $.fn.modal.Constructor.prototype.enforceFocus = function() {};
+    }
+
     //弹窗关闭触发方法
     /*$(".modal").on("hidden.bs.modal", function() {
     	$('.modal').css("overflow","auto");

src/main/webapp/JS/commonFile.js

@@ -116,8 +116,11 @@ var getFileListMinioPic = function (divId, status, entityId, previews, previewCo
         tbName: tbName,
         bucketName: bucketName
     }, function (data) {
+        // 清空数组而不是重新赋值，这样可以保持引用不变
+        previews.length = 0;
+        previewConfigs.length = 0;
+        
         if (data.length > 0) {
-            previews = new Array();
             $('#maintenancefile').show();
             for (var i = 0; i < data.length; i++) {
                 var previewConfig = new Object();
@@ -133,10 +136,9 @@ var getFileListMinioPic = function (divId, status, entityId, previews, previewCo
                 }
                 previewConfigs.push(previewConfig);
             }
-            showFileInput_new(divId, previews, previewConfigs);
-        } else {
-            $('#' + divId).hide();
         }
+        // 无论是否有数据都重新初始化控件
+        showFileInput_new(divId, previews, previewConfigs);
     }, 'json');
 };
 

src/main/webapp/JS/main/main_js.js

@@ -1,6 +1,5 @@
 //金山项目首页
 
-
 /**
  * 获取点位实时值
  * @param unitId
@@ -8,30 +7,64 @@
  * @param valueId
  * @param textId
  */
-function getValue(unitId, mpointCode, valueId, textId) {
+function getValue4Es(unitId, mpointCode, valueId, textId) {
     $.ajax({
-        type: 'GET',
-        url: ext.contextPath + '/work/mpoint/getValue4Es.do?unitId=' + unitId + '&mpointCode=' + mpointCode,
+        type: "GET",
+        url:
+            ext.contextPath +
+            "/work/mpoint/getValue4Es.do?unitId=" +
+            unitId +
+            "&mpointCode=" +
+            mpointCode,
         async: true,
         globle: false,
         error: function () {
             return false;
         },
         success: function (data) {
-            if (data != null && data != '') {
-                var data = eval('(' + data + ')');
+            if (data != null && data != "") {
+                var data = eval("(" + data + ")");
                 //只限制上限为0.8   下限根据设定值自己设
                 // var maxvalue = data.alarmmax/0.8;
                 // var minvalue = data.alarmmin/maxvalue;
                 // var acvalue = data.parmvalue/maxvalue*100;
-                $('#' + valueId).html(data.parmvalue);//赋值
+                $("#" + valueId).html(data.parmvalue); //赋值
                 if (data.unit == undefined) {
-                    $('#' + textId).html(data.parmname);//赋值名称
+                    $("#" + textId).html(data.parmname); //赋值名称
                 } else {
-                    $('#' + textId).html(data.parmname + ' (' + data.unit + ')');//赋值名称+单位
+                    $("#" + textId).html(data.parmname + " (" + data.unit + ")"); //赋值名称+单位
                 }
             }
-        }
+        },
+    });
+}
+
+function getValue(unitId, mpointCode, valueId, textId) {
+    $.ajax({
+        type: "GET",
+        url:
+            ext.contextPath +
+            "/work/mpoint/getValue.do?unitId=" +
+            unitId +
+            "&mpointCode=" +
+            mpointCode,
+        async: true,
+        globle: false,
+        error: function () {
+            return false;
+        },
+        success: function (data) {
+            if (data != null && data != "") {
+                var data = eval("(" + data + ")");
+                console.log(data);
+                $("#" + valueId).html(data.parmvalue); //赋值
+                if (data.unit == undefined) {
+                    $("#" + textId).html(data.parmname); //赋值名称
+                } else {
+                    $("#" + textId).html(data.parmname + " (" + data.unit + ")"); //赋值名称+单位
+                }
+            }
+        },
     });
 }
 
@@ -41,19 +74,24 @@ function getValue(unitId, mpointCode, valueId, textId) {
 function echartPie(unitId, mpointCode, echartId, textId) {
     var myChart = echarts.init(document.getElementById(echartId));
     $.ajax({
-        type: 'GET',
-        url: ext.contextPath + '/work/mpoint/getValue4Es.do?unitId=' + unitId + '&mpointCode=' + mpointCode,
+        type: "GET",
+        url:
+            ext.contextPath +
+            "/work/mpoint/getValue4Es.do?unitId=" +
+            unitId +
+            "&mpointCode=" +
+            mpointCode,
         async: true,
         globle: false,
         error: function () {
             return false;
         },
         success: function (data) {
-            if (data != null && data != '') {
+            if (data != null && data != "") {
                 var echart_minvalue = 0.2;
                 var echart_maxvalue = 0.8;
 
-                var data = eval('(' + data + ')');
+                var data = eval("(" + data + ")");
                 //180度的上限
                 var maxvalue_20 = data.alarmmax * 1.2;
                 //0度的下限
@@ -63,7 +101,7 @@ function echartPie(unitId, mpointCode, echartId, textId) {
                 var minvalue = data.alarmmin;
 
                 //判断是否需要下限
-                if (data.alarmmin == null || data.alarmmin == '') {
+                if (data.alarmmin == null || data.alarmmin == "") {
                     minvalue_20 = 0;
                     minvalue = 0;
                     echart_minvalue = 0;
@@ -71,12 +109,12 @@ function echartPie(unitId, mpointCode, echartId, textId) {
 
                 var parmvalue = data.parmvalue;
                 var rate = 0;
-                var unit = '';
+                var unit = "";
 
-                $('#' + textId).html(data.parmname);
+                $("#" + textId).html(data.parmname);
 
-                if (data.unit != undefined && data.unit != null && data.unit != '') {
-                    unit = '(' + data.unit + ')';
+                if (data.unit != undefined && data.unit != null && data.unit != "") {
+                    unit = "(" + data.unit + ")";
                 }
 
                 //计算实际值比例
@@ -87,7 +125,7 @@ function echartPie(unitId, mpointCode, echartId, textId) {
                     minvalue = minvalue * 100;
                     maxvalue = maxvalue * 100;
                     if (maxvalue != undefined && minvalue != undefined) {
-                        rate = parmvalue / (maxvalue_20 - minvalue_20) * 100;
+                        rate = (parmvalue / (maxvalue_20 - minvalue_20)) * 100;
                     } else {
                         rate = parmvalue;
                     }
@@ -103,52 +141,92 @@ function echartPie(unitId, mpointCode, echartId, textId) {
                 }
 
                 //计算颜色
-                var colorStr = '#6C6C6C';
+                var colorStr = "#6C6C6C";
                 if (parmvalue < minvalue) {
-                    colorStr = '#6C6C6C';
+                    colorStr = "#6C6C6C";
                 } else if (parmvalue > maxvalue) {
-                    colorStr = '#f35a4a';
+                    colorStr = "#f35a4a";
                 } else {
-                    colorStr = '#66d99f';
+                    colorStr = "#66d99f";
                 }
 
-                console.log(data.parmname + '扩大下限：' + minvalue_20 + '------扩大上限：' + maxvalue_20 + '------实际比率：' + rate + '------实际值：' + parmvalue + '------实际下限：' + minvalue + '------实际上限：' + maxvalue);
+                console.log(
+                    data.parmname +
+                    "扩大下限：" +
+                    minvalue_20 +
+                    "------扩大上限：" +
+                    maxvalue_20 +
+                    "------实际比率：" +
+                    rate +
+                    "------实际值：" +
+                    parmvalue +
+                    "------实际下限：" +
+                    minvalue +
+                    "------实际上限：" +
+                    maxvalue,
+                );
 
                 var option = {
-                    toolbox: { //可视化的工具箱
-                        show: false, feature: {
-                            restore: { //重置
-                                show: true
-                            }, saveAsImage: {//保存图片
-                                show: true
-                            }
-                        }
-                    }, series: [{
-                        name: '业务指标', type: 'gauge', startAngle: 180, endAngle: 0, radius: 70, center: ['50%', '80%'],//设置饼图位置
-                        axisLine: {
-                            show: true, // 属性lineStyle控制线条样式
-                            lineStyle: {
-                                width: 15, // color: [[0.2, '#e2e2e2'], [0.8, '#66d99f'], [maxvalue, '#f35a4a']]
-                                color: [[echart_minvalue, '#f35a4a'], [echart_maxvalue, '#66d99f'], [maxvalue_20, '#f35a4a']]
-                            }
-                        }, splitLine: {
-                            show: false,
-                        }, axisTick: {
-                            show: false,
-                        }, axisLabel: {
-                            show: false,
-                        }, pointer: {
-                            length: '40px', width: '3px',
-                        }, detail: {
-                            offsetCenter: [0, '20%'], fontSize: 14, color: colorStr, //formatter: data.parmname,
-                            formatter: data.parmvalue + unit//data.parmvalue为实际值  acvalue为计算后的比例
-                        }, data: [{value: rate}]
-                    }]
+                    toolbox: {
+                        //可视化的工具箱
+                        show: false,
+                        feature: {
+                            restore: {
+                                //重置
+                                show: true,
+                            },
+                            saveAsImage: {
+                                //保存图片
+                                show: true,
+                            },
+                        },
+                    },
+                    series: [
+                        {
+                            name: "业务指标",
+                            type: "gauge",
+                            startAngle: 180,
+                            endAngle: 0,
+                            radius: 70,
+                            center: ["50%", "80%"], //设置饼图位置
+                            axisLine: {
+                                show: true, // 属性lineStyle控制线条样式
+                                lineStyle: {
+                                    width: 15, // color: [[0.2, '#e2e2e2'], [0.8, '#66d99f'], [maxvalue, '#f35a4a']]
+                                    color: [
+                                        [echart_minvalue, "#f35a4a"],
+                                        [echart_maxvalue, "#66d99f"],
+                                        [maxvalue_20, "#f35a4a"],
+                                    ],
+                                },
+                            },
+                            splitLine: {
+                                show: false,
+                            },
+                            axisTick: {
+                                show: false,
+                            },
+                            axisLabel: {
+                                show: false,
+                            },
+                            pointer: {
+                                length: "40px",
+                                width: "3px",
+                            },
+                            detail: {
+                                offsetCenter: [0, "20%"],
+                                fontSize: 14,
+                                color: colorStr, //formatter: data.parmname,
+                                formatter: data.parmvalue + unit, //data.parmvalue为实际值  acvalue为计算后的比例
+                            },
+                            data: [{ value: rate }],
+                        },
+                    ],
                 };
                 myChart.setOption(option);
                 myChart.resize();
             }
-        }
+        },
     });
 }
 
@@ -159,42 +237,97 @@ function echartLine(unitId, mpointCode, echartId) {
     var myChart = echarts.init(document.getElementById(echartId));
 
     $.ajax({
-        type: 'GET',
-        url: ext.contextPath + '/work/mpoint/getValueMonth.do?unitId=' + unitId + '&mpointCode=' + mpointCode,
+        type: "GET",
+        url:
+            ext.contextPath +
+            "/work/mpoint/getValueMonth.do?unitId=" +
+            unitId +
+            "&mpointCode=" +
+            mpointCode,
         async: true,
         globle: false,
         error: function () {
             return false;
         },
         success: function (data) {
-            var data = eval('(' + data + ')');
+            var data = eval("(" + data + ")");
             var option = {
                 tooltip: {
-                    trigger: 'axis'
-                }, title: [{
-                    left: 'center', text: data.name
-                }], grid: {
-                    left: '3%', right: '4%', bottom: '3%', containLabel: true
-                }, xAxis: {
-                    type: 'category',
+                    trigger: "axis",
+                },
+                title: [
+                    {
+                        left: "center",
+                        text: data.name,
+                    },
+                ],
+                grid: {
+                    left: "3%",
+                    right: "4%",
+                    bottom: "3%",
+                    containLabel: true,
+                },
+                xAxis: {
+                    type: "category",
                     boundaryGap: false,
-                    data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31']
-                }, yAxis: {
-                    type: 'value'
-                }, series: [{
-                    name: '上限', type: 'line', // stack: '总量',
-                    data: data.maxlist
-                }, {
-                    name: '下限', type: 'line', // stack: '总量',
-                    data: data.minlist
-                }, {
-                    name: '实际值', type: 'line', // stack: '总量',
-                    data: data.datalist
-                }]
+                    data: [
+                        "1",
+                        "2",
+                        "3",
+                        "4",
+                        "5",
+                        "6",
+                        "7",
+                        "8",
+                        "9",
+                        "10",
+                        "11",
+                        "12",
+                        "13",
+                        "14",
+                        "15",
+                        "16",
+                        "17",
+                        "18",
+                        "19",
+                        "20",
+                        "21",
+                        "22",
+                        "23",
+                        "24",
+                        "25",
+                        "26",
+                        "27",
+                        "28",
+                        "29",
+                        "30",
+                        "31",
+                    ],
+                },
+                yAxis: {
+                    type: "value",
+                },
+                series: [
+                    {
+                        name: "上限",
+                        type: "line", // stack: '总量',
+                        data: data.maxlist,
+                    },
+                    {
+                        name: "下限",
+                        type: "line", // stack: '总量',
+                        data: data.minlist,
+                    },
+                    {
+                        name: "实际值",
+                        type: "line", // stack: '总量',
+                        data: data.datalist,
+                    },
+                ],
             };
             myChart.setOption(option);
             myChart.resize();
-        }
+        },
     });
 }
 
@@ -205,76 +338,381 @@ function echartColumnar(unitId, mpointCode, echartId) {
     var myChart = echarts.init(document.getElementById(echartId));
 
     $.ajax({
-        type: 'GET',
-        url: ext.contextPath + '/work/mpoint/getValueMonth.do?unitId=' + unitId + '&mpointCode=' + mpointCode,
+        type: "GET",
+        url:
+            ext.contextPath +
+            "/work/mpoint/getValueMonth.do?unitId=" +
+            unitId +
+            "&mpointCode=" +
+            mpointCode,
         async: true,
         globle: false,
         error: function () {
             return false;
         },
         success: function (data) {
-            var data = eval('(' + data + ')');
+            var data = eval("(" + data + ")");
             var option = {
-                color: '#62AEDF', tooltip: {
-                    trigger: 'axis', axisPointer: {            // 坐标轴指示器，坐标轴触发有效
-                        type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
-                    }
-                }, xAxis: {
-                    type: 'category',
-                    data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31']
-                }, yAxis: {
-                    type: 'value'
-                }, title: [{
-                    left: 'center', text: data.name
-                }], grid: {
-                    left: '3%', right: '4%', bottom: '3%', containLabel: true
-                }, series: [{
-                    data: data.datalist, type: 'bar', showBackground: true
-                    // backgroundStyle: {
-                    //     //color: '#62AEDF'
-                    // }
-                }]
+                color: "#62AEDF",
+                tooltip: {
+                    trigger: "axis",
+                    axisPointer: {
+                        // 坐标轴指示器，坐标轴触发有效
+                        type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+                    },
+                },
+                xAxis: {
+                    type: "category",
+                    data: [
+                        "1",
+                        "2",
+                        "3",
+                        "4",
+                        "5",
+                        "6",
+                        "7",
+                        "8",
+                        "9",
+                        "10",
+                        "11",
+                        "12",
+                        "13",
+                        "14",
+                        "15",
+                        "16",
+                        "17",
+                        "18",
+                        "19",
+                        "20",
+                        "21",
+                        "22",
+                        "23",
+                        "24",
+                        "25",
+                        "26",
+                        "27",
+                        "28",
+                        "29",
+                        "30",
+                        "31",
+                    ],
+                },
+                yAxis: {
+                    type: "value",
+                },
+                title: [
+                    {
+                        left: "center",
+                        text: data.name,
+                    },
+                ],
+                grid: {
+                    left: "3%",
+                    right: "4%",
+                    bottom: "3%",
+                    containLabel: true,
+                },
+                series: [
+                    {
+                        data: data.datalist,
+                        type: "bar",
+                        showBackground: true,
+                        // backgroundStyle: {
+                        //     //color: '#62AEDF'
+                        // }
+                    },
+                ],
             };
             myChart.setOption(option);
             myChart.resize();
-        }
+        },
     });
 }
 
 /**
- * echart柱状图--多点
+ * echart柱状图--多点 (原有)
  */
-function echartColumnar2(unitId, mpointCode, echartId) {
+function echartColumnar2_1(unitId, mpointCode, echartId) {
     var myChart = echarts.init(document.getElementById(echartId));
 
     $.ajax({
-        type: 'GET',
-        url: ext.contextPath + '/work/mpoint/getValueWeekS.do?unitId=' + unitId + '&mpointCode=' + mpointCode,
+        type: "GET",
+        url:
+            ext.contextPath +
+            "/work/mpoint/getValueWeekS.do?unitId=" +
+            unitId +
+            "&mpointCode=" +
+            mpointCode,
         async: true,
         globle: false,
         error: function () {
             return false;
         },
         success: function (data) {
-            var datastr = eval('(' + data + ')');
+            var datastr = eval("(" + data + ")");
 
             var data1 = datastr.dataJson;
             var data2 = datastr.timeJson;
 
             var option = {
-                color: ['#67D89F', '#FFBB00'], legend: {}, calculable: true, xAxis: [{
-                    type: 'category', axisLabel: {
-                        interval: 0,//代表显示所有x轴标签显示
-                    }, data: data2
-                }], yAxis: [{
-                    type: 'value'
-                }], grid: {
-                    left: '2%', right: '5%', bottom: '3%', containLabel: true
-                }, series: data1
+                color: ["#67D89F", "#FFBB00"],
+                legend: {},
+                calculable: true,
+                xAxis: [
+                    {
+                        type: "category",
+                        axisLabel: {
+                            interval: 0, //代表显示所有x轴标签显示
+                        },
+                        data: data2,
+                    },
+                ],
+                yAxis: [
+                    {
+                        type: "value",
+                    },
+                ],
+                grid: {
+                    left: "2%",
+                    right: "5%",
+                    bottom: "3%",
+                    containLabel: true,
+                },
+                series: data1,
             };
             myChart.setOption(option);
             myChart.resize();
-        }
+        },
+    });
+}
+
+function initEchartColumnar2() {
+                var chart = echarts.init(document.getElementById('myChartProduce8'));
+            var option = {
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'shadow'
+                    }
+                },
+                legend: {
+                    data: ['工业进水', '工业出水', '生活进水', '生活出水'],
+                    top: 5,
+                    textStyle: {
+                        fontSize: 12
+                    }
+                },
+                grid: {
+                    left: '5%',
+                    right: '5%',
+                    bottom: '8%',
+                    top: '18%',
+                    containLabel: true
+                },
+                xAxis: {
+                    type: 'category',
+                    data: ['3/16', '3/17', '3/18', '3/19', '3/20', '3/21', '3/22'],
+                    axisLine: {
+                        lineStyle: {
+                            color: '#e8e8e8'
+                        }
+                    },
+                    axisLabel: {
+                        color: '#666',
+                        fontSize: 12
+                    }
+                },
+                yAxis: {
+                    type: 'value',
+                    name: 'm³/D',
+                    nameTextStyle: {
+                        fontSize: 12
+                    },
+                    axisLine: {
+                        show: false
+                    },
+                    axisTick: {
+                        show: false
+                    },
+                    axisLabel: {
+                        color: '#666',
+                        fontSize: 12
+                    },
+                    splitLine: {
+                        lineStyle: {
+                            color: '#f0f0f0'
+                        }
+                    }
+                },
+                series: [
+                    {
+                        name: '工业进水',
+                        type: 'bar',
+                        barWidth: '20%',
+                        itemStyle: {
+                            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                                {offset: 0, color: '#378dcc'},
+                                {offset: 1, color: '#5ba3d9'}
+                            ])
+                        },
+                        data: [0, 0, 0, 0, 0, 0, 0]
+                    },
+                    {
+                        name: '工业出水',
+                        type: 'bar',
+                        barWidth: '20%',
+                        itemStyle: {
+                            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                                {offset: 0, color: '#5b8def'},
+                                {offset: 1, color: '#40a9ff'}
+                            ])
+                        },
+                        data: [0, 0, 0, 0, 0, 0, 0]
+                    },
+                    {
+                        name: '生活进水',
+                        type: 'bar',
+                        barWidth: '20%',
+                        itemStyle: {
+                            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                                {offset: 0, color: '#52c41a'},
+                                {offset: 1, color: '#73d13d'}
+                            ])
+                        },
+                        data: [0, 0, 0, 0, 0, 0, 0]
+                    },
+                    {
+                        name: '生活出水',
+                        type: 'bar',
+                        barWidth: '20%',
+                        itemStyle: {
+                            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                                {offset: 0, color: '#2ecc71'},
+                                {offset: 1, color: '#58d68d'}
+                            ])
+                        },
+                        data: [0, 0, 0, 0, 0, 0, 0]
+                    }
+                ]
+            };
+            chart.setOption(option);
+            chart.resize();
+       
+}
+
+/**
+ * echart柱状图--多点 （TGLW新版）- （工业生活污水流量7天日趋势）
+ */
+function echartColumnar2(unitId, mpointCode, echartId) {
+    var myChart = echarts.init(document.getElementById(echartId));
+
+    $.ajax({
+        type: "GET",
+        // url: ext.contextPath + '/work/mpoint/getValueWeekS.do?unitId=' + unitId + '&mpointCode=' + mpointCode,
+        url:
+            ext.contextPath +
+            "/work/mpoint/getValueWeekS.do?unitId=" +
+            unitId +
+            "&mpointCode=" +
+            "C_GYJsssll,C_GYCsssll,C_SHJsssll,C_SHCsssll",
+        async: true,
+        globle: false,
+        error: function () {
+            return false;
+        },
+        success: function (data) {
+            var datastr = eval("(" + data + ")");
+
+            var data1 = datastr.dataJson;
+            var data2 = datastr.timeJson;
+            var series = [];
+            var legendData = [];
+
+            if (data1) {
+                data1.forEach(function(item, index) {
+                    legendData.push(item.name);
+                    var colors = [
+                        [{offset: 0, color: '#378dcc'}, {offset: 1, color: '#5ba3d9'}],
+                        [{offset: 0, color: '#5b8def'}, {offset: 1, color: '#40a9ff'}],
+                        [{offset: 0, color: '#52c41a'}, {offset: 1, color: '#73d13d'}],
+                        [{offset: 0, color: '#2ecc71'}, {offset: 1, color: '#58d68d'}]
+                    ];
+                    series.push({
+                        name: item.name,
+                        type: item.type || 'bar',
+                        barWidth: '20%',
+                        itemStyle: {
+                            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, colors[index % colors.length])
+                        },
+                        data: item.data
+                    });
+                });
+            }
+
+            var option = {
+                tooltip: {
+                    trigger: "axis",
+                    axisPointer: {
+                        type: "shadow",
+                    },
+                },
+                legend: {
+                    data: legendData,
+                    top: 5,
+                    textStyle: {
+                        fontSize: 12,
+                    },
+                },
+                grid: {
+                    left: "5%",
+                    right: "5%",
+                    bottom: "8%",
+                    top: "18%",
+                    containLabel: true,
+                },
+                xAxis: [
+                    {
+                        type: "category",
+                        data: data2,
+                        axisLine: {
+                            lineStyle: {
+                                color: "#e8e8e8",
+                            },
+                        },
+                        axisLabel: {
+                            color: "#666",
+                            fontSize: 12,
+                            interval: 0, //代表显示所有x轴标签显示
+                        },
+                    },
+                ],
+                yAxis: {
+                    type: "value",
+                    name: "m³/D",
+                    nameTextStyle: {
+                        fontSize: 12,
+                    },
+                    axisLine: {
+                        show: false,
+                    },
+                    axisTick: {
+                        show: false,
+                    },
+                    axisLabel: {
+                        color: "#666",
+                        fontSize: 12,
+                    },
+                    splitLine: {
+                        lineStyle: {
+                            color: "#f0f0f0",
+                        },
+                    },
+                },
+                series: series,
+            };
+            myChart.setOption(option);
+            myChart.resize();
+        },
     });
 }
 
@@ -283,7 +721,10 @@ function echartColumnar2(unitId, mpointCode, echartId) {
  * @param unitId
  */
 function getPic(unitId) {
-    $("#mainImg").attr("src", ext.contextPath + "/IMG/main/main_" + unitId + ".jpg");
+    $("#mainImg").attr(
+        "src",
+        ext.contextPath + "/IMG/main/main_" + unitId + ".jpg",
+    );
 }
 
 /**
@@ -294,21 +735,37 @@ function getPic(unitId, unit, proDatavisualFrame) {
     //$("#mainImg").attr("src", ext.contextPath + "/IMG/main/main_" + unitId + ".jpg");
     var unitIds = JSON.parse(unit);
     var proDatavisualFrames = JSON.parse(proDatavisualFrame);
-    var active = '';
-    var item = '';
+    var active = "";
+    var item = "";
     var proDatavisualFrames_i = 0;
     if (unitIds != null && unitIds.length > 0) {
         for (var i = 0; i < unitIds.length; i++) {
-            if (unitIds[i].type == 'B' || unitIds[i].type == 'C') {
+            if (unitIds[i].type == "B" || unitIds[i].type == "C") {
                 var proDatavisualFrameId = proDatavisualFrames[proDatavisualFrames_i];
                 proDatavisualFrames_i++;
                 if (unitId == unitIds[i].id) {
-                    active = 'active';
+                    active = "active";
                 } else {
-                    active = '';
+                    active = "";
                 }
                 var src = ext.contextPath + "/IMG/main/main_" + unitIds[i].id + ".jpg";
-                item += '<div class="item ' + active + ' ">' + '<img src="' + src + '" class="mainImg">' + '<div class="carousel-caption" onclick="proDatavisualFrame(\'' + unitIds[i].id + '\',\'' + proDatavisualFrameId + '\')">' + '<h4>' + unitIds[i].text + '</h4>' + '</div>' + '</div>';
+                item +=
+                    '<div class="item ' +
+                    active +
+                    ' ">' +
+                    '<img src="' +
+                    src +
+                    '" class="mainImg">' +
+                    '<div class="carousel-caption" onclick="proDatavisualFrame(\'' +
+                    unitIds[i].id +
+                    "','" +
+                    proDatavisualFrameId +
+                    "')\">" +
+                    "<h4>" +
+                    unitIds[i].text +
+                    "</h4>" +
+                    "</div>" +
+                    "</div>";
             }
         }
     }
@@ -316,15 +773,39 @@ function getPic(unitId, unit, proDatavisualFrame) {
 }
 
 function getUnitsByUnitId4Select(id, funname, proDatavisualFrame) {
-    $.post(ext.contextPath + "/user/getUnitsByUnitId4Select.do", {id: id}, function (data) {
-        //console.log(data);
-        var unitIds = data;
-        eval(funname + "('" + id + "','" + unitIds + "','" + proDatavisualFrame + "')")
-    });
+    $.post(
+        ext.contextPath + "/user/getUnitsByUnitId4Select.do",
+        { id: id },
+        function (data) {
+            //console.log(data);
+            var unitIds = data;
+            eval(
+                funname +
+                "('" +
+                id +
+                "','" +
+                unitIds +
+                "','" +
+                proDatavisualFrame +
+                "')",
+            );
+        },
+    );
 }
 
 function proDatavisualFrame(unitId, proDatavisualFrameId) {
-    if (proDatavisualFrameId != null && proDatavisualFrameId != undefined && proDatavisualFrameId != '') {
-        parent.addTab(proDatavisualFrameId, '工艺可视化', 'process/dataVisualFrame/view.do?frameId=' + proDatavisualFrameId + '&unitId=' + unitId);
+    if (
+        proDatavisualFrameId != null &&
+        proDatavisualFrameId != undefined &&
+        proDatavisualFrameId != ""
+    ) {
+        parent.addTab(
+            proDatavisualFrameId,
+            "工艺可视化",
+            "process/dataVisualFrame/view.do?frameId=" +
+            proDatavisualFrameId +
+            "&unitId=" +
+            unitId,
+        );
     }
-}
+}

src/main/webapp/jsp/activiti/processInstanceList.jsp

@@ -174,7 +174,7 @@
                       page: params.offset/params.limit+1, // 每页显示数据的开始页码
                       sort: params.sort, // 要排序的字段
                       order: params.order,
-                      search_name: $('#search_name').val(),
+                    //   search_name: $('#search_name').val(),
                       search_code: $('#search_code').val()
                   }
               },
@@ -301,14 +301,14 @@
                     <label class="form-label" id="companylabel">公司</label>
                             <select class="form-control select2 "  id="search_code" name ="search_code" style="width: 220px;"></select>
                             <span class="select2-selection select2-selection--single" id="company" style="width:220px;border: none;background: transparent;" ></span>
-                        <div class="form-group pull-right" >
+                        <!-- <div class="form-group pull-right" >
                              <div class="input-group input-group-sm" style="width: 250px;">
                                <input type="text" id="search_name" name="search_name" class="form-control pull-right" placeholder="名称">
                                <div class="input-group-btn">
                                  <button  class="btn btn-default" onclick="dosearch();"><i class="fa fa-search"></i></button>
                                </div>
                             </div>
-                        </div>
+                        </div> -->
                     </div>                        
                     <table id="table"></table>
                 </div>

src/main/webapp/jsp/activiti/taskList.jsp

@@ -533,6 +533,14 @@
                   $("#subDiv").html(data);
                   openModal('subModal');
                 });
+            } else if (type.indexOf('${SAFETY_JOB_INSIDE}') != -1) {
+                $.post(ext.contextPath + '/safety/SafetyJobInside/view.do', {id: id}, function (data) {
+                  $("#subDiv").html(data);
+                  openModal('subModal');
+                });
+            }
+            else {
+                showAlert('w', `未查询到任务模块！${type}`, 'mainAlertdiv');
             }
         };
         var deleteFun = function (id) {

src/main/webapp/jsp/base/fileinputMinioPic.jsp

@@ -1,9 +1,10 @@
 <%@ page language="java" pageEncoding="UTF-8" %>
 <script type="text/javascript">
 
-    var previews = new Array();
-    var previewConfigs = new Array();
-    var filelist = new Array();
+    // 不重新定义这些变量，直接使用主页面的全局变量
+    // var previews = new Array();
+    // var previewConfigs = new Array();
+    // var filelist = new Array();
 
     //初始化fileinput控件（第一次初始化）
     function initFileInput(ctrlName, uploadUrl) {
@@ -55,9 +56,10 @@
         //导入文件上传完成之后的事件
         control.on("fileuploaded", function (event, data, previewId, index) {
             if (data.response.suc) {
-                <%--getFileListMinioPic('${param.divId}','edit');--%>
-                // getFileListMinioPic('abnormityFileId', 'edit', '', previews, previewConfigs);
+                // 直接使用主页面的全局变量重新加载文件列表
                 getFileListMinioPic('${param.divId}', 'edit', '', previews, previewConfigs);
+                // 关闭上传弹窗，返回主页面
+                closeModal('fileInputModal');
             }
         });
     }

src/main/webapp/jsp/business/businessUnitList.jsp

@@ -110,6 +110,11 @@
 		    url: ext.contextPath +"/activiti/workflow/getProcessTypes4Combo.do",
 		    dataType: 'json',
 		    delay: 250,
+		    data: function (params) {
+		      return {
+		        term: params.term
+		      };
+		    },
 		    processResults: function (data) {
 		      return {
 		        results: data
@@ -123,8 +128,8 @@
 	      language: "zh-CN", 
 	      minimumInputLength: 0,
 	      minimumResultsForSearch: 10,
-	      formatResult: function formatRepo(repo){return repo.text;},
-	      formatSelection: function formatRepoSelection(repo){return repo.text;}
+	      templateResult: function formatRepo(repo){return repo.text;},
+	      templateSelection: function formatRepoSelection(repo){return repo.text;}
 		}); 
 	    fixSelect2ToTool("search_processType");
 		$("#table").bootstrapTable({

src/main/webapp/jsp/equipment/equipmentBelongListForSelect.jsp

@@ -19,6 +19,10 @@
         }
     };
     
+    var dosearchBelong = function() {
+        $("#equipmentBelongTable").bootstrapTable('refresh');
+    };
+    
     
     //显示已经勾选的数据
     function stateFormatter(value, row, index) {  
@@ -53,6 +57,7 @@
                     page: params.offset/params.limit+1, // 每页显示数据的开始页码
                     sort: params.sort, // 要排序的字段
                     order: params.order,
+                    search_name: $('#search_belongname').val()
                 }
             },
             queryParamsType: "limit",
@@ -110,6 +115,12 @@
                 <div id="mainAlertdiv"></div>
                 <div id="menu4SelectDiv"></div> 
 				<div id="modal-body">
+                    <div class="input-group input-group-sm" style="width: 250px;float: right;margin-bottom: 15px;">
+                        <input type="text" id="search_belongname" name="search_belongname" class="form-control pull-right" placeholder="归属名称/编码">
+                        <div class="input-group-btn">
+                            <button  class="btn btn-default" onclick="dosearchBelong();"><i class="fa fa-search"></i></button>
+                        </div>
+                    </div>
                     <div class="table-scrollable">
 					   <table class="table table-bordered table-striped" style="overflow:auto;width:100%" id="equipmentBelongTable"></table>
 					</div>

src/main/webapp/jsp/equipment/equipmentCardList.jsp

@@ -141,9 +141,9 @@
                         formatter: function (value, row, index) {
                             var buts = "";
 
-                            buts += '<security:authorize buttonUrl="equipment/location.do">';
-                            buts += '<button class="btn btn-default btn-sm" title="定位" onclick="locationFun(\'' + row.id + '\')"><i class="fa fa-map-marker"></i><span class="hidden-md hidden-lg"> 定位</span></button>';
-                            buts += '</security:authorize>';
+                            // buts += '<security:authorize buttonUrl="equipment/location.do">';
+                            // buts += '<button class="btn btn-default btn-sm" title="定位" onclick="locationFun(\'' + row.id + '\')"><i class="fa fa-map-marker"></i><span class="hidden-md hidden-lg"> 定位</span></button>';
+                            // buts += '</security:authorize>';
 
                             buts += '<security:authorize buttonUrl="equipment/edit.do">';
                             buts += '<button class="btn btn-default btn-sm" title="编辑" onclick="editFun(\'' + row.id + '\')"><i class="fa fa-edit"></i><span class="hidden-md hidden-lg"> 编辑</span></button>';

src/main/webapp/jsp/equipment/equipmentCardReamrkView.jsp

@@ -105,16 +105,15 @@
             masterId: id,
             tbName: tbName
         }, function (data) {
-            //console.info(data)
+            // 清空之前的配置
+            previews = [];
+            previewConfigs = [];
             if (data.length > 0) {
-                previews = new Array();
                 $('#maintenancefile').show();
                 for (var i = 0; i < data.length; i++) {
                     var previewConfig = new Object();
-                    var path = data[i].abspath;
-                    path = path.substring(path.indexOf('webapps') + 7, path.length);
-                    path = ext.basePath.replace(ext.contextPath, '') + path.replace(/\\/g, "\/");
-                    ;
+                    // 预览地址：添加preview=true参数，让浏览器内嵌显示
+                    var path = ext.contextPath + "/report/rptInfoSetFile/downloadFile4minio.do?id=" + data[i].id + "&tbName=" + tbName + "&preview=true";
                     previews.push(path);
                     previewConfig['width'] = '2500px';
                     previewConfig['caption'] = data[i].filename;

src/main/webapp/jsp/equipment/maintenancePlanHandle.jsp

@@ -47,7 +47,7 @@
 		$("#subForm").bootstrapValidator('validate');//提交验证
 		//setTimeout(function(){
         if ($("#subForm").data('bootstrapValidator').isValid()) {//获取验证结果，如果成功，执行下面代码
-        	$.post(ext.contextPath + "/equipment/maintenancePlan/doupdate.do", $("#subForm").serialize(), function(data) {
+        	$.post(ext.contextPath + "/maintenance/equipmentPlan/doupdate.do", $("#subForm").serialize(), function(data) {
                 if (data.res == 1){
                 	$("#table").bootstrapTable('refresh');
                 	closeModal("subModal");
@@ -70,7 +70,7 @@
 		$("#subUnitForm").bootstrapValidator('validate');//提交验证
 		//setTimeout(function(){
 			if ($("#subForm").data('bootstrapValidator').isValid() && $("#subUnitForm").data('bootstrapValidator').isValid()) {//获取验证结果，如果成功，执行下面代码
-		    		$.post(ext.contextPath + "/equipment/maintenancePlan/doupdate.do", $("#subForm").serialize(), function(data) {
+		    		$.post(ext.contextPath + "/maintenance/equipmentPlan/doupdate.do", $("#subForm").serialize(), function(data) {
 		                var routeNum = $("#routeNum").val();
 		    			if (data.res == 1){
 		                	$.post(ext.contextPath + "/equipment/maintenancePlan/submitAuditAgain.do", $("#subUnitForm").serialize()+"&routeNum="+routeNum, function(unitdata) {
@@ -426,6 +426,43 @@
 					</div>
 					<div id="fileArea"></div>--%>
 				</form>
+					<!--流程审核退回后显示-->
+					<form class="form-horizontal" id="subUnitForm" enctype="multipart/form-data">
+						<input type="hidden" class="form-control" name="id" value="${businessUnitHandle.id}">
+						<input type="hidden" class="form-control" name="processid" value="${businessUnitHandle.processid}">
+						<input type="hidden" class="form-control" name="taskid" value="${businessUnitHandle.taskid}">
+						<input type="hidden" class="form-control" name="businessid" value="${businessUnitHandle.businessid}">
+						<input type="hidden" class="form-control" name="taskdefinitionkey" value="${businessUnitHandle.taskdefinitionkey}">
+						<input type="hidden" class="form-control" name="unitid" value="${businessUnitHandle.unitid}">
+						<c:if test='${not empty businessUnitAudit.auditopinion}'>
+							<div class="form-group">
+								<label class="col-sm-2 control-label">审核意见：</label>
+								<div class="col-sm-10">
+									<textarea class="form-control" id="auditopinion" name="auditopinion" rows="2" placeholder="审核意见">${businessUnitAudit.auditopinion}</textarea>
+								</div>
+							</div>
+						</c:if>
+						<div class="form-group">
+							<label class="col-sm-2 control-label">*下一节点</label>
+							<div class="col-sm-6">
+								<select class="form-control select2" id="routeNum" name="routeNum" style="width: 270px;">
+								</select>
+							</div>
+						</div>
+						<div id="selectUsers" class="form-group">
+							<label class="col-sm-2 control-label">提交至：</label>
+							<div class="col-sm-10">
+								<input type="text" class="form-control" id="targetUsersName" name="targetUsersName" placeholder="下一级人员" onclick="showUser4AuditSelectsFun();">
+								<input id="targetusers" name="targetusers" type="hidden" value="${businessUnitHandle.targetusers}"/>
+								<input class="form-control" id="targetjobs" name="targetjobs" type="hidden" value=""/>
+							</div>
+						</div>
+						<!-- 文件上传，显示 -->
+						<div class="form-group" style="margin:8px">
+							<button type="button" class="btn btn-default btn-file" onclick="fileinput_process()"><i class="fa fa-paperclip"></i>上传文件</button>
+						</div>
+						<div class="file-border" id="fileArea"></div>
+					</form>
 					<div class="box box-primary">
 					<div class="box-header with-border">
 						<h3 class="box-title">关联设备</h3>

src/main/webapp/jsp/inc.jsp

@@ -166,9 +166,8 @@
     $.widget.bridge('uibutton', $.ui.button);
 </script>
 <!-- END 布局样式 -->
-<LINK href="<%=contextPath%>/IMG/sipai.ico" type="image/x-icon" rel="shortcut icon"></LINK>
-<!-- END HEAD -->
-<LINK href="<%=contextPath%>/IMG/logo.ico" type="image/x-icon" rel="shortcut icon"></LINK>
+<LINK href="<%=contextPath%>/IMG/logo.png" type="image/png" rel="shortcut icon"></LINK>
+<LINK href="<%=contextPath%>/IMG/logo.png" type="image/png" rel="icon"></LINK>
 
 <script type="text/javascript" src="<%=contextPath%>/node_modules/bootstrap/layer/layer.js" charset="utf-8"></script>
 

src/main/webapp/jsp/kpi/kpiPlanAdd.jsp

@@ -62,7 +62,8 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
         selelct_4.val('').trigger("change");
 
 
-        //TODO 代码有冲突
+        // Initialize job dropdown with all jobs
+        onValueChange();
         key = setInterval(() => {
             // console.log(document.getElementById('objUserName'))
             if ($('#objUserId').val() != old) {
@@ -140,7 +141,14 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
             jobId: {
                 validators: {
                     notEmpty: {
-                        message: '周期类型不能为空'
+                        message: '岗位不能为空'
+                    }
+                }
+            },
+            levelType: {
+                validators: {
+                    notEmpty: {
+                        message: '岗位类型不能为空'
                     }
                 }
             },
@@ -165,9 +173,17 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
 
     function onValueChange() {
         // console.log($('#objUserId').val())
-        $.post(ext.contextPath + "/user/getJsonJobByUser.do?userId=" + $('#objUserId').val(), function (data) {
+        $.get(ext.contextPath + "/user/getJsonJob.do", function (data) {
+            // Transform data to Select2 format: {id, text}
+            var transformedData = [];
+            $.each(data, function(index, item) {
+                transformedData.push({
+                    id: item.id,
+                    text: item.name
+                });
+            });
             $("#jobId").select2({
-                data: data,
+                data: transformedData,
                 cache: false,
                 placeholder: '请选择',//默认文字提示
                 // allowClear: true,//允许清空
@@ -230,6 +246,13 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
                                 <select class="form-control" id="jobId" name="jobId"></select>
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">* 岗位类型：</label>
+                            <div class="col-sm-9">
+                                <select class="form-control" name="levelType" id="status3" style="width: 100%;">
+                                </select>
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label class="col-sm-3 control-label">* 周期类型：</label>
                             <div class="col-sm-9">

src/main/webapp/jsp/login.jsp

@@ -135,7 +135,7 @@
       //配置logo
       var array = eval(${jsonArray});
       var verCode = true;
-      var bgpath = ["IMG/login/bg1.png"];
+      var bgpath = ["IMG/loginbp.png"];
         if(array!=null && array!=undefined && array.length>0){
           for(var i =0;i<array.length;i++){
             var img = null;
@@ -325,15 +325,9 @@
     <div class="content" style="height:100%;vertical-align: middle;" id="login-content">
         <!-- BEGIN 登录 FORM -->
       <form class="login-form " id="loginForm">
-        <div class="logo row">
+        <!-- <div class="logo row">
             <img  src="IMG/login/title.png" style="width:100%;" alt="" id="login-title" />
-          <!-- <div class="col-lg-8 col-sm-8 col-md-8 col-xs-8">
-            <h5 style="color:black" class="form-title">西派埃智能</h4>
-            <h2 style="margin:0px">南康智慧水厂运管平台</h2>
-            <h4 style="color:black;margin-top:4px" >精益运行工业互联网平台</h4>
-            
-          </div> -->
-        </div>
+        </div> -->
         
         <div class="form-group">
             <div id="alertDiv"></div>

src/main/webapp/jsp/main_JS_Company2.jsp

@@ -0,0 +1,839 @@
+<%@ page language="java" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="com.sipai.entity.base.ServerObject" %>
+<%@ taglib uri="http://www.springsecurity.org/jsp" prefix="security" %>
+
+<%@ page import="com.sipai.entity.base.MainConfig" %>
+<% request.setAttribute("type_pro", MainConfig.type_pro); %>
+<% request.setAttribute("type_safe", MainConfig.type_safe); %>
+<% request.setAttribute("type_eff", MainConfig.type_eff); %>
+<% request.setAttribute("type_pic", MainConfig.type_pic); %>
+
+<!DOCTYPE html>
+
+<head>
+    <title><%= ServerObject.atttable.get("TOPTITLE")%>
+    </title>
+
+    <!-- 引用页头及CSS页-->
+    <jsp:include page="/jsp/inc.jsp"></jsp:include>
+    <!-- echarts-->
+    <script type="text/javascript" src="<%=request.getContextPath()%>/plugins/echarts/echarts.4.1.0.min.js"
+            charset="utf-8"></script>
+
+    <script type="text/javascript" src="<%=request.getContextPath()%>/JS/main/main_js.js" charset="utf-8"></script>
+    <style>
+        /*
+        根据不同分辨率显示不同px的文字大小
+        */
+        @media (min-width: 1080px) {
+
+        }
+
+        @media (min-width: 1550px) {
+
+        }
+
+        .fontValue {
+            text-align: center;
+            margin-top: 20px;
+            margin-left: 70px;
+            font-size: 20px;
+            color: #ffffff;
+            font-weight: bold;
+        }
+
+        .fontText {
+            margin: 20px;
+            font-size: 18px;
+            color: #ffffff;
+            font-weight: bold;
+        }
+      .carousel-inner,
+      .carousel-inner >.item,
+      .carousel-inner >.item >img{
+        width:100%;height:100%;
+      }
+      .carousel-caption{
+        cursor: pointer;
+        padding: 0;
+        background-color: RGBA(55,141,204,0.5);
+        bottom: 10px;
+      }
+      .section-header {
+          width: 100%;
+          height: 48px;
+          float: left;
+          border-bottom: 2px solid #67aad7;
+          font-weight: bold;
+          font-size: 16px;
+          color: #0c4377;
+          padding-left: 15px;
+          display: flex;
+          align-items: center;
+          background: linear-gradient(to right, rgba(103, 170, 215, 0.1), transparent);
+      }
+      .section-header::before {
+          content: "";
+          display: block;
+          width: 4px;
+          height: 60%;
+          background-color: #0c4377;
+          margin-right: 10px;
+          border-radius: 2px;
+      }
+    </style>
+    <script type="text/javascript">
+
+
+        $(function () {
+            firstFun();
+        });
+
+        window.onresize = function () {
+            firstFun();
+        }
+
+        function firstFun() {
+            // 不再设置固定高度，让页面自然滚动
+
+            $.ajax({
+                type: 'GET',
+                url: ext.contextPath + '/base/mainConfig/getJson.do',
+                async: true,
+                data: {unitId: unitId},
+                globle: false,
+                error: function () {
+                    return false;
+                },
+                success: function (data1) {
+                    // var data = eval('(' + data + ')');
+
+                    console.log(data);
+                    var data = {
+                        "status": "pass",
+                        "mpcode": [
+                            {
+                                "divId": "valueProduce1_js",
+                                "funName": "getValue",
+                                "id": "9A46F4D7-3C49-42DD-9603-BC55890F6829",
+                                "memo": "AUTO_HOME_PRO_VAL_1",
+                                "morder": 1,
+                                "mpointId": "C_Jsssll",
+                                "sql": "",
+                                "testId": "textProduce1_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "",
+                                "funName": "getPic",
+                                "id": "D071B1E9-EADC-466A-86E8-300EE5ED35B2",
+                                "memo": "AUTO_HOME_PIC",
+                                "morder": 1,
+                                "mpointId": "",
+                                "sql": "",
+                                "testId": "",
+                                "type": "pic",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "valueProduce2_js",
+                                "funName": "getValue",
+                                "id": "7A212EF9-6A0D-415D-BEA5-5A1B23250069",
+                                "memo": "AUTO_HOME_PRO_VAL_2",
+                                "morder": 2,
+                                "mpointId": "C_Csssll",
+                                "sql": "",
+                                "testId": "textProduce2_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "valueProduce3_js",
+                                "funName": "getValue",
+                                "id": "37D4878E-82D5-4A06-A7FC-3D1D9298D5F7",
+                                "memo": "AUTO_HOME_PRO_VAL_3",
+                                "morder": 3,
+                                "mpointId": "C_Mrddh",
+                                "sql": "",
+                                "testId": "textProduce3_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce1_js",
+                                "funName": "echartPie",
+                                "id": "D88301BC-ACF7-48F5-A1B1-6672CB686786",
+                                "memo": "AUTO_HOME_PRO_PIE_1",
+                                "morder": 14,
+                                "mpointId": "D_JinSCOD",
+                                "sql": "",
+                                "testId": "myChartProduceText1_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce2_js",
+                                "funName": "echartPie",
+                                "id": "D90B7C5B-76F4-4B70-9C65-58AD3F70C127",
+                                "memo": "AUTO_HOME_PRO_PIE_2",
+                                "morder": 15,
+                                "mpointId": "D_JinSPH",
+                                "sql": "",
+                                "testId": "myChartProduceText2_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce3_js",
+                                "funName": "echartPie",
+                                "id": "B2309C35-5F47-402C-A7C3-F710F67A0AE3",
+                                "memo": "AUTO_HOME_PRO_PIE_3",
+                                "morder": 16,
+                                "mpointId": "C_Jstp",
+                                "sql": "",
+                                "testId": "myChartProduceText3_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce4_js",
+                                "funName": "echartPie",
+                                "id": "B054F2EA-CF10-4976-B308-EE6A929468A3",
+                                "memo": "AUTO_HOME_PRO_PIE_4",
+                                "morder": 17,
+                                "mpointId": "C_Jstn",
+                                "sql": "",
+                                "testId": "myChartProduceText4_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce5_js",
+                                "funName": "echartPie",
+                                "id": "0DDD5D71-2D8F-400D-A99E-0D19C3D8DADF",
+                                "memo": "AUTO_HOME_PRO_PIE_5",
+                                "morder": 18,
+                                "mpointId": "C_Jsnh4n",
+                                "sql": "",
+                                "testId": "myChartProduceText5_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce6_js",
+                                "funName": "echartPie",
+                                "id": "DAB3ABF7-5135-462F-80FC-E717A09391C0",
+                                "memo": "AUTO_HOME_PRO_PIE_6",
+                                "morder": 19,
+                                "mpointId": "D_ChuSCOD",
+                                "sql": "",
+                                "testId": "myChartProduceText6_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce7_js",
+                                "funName": "echartPie",
+                                "id": "9864A8F9-6362-49F9-8F10-812E45F22FFB",
+                                "memo": "AUTO_HOME_PRO_PIE_7",
+                                "morder": 20,
+                                "mpointId": "D_ChuSPH",
+                                "sql": "",
+                                "testId": "myChartProduceText7_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce8_js",
+                                "funName": "echartPie",
+                                "id": "B989F914-9883-47BA-B261-F12DC2CA1365",
+                                "memo": "AUTO_HOME_PRO_PIE_8",
+                                "morder": 21,
+                                "mpointId": "C_Cstp",
+                                "sql": "",
+                                "testId": "myChartProduceText8_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce9_js",
+                                "funName": "echartPie",
+                                "id": "BBA7F23F-197F-4FF0-AD42-426DE4569907",
+                                "memo": "AUTO_HOME_PRO_PIE_9",
+                                "morder": 22,
+                                "mpointId": "C_Cstn",
+                                "sql": "",
+                                "testId": "myChartProduceText9_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce10_js",
+                                "funName": "echartPie",
+                                "id": "E179A4CE-D159-4B11-A517-7CC760C27E70",
+                                "memo": "AUTO_HOME_PRO_PIE_10",
+                                "morder": 23,
+                                "mpointId": "C_Csnh4n",
+                                "sql": "",
+                                "testId": "myChartProduceText10_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce11_js",
+                                "funName": "echartPie",
+                                "id": "E179A4CE-D159-4B11-A517-7CC760C27E70",
+                                "memo": "AUTO_HOME_PRO_PIE_10",
+                                "morder": 23,
+                                "mpointId": "C_Csnh4n",
+                                "sql": "",
+                                "testId": "myChartProduceText11_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce12_js",
+                                "funName": "echartPie",
+                                "id": "E179A4CE-D159-4B11-A517-7CC760C27E70",
+                                "memo": "AUTO_HOME_PRO_PIE_10",
+                                "morder": 23,
+                                "mpointId": "C_Csnh4n",
+                                "sql": "",
+                                "testId": "myChartProduceText12_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce13_js",
+                                "funName": "echartPie",
+                                "id": "E179A4CE-D159-4B11-A517-7CC760C27E70",
+                                "memo": "AUTO_HOME_PRO_PIE_10",
+                                "morder": 23,
+                                "mpointId": "C_Csnh4n",
+                                "sql": "",
+                                "testId": "myChartProduceText13_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce14_js",
+                                "funName": "echartPie",
+                                "id": "E179A4CE-D159-4B11-A517-7CC760C27E70",
+                                "memo": "AUTO_HOME_PRO_PIE_10",
+                                "morder": 23,
+                                "mpointId": "C_Csnh4n",
+                                "sql": "",
+                                "testId": "myChartProduceText14_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce15_js",
+                                "funName": "echartPie",
+                                "id": "E179A4CE-D159-4B11-A517-7CC760C27E70",
+                                "memo": "AUTO_HOME_PRO_PIE_10",
+                                "morder": 23,
+                                "mpointId": "C_Csnh4n",
+                                "sql": "",
+                                "testId": "myChartProduceText15_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce16_js",
+                                "funName": "echartPie",
+                                "id": "E179A4CE-D159-4B11-A517-7CC760C27E70",
+                                "memo": "AUTO_HOME_PRO_PIE_10",
+                                "morder": 23,
+                                "mpointId": "C_Csnh4n",
+                                "sql": "",
+                                "testId": "myChartProduceText16_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce17_js",
+                                "funName": "echartPie",
+                                "id": "E179A4CE-D159-4B11-A517-7CC760C27E70",
+                                "memo": "AUTO_HOME_PRO_PIE_10",
+                                "morder": 23,
+                                "mpointId": "C_Csnh4n",
+                                "sql": "",
+                                "testId": "myChartProduceText17_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce18_js",
+                                "funName": "echartPie",
+                                "id": "E179A4CE-D159-4B11-A517-7CC760C27E70",
+                                "memo": "AUTO_HOME_PRO_PIE_10",
+                                "morder": 23,
+                                "mpointId": "C_Csnh4n",
+                                "sql": "",
+                                "testId": "myChartProduceText18_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce19_js",
+                                "funName": "echartPie",
+                                "id": "E179A4CE-D159-4B11-A517-7CC760C27E70",
+                                "memo": "AUTO_HOME_PRO_PIE_10",
+                                "morder": 23,
+                                "mpointId": "C_Csnh4n",
+                                "sql": "",
+                                "testId": "myChartProduceText19_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce20_js",
+                                "funName": "echartPie",
+                                "id": "E179A4CE-D159-4B11-A517-7CC760C27E70",
+                                "memo": "AUTO_HOME_PRO_PIE_10",
+                                "morder": 23,
+                                "mpointId": "C_Csnh4n",
+                                "sql": "",
+                                "testId": "myChartProduceText20_js",
+                                "type": "pro",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "safe_value_1",
+                                "funName": "getValue",
+                                "id": "E39427C5-3120-46CB-B94B-53B76190ED39",
+                                "memo": "AUTO_HOME_SAFE_VAL_1",
+                                "morder": 44,
+                                "mpointId": "C_Ydrjjs",
+                                "sql": "",
+                                "testId": "safe_text_1",
+                                "type": "safe",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "safe_value_2",
+                                "funName": "getValue",
+                                "id": "541399E8-7413-444F-85A9-22D746E4A3A2",
+                                "memo": "AUTO_HOME_SAFE_VAL_2",
+                                "morder": 45,
+                                "mpointId": "C_Ndzjs",
+                                "sql": "",
+                                "testId": "safe_text_2",
+                                "type": "safe",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "safe_value_3",
+                                "funName": "getValue",
+                                "id": "E109D0CB-4458-4A63-B714-A6AC7B6979F1",
+                                "memo": "AUTO_HOME_SAFE_VAL_3",
+                                "morder": 46,
+                                "mpointId": "C_Sbwhl",
+                                "sql": "",
+                                "testId": "safe_text_3",
+                                "type": "safe",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "safe_value_4",
+                                "funName": "getValue",
+                                "id": "024F849A-E7F3-4665-862A-49B2944277B7",
+                                "memo": "AUTO_HOME_SAFE_VAL_4",
+                                "morder": 47,
+                                "mpointId": "C_Mrddh",
+                                "sql": "",
+                                "testId": "safe_text_4",
+                                "type": "safe",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            {
+                                "divId": "myChartProduce8",
+                                "funName": "echartMixed",
+                                "id": "B414A41C-DC87-47A0-BB07-5BC64E5E61CB",
+                                "memo": "AUTO_HOME_SAFE_BAR",
+                                "morder": 100,
+                                "mpointId": "C_Mrjsy,C_Mrjse",
+                                "sql": "",
+                                "testId": "",
+                                "type": "safe",
+                                "unitId": "0533JS",
+                                "where": ""
+                            },
+                            // {
+                            //     "divId": "myChartProduce9",
+                            //     "funName": "echartColumnar2",
+                            //     "id": "B414A41C-DC87-47A0-BB07-5BC64E5E61CB",
+                            //     "memo": "AUTO_HOME_SAFE_BAR",
+                            //     "morder": 100,
+                            //     "mpointId": "C_Mrjsy,C_Mrjse",
+                            //     "sql": "",
+                            //     "testId": "",
+                            //     "type": "safe",
+                            //     "unitId": "0533JS",
+                            //     "where": ""
+                            // },
+                            // {
+                            //     "divId": "myChartProduce10",
+                            //     "funName": "echartLine2",
+                            //     "id": "B414A41C-DC87-47A0-BB07-5BC64E5E61CB",
+                            //     "memo": "AUTO_HOME_SAFE_BAR",
+                            //     "morder": 100,
+                            //     "mpointId": "C_Mrjsy,C_Mrjse",
+                            //     "sql": "",
+                            //     "testId": "",
+                            //     "type": "safe",
+                            //     "unitId": "0533JS",
+                            //     "where": ""
+                            // }
+                        ]
+                    }
+
+                    for (var i = 0; i < data.mpcode.length; i++) {
+                        var code = data.mpcode[i].mpointId;
+                        var funname = data.mpcode[i].funName;
+                        var divid = data.mpcode[i].divId;
+                        var testid = data.mpcode[i].testId;
+                        var mpointId = data.mpcode[i].mpointId;
+                        if (data.mpcode[i].type == '${type_pro}') {//生产
+                            eval(funname + "('" + unitId + "','" + code + "','" + divid + "','" + testid + "')")
+                        }
+                        if (data.mpcode[i].type == '${type_safe}') {//安全
+                            eval(funname + "('" + unitId + "','" + code + "','" + divid + "','" + testid + "')")
+                        }
+                        if (data.mpcode[i].type == '${type_eff}') {//效率
+                            eval(funname + "('" + unitId + "','" + code + "','" + divid + "','" + testid + "')")
+                        }
+                        if (data.mpcode[i].type == '${type_pic}') {//左上角图片
+                            //eval(funname + "('" + unitId + "')")
+                            getUnitsByUnitId4Select(unitId,funname,mpointId);
+                        }
+                    }
+                    //安全
+                    // echartColumnar2(unitId, 'TH_03_FIT040001D_FLOW_C', 'myChartsafe1');
+                }
+            });
+
+            //优良差
+            $(".evaluateIcon").attr("src", ext.contextPath + "/IMG/main/evaluate.png");
+
+            //左上角图片
+            // $("#mainImg").attr("src", ext.contextPath + "/IMG/main/main.jpg");
+
+        }
+    </script>
+
+</head>
+
+<body>
+<div id="mainDiv" style="background:#f1f1f1;min-height:100vh; width:100%;">
+
+    <div style="float:left;width:100%;">
+        <!-- 水质指标区域 -->
+        <div style="float:left;width:100%;padding:5px;">
+            <div style="width:100%;background-color:#ffffff;border-radius:5px;">
+                <div class="section-header">
+                    金山卫污水厂
+                </div>
+                <div style="display:flex;width:100%;">
+                    <!-- 左侧卡片 -->
+                    <div style="width:300px;min-width:300px;display:flex;flex-direction:column;justify-content:space-evenly;padding:10px;gap:10px;">
+                        <div></div>
+                        <div style="width:100%;height:120px;background-color:#cbe3f9;border-radius:5px;">
+                            <div class="fontText" style="color: #0c4377;" id="textProduce1_js">进水瞬时流量(m³/h)</div>
+                            <div class="fontValue" style="color: #0c4377;" id="valueProduce1_js">3551</div>
+                        </div>
+                        <div style="width:100%;height:120px;background-color:#badaf8;border-radius:5px;">
+                            <div class="fontText" style="color: #0c4377;" id="textProduce2_js">出水瞬时流量(m³/h)</div>
+                            <div class="fontValue" style="color: #0c4377;" id="valueProduce2_js">3551</div>
+                        </div>
+                        <div></div>
+                        <div style="width:100%;height:120px;background-color:#73afd8;border-radius:5px;">
+                            <div class="fontText" style="color: #0c4377;" id="textProduce3_js">进水瞬时流量(m³/h)</div>
+                            <div class="fontValue" style="color: #0c4377;" id="valueProduce3_js">3551</div>
+                        </div>
+                        <div style="width:100%;height:120px;background-color:#378dcc;border-radius:5px;">
+                            <div class="fontText" style="color: #0c4377;" id="textProduce4_js">出水瞬时流量(m³/h)</div>
+                            <div class="fontValue" style="color: #0c4377;" id="valueProduce4_js">3551</div>
+                        </div>
+                    </div>
+                    <!-- 右侧图表区域 -->
+                    <div style="flex:1;padding:10px;">
+                        <!-- 工业污水质量指标 标题 -->
+                        <div style="width:100%;height:30px;font-weight:bold;color:#0c4377;padding-left:10px;border-bottom:2px solid #67aad7;display:flex;align-items:center;">
+                            工业污水质量指标
+                        </div>
+                        <!-- 工业污水质量指标 第一行 (1-5) -->
+                        <div style="width:100%;height:180px;display:flex;padding:5px 0;">
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:30px;text-align:center; line-height: 40px;" id="myChartProduceText1_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce1_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:30px;text-align:center; line-height: 40px" id="myChartProduceText2_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce2_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText3_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce3_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText4_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce4_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText5_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce5_js"></div>
+                            </div>
+                        </div>
+                        <!-- 工业污水质量指标 第二行 (6-10) -->
+                        <div style="width:100%;height:180px;display:flex;padding:5px 0;">
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText6_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce6_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText7_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce7_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText8_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce8_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText9_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce9_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText10_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce10_js"></div>
+                            </div>
+                        </div>
+                        <!-- 生活污水质量指标 标题 -->
+                        <div style="width:100%;height:30px;font-weight:bold;color:#0c4377;padding-left:10px;border-bottom:2px solid #67aad7;display:flex;align-items:center;margin-top:10px;">
+                            生活污水质量指标
+
+                        </div>
+                        <!-- 生活污水质量指标 第一行 (11-15) -->
+                        <div style="width:100%;height:180px;display:flex;padding:5px 0;">
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText11_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce11_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText12_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce12_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText13_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce13_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText14_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce14_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText15_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce15_js"></div>
+                            </div>
+                        </div>
+                        <!-- 生活污水质量指标 第二行 (16-20) -->
+                        <div style="width:100%;height:180px;display:flex;padding:5px 0;">
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText16_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce16_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText17_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce17_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText18_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce18_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText19_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce19_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;padding:0 5px;">
+                                <div style="width:100%;height:25px;text-align:center; line-height: 40px" id="myChartProduceText20_js">-</div>
+                                <div style="width:100%;height:110px;" id="myChartProduce20_js"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- 水量及电耗区域 -->
+        <div style="float:left;width:100%;padding:5px;">
+            <div style="width:100%;background-color:#ffffff;border-radius:5px;">
+                <div class="section-header">
+                    水量及电耗
+                </div>
+                <div style="display:flex;width:100%;padding:10px;gap:10px;">
+                    <div style="flex:1;height:100px;background-color:#378dcc;border-radius:5px;">
+                        <div class="fontValue" id="safe_value_1">16532</div>
+                        <div class="fontText" id="safe_text_1">工业进水量 (m3)</div>
+                    </div>
+                    <div style="flex:1;height:100px;background-color:#67aad7;border-radius:5px;">
+                        <div class="fontValue" id="safe_value_2">16532</div>
+                        <div class="fontText" id="safe_text_2">工业出水量 (m3)</div>
+                    </div>
+                    <div style="flex:1;height:100px;background-color:#FACA00;border-radius:5px;">
+                        <div class="fontValue" id="safe_value_3">16532</div>
+                        <div class="fontText" id="safe_text_3">生活进水量 (m3)</div>
+                    </div>
+                    <div style="flex:1;height:100px;background-color:#66D97C;border-radius:5px;">
+                        <div class="fontValue" id="safe_value_4">16532</div>
+                        <div class="fontText" id="safe_text_4">生活出水量 (m3)</div>
+                    </div>
+                </div>
+                <div style="width:100%;height:300px;padding:10px;">
+                    <div style="width:100%;height:100%;" id="myChartProduce8"></div>
+<%--                    <div style="width:100%;height:100%;" id="myChartProduce9"></div>--%>
+<%--                    <div style="width:100%;height:100%;" id="myChartProduce10"></div>--%>
+                </div>
+            </div>
+        </div>
+        <!-- 
+        <div style="float:left;height:50%;width:100%;padding:5px 5px 5px 5px;">
+            <div style="height:100%;width:100%;background-color:#ffffff;">
+                <div style="width:100%;height:5%;float:left;border-bottom:2px solid #67aad7;font-weight: bold;">
+                    二车间
+                </div>
+                <div style="width:20%;height:96%;float:left;">
+                    <div style="width:100%;height:25%;float:left;background-color:#cbe3f9;margin:6%;">
+                        <div class="fontValue" style="color: #0c4377;" id="valueProduce1_cs"></div>
+                        <div class="fontText" style="color: #0c4377;" id="textProduce1_cs"></div>
+                    </div>
+                    <div style="width:100%;height:25%;float:left;background-color:#badaf8;margin:6%;">
+                        <div class="fontValue" style="color: #0c4377;" id="valueProduce2_cs"></div>
+                        <div class="fontText" style="color: #0c4377;" id="textProduce2_cs"></div>
+                    </div>
+                    <div style="width:100%;height:25%;float:left;background-color:#73afd8;margin:6%;">
+                        <div class="fontValue" style="color: #0c4377;" id="valueProduce3_cs"></div>
+                        <div class="fontText" style="color: #0c4377;" id="textProduce3_cs"></div>
+                    </div>
+                </div>
+                <div style="width:80%;height:96%;float:left;padding: 5px 10px 30px 10px;">
+                    <div style="width:100%;height:100%;float:left;">
+                        <div style="width:100%;height:3%;float:left;"></div>
+                        <div style="width:100%;height:40%;float:left;">
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText1_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce1_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText2_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce2_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText3_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce3_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText4_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce4_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText5_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce5_cs"></div>
+                            </div>
+                        </div>
+                        <div style="width:100%;height:4%;float:left;"></div>
+                        <div style="width:100%;height:40%;float:left;">
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText6_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce6_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText7_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce7_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText8_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce8_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText9_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce9_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText10_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce10_cs"></div>
+                            </div>
+                        </div>
+                        <div style="width:100%;height:3%;float:left;"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        -->
+    </div>
+
+</div>
+</body>
+
+</html>

src/main/webapp/jsp/main_JS_Company2_init.jsp

@@ -0,0 +1,398 @@
+<%@ page language="java" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="com.sipai.entity.base.ServerObject" %>
+<%@ taglib uri="http://www.springsecurity.org/jsp" prefix="security" %>
+
+<%@ page import="com.sipai.entity.base.MainConfig" %>
+<% request.setAttribute("type_pro", MainConfig.type_pro); %>
+<% request.setAttribute("type_safe", MainConfig.type_safe); %>
+<% request.setAttribute("type_eff", MainConfig.type_eff); %>
+<% request.setAttribute("type_pic", MainConfig.type_pic); %>
+
+<!DOCTYPE html>
+
+<head>
+    <title><%= ServerObject.atttable.get("TOPTITLE")%>
+    </title>
+
+    <!-- 引用页头及CSS页-->
+    <jsp:include page="/jsp/inc.jsp"></jsp:include>
+    <!-- echarts-->
+    <script type="text/javascript" src="<%=request.getContextPath()%>/plugins/echarts/echarts.4.1.0.min.js"
+            charset="utf-8"></script>
+
+    <script type="text/javascript" src="<%=request.getContextPath()%>/JS/main/main_js.js" charset="utf-8"></script>
+    <style>
+        /*
+        根据不同分辨率显示不同px的文字大小
+        */
+        @media (min-width: 1080px) {
+
+        }
+
+        @media (min-width: 1550px) {
+
+        }
+
+        .fontValue {
+            text-align: center;
+            margin-top: 20px;
+            margin-left: 70px;
+            font-size: 20px;
+            color: #ffffff;
+            font-weight: bold;
+        }
+
+        .fontText {
+            margin-left: 20px;
+            font-size: 14px;
+            color: #ffffff;
+            font-weight: bold;
+        }
+      .carousel-inner,
+      .carousel-inner >.item,
+      .carousel-inner >.item >img{
+        width:100%;height:100%;
+      }
+      .carousel-caption{
+        cursor: pointer;
+        padding: 0;
+        background-color: RGBA(55,141,204,0.5);
+        bottom: 10px;
+      }
+    </style>
+    <script type="text/javascript">
+
+
+        $(function () {
+            firstFun();
+        });
+
+        window.onresize = function () {
+            firstFun();
+        }
+
+        function firstFun() {
+            //var height = document.documentElement.clientHeight;
+            var height = $(window).height();
+            $('#mainDiv').css('height', height);//页面加载先给高度
+
+            $.ajax({
+                type: 'GET',
+                url: ext.contextPath + '/base/mainConfig/getJson.do',
+                async: true,
+                data: {unitId: unitId},
+                globle: false,
+                error: function () {
+                    return false;
+                },
+                success: function (data) {
+                    var data = eval('(' + data + ')');
+                    for (var i = 0; i < data.mpcode.length; i++) {
+                        var code = data.mpcode[i].mpointId;
+                        var funname = data.mpcode[i].funName;
+                        var divid = data.mpcode[i].divId;
+                        var testid = data.mpcode[i].testId;
+                        var mpointId = data.mpcode[i].mpointId;
+                        if (data.mpcode[i].type == '${type_pro}') {//生产
+                            eval(funname + "('" + unitId + "','" + code + "','" + divid + "','" + testid + "')")
+                        }
+                        if (data.mpcode[i].type == '${type_safe}') {//安全
+                            eval(funname + "('" + unitId + "','" + code + "','" + divid + "','" + testid + "')")
+                        }
+                        if (data.mpcode[i].type == '${type_eff}') {//效率
+                            eval(funname + "('" + unitId + "','" + code + "','" + divid + "','" + testid + "')")
+                        }
+                        if (data.mpcode[i].type == '${type_pic}') {//左上角图片
+                            //eval(funname + "('" + unitId + "')")
+                            getUnitsByUnitId4Select(unitId,funname,mpointId);
+                        }
+                    }
+                    //安全
+                    // echartColumnar2(unitId, 'TH_03_FIT040001D_FLOW_C', 'myChartsafe1');
+                }
+            });
+
+            //优良差
+            $(".evaluateIcon").attr("src", ext.contextPath + "/IMG/main/evaluate.png");
+
+            //左上角图片
+            // $("#mainImg").attr("src", ext.contextPath + "/IMG/main/main.jpg");
+
+        }
+    </script>
+
+</head>
+
+<body>
+<div id="mainDiv" style="background:#f1f1f1;">
+
+    <div style="float:left;height:100%;width:35%;">
+        <div style="float:left;height:45%;width:100%;padding:5px 5px 5px 5px;">
+            <div style="height:100%;width:100%;background-color:#ffffff;">
+                <%--图片--%>
+                <!-- <img src="" id="mainImg" style="width:100%;height:100%;"> -->
+                <div id="carousel-example-generic" class="carousel slide" data-ride="carousel" style="width:100%;height:100%;">
+                
+                  <!-- Wrapper for slides -->
+                  <div class="carousel-inner" role="listbox" id="carousel-items">
+                  </div>
+                  <!-- Controls -->
+                  <a class="left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
+                    <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+                    <span class="sr-only">Previous</span>
+                  </a>
+                  <a class="right carousel-control" href="#carousel-example-generic" role="button" data-slide="next">
+                    <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+                    <span class="sr-only">Next</span>
+                  </a>
+                </div>
+            </div>
+        </div>
+        <div style="float:left;height:55%;width:100%;padding:5px 5px 5px 5px;">
+            <div style="height:100%;width:100%;background-color:#ffffff;">
+                <div style="width:100%;height:5%;float:left;border-bottom:2px solid #67aad7;font-weight: bold;">
+                    水量及电耗
+                </div>
+                <div style="width:100%;height:40%;float:left;">
+
+                    <div style="width:48%;height:45%;float:left;background-color:#378dcc;margin:1%;">
+                        <div class="fontValue" id="safe_value_1">-</div>
+                        <div class="fontText" id="safe_text_1">-</div>
+                    </div>
+                    <div style="width:48%;height:45%;float:right;background-color:#67aad7;margin:1%;">
+                        <div class="fontValue" id="safe_value_2">-</div>
+                        <div class="fontText" id="safe_text_2">-</div>
+                    </div>
+
+                    <div style="width:48%;height:45%;float:left;background-color:#FACA00;margin:1%;">
+                        <div class="fontValue" id="safe_value_3">-</div>
+                        <div class="fontText" id="safe_text_3">-</div>
+                    </div>
+                    <div style="width:48%;height:45%;float:right;background-color:#66D97C;margin:1%;">
+                        <div class="fontValue" id="safe_value_4">-</div>
+                        <div class="fontText" id="safe_text_4">-</div>
+                    </div>
+                </div>
+                <div style="width:100%;height:55%;float:left;padding: 5px 5px 5px 5px;">
+                    <div style="width:100%;height:100%;float:left;">
+                        <div style="width:100%;height:100%;float:left;" id="myChartProduce8"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div style="float:left;height:100%;width:65%;">
+        <div style="float:left;height:50%;width:100%;padding:5px 5px 5px 5px;">
+            <div style="height:100%;width:100%;background-color:#ffffff;">
+                <div style="width:100%;height:5%;float:left;border-bottom:2px solid #67aad7;font-weight: bold;">
+                    一车间
+                </div>
+                <div style="width:20%;height:100%;float:left;">
+                    <div style="width:100%;height:25%;float:left;background-color:#cbe3f9;margin:6%;">
+                        <div class="fontValue" style="color: #0c4377;" id="valueProduce1_js"></div>
+                        <div class="fontText" style="color: #0c4377;" id="textProduce1_js"></div>
+                    </div>
+                    <div style="width:100%;height:25%;float:left;background-color:#badaf8;margin:6%;">
+                        <div class="fontValue" style="color: #0c4377;" id="valueProduce2_js"></div>
+                        <div class="fontText" style="color: #0c4377;" id="textProduce2_js"></div>
+                    </div>
+                    <div style="width:100%;height:25%;float:left;background-color:#73afd8;margin:6%;">
+                        <div class="fontValue" style="color: #0c4377;" id="valueProduce3_js"></div>
+                        <div class="fontText" style="color: #0c4377;" id="textProduce3_js"></div>
+                    </div>
+                </div>
+                <div style="width:80%;height:100%;float:left;padding: 5px 10px 30px 10px;">
+                    <div style="width:100%;height:100%;float:left;">
+                        <div style="width:100%;height:3%;float:left;"></div>
+                        <div style="width:100%;height:40%;float:left;">
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText1_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce1_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText2_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce2_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText3_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce3_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText4_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce4_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText5_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce5_js"></div>
+                            </div>
+                        </div>
+                        <div style="width:100%;height:4%;float:left;"></div>
+                        <div style="width:100%;height:40%;float:left;">
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText6_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce6_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText7_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce7_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText8_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce8_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText9_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce9_js"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText10_js">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce10_js"></div>
+                            </div>
+                        </div>
+                        <div style="width:100%;height:3%;float:left;"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div style="float:left;height:50%;width:100%;padding:5px 5px 5px 5px;">
+            <div style="height:100%;width:100%;background-color:#ffffff;">
+                <div style="width:100%;height:5%;float:left;border-bottom:2px solid #67aad7;font-weight: bold;">
+                    二车间
+                </div>
+                <div style="width:20%;height:96%;float:left;">
+                    <div style="width:100%;height:25%;float:left;background-color:#cbe3f9;margin:6%;">
+                        <div class="fontValue" style="color: #0c4377;" id="valueProduce1_cs"></div>
+                        <div class="fontText" style="color: #0c4377;" id="textProduce1_cs"></div>
+                    </div>
+                    <div style="width:100%;height:25%;float:left;background-color:#badaf8;margin:6%;">
+                        <div class="fontValue" style="color: #0c4377;" id="valueProduce2_cs"></div>
+                        <div class="fontText" style="color: #0c4377;" id="textProduce2_cs"></div>
+                    </div>
+                    <div style="width:100%;height:25%;float:left;background-color:#73afd8;margin:6%;">
+                        <div class="fontValue" style="color: #0c4377;" id="valueProduce3_cs"></div>
+                        <div class="fontText" style="color: #0c4377;" id="textProduce3_cs"></div>
+                    </div>
+                </div>
+                <div style="width:80%;height:96%;float:left;padding: 5px 10px 30px 10px;">
+                    <div style="width:100%;height:100%;float:left;">
+                        <div style="width:100%;height:3%;float:left;"></div>
+                        <div style="width:100%;height:40%;float:left;">
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText1_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce1_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText2_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce2_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText3_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce3_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText4_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce4_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText5_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce5_cs"></div>
+                            </div>
+                        </div>
+                        <div style="width:100%;height:4%;float:left;"></div>
+                        <div style="width:100%;height:40%;float:left;">
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText6_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce6_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText7_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce7_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText8_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce8_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText9_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce9_cs"></div>
+                            </div>
+                            <div style="width:20%;height:100%;float:left;">
+                                <div style="width:100%;height:20%;padding-top:10%;padding-right:5%;" align="center"
+                                     id="myChartProduceText10_cs">
+                                    -
+                                </div>
+                                <div style="width:100%;height:80%;" id="myChartProduce10_cs"></div>
+                            </div>
+                        </div>
+                        <div style="width:100%;height:3%;float:left;"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>
+</body>
+
+</html>

src/main/webapp/jsp/maintenance/abnormityAdd.jsp

@@ -173,8 +173,8 @@
                     return repo.text;
                 } // 函数用于呈现当前的选择
             });
-            selelct_.val('').trigger("change");
-            selelct_.on('change', function () {
+            selelct_.val('').trigger("change.select2");
+            selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function () {
                 //工艺段选择后，清空原有工艺段选择的设备
                 $("#equipmentIds").val("");
                 $("#equipname").val("");

src/main/webapp/jsp/maintenance/abnormityEdit.jsp

@@ -159,8 +159,8 @@
                    formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
                    formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
              });  
-            selelct_.val('${abnormity.processSectionId}').trigger("change");
-        },'json');  
+            selelct_.val('${abnormity.processSectionId}').trigger("change.select2");
+        },'json');
     };
     var companyId = "${abnormity.bizId}";
 	$(function(){
@@ -181,9 +181,9 @@
                 formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
           });  
          if(data!=null && data.length>0){
-             selelct_.val('${abnormity.processSectionId}').trigger("change");
+             selelct_.val('${abnormity.processSectionId}').trigger("change.select2");
          }
-         selelct_.on('change',function(){
+         selelct_.off("select2:select select2:clear").on("select2:select select2:clear",function(){
             //工艺段选择后，清空原有工艺段选择的设备
             $("#equipmentIds").val("");
             $("#equipname").val("");

src/main/webapp/jsp/maintenance/abnormityList.jsp

@@ -195,8 +195,8 @@
                      formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
                      formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
                });  
-              selelct_.val('').trigger("change");
-              selelct_.on("change",function(e){
+              selelct_.val('').trigger("change.select2");
+              selelct_.off("select2:select select2:clear").on("select2:select select2:clear",function(e){
                   dosearch();
               });
         },'json'); 

src/main/webapp/jsp/maintenance/abnormityList_new.jsp

@@ -156,8 +156,8 @@
                             return repo.text;
                         } // 函数用于呈现当前的选择
                     });
-                    selelct_.val('').trigger("change");
-                    selelct_.on("change", function (e) {
+                    selelct_.val('').trigger("change.select2");
+                    selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
                         initAPPFun();
                     });
                 }, 'json');
@@ -493,8 +493,8 @@
                         return repo.text;
                     } // 函数用于呈现当前的选择
                 });
-                selelct_.val('').trigger("change");
-                selelct_.on("change", function (e) {
+                selelct_.val('').trigger("change.select2");
+                selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
                     // dosearch();
                     $("#table").bootstrapTable('refresh');
                 });

src/main/webapp/jsp/maintenance/anticorrosiveLibraryList.jsp

@@ -170,16 +170,16 @@
                         return repo.text;
                     } // 函数用于呈现当前的选择
                 });
-                selelct_.val('').trigger("change");
-                selelct_.on("change", function (e) {
+                selelct_.val('').trigger("change.select2");
+                selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
                     dosearch();
                 });
             }, 'json');
             var statusSelect = $("#statusSelect").select2({
                 minimumResultsForSearch: 10,
                 placeholder: '请选择',
-            }).val('').trigger("change");
-            statusSelect.on("change", function (e) {
+            }).val('').trigger("change.select2");
+            statusSelect.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
                 dosearch();
             });
             $("#table").bootstrapTable({ // 对应table标签的id

src/main/webapp/jsp/maintenance/defectEndRecordList.jsp

@@ -174,8 +174,8 @@
                         return repo.text;
                     } // 函数用于呈现当前的选择
                 });
-                selelct_.val("").trigger("change");
-                selelct_.on("change", function (e) {
+                selelct_.val("").trigger("change.select2");
+                selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
                     dosearch();
                 });
             }, 'json');

src/main/webapp/jsp/maintenance/defectRecordAdd.jsp

@@ -354,7 +354,7 @@
                     </div>--%>
 
                     <div class="form-group" style="margin:8px">
-                        <button type="button" class="btn btn-default btn-file" onclick="fileinputPic('maintenanceDetailFile')"
+                        <button type="button" class="btn btn-default btn-file" onclick="fileinputPic('abnormityFileId')"
                                 id="btn_save"><i
                                 class="fa fa-paperclip"></i>上传图片
                         </button>

src/main/webapp/jsp/maintenance/defectRecordList.jsp

@@ -187,8 +187,8 @@
                         return repo.text;
                     } // 函数用于呈现当前的选择
                 });
-                selelct_.val("").trigger("change");
-                selelct_.on("change", function (e) {
+                selelct_.val("").trigger("change.select2");
+                selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
                     dosearch();
                 });
             }, 'json');

src/main/webapp/jsp/maintenance/maintenanceDetailList.jsp

@@ -271,8 +271,8 @@
           formatResult: function formatRepo(repo) { return repo.text; }, // 函数用来渲染结果
           formatSelection: function formatRepoSelection(repo) { return repo.text; } // 函数用于呈现当前的选择
         });
-        selelct_.val("").trigger("change");
-        selelct_.on("change", function (e) {
+        selelct_.val("").trigger("change.select2");
+        selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) {
           dosearch();
         });
       }, 'json');

src/main/webapp/jsp/pipeline/pipelineDataList.jsp

@@ -88,7 +88,10 @@
         var checkedItems = $("#table").bootstrapTable('getSelections');
         var datas = "";
         $.each(checkedItems, function(index, item) {
-            datas += item.id + ",";
+            if (datas != "") {
+                datas += ",";
+            }
+            datas += item.id;
         });
         if (datas == "") {
             showAlert('d', '请先选择记录', 'mainAlertdiv');

src/main/webapp/jsp/report/rptDayLogList.jsp

@@ -78,8 +78,11 @@
             rptdt: time,
             rptdeptId: '${param.rptdeptId}'
         }, function (data) {
-            $("#rptDiv").html(data);
-            openModal('subModal');
+            if (data.code > 0) {
+            $("#rptDiv").html(data); openModal('subModal');
+            } else {
+                showAlert('d', '您没有该报表的填报权限', 'mainAlertdiv');
+            }
         });
     };
 
@@ -160,7 +163,7 @@
                             if (data.code > 0) {
                                 $("#table").bootstrapTable('refresh');
                             } else {
-                                showAlert('d', '删除失败', 'mainAlertdiv');
+                                showAlert('d', data.msg, 'mainAlertdiv');
                             }
                         }, 'json');
 

src/main/webapp/jsp/safety/EducationBuilderList.jsp

@@ -263,7 +263,8 @@
                         field: 'name', // 返回json数据中的name
                         title: '姓名', // 表格表头显示文字
                         align: 'center', // 左右居中
-                        valign: 'middle' // 上下居中
+                        valign: 'middle', // 上下居中
+                        width: 200,
                     }, {
 /*                        field: 'gender', // 返回json数据中的name
                         title: '性别', // 表格表头显示文字

src/main/webapp/jsp/safety/EducationBuilderView.jsp

@@ -17,17 +17,11 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
         display: flex;
         padding-left: 50px;
     }
-
-    /*.layout{*/
-    /   display: flex;*/
-    /   padding-left: 15px;*/
-    /*}*/
     .form-horizontal {
         padding-top: 20px;
         padding-left: 60px;
 
     }
-
     .right {
         margin-left: 50px;
     }

src/main/webapp/jsp/safety/EducationInsiderView.jsp

@@ -50,10 +50,10 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
             formatResult: function formatRepo(repo) {
                 return repo.text;
             }, // 函数用来渲染结果
+            formatSelection: function formatRepoSelection(repo) {
                 return repo.text;
             } // 函数用于呈现当前的选择
         });
-        });
         $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'});
 
         select_3.val('${bean.educationType}').trigger("change");

src/main/webapp/jsp/safety/SafetyCheckDaylyAdd.jsp

@@ -115,7 +115,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
     var fileinput = function () {
         $('#file').click();
     };
-    var filedel = function () {
+    var filedel = function (index) {
         fileList.splice(index,1)
         $('#test').html(initFileInputView())
     };

src/main/webapp/jsp/safety/SafetyJobInsideAdd.jsp

@@ -72,7 +72,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
     var fileinput = function () {
         $('#file').click();
     };
-    var filedel = function () {
+    var filedel = function (index) {
         fileList.splice(index, 1)
         $('#test').html(initFileInputView())
     };
@@ -234,7 +234,8 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
             {
                 formId: "addForm",
                 hiddenId: "userId",
-                textId: "userName"
+                textId: "userName",
+                displayDept: "true"
             }, function (data) {
                 $("#user4SelectDiv").html(data);
                 openModal("user4SelectModal");

src/main/webapp/jsp/safety/SafetyJobInsideSign.jsp

@@ -47,6 +47,11 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
         display: inline-block;
         vertical-align: top;
         padding: 8px;
+        width: 140px;
+        text-align: left;
+    }
+    .detail-row {
+        clear: both;
     }
 </style>
 <script type="text/javascript">
@@ -253,7 +258,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
     function initdeTail(list) {
         let temp = `<div >`
         list.forEach((item, index) => {
-            temp += `<div><div class="AAA">` + item.deptName + `</div>`
+            temp += `<div class="detail-row"><div class="AAA">` + item.deptName + `</div>`
             temp += `<div class="AAA">` + item.userName + `</div>`
             temp += `<div class="AAA">` + item.pass + `</div>`
             temp += `<div class="AAA">` + item.time + `</div></div>`
@@ -426,7 +431,9 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
                             </div>
                             <div class="form-group">
                                 <label class="col-sm-2 control-label ">查看其它会签意见</label>
-                                <div id="deTail"></div>
+                                <div class="col-sm-10">
+                                    <div id="deTail"></div>
+                                </div>
                             </div>
                             <div class="form-group" style="margin-left: 39px">
                                 <div id="fileList"></div>

src/main/webapp/jsp/safety/staffArchivesAdd.jsp

@@ -147,6 +147,7 @@
       hiddenId: "userid",
       textId: "username",
       deptNameDom: "deptName",
+      deptIdDom: "pid",
       sexDom: "sex",
       userCardIdDom: "userCardId",
       userId: userId
@@ -156,6 +157,18 @@
     });
   }
 
+  //选择所属部门
+  function showDept4SelectFun() {
+    $.post(ext.contextPath + '/user/showUnit4Select_Limited.do', {
+      formId: "subForm",
+      hiddenId: "pid",
+      textId: "deptName"
+    }, function (data) {
+      $("#deptSelectDiv").html(data);
+      openModal('unit4SelectModal_Limited');
+    });
+  }
+
 </script>
 <div class="modal fade" id="subModal">
     <div class="modal-dialog" style="width: 53%">
@@ -239,8 +252,9 @@
                         </div>
                         <label class="col-sm-2 control-label">*所属部门:</label>
                         <div class="col-sm-4">
-                            <input type="text" class="form-control" id="deptName" name="deptName" placeholder="所属部门"
-                                   value="" disabled>
+                            <input type="text" class="form-control" id="deptName" name="deptName" placeholder="点击选择所属部门"
+                                   value="" onclick="showDept4SelectFun();" readonly>
+                            <input type="hidden" id="pid" name="pid" value="">
                         </div>
                     </div>
 
@@ -274,3 +288,4 @@
     </div>
     <!-- /.modal-dialog -->
 </div>
+<div id="deptSelectDiv"></div>

src/main/webapp/jsp/safety/staffArchivesEdit.jsp

@@ -152,6 +152,7 @@
       hiddenId: "userid",
       textId: "username",
       deptNameDom: "deptName",
+      deptIdDom: "pid",
       sexDom: "sex",
       userCardIdDom: "userCardId",
       userId: userId
@@ -161,6 +162,18 @@
     });
   }
 
+  //选择所属部门
+  function showDept4SelectFun() {
+    $.post(ext.contextPath + '/user/showUnit4Select_Limited.do', {
+      formId: "subForm",
+      hiddenId: "pid",
+      textId: "deptName"
+    }, function (data) {
+      $("#deptSelectDiv").html(data);
+      openModal('unit4SelectModal_Limited');
+    });
+  }
+
 </script>
 <div class="modal fade" id="subModal">
     <div class="modal-dialog modal-lg">
@@ -245,8 +258,9 @@
 
                         <label class="col-sm-2 control-label">*所属部门:</label>
                         <div class="col-sm-4">
-                            <input type="text" class="form-control" id="deptName" name="deptName" placeholder="所属部门"
-                                   value="${safetyStaffArchives.deptName}" disabled>
+                            <input type="text" class="form-control" id="deptName" name="deptName" placeholder="点击选择所属部门"
+                                   value="${safetyStaffArchives.deptName}" onclick="showDept4SelectFun();" readonly>
+                            <input type="hidden" id="pid" name="pid" value="${safetyStaffArchives.pid}">
                         </div>
                     </div>
 
@@ -282,3 +296,4 @@
     </div>
     <!-- /.modal-dialog -->
 </div>
+<div id="deptSelectDiv"></div>

src/main/webapp/jsp/safety/userForOneSelectByStructure.jsp

@@ -26,6 +26,9 @@
       if(`${param.deptNameDom}` != ""){
         $('#${param.formId} #${param.deptNameDom}').val(resp[0]._pname);
       }
+      if(`${param.deptIdDom}` != ""){
+        $('#${param.formId} #${param.deptIdDom}').val(resp[0].pid);
+      }
       if(`${param.sexDom}` != ""){
         $('#${param.formId} #${param.sexDom}').val(resp[0].sex);
       }

src/main/webapp/jsp/sparepart/sewageList.jsp

@@ -29,6 +29,19 @@
             openModal('subModal');
         }); 
   };
+  
+  // 查看曲线（瞬时流量、累计流量）
+  var showLineFun = function(ventNum, type) {
+        if (!ventNum) {
+            showAlert('w', '请关联点位ID', 'mainAlertdiv');
+            return;
+        }
+        var mpcode = ventNum + '_' + type;
+        $.post(ext.contextPath + '/data/showOnlyLine.do', {mpcode: mpcode, unitId: unitId}, function(data) {
+            $("#subDiv").html(data);
+            openModal('curveModal');
+        }); 
+  };
 	var editFun = function(id) {
         $.post(ext.contextPath + '/sparepart/sewage/edit.do', {id:id} , function(data) {
             $("#subDiv").html(data);
@@ -339,9 +352,13 @@
 	                  width: 120, // 定义列的宽度，单位为像素px
 	                  formatter: function (value, row, index) {
 	                	  var buts= '';
-	                     buts+= '<button class="btn btn-default btn-sm" title="查看点位" onclick="showpointFun(\'' + row.name + '\')"><i class="fa fa-check-square-o"></i><span class="hidden-md hidden-lg"> 查看点位</span></button>';
+	                 	  buts+= '<button class="btn btn-default btn-sm" title="瞬时流量" onclick="showLineFun(\'' + (row.ventNum || '') + '\', \'SSLL\')"><i class="fa fa-line-chart"></i></button>';
+	                 	  buts+= '<button class="btn btn-default btn-sm" title="累计流量" onclick="showLineFun(\'' + (row.ventNum || '') + '\', \'LJLL\')"><i class="fa fa-area-chart"></i></button>';
+
+	                    //  buts+= '<button class="btn btn-default btn-sm" title="查看点位" onclick="showpointFun(\'' + row.name + '\')"><i class="fa fa-check-square-o"></i></button>';
+
 	                	   buts+= '<security:authorize buttonUrl="sparepart/sewage/edit.do">';
-	                	   buts+= '<button class="btn btn-default btn-sm" title="编辑" onclick="editFun(\'' + row.id + '\')"><i class="fa fa-edit"></i><span class="hidden-md hidden-lg"> 编辑</span></button>';
+	                 	   buts+= '<button class="btn btn-default btn-sm" title="编辑" onclick="editFun(\'' + row.id + '\')"><i class="fa fa-edit"></i><span class="hidden-md hidden-lg"> 编辑</span></button>';
 	                	   buts+= '</security:authorize>';
 	                	   
 	                	   buts+= '<security:authorize buttonUrl="sparepart/sewage/delete.do">';

src/main/webapp/jsp/timeefficiency/patrolRecordViewMap_0533JS.jsp

@@ -0,0 +1,180 @@
+<%@ page language="java" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+
+<style type="text/css">
+    #map_canvas {
+        width: 100%;
+        height: 100%;
+    }
+
+    #result {
+        width: 100%
+    }
+
+    #btns {
+        z-index: 999;
+        position: fixed;
+        bottom: 3.5rem;
+        margin-left: 2.5rem;
+        padding-left: 0;
+        border-radius: .25rem;
+        display: flex;
+        box-shadow: 0 2px 6px 0 rgba(27, 142, 236, 0.5);
+        text-align: center;
+    }
+
+    #btns li {
+        border-right: 1px solid #d2d2d2;
+        padding: 10px 10px;
+        height: 100%;
+        background-color: #fff;
+        cursor: pointer;
+        color: #3a79b5;
+    }
+
+    /*.modal-body {
+        position: relative;
+        padding: 15px;
+    }*/
+</style>
+
+<script>
+    window.BMAP_AUTHENTIC_KEY = '7Cc5Kmn672miPzG4qQhvlOrERcXMMinq';
+</script>
+
+<script type="text/javascript">
+    var lushuArray = [];//多人巡检轨迹数
+
+    // var map = new BMapGL.Map('map_canvas');
+    var map = new BMapGL.Map('map_canvas', {
+        minZoom: 19,
+        maxZoom: 19
+    });
+    map.enableScrollWheelZoom();
+    // 113.044283, 23.028002  沙口
+    // 112.911564,23.370377   北江
+    // 121.374879,30.73846   金山一厂
+    // 121.363482,30.807332   金山二厂
+    var x1 = '121.363482';
+    var y1 = '30.807332';
+    map.centerAndZoom(new BMapGL.Point(x1, y1), 19);
+    map.enableScrollWheelZoom(true);//禁止鼠标滚动
+    map.setMapType(BMAP_EARTH_MAP);// 设置地图类型为地球模式
+    // var lushu;
+    //实例化一个轨迹用来生成路线
+    var drv = new BMapGL.DrivingRoute('佛山', {
+        onSearchComplete: function (res) {
+            // if (drv.getStatus() == BMAP_STATUS_SUCCESS) {
+
+                var userName = '';//人员名称
+                var userIcon = '';//人员头像
+
+                $.post(ext.contextPath + "/timeEfficiency/patrolRecord/getGPS.do", {patrolRecordId: '${patrolRecord.id}'}, function (data) {
+                    for (let i = 0; i < data.length; i++) {
+                        var gpsStr = [];//gps数组
+
+                        var str = data[i].data;
+                        for (let j = 0; j < str.length; j++) {
+                            gpsStr.push(str[j])
+                        }
+
+                        userName = data[i].userName;
+
+                        if (data[i].icon != null && data[i].icon != '') {
+                            userIcon = data[i].icon;
+                        } else {
+                            userIcon = ext.contextPath + '/IMG/sy/headportrait.png';
+                        }
+
+                        creatGPSLine(gpsStr, userName, userIcon);
+                    }
+
+                }, 'json');
+
+            // }
+        }
+    });
+
+    //调用不同人员的巡检路线
+    function creatGPSLine(gpsStr, userName, userIcon) {
+        if (gpsStr != null && gpsStr != '') {
+            map.addOverlay(new BMapGL.Marker(gpsStr[0]));
+            map.addOverlay(new BMapGL.Marker(gpsStr[gpsStr.length - 1]));
+            map.addOverlay(new BMapGL.Polyline(gpsStr, {strokeColor: 'blue'}));
+            map.setViewport(gpsStr);
+            var lushu = new BMapGLLib.LuShu(map, gpsStr, {
+                defaultContent: userName, // "信息窗口文案"
+                autoView: true, // 是否开启自动视野调整，如果开启那么路书在运动过程中会根据视野自动调整
+                speed: 50,
+                icon: new BMapGL.Icon(userIcon, new BMapGL.Size(40, 40), {anchor: new BMapGL.Size(20, 40)}),
+                enableRotation: false, // 是否设置marker随着道路的走向进行旋转
+            });
+            lushuArray.push(lushu);
+        } else {
+
+        }
+    }
+
+    var start = new BMapGL.Point(116.404844, 40);
+    var end = new BMapGL.Point(116.308102, 40.056057);
+    drv.search(start, end);
+
+    //开始
+    function run() {
+        // lushu.start();
+        for (var i = 0; i < lushuArray.length; i++) {
+            // console.log(lushuArray[i]);
+            lushuArray[i].start();//多人轨迹演示
+        }
+    }
+
+    //停止
+    function stop() {
+        // lushu.stop();
+        for (var i = 0; i < lushuArray.length; i++) {
+            // console.log(lushuArray[i]);
+            lushuArray[i].stop();//多人轨迹演示
+        }
+    }
+
+    //暂停
+    function pause() {
+        // lushu.pause();
+        for (var i = 0; i < lushuArray.length; i++) {
+            // console.log(lushuArray[i]);
+            lushuArray[i].pause();//多人轨迹演示
+        }
+    }
+
+    /*$("hide").onclick = function () {
+        //隐藏信息窗口
+        lushu.hideInfoWindow();
+    }
+    $("show").onclick = function () {
+        //展示信息窗口
+        lushu.showInfoWindow();
+    }*/
+
+</script>
+<div class="modal fade" id="subModal_recordMap">
+    <div class="modal-dialog modal-xlg" style="width: 1800px;height: 700px;">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title">巡检轨迹</h4>
+            </div>
+            <div class="modal-body" style="width: 1800px;height: 700px;padding: 0px;">
+                <div id="map_canvas"></div>
+                <div id="result"></div>
+                <ul id='btns'>
+                    <li id="run" onclick="run();">开始</li>
+                    <li id="stop" onclick="stop();">停止</li>
+                    <li id="pause" onclick="pause();">暂停</li>
+                    <%--<li id="hide" onclick="hide();">隐藏信息窗口</li>
+                    <li id="show" onclick="show();">展示信息窗口</li>--%>
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>

src/main/webapp/jsp/top.jsp

@@ -1062,12 +1062,12 @@
     <a onclick="goToMainTab();" style="cursor:pointer " class="logo">
         <!-- mini logo for sidebar mini 50x50 pixels -->
         <span class="logo-mini">
-            <img src="<%=request.getContextPath()%>/IMG/logo.png" style="height: 30px; margin-top: 10px;" alt="Logo"/>
+            <img src="<%=request.getContextPath()%>/IMG/logo.png" style="height: 30px;" alt="Logo"/>
         </span>
         <!-- logo for regular state and mobile devices -->
         <span class="logo-lg">
             <img src="<%=request.getContextPath()%>/IMG/logo.png" style="height: 30px; margin-right: 5px; vertical-align: middle;" alt="Logo"/>
-            <b id="logo-lg" style="vertical-align: middle; font-size: 18px;">上海金山卫污水厂</b>
+            <b id="logo-lg" style="vertical-align: middle; font-size: 18px;">金山卫污水厂</b>
         </span>
     </a>
     <!-- Navbar Right Menu -->

src/main/webapp/jsp/user/jobList.jsp

@@ -20,7 +20,10 @@
             src="<%=request.getContextPath()%>/node_modules/bootstrap-switch/dist/js/bootstrap-switch.min.js"
             charset="utf-8"></script>
     <script type="text/javascript">
-        var companyId = unitId;
+        var companyId = '';
+        $(function() {
+            companyId = unitId;
+        });
         var addFun = function () {
             $.post(ext.contextPath + '/user/addJob.do', {companyId: companyId}, function (data) {
                 $("#subDiv").html(data);

src/main/webapp/jsp/user/roleList.jsp

@@ -56,7 +56,7 @@
 
         //编辑用户信息
         var editUserFun = function (roleid, bizid) {
-            $.post(ext.contextPath + '/user/showRoleUser.do', { roleid: roleid }, function (data) {
+            $.post(ext.contextPath + '/user/showRoleUser.do', { roleid: roleid, bizid: bizid }, function (data) {
                 $("#subDiv_User").html(data);
                 openModal('roleUserModal');
             });

src/main/webapp/jsp/user/roleUser.jsp

@@ -88,9 +88,14 @@
 		$("#search_pid").select2({
 	          ajax: {
 	            type:'POST',
-	            url: ext.contextPath +"/work/group/getListForSelect.do",
+	            url: ext.contextPath +"/user/getDeptByBizId4Select.do",
 	            dataType: 'json',
 	            delay: 250,
+	            data: function (params) {
+	              return {
+	                companyId: '${companyId}'
+	              };
+	            },
 	            processResults: function (data) {
 	              return {
 	                results: data

src/main/webapp/jsp/user/userForSelectByCompany.jsp

@@ -20,7 +20,12 @@
                 if(datas_name!=""){
                 	datas_name+=",";
                 }
-                datas_name+=item.caption;
+                // 支持通过参数控制显示部门名称还是用户名称
+                var displayField = item.caption;
+                if('${param.displayDept}' === 'true' && item._pname) {
+                    displayField = item._pname;
+                }
+                datas_name+=displayField;
             });
         	 $('#${param.formId} #${param.hiddenId}' ).val(datas);
              $('#${param.formId} #${param.textId}').val(datas_name);

src/main/webapp/jsp/visual/modules/bigScreen_pipelineStatus.jsp

@@ -534,7 +534,7 @@
                 <img  src="/images/大屏/企业简介.png" style="height:60px;width:420px;"/>
               </div>
               <div style="float: left;width: 100%;height: 137px;padding-top: 10px;padding-left: 20px;color: #ffffff;line-height: 30px;font-size: 20px;font-weight: 400;letter-spacing:2px;">
-                &nbsp;&nbsp;&nbsp;&nbsp;上海金山排海工程有限公司成立于1993年，主要承担金山东部地区生活污水和工业废水的收集处理任务，服务范围包括金山东部亭林、张堰、山阳、漕泾四镇及金山工业区、金山新城区、金山卫钱圩地区，服务区域约155平方公里。
+                &nbsp;&nbsp;&nbsp;&nbsp;上海金山卫污水厂成立于1993年，主要承担金山东部地区生活污水和工业废水的收集处理任务，服务范围包括金山东部亭林、张堰、山阳、漕泾四镇及金山工业区、金山新城区、金山卫钱圩地区，服务区域约155平方公里。
               </div>
             </div>
             <div style='position: absolute;width: 440px;height: 470px;left: 21px;

src/main/webapp/jsp/visual/newSourceGISPage.jsp

@@ -233,12 +233,12 @@ pageEncoding="UTF-8"%>
             class="drawer-nav-icon"
           />企业
         </div>
-        <div class="drawer-nav-item" onclick="switchTab('tab-pipeline', this)">
+        <!-- <div class="drawer-nav-item" onclick="switchTab('tab-pipeline', this)">
           <img
             src="<%=request.getContextPath()%>/IMG/icon_gd.png"
             class="drawer-nav-icon"
           />管道
-        </div>
+        </div> -->
         <!-- <div class="drawer-nav-item" onclick="switchTab('tab-well', this)">
           <img
             src="<%=request.getContextPath()%>/IMG/icon_gj.png"
@@ -268,7 +268,7 @@ pageEncoding="UTF-8"%>
               margin-top: 0;
             "
           >
-            污水厂查询
+            污水厂详情
           </h5>
 
           <!-- <div
@@ -361,10 +361,10 @@ pageEncoding="UTF-8"%>
                 <th width="40">序号</th>
                 <th width="40">选择</th>
                 <th>名称</th>
-                <th>出口流量<br />(m³/h)</th>
-                <th>入口流量<br />(m³/h)</th>
+                <th>出口流量(m³/h)</th>
+                <th>入口流量(m³/h)</th>
                 <th>状态</th>
-                <th>设计能力<br />(万吨/天)</th>
+                <th>设计能力(万吨/天)</th>
                 <th>详细地址</th>
                 <th>监测时间</th>
               </tr>
@@ -384,7 +384,7 @@ pageEncoding="UTF-8"%>
               margin-top: 0;
             "
           >
-            泵站查询
+            泵站详情
           </h5>
 
           <!-- <div
@@ -476,7 +476,7 @@ pageEncoding="UTF-8"%>
               margin-top: 0;
             "
           >
-            企业查询
+            企业详情
           </h5>
 
           <!-- 查询条件 -->
@@ -547,7 +547,7 @@ pageEncoding="UTF-8"%>
             </div>
           </div>
 
-          <div style="max-height: 400px; overflow-y: auto">
+          <div style="max-height: 400px; overflow-y: auto" id="company-table-container">
             <table
               class="table table-bordered table-hover table-condensed table-custom"
               style="font-size: 12px; white-space: nowrap"
@@ -569,6 +569,10 @@ pageEncoding="UTF-8"%>
               </thead>
               <tbody id="company-table-body"></tbody>
             </table>
+            <div id="company-loading" style="display: none; text-align: center; padding: 20px;">
+              <i class="glyphicon glyphicon-refresh" style="font-size: 24px; color: #007bff; animation: spin 1s infinite linear;"></i>
+              <p style="margin-top: 10px; color: #666; font-size: 12px">数据加载中...</p>
+            </div>
           </div>
         </div>
 
@@ -581,7 +585,7 @@ pageEncoding="UTF-8"%>
               margin-top: 0;
             "
           >
-            管道查询
+            管道详情
           </h5>
 
           <!-- <div
@@ -1005,6 +1009,7 @@ pageEncoding="UTF-8"%>
     <!-- Scripts -->
     <script src="<%=request.getContextPath()%>/node_modules/jquery/dist/jquery.min.js"></script>
     <script src="<%=request.getContextPath()%>/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="<%=request.getContextPath()%>/JS/main/main_js.js" charset="utf-8"></script>
 
     <!-- Tianditu Map API -->
     <!-- 704ebaecb29ce869b41f7d64a88919bc -->
@@ -1014,147 +1019,37 @@ pageEncoding="UTF-8"%>
     ></script>
 
     <script type="text/javascript">
-      // 坐标转换工具 (百度 BD-09 <-> 火星 GCJ-02 <-> 天地图/GPS WGS-84)
-      var CoordTransform = {
-        x_pi: (3.14159265358979324 * 3000.0) / 180.0,
-        pi: 3.1415926535897932384626,
-        a: 6378245.0,
-        ee: 0.00669342162296594323,
-
-        // 百度坐标 (BD-09) 转 火星坐标 (GCJ-02)
-        bd09_to_gcj02: function (bd_lon, bd_lat) {
-          var x = bd_lon - 0.0065;
-          var y = bd_lat - 0.006;
-          var z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * this.x_pi);
-          var theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * this.x_pi);
-          var gg_lng = z * Math.cos(theta);
-          var gg_lat = z * Math.sin(theta);
-          return [gg_lng, gg_lat];
-        },
-
-        // 火星坐标 (GCJ-02) 转 GPS 坐标 (WGS-84)
-        gcj02_to_wgs84: function (lng, lat) {
-          if (this.out_of_china(lng, lat)) {
-            return [lng, lat];
-          }
-          var dlat = this.transformlat(lng - 105.0, lat - 35.0);
-          var dlng = this.transformlng(lng - 105.0, lat - 35.0);
-          var radlat = (lat / 180.0) * this.pi;
-          var magic = Math.sin(radlat);
-          magic = 1 - this.ee * magic * magic;
-          var sqrtmagic = Math.sqrt(magic);
-          dlat =
-            (dlat * 180.0) /
-            (((this.a * (1 - this.ee)) / (magic * sqrtmagic)) * this.pi);
-          dlng =
-            (dlng * 180.0) /
-            ((this.a / sqrtmagic) * Math.cos(radlat) * this.pi);
-          var mglat = lat + dlat;
-          var mglng = lng + dlng;
-          return [lng * 2 - mglng, lat * 2 - mglat];
-        },
-
-        // 百度坐标 (BD-09) 直接转 天地图/GPS 坐标 (WGS-84)
-        bd09_to_wgs84: function (bd_lon, bd_lat) {
-          var gcj = this.bd09_to_gcj02(bd_lon, bd_lat);
-          var wgs = this.gcj02_to_wgs84(gcj[0], gcj[1]);
-          return wgs;
-        },
-
-        transformlat: function (lng, lat) {
-          var ret =
-            -100.0 +
-            2.0 * lng +
-            3.0 * lat +
-            0.2 * lat * lat +
-            0.1 * lng * lat +
-            0.2 * Math.sqrt(Math.abs(lng));
-          ret +=
-            ((20.0 * Math.sin(6.0 * lng * this.pi) +
-              20.0 * Math.sin(2.0 * lng * this.pi)) *
-              2.0) /
-            3.0;
-          ret +=
-            ((20.0 * Math.sin(lat * this.pi) +
-              40.0 * Math.sin((lat / 3.0) * this.pi)) *
-              2.0) /
-            3.0;
-          ret +=
-            ((160.0 * Math.sin((lat / 12.0) * this.pi) +
-              320 * Math.sin((lat * this.pi) / 30.0)) *
-              2.0) /
-            3.0;
-          return ret;
-        },
-
-        transformlng: function (lng, lat) {
-          var ret =
-            300.0 +
-            lng +
-            2.0 * lat +
-            0.1 * lng * lng +
-            0.1 * lng * lat +
-            0.1 * Math.sqrt(Math.abs(lng));
-          ret +=
-            ((20.0 * Math.sin(6.0 * lng * this.pi) +
-              20.0 * Math.sin(2.0 * lng * this.pi)) *
-              2.0) /
-            3.0;
-          ret +=
-            ((20.0 * Math.sin(lng * this.pi) +
-              40.0 * Math.sin((lng / 3.0) * this.pi)) *
-              2.0) /
-            3.0;
-          ret +=
-            ((150.0 * Math.sin((lng / 12.0) * this.pi) +
-              300.0 * Math.sin((lng / 30.0) * this.pi)) *
-              2.0) /
-            3.0;
-          return ret;
-        },
-
-        out_of_china: function (lng, lat) {
-          return (
-            lng < 72.004 ||
-            lng > 137.8347 ||
-            lat < 0.8293 ||
-            lat > 55.8271 ||
-            false
-          );
-        },
-      };
-
       // Initialize Map
       // Tianditu uses CGCS2000/WGS84 coordinates.
       // Center on Shanghai Jinshan District
       console.log("=== newSourceGISPage.jsp 页面已加载 ===");
       var map = new T.Map("map-container");
-      map.centerAndZoom(new T.LngLat(121.34, 30.74), 13);
+      map.centerAndZoom(new T.LngLat(121.34, 30.74), 16);
       map.enableScrollWheelZoom();
 
-      // 记录当前缩放级别，用于限制只能放大不能缩小
-      var currentZoomLevel = 13;
-      var minZoomLevel = 13; // 最小缩放级别
+      // // 记录当前缩放级别，用于限制只能放大不能缩小
+      // var currentZoomLevel = 13;
+      // var minZoomLevel = 13; // 最小缩放级别
 
-      // 监听缩放开始事件，阻止缩小操作
-      map.addEventListener("zoomstart", function(e) {
-        var newZoom = e.zoom;
-        console.log("[地图缩放] 当前级别:", currentZoomLevel, "目标级别:", newZoom);
-        if (newZoom < minZoomLevel) {
-          console.log("[地图缩放] 阻止缩小操作，最小级别:", minZoomLevel);
-          map.setZoom(minZoomLevel);
-          return false;
-        }
-      });
+      // // 监听缩放开始事件，阻止缩小操作
+      // map.addEventListener("zoomstart", function(e) {
+      //   var newZoom = e.zoom;
+      //   console.log("[地图缩放] 当前级别:", currentZoomLevel, "目标级别:", newZoom);
+      //   if (newZoom < minZoomLevel) {
+      //     console.log("[地图缩放] 阻止缩小操作，最小级别:", minZoomLevel);
+      //     map.setZoom(minZoomLevel);
+      //     return false;
+      //   }
+      // });
 
-      // 监听缩放结束事件，更新当前缩放级别
-      map.addEventListener("zoomend", function(e) {
-        currentZoomLevel = map.getZoom();
-        console.log("[地图缩放] 缩放完成，当前级别:", currentZoomLevel);
-      });
+      // // 监听缩放结束事件，更新当前缩放级别
+      // map.addEventListener("zoomend", function(e) {
+      //   currentZoomLevel = map.getZoom();
+      //   console.log("[地图缩放] 缩放完成，当前级别:", currentZoomLevel);
+      // });
 
-      // 禁用双击缩小
-      map.disableDoubleClickZoom();
+      // // 禁用双击缩小
+      // map.disableDoubleClickZoom();
 
       // Controls
       var scale = new T.Control.Scale();
@@ -1164,18 +1059,18 @@ pageEncoding="UTF-8"%>
       var mapType = new T.Control.MapType();
       map.addControl(mapType);
 
-      // 隐藏缩小按钮，只保留放大按钮
-      setTimeout(function() {
-        var zoomOutBtn = document.querySelector(".TMAP_zoom_button");
-        if (zoomOutBtn) {
-          // 隐藏所有缩放按钮中的缩小按钮
-          var zoomButtons = document.querySelectorAll(".TMAP_zoom_button");
-          if (zoomButtons.length > 0) {
-            zoomButtons[0].style.display = "none"; // 隐藏缩小按钮
-          }
-        }
-        console.log("[地图控制] 已隐藏缩小按钮");
-      }, 500);
+      // // 隐藏缩小按钮，只保留放大按钮
+      // setTimeout(function() {
+      //   var zoomOutBtn = document.querySelector(".TMAP_zoom_button");
+      //   if (zoomOutBtn) {
+      //     // 隐藏所有缩放按钮中的缩小按钮
+      //     var zoomButtons = document.querySelectorAll(".TMAP_zoom_button");
+      //     if (zoomButtons.length > 0) {
+      //       zoomButtons[0].style.display = "none"; // 隐藏缩小按钮
+      //     }
+      //   }
+      //   console.log("[地图控制] 已隐藏缩小按钮");
+      // }, 500);
       // var mousePosition = new T.Control.MousePosition({position: T_ANCHOR_BOTTOM_RIGHT});
       // map.addControl(mousePosition);
 
@@ -1213,17 +1108,25 @@ pageEncoding="UTF-8"%>
           api: { url: '/user/processSection/getProcessSection4Select.do', mock: false, params: { companyId: 'JSBZ' } },
           tableBody: 'pump-table-body',
           icon: 'icon_bz.png',
+          // 泵站名称到经纬度的映射
+          lngLatMap: {
+            '卫八路泵站': { lng: 121.277502, lat: 30.720661 },
+            '春华路泵站': { lng: 121.287567, lat: 30.727986 },
+            '九号泵站': { lng: 121.286513, lat: 30.716669 },
+          },
           transform: function(item, idx) {
+            var name = item.text || item.name || '';
+            var lngLat = this.lngLatMap[name] ? this.lngLatMap[name] : { lng: 121.32 + idx * 0.01, lat: 30.76 - idx * 0.005 };
             return {
               id: item.id || 'pump_' + idx,
-              name: item.text || item.name || '',
+              name: name,
               code: item.id || '',
               level: '-',
               flow: '-',
               status: '-',
               time: '-',
-              lng: 121.32 + idx * 0.01,
-              lat: 30.76 - idx * 0.005
+              lng: lngLat.lng,
+              lat: lngLat.lat
             };
           }
         },
@@ -1329,21 +1232,42 @@ pageEncoding="UTF-8"%>
       };
 
       // ==================== 统一API请求 ====================
+      // 获取点位实时值（封装方法）
+      function getMpointValue(unitId, mpointCode) {
+        return new Promise(function(resolve) {
+          $.get(contextPath + '/work/mpoint/getValue.do?unitId=' + unitId + '&mpointCode=' + mpointCode, function(data) {
+            try {
+              var d = typeof data === 'string' ? eval('(' + data + ')') : data;
+              resolve(d.parmvalue || 0);
+            } catch(e) {
+              resolve(0);
+            }
+          }).fail(function() { resolve(0); });
+        });
+      }
+
       function apiRequest(url, params, isMock, isStatic) {
         return new Promise(function(resolve, reject) {
           if (isMock) {
             // Mock数据
-            setTimeout(function() {
-              if (url === '/api/sewage/list') {
+            if (url === '/api/sewage/list') {
+              // 获取入口流量和出口流量的实时值
+              var unitId = '0533JS';
+              Promise.all([
+                getMpointValue(unitId, 'C_Jsssll'),
+                getMpointValue(unitId, 'C_Csssll')
+              ]).then(function(values) {
                 resolve([{
-                  id: 1, name: '金山水卫污水厂', lng: 121.345, lat: 30.725,
-                  status: 0, address: '上海金山区金山水卫污水厂',
-                  inFlow: 4774, outFlow: 4536, designCapacity: 10, time: '02-25 17:24'
+                  id: 1, name: '上海金山卫污水处理有限公司', longitudeLatitude: '121.272242,30.708638',
+                  lng: '121.272242',
+                  lat: '30.708638',
+                  status: 0, address: '海金路958号',
+                  inFlow: values[0], outFlow: values[1], designCapacity: 10, time: new Date().toLocaleTimeString()
                 }]);
-              } else {
-                resolve([]);
-              }
-            }, 100);
+              });
+            } else {
+              resolve([]);
+            }
           } else if (isStatic) {
             // 静态 JSON 文件请求（GET）
             $.ajax({
@@ -1401,7 +1325,9 @@ pageEncoding="UTF-8"%>
             // 直接返回数组
             list = res;
           }
-          config.data = list.map(config.transform);
+          config.data = list.map(function(item, idx) {
+            return config.transform(item, idx);
+          });
           config.loaded = true;
           console.log('[' + type + '] 加载完成:', config.data.length, '条');
           return config.data;
@@ -1676,7 +1602,7 @@ pageEncoding="UTF-8"%>
         var item = dataConfig.company.data[index];
         if (!item || !item.lng || !item.lat) return;
         map.panTo(new T.LngLat(item.lng, item.lat));
-        map.setZoom(15);
+        map.setZoom(16);
         selectMarker(item.name, 'company');
       }
 
@@ -1731,14 +1657,28 @@ pageEncoding="UTF-8"%>
         config.loaded = false;
         config.data = [];
         
+        // 显示loading状态
+        $('#company-loading').show();
+        $('#company-table-body').empty();
+        
         // 获取动态参数
         var params = config.api.getParams();
         console.log('[企业查询] 查询参数:', params);
         
         // 重新加载数据
         loadData('company').then(function() {
+          // 隐藏loading
+          $('#company-loading').hide();
           renderTable('company');
           initMarkers('company');
+          
+          // 默认定位到第一个企业
+          if (config.data.length > 0) {
+            selectCompany(0);
+          }
+        }).catch(function() {
+          // 隐藏loading
+          $('#company-loading').hide();
         });
       }
 
@@ -1850,15 +1790,31 @@ pageEncoding="UTF-8"%>
         };
         var type = typeMap[tabId] || 'sewage';
 
-        loadData(type).then(function() {
-          renderTable(type);
-          initMarkers(type);
-        });
-        
         // 企业 Tab 初始化查询下拉选项
         if (type === 'company') {
           initCompanySearchOptions();
+          // 显示loading状态
+          $('#company-loading').show();
         }
+        
+        loadData(type).then(function() {
+          // 企业Tab加载完成后隐藏loading并定位到第一个企业
+          if (type === 'company') {
+            $('#company-loading').hide();
+            renderTable(type);
+            initMarkers(type);
+            if (dataConfig.company.data.length > 0) {
+              selectCompany(0);
+            }
+          } else {
+            renderTable(type);
+            initMarkers(type);
+          }
+        }).catch(function() {
+          if (type === 'company') {
+            $('#company-loading').hide();
+          }
+        });
       }
 
       // ==================== 抽屉和调整大小逻辑 ====================