Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

VisualInspection/js/config.js

@@ -1,6 +1,6 @@
-// var base_ui_url = "http://192.168.68.126:8081/";
-// var base_server_url = "http://192.168.68.126:8089/";
+var base_ui_url = "http://10.112.0.236:8088/";
+var base_server_url = "http://10.112.0.236:8089/";
 var base_image_server_url = "http://10.112.0.236:8088/";
 
-var base_ui_url = "http://localhost:8081/";
-var base_server_url = "http://localhost:8089/";
+// var base_ui_url = "http://localhost:8081/";
+// var base_server_url = "http://localhost:8089/";

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -126,7 +126,7 @@
                 for(var i=0;i<data.length;i++){
                     classCode[data[i].code] = data[i];
                 }
-                console.log(classCode);
+                // console.log(classCode);
                 $(".class_type_1").html(classCode[1].class_name);
                 $(".class_type_2").html(classCode[2].class_name);
                 $(".class_type_3").html(classCode[3].class_name);

VisualInspection/js/term_management/charge_terms_m.js

@@ -52,11 +52,13 @@
             $("#monitor").empty();
             $("#second-monitor").empty();
             $("#member").empty();
+            $("#monitor").append('<option value="0">请选择班长</option>');
+            $("#second-monitor").append('<option value="0">请选择副班长</option>');
             for(i=0;i<data.length;i++){
                 $("#monitor").append('<option value="'+data[i].id+'">'+data[i].truename+'</option>');
                 $("#second-monitor").append('<option value="'+data[i].id+'">'+data[i].truename+'</option>');
                 $("#member").append('<div style="width:78px;float:left;">\
-                                         <input type="checkbox" value="'+data[i].id+'" name="chkItem"><span>'+data[i].truename+'</span>\
+                                         <input type="checkbox" value="'+data[i].id+'" class="chkItem"><span>'+data[i].truename+'</span>\
                                      </div>');
             }
         }, function(){
@@ -72,6 +74,16 @@
             $("#team_name").val(data.name);
             $("#monitor").val(data.monitor);
             $("#second-monitor").val(data.sub_monitor);
+             var ids = data.user_ids.split(",");
+              $(".chkItem").prop("checked",false);
+             for(i=0;i<ids.length;i++){
+                // console.log(ids[i])
+                $(".chkItem").each(function(){ 
+                    if($(this).attr('value') == ids[i]){
+                        $(this).prop("checked", true);
+                    }
+                });
+            }
             idUpdate = true;
             layerUpdateTeam('form-div','班组修改','550px');
         }, function(){
@@ -80,6 +92,7 @@
         
     }
     function layerUpdateTeam(domId,title,area){
+        //  $(".chkItem").attr("checked", false);
         layer.open({
             type: 1,
             title: false,
@@ -90,7 +103,6 @@
             area:area,
             content: $("#"+domId)
         });
-        $("[name = chkItem]:checkbox").attr("checked", false);
     }
     //关闭弹窗
     $("#close-layer").click(function(){
@@ -148,5 +160,9 @@
     //添加班组
     $("#addTeam").click(function(){
         idUpdate = false;
+        $("#team_name").val("");
+        $("#monitor").val(0);
+        $("#second-monitor").val(0);
+        $(".chkItem").attr("checked", false);
         layerUpdateTeam('form-div','班组新增','550px');
     })

VisualInspection/js/term_management/check_terms_m.js

@@ -52,6 +52,8 @@
             $("#monitor").empty();
             $("#second-monitor").empty();
             $("#member").empty();
+            $("#monitor").append('<option value="0">请选择班长</option>');
+            $("#second-monitor").append('<option value="0">请选择副班长</option>');
             for(i=0;i<data.length;i++){
                 $("#monitor").append('<option value="'+data[i].id+'">'+data[i].truename+'</option>');
                 $("#second-monitor").append('<option value="'+data[i].id+'">'+data[i].truename+'</option>');
@@ -73,14 +75,14 @@
             $("#monitor").val(data.monitor);
             $("#second-monitor").val(data.sub_monitor);
             var ids = data.user_ids.split(",");
-            // for(i=0;i<ids.length;i++){
-            //     console.log(ids[i])
-            //     $("input[name='chkItem']:checkbox").each(function(){ 
-            //         if($(this).attr('value') == ids[i]){
-            //             $(this).prop("checked", true);
-            //         }
-            //     });
-            // }
+            for(i=0;i<ids.length;i++){
+                console.log(ids[i])
+                $("input[name='chkItem']:checkbox").each(function(){ 
+                    if($(this).attr('value') == ids[i]){
+                        $(this).prop("checked", true);
+                    }
+                });
+            }
             idUpdate = true;
             layerUpdateTeam('form-div','班组修改','550px');
         }, function(){
@@ -99,7 +101,7 @@
             area:area,
             content: $("#"+domId)
         });
-        $("[name = chkItem]:checkbox").attr("checked", false);
+        
     }
     //关闭弹窗
     $("#close-layer").click(function(){
@@ -153,5 +155,9 @@
     //添加班组
     $("#addTeam").click(function(){
         idUpdate = false;
+        $("#team_name").val("");
+        $("#monitor").val(0);
+        $("#second-monitor").val(0);
+        $("[name = chkItem]:checkbox").attr("checked", false);
         layerUpdateTeam('form-div','班组新增','550px');
     })

VisualInspection/js/util/const.js

@@ -7,7 +7,7 @@ var USER_UPDATE = "/user/updateUser/"
 var USER_DELETE = "/user/deleteUser/"
 
 
-var UI_USER_LOGIN = "view/user/login"
+var UI_USER_LOGIN = "view/user/login.html"
 
 
 // 菜单

VisualInspection/view/term_management/charge_terms_m.html

@@ -47,7 +47,7 @@
                     <span style="line-height:32px;">班长</span>
                 </div>
                 <div style="width:270px;float:left;">
-                    <select class="form-control" style="width:110px;" id="monitor">
+                    <select class="form-control" style="width:120px;" id="monitor">
                         
                     </select>
                 </div>
@@ -57,7 +57,7 @@
                     <span style="line-height:32px;">副班长</span>
                 </div>
                 <div style="width:270px;float:left;">
-                    <select class="form-control" style="width:110px;" id="second-monitor">
+                    <select class="form-control" style="width:120px;" id="second-monitor">
                         
                     </select>
                 </div>

VisualInspection/view/term_management/check_terms_m.html

@@ -50,7 +50,7 @@
                     <span style="line-height:32px;">班长</span>
                 </div>
                 <div style="width:270px;float:left;">
-                    <select class="form-control" style="width:110px;" id="monitor">
+                    <select class="form-control" style="width:120px;" id="monitor">
                         
                     </select>
                 </div>
@@ -60,7 +60,7 @@
                     <span style="line-height:32px;">副班长</span>
                 </div>
                 <div style="width:270px;float:left;">
-                    <select class="form-control" style="width:110px;" id="second-monitor">
+                    <select class="form-control" style="width:120px;" id="second-monitor">
                         
                     </select>
                 </div>

VisualInspection_server/src/main/resources/application.properties

@@ -2,14 +2,14 @@ server.port=8089
 spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
-master.datasource.url = jdbc:mysql://git_xt.git.topm.win:9001/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://10.112.0.236:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
 master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
 ## \u7528\u6237\u6570\u636e\u6e90\u914d\u7f6e
-cluster.datasource.url=jdbc:mysql://git_xt.git.topm.win:9001/yanhai?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://10.112.0.236:3306/yanhai?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -50,7 +50,7 @@ spring.datasource.useGlobalDataSourceStat=true
 # Redis\u6570\u636e\u5e93\u7d22\u5f15\uff08\u9ed8\u8ba4\u4e3a0\uff09
 spring.redis.database=0  
 # Redis\u670d\u52a1\u5668\u5730\u5740
-spring.redis.host=git_xt.git.topm.win
+spring.redis.host=10.112.0.236
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
 spring.redis.port=6379  
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u5bc6\u7801\uff08\u9ed8\u8ba4\u4e3a\u7a7a\uff09