m

youxiw2000
1 parent 019be050
Showing 4 changed files with 67 additions and 22 deletions
trash-ui/src/api/caseOfflineInfo.js
trash-ui/src/api/vio_casefile.js
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
trash-workFlow/src/main/java/com/trash/business/controller/TruckActivateController.java
@@ -92,15 +92,14 @@ export default {
     let id = this.businessKey.split(":");
     if (id.length == 2) {
-      this.businessKey = id[1];
-    } else {
-      this.businessKey = id;
+      id = id[1];
     }
+
     getArea().then(res => {
       this.areas = res.result;
       this.handleUpdate();
     });
-    listReplyApprovalProcess({tableName: "workflow_caseoffline:"+this.businessKey}).then(response => {
+    listReplyApprovalProcess({tableName: "workflow_caseoffline:"+id}).then(response => {
       this.replyApprovalProcessList = response.rows;
     });
   },
@@ -148,11 +147,9 @@ export default {
       let id = this.businessKey.split(":");
       if (id.length == 2) {
-        this.businessKey = id[1];
-      } else {
-        this.businessKey = id;
-      }
-      getCaseOffline(this.businessKey).then(response => {
+        id = id[1];
+      } 
+      getCaseOffline(id).then(response => {
         this.form = response.data;
         if (this.form.attach && this.form.attach != "")
           this.form.attach = this.form.attach.split(",");
@@ -161,7 +158,7 @@ export default {
         this.form.type = this.getCaseType(this.form.type);
         this.form.place = this.getAreaName(this.form.place);
-        getAdviceList(this.workflow + ":" + this.businessKey).then(res => {
+        getAdviceList(this.workflow + ":" + id).then(res => {
           if (res.data) {
             if (res.data.advice1) {
               this.adviceList.push({
@@ -153,7 +153,6 @@ export default {
   },
   created() {
     getArea().then(res => {
-
       this.areas = res.result;
     });
@@ -171,6 +170,39 @@ export default {
       this.companyList = res.result.list;
     });
+    if(window.location.search){
+      let params = window.location.search.replace("?","");
+      let arr = params.split("&");
+      let type = -1;
+      let name = null;
+      for(let j in arr){
+        if(arr[j].split("=")[0] == "objType"){
+            if(arr[j].split("=")[1] == "company"){
+                type = 1;
+                this.queryParams.violationObjectType = "2";
+            }else if(arr[j].split("=")[1] == "construction"){
+                type = 0;
+                this.queryParams.violationObjectType = "0";
+            }else if(arr[j].split("=")[1] == "earthSite"){
+                type = 0;
+                this.queryParams.violationObjectType = "1";
+            }
+        }
+        if(arr[j].split("=")[0] == "objValue"){
+            name = arr[j].split("=")[1];
+        }
+      }
+
+      if(type == 0){
+        this.queryParams.projectName = decodeURIComponent(name);
+      }
+      if(type == 1){
+        this.queryParams.companyName = decodeURIComponent(name);
+      }
+
+
+    }
+
     this.getList();
   },
@@ -241,7 +273,11 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+
       this.resetForm("queryForm");
+      this.queryParams.violationObjectType =null;
+      this.queryParams.projectName = null;
+      this.queryParams.companyName = null;
       this.handleQuery();
     },
     // 多选框选中数据
@@ -486,10 +522,10 @@ export default {
           const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
           const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
           const code = `${year}/${month}/${day} ${hour}:${minute}:${second}`;
-          
+
           let companyName = formData.companyName ? formData.companyName : "";
           let projectName = formData.projectName ? formData.projectName : "";
-          
+
           this.form.describe = code + companyName + "在" + projectName + "出现" + formData.violationType;
           this.rules.companyName = null;
           this.rules.projectName = null;
@@ -139,9 +139,16 @@ public class SupervisionThreestepController extends BaseController
     @PostMapping("/getByObjects")
     public AjaxResult getLists(@RequestBody SupervisionThreestep supervisionThreestep)
-    {
-        List<SupervisionThreestep> list = supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep);
-        return AjaxResult.success(list);
+    {	
+    	AjaxResult ajaxResult = AjaxResult.success();
+    	try {
+        	ajaxResult.put("result", supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+    	
+        return ajaxResult;
+    	
     }
     String[] outside = {"长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县"};
@@ -177,7 +177,6 @@ public class TruckActivateController extends BaseController
         List<TruckActivate> list = truckActivateService.selectTruckActivateList(truckActivate);
         List<TruckActivateInfo> outList = new ArrayList<>();
-
     	for(int i = 0;i<list.size();i++){
     		TruckActivate turck = list.get(i);
@@ -199,7 +198,6 @@ public class TruckActivateController extends BaseController
         	info.setEffectiveFrom(object.getString("effectiveFrom"));
         	info.setEffectiveEnd(object.getString("effectiveEnd"));
-        	
         	outList.add(info);
         }
@@ -259,10 +257,17 @@ public class TruckActivateController extends BaseController
     @PostMapping(value="/getTruckListByObjects")
     public AjaxResult getTruckListByObjects(@RequestBody TruckActivate truckActivate)
-    {
-    	List<TruckActivate> list = truckActivateService.getTruckListByObjects(truckActivate);
-            	
-        return AjaxResult.success(list);
+    {         
+    	
+    	AjaxResult ajaxResult = AjaxResult.success();
+    	try {
+        	ajaxResult.put("result", truckActivateService.getTruckListByObjects(truckActivate));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+    	
+        return ajaxResult;
+    	
     }