Merge branch 'njy' of http://git.xt.wenhq.top:8083/wenhongquan/VisualInspection into njy

# Conflicts:
#	VisualInspection_server/src/main/resources/application.properties

VisualInspection/js/config.js

@@ -33,11 +33,11 @@ function getImageaddr() {
     } else if (base_ui_url.indexOf("file_release_yanhai") != -1) {
         return "http://file_release_yanhai.jsxt.jsjtyxt.com/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
-         return "http://172.28.2.6:8080/"
-       // return "http://200.200.19.126:8080/";
+        return "http://njy.xt.wenhq.top:8083/"
+            // return "http://200.200.19.126:8080/";
     } else if (base_ui_url.indexOf("http://172.28.2.6") != -1) {
         return "http://172.28.2.6:8080/"
-    } else if(base_ui_url.indexOf("200.200.19.126") != -1){
+    } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
         return "http://200.200.19.126:8080/"
     }
 }
@@ -50,7 +50,7 @@ function getTaskaddr() {
         return "http://localhost:8080/"
     } else if (base_ui_url.indexOf("http://172.28.2.6") != -1) {
         return "http://172.28.2.6:8099/"
-    } else if(base_ui_url.indexOf("200.200.19.126") != -1){
+    } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
         return "http://200.200.19.126:8100/"
     }
 }

VisualInspection/js/other_check/other_check.js

@@ -40,7 +40,7 @@ function init() {
     if (roleContains("ROAD_MANAGER")) {
         road_manager = getCurrentUser().organid;
     }
-    setRoadManagerSelect("#first", road_manager, true);
+    // setRoadManagerSelect("#first", road_manager, true);
     setSecond();
 
     // 收费站下拉框
@@ -318,7 +318,7 @@ function updateCheckTeam(id) {
             var str = "";
             for (i = 0; i < ids.length; i++) {
                 str += ids[i] + ",";
-                $("#editImage").append("<div style='float:left;width:60px;'><img  img_src='" + ids[i] + "' class='pic-class  img-thumbnail' style='width:50px;height:50px;' alt='' src='http://file_release_yanhai.jsxt.jsjtyxt.com/" + ids[i] + "' ></div>");
+                $("#editImage").append("<div style='float:left;width:60px;'><img  img_src='" + ids[i] + "' class='pic-class  img-thumbnail' style='width:50px;height:50px;' alt='' src='" + getImageaddr() + ids[i] + "' ></div>");
             }
             $("#editImage").attr("file_src", (str.substring(str.length - 1) == ',') ? str.substring(0, str.length - 1) : str);
         }
@@ -791,24 +791,24 @@ function static() {
 
 
                     datas += '<tr>';
-                    if (i == 0) {
-                        datas += '<td rowspan=' + data[key].length + '>' + key + "</td>";
-                    }
+                    // if (i == 0) {
+                    //     datas += '<td rowspan=' + data[key].length + '>' + key + "</td>";
+                    // }
                     datas += '<td>' + data[key][i].deptname + "</td>";
                     datas += itemvalue;
-                    datas += '<td>' + data[key][i].totalScore + '</td>';
-                    datas += '<td>' + data[key][i].level + '</td>';
+                    // datas += '<td>' + data[key][i].totalScore + '</td>';
+                    // datas += '<td>' + data[key][i].level + '</td>';
                     datas += '</tr>';
 
                     t8 += data[key][i].totalScore;
                 }
             }
 
-            datas += '<tr><td colspan=2>合计</td>';
+            datas += '<tr><td colspan=1>合计</td>';
             for (var i in names) {
                 datas += '<td>' + totalnamesvalue.get(names[i]) + '</td>';
             }
-            datas += '<td>' + t8 + '</td><td> - </td></tr>';
+            // datas += '<td>' + t8 + '</td></tr>';
 
             var html = ' <table class="statable">' +
                 '            <thead style="font-size:  20px;text-align:  center;border:  0px;">' +
@@ -818,11 +818,11 @@ function static() {
                 '            </thead>' +
                 '            <tbody>' +
                 '                <tr>' +
-                '                    <td style="width:40px">道管</td>' +
+
                 '                    <td style="width:78px">站名</td>' +
                 itemsname +
-                '                    <td>得分<br>（1000）</td>' +
-                '                    <td>服务<br>评价</td>' +
+
+
                 '                </tr>' +
                 datas +
                 '            </tbody>' +

VisualInspection/view/other_check/onsite_check.html

@@ -9,11 +9,11 @@
             <div class="div-month">
                 <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
             </div>
-            <span style="float: left;
+            <!-- <span style="float: left;
                  padding-top: 5px;">道管：</span>
             <div class="div-roadManage">
                 <select class="form-control" id="first"></select>
-            </div>
+            </div> -->
             <span style="float: left;
                 padding-top: 5px;">收费站：</span>
             <div class="div-station">
@@ -30,7 +30,7 @@
 
                 <button class="btn btn-info3" type="button" style="margin-right:30px;" onclick="static()">统计</button>
 
-                <button class="btn btn-primary" type="button" id="add_btn"><i class="icon icon-plus-sign"></i> 增加稽查记录</button>
+                <!-- <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>
             </div>

VisualInspection_server/src/main/java/com/xintong/GetOffWork.java

@@ -23,7 +23,7 @@ public class GetOffWork {
       // Date now = new Date();
 
         logger.info("任务确认检测开始---------");
-        offWorkService.getOffWorkList();
+//        offWorkService.getOffWorkList();
         logger.info("任务确认检测结束---------");
     }