bugfix

VisualInspection/js/config.js

@@ -20,7 +20,7 @@ function getserveraddr() {
         return "http://server_release_yanhai.jsxt.jsjtyxt.com:8283/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
         // return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
-        return "http://localhost:8089/"
+        // return "http://localhost:8089/"
     } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
         return "http://200.200.19.126:8089/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
@@ -29,6 +29,7 @@ function getserveraddr() {
         return "http://10.112.0.199:8089/"
             // return "http://10.112.0.199:7001/"
     }
+    return "http://10.112.0.199:8089/"
 }
 
 function getExcelServeraddr() {
@@ -38,7 +39,7 @@ function getExcelServeraddr() {
         return "http://server_fwq_release_yanhai.jsxt.jsjtyxt.com:8283/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
         // return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
-        return "http://localhost:9000/"
+        // return "http://localhost:9000/"
     } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
         return "http://200.200.19.126:9000/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
@@ -47,6 +48,7 @@ function getExcelServeraddr() {
         return "http://10.112.0.199:9000/"
             // return "http://10.112.0.199:7010/"
     }
+    return "http://10.112.0.199:9000/"
 }
 
 function getQzdExcelServeraddr() {
@@ -56,7 +58,7 @@ function getQzdExcelServeraddr() {
         return "http://server_fwq_release_yanhai.jsxt.jsjtyxt.com:8283/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
         // return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
-        return "http://localhost:9001/"
+        // return "http://localhost:9001/"
     } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
         return "http://200.200.19.126:9001/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
@@ -65,6 +67,7 @@ function getQzdExcelServeraddr() {
         return "http://10.112.0.199:9001/"
             // return "http://10.112.0.199:7011/"
     }
+    return "http://10.112.0.199:9001/"
 }
 
 function getImageaddr() {
@@ -75,7 +78,7 @@ function getImageaddr() {
     } else if (base_ui_url.indexOf("localhost") != -1) {
         // return "http://10.112.0.199:7000/"
         // return "http://file_release_yanhai.jsxt.jsjtyxt.com:8283/";
-        return "http://localhost:8081/";
+        // return "http://localhost:8081/";
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236/"
     } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
@@ -84,6 +87,7 @@ function getImageaddr() {
         return "http://10.112.0.199/"
             // return "http://10.112.0.199:7000/"
     }
+    return "http://10.112.0.199/"
 }
 
 function getTaskaddr() {
@@ -91,10 +95,11 @@ function getTaskaddr() {
         return "http://task_yanhai.jsxt.jsjtyxt.com:8283/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
         // return "http://10.112.0.199:8099/"
-        return "http://localhost:8099/"
+        // return "http://localhost:8099/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:8099/"
     } else {
         return "http://10.112.0.199:8099/"
     }
+    return "http://10.112.0.199:8099/"
 }

VisualInspection/qzd/js/other_check/other_check.js

@@ -49,8 +49,8 @@ function init() {
     if (roleContains("QZD")) {
         checked_dept = getCurrentUser().organid;
     }
-  //  setSASelect("#fsList", checked_dept);
-  setWreckerGroupAllSelect("#fsList", checked_dept);
+    //  setSASelect("#fsList", checked_dept);
+    setWreckerGroupAllSelect("#fsList", checked_dept);
 
     // 新增服务区下拉框
     var dept;
@@ -62,8 +62,8 @@ function init() {
         roadManager2 = getCurrentUser().organid;
     }
     var feeList = getOrganList(roadManager2);
-   // setWreckerGroupSelect("#select-dept", checked_dept);
-   setQzdSelectValueNoAll(feeList, "#select-dept", dept);
+    // setWreckerGroupSelect("#select-dept", checked_dept);
+    setQzdSelectValueNoAll(feeList, "#select-dept", dept);
     // setPersonal();// 2期不需要人员显示
     var zTreeObj;
     var zNodes = [];
@@ -264,7 +264,7 @@ function queryTable() {
     // }
 
     var cols = [
-        { width: 20, text: '序号', flex: false, colClass: 'text-center', field: 'num' },
+        { width: 30, text: '序号', flex: false, colClass: 'text-center', field: 'num' },
         { width: 70, text: '时间', flex: false, colClass: '', field: 'check_time' },
         { width: 50, text: '部门', flex: false, colClass: '', field: 'organ_name' },
         // {
@@ -713,12 +713,12 @@ function getOtherCheckItems() {
         param.rule_type = 11;
     } else if (check_type == 12) {
         param.rule_type = 12;
-    }else if (check_type == 13) {
+    } else if (check_type == 13) {
         param.rule_type = 13;
-    }else if (check_type == 14) {
+    } else if (check_type == 14) {
         param.rule_type = 14;
     }
-    
+
 
     post_common_service('checkRule/getItemListByRuleType', param, function(data) {
         all_data = [];

VisualInspection/qzd/js/task/new.js

@@ -138,7 +138,7 @@ function queryTask() {
                     onFileUploaded: function(file, responseObject) {
                         var file_src = recordVideos;
                         var datas = eval('(' + responseObject.response + ')');
-                        if (file_src != '' && file_src != null) {
+                        if (file_src != '' && file_src != null && file_src != undefined) {
                             file_src += "," + datas.result_data.path;
                         } else {
                             file_src += datas.result_data.path;

VisualInspection/qzd/view/other_check/96777_check.html

@@ -37,7 +37,7 @@
 
                 <button class="btn btn-primary" type="button" id="add_btn"><i class="icon icon-plus-sign"></i> 增加稽查记录</button>
 
-                <button class="btn btn-info3" type="button" style="margin-left:30px;" onclick="exportThird()"> 导出Excel</button>
+                <button class="btn btn-info3" type="button" style="margin-left:10px;" onclick="exportThird()"> 导出Excel</button>
             </div>
 
         </div>

VisualInspection/qzd/view/other_check/onsite_check.html

@@ -37,7 +37,7 @@
 
                 <button class="btn btn-primary" type="button" id="add_btn"><i class="icon icon-plus-sign"></i> 增加稽查记录</button>
 
-                <button class="btn btn-info3" type="button" style="margin-left:30px;" onclick="exportThird()"> 导出Excel</button>
+                <button class="btn btn-info3" type="button" style="margin-left:10px;" onclick="exportThird()"> 导出Excel</button>
             </div>
 
         </div>

VisualInspection/qzd/view/other_check/other_check.html

@@ -37,7 +37,7 @@
 
                 <button class="btn btn-primary" type="button" id="add_btn"><i class="icon icon-plus-sign"></i> 增加稽查记录</button>
 
-                <button class="btn btn-info3" type="button" style="margin-left:30px;" onclick="exportThird()"> 导出Excel</button>
+                <button class="btn btn-info3" type="button" style="margin-left:10px;" onclick="exportThird()"> 导出Excel</button>
             </div>
 
         </div>

VisualInspection/qzd/view/other_check/third_unannounced_check.html

@@ -37,7 +37,7 @@
 
                 <button class="btn btn-primary" type="button" id="add_btn"><i class="icon icon-plus-sign"></i> 增加稽查记录</button>
 
-                <button class="btn btn-info3" type="button" style="margin-left:30px;" onclick="exportThird()"> 导出Excel</button>
+                <button class="btn btn-info3" type="button" style="margin-left:10px;" onclick="exportThird()"> 导出Excel</button>
             </div>
 
         </div>

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/gettway/CheckAppealController_Q.java

@@ -147,9 +147,9 @@ public class CheckAppealController_Q extends BaseController {
     public String getTaskList(HttpServletRequest request, @PathVariable Integer page,@PathVariable Integer size, @RequestBody QzdCheckTask task){
         PageHelper.startPage(page, size);
         User user = getCurrentUser(request);
-        if(AuthorUtil.hasRole(user, Constants.ROLE_FWQ_ADMIN)
-                ||AuthorUtil.hasRole(user, Constants.ROLE_FWQ)
-                ||AuthorUtil.containsRole(user, "ROLE_FWQ")){
+        if(AuthorUtil.hasRole(user, Constants.ROLE_WRECKER_MANAGER)
+                ||AuthorUtil.hasRole(user, Constants.ROLE_WRECKER)
+                ||AuthorUtil.containsRole(user, "ROLE_WRECKER")){
             task.setChecked_dept((long)user.getOrganid());
         }else if(AuthorUtil.hasRole(user, Constants.ROLE_JICHA)){
             task.setRecheckman(new Long(user.getId()));

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/gettway/RecordController_Q.java

@@ -40,9 +40,9 @@ public class RecordController_Q extends BaseController {
     @RequestMapping(value = "/getall/{page}/{size}")
     public String getall(HttpServletRequest request, @PathVariable Integer page, @PathVariable Integer size, @RequestBody QzdRecord qzdRecord) {
         User user = getCurrentUser(request);
-        if (AuthorUtil.hasRole(user, Constants.ROLE_QZD_ADMIN)
-            || AuthorUtil.hasRole(user, Constants.ROLE_QZD)
-                || AuthorUtil.containsRole(user, "ROLE_QZD")) {
+        if (AuthorUtil.hasRole(user, Constants.ROLE_WRECKER_MANAGER)
+            || AuthorUtil.hasRole(user, Constants.ROLE_WRECKER)
+                || AuthorUtil.containsRole(user, "ROLE_WRECKER")) {
             qzdRecord.setDept(user.getOrganid());
         }
         Object ss = recordService_q.getAllRecord(page, size, qzdRecord);
@@ -108,9 +108,9 @@ public class RecordController_Q extends BaseController {
     @RequestMapping(value = "/one")
     public String getone(HttpServletRequest request,@RequestBody QzdRecord qzdRecord) {
         User user = getCurrentUser(request);
-        if (AuthorUtil.hasRole(user, Constants.ROLE_QZD_ADMIN)
-                || AuthorUtil.hasRole(user, Constants.ROLE_QZD)
-                || AuthorUtil.containsRole(user, "ROLE_QZD")) {
+        if (AuthorUtil.hasRole(user, Constants.ROLE_WRECKER_MANAGER)
+                || AuthorUtil.hasRole(user, Constants.ROLE_WRECKER)
+                || AuthorUtil.containsRole(user, "ROLE_WRECKER")) {
             qzdRecord.setDept(user.getOrganid());
         }
         Object ss = recordService_q.getRecord(qzdRecord);

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/gettway/TaskController_Q.java

@@ -63,9 +63,9 @@ public class TaskController_Q extends BaseController {
     @RequestMapping(value = "/getall/{page}/{size}")
     public String getall(HttpServletRequest request, @PathVariable Integer page, @PathVariable Integer size, @RequestBody QzdCheckTask qzdCheckTask) {
         User user = getCurrentUser(request);
-        if (AuthorUtil.hasRole(user, Constants.ROLE_FWQ_ADMIN)
-                || AuthorUtil.hasRole(user, Constants.ROLE_FWQ)
-                || AuthorUtil.containsRole(user, "ROLE_FWQ")) {
+        if (AuthorUtil.hasRole(user, Constants.ROLE_WRECKER)
+                || AuthorUtil.hasRole(user, Constants.ROLE_WRECKER_MANAGER)
+                || AuthorUtil.containsRole(user, "ROLE_WRECKER")) {
             qzdCheckTask.setChecked_dept((long) user.getOrganid());
         } else if (AuthorUtil.hasRole(user, Constants.ROLE_JICHA)) {
             qzdCheckTask.setCheckman(new Long(user.getId()));
@@ -148,9 +148,9 @@ public class TaskController_Q extends BaseController {
     @RequestMapping(value = "/getTasks/{page}/{size}")
     public List getTasks(HttpServletRequest request, @PathVariable Integer page, @PathVariable Integer size, @RequestBody QzdCheckTask qzdCheckTask) {
         User user = getCurrentUser(request);
-        if (AuthorUtil.hasRole(user, Constants.ROLE_FWQ_ADMIN)
-                || AuthorUtil.hasRole(user, Constants.ROLE_FWQ)
-                || AuthorUtil.containsRole(user, "ROLE_FWQ")) {
+        if (AuthorUtil.hasRole(user, Constants.ROLE_WRECKER_MANAGER)
+                || AuthorUtil.hasRole(user, Constants.ROLE_WRECKER)
+                || AuthorUtil.containsRole(user, "ROLE_WRECKER")) {
             qzdCheckTask.setChecked_dept((long) user.getOrganid());
         } else if (AuthorUtil.hasRole(user, Constants.ROLE_JICHA)) {
             qzdCheckTask.setCheckman(new Long(user.getId()));

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/Constants.java

@@ -25,6 +25,7 @@ public class Constants {
 	public static String ROLE_MANAGER="ROLE_MANAGER";
     public static String ROLE_FWQ_ADMIN="ROLE_FWQ_ADMIN";
     public static String ROLE_FWQ="ROLE_FWQ";
-    public static String ROLE_QZD_ADMIN="ROLE_QZD_ADMIN";
-    public static String ROLE_QZD="ROLE_QZD";
+    public static String ROLE_WRECKER="ROLE_QZD_ADMIN";
+    public static String ROLE_WRECKER_MANAGER="ROLE_WRECKER_MANAGER";
+    public static String ROLE_WRECKER_NQ="ROLE_WRECKER_NQ";
 }

Visuallnspection_fjq/visuallnspectioninteface/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Aug 15 09:53:20 CST 2018
+#Thu Aug 16 09:45:08 CST 2018
 version=1.0-SNAPSHOT
 groupId=com.xintong.visuallnspection.inteface
 artifactId=visuallnspectioninteface