bugfix

VisualInspection/fwq/js/task/add.js

@@ -242,6 +242,7 @@ function inittAreaable(time, dept) {
             if (checkusersselect != null) {
                 reset();
             }
+
             checkusersselect = $('#check_users').comboTree({
                 source: checkuserlist,
                 isMultiple: true
@@ -264,10 +265,8 @@ function reset() {
     if (checkusersselect != null) {
         $("#check_users").val("");
         checkusersselect.destroy();
+        checkusersselect = null;
     }
-    $("#starttime").val("");
-    $("#endtime").val("");
-
 
 
 }

VisualInspection/js/config.js

@@ -26,8 +26,8 @@ function getserveraddr() {
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:8089/"
     } else {
-        // return "http://10.112.0.199:8089/"
-        return "http://10.112.0.199:7001/"
+        return "http://10.112.0.199:8089/"
+            // return "http://10.112.0.199:7001/"
     }
 }
 
@@ -44,8 +44,8 @@ function getExcelServeraddr() {
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:9000/"
     } else {
-        // return "http://10.112.0.199:9000/"
-        return "http://10.112.0.199:7010/"
+        return "http://10.112.0.199:9000/"
+            // return "http://10.112.0.199:7010/"
     }
 }
 
@@ -62,8 +62,8 @@ function getQzdExcelServeraddr() {
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:9001/"
     } else {
-        // return "http://10.112.0.199:9001/"
-        return "http://10.112.0.199:7011/"
+        return "http://10.112.0.199:9001/"
+            // return "http://10.112.0.199:7011/"
     }
 }
 
@@ -81,8 +81,8 @@ function getImageaddr() {
     } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
         return "http://200.200.19.126:8080/"
     } else {
-        // return "http://10.112.0.199/"
-        return "http://10.112.0.199:7000/"
+        return "http://10.112.0.199/"
+            // return "http://10.112.0.199:7000/"
     }
 }
 

VisualInspection/js/lib/combotree/comboTreePlugin.js

@@ -419,4 +419,4 @@
             return ctArr;
     }
 
-})(jQuery, window, document);
+})(jQuery, window, document)

VisualInspection/qzd/js/task/add.js

@@ -64,13 +64,16 @@ var layindex = null;
 var taskMap = new HashMap();
 
 function inittAreaable(time, dept) {
+
+
+
     layindex = layer.load(0, { shade: false });
     var t = time.replace("/", "-") + "";
     var endtime = moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss");
     var starttime = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
 
     var param1 = { "startTime": getMomentTimeFormat(starttime), "endTime": getMomentTimeFormat(endtime), "checked_dept": dept }
-    console.log(param1);
+
 
 
     //获取排班情况
@@ -126,54 +129,46 @@ function inittAreaable(time, dept) {
                 records: recodedata
             };
             reloadtableData();
-
-            if (tabledatagride != null) {
-                tabledatagride.dataSource.data = null;
-                tabledatagride.setDataSource(datac);
-                tabledatagride.setPager(1, datac.array.length, datac.array.length);
-                tabledatagride.render();
-            } else {
-
-                $(".completec").mouseover(function() {
-                    var titlehtml = "稽查完成";
-                    layer.tips(titlehtml, "#" + this.id, {
-                        tips: [1, '#8e8e8e'],
-                        time: 0,
-                        width: '240px'
-                    });
+            $(".completec").mouseover(function() {
+                var titlehtml = "稽查完成";
+                layer.tips(titlehtml, "#" + this.id, {
+                    tips: [1, '#8e8e8e'],
+                    time: 0,
+                    width: '240px'
                 });
-                $(".doingc").mouseover(function() {
-                    var titlehtml = "稽查中";
-                    layer.tips(titlehtml, "#" + this.id, {
-                        tips: [1, '#8e8e8e'],
-                        time: 0,
-                        width: '240px'
-                    });
+            });
+            $(".doingc").mouseover(function() {
+                var titlehtml = "稽查中";
+                layer.tips(titlehtml, "#" + this.id, {
+                    tips: [1, '#8e8e8e'],
+                    time: 0,
+                    width: '240px'
                 });
-                $(".unusec").mouseover(function() {
-                    var titlehtml = "无效";
-                    layer.tips(titlehtml, "#" + this.id, {
-                        tips: [1, '#8e8e8e'],
-                        time: 0,
-                        width: '240px'
-                    });
+            });
+            $(".unusec").mouseover(function() {
+                var titlehtml = "无效";
+                layer.tips(titlehtml, "#" + this.id, {
+                    tips: [1, '#8e8e8e'],
+                    time: 0,
+                    width: '240px'
                 });
-                $(".novideoc").mouseover(function() {
-                    var titlehtml = "未上传视屏";
-                    layer.tips(titlehtml, "#" + this.id, {
-                        tips: [1, '#8e8e8e'],
-                        time: 0,
-                        width: '240px'
-                    });
+            });
+            $(".novideoc").mouseover(function() {
+                var titlehtml = "未上传视屏";
+                layer.tips(titlehtml, "#" + this.id, {
+                    tips: [1, '#8e8e8e'],
+                    time: 0,
+                    width: '240px'
                 });
+            });
 
 
-                $(".btn,.btc").mouseout(function() {
-                    layer.close(layer.index);
-                });
+            $(".btn,.btc").mouseout(function() {
+                layer.close(layer.index);
+            });
+
+            $('#myTable05').fixedHeaderTable({ altClass: 'odd', footer: false, fixedColumns: 1 });
 
-                $('#myTable05').fixedHeaderTable({ altClass: 'odd', footer: false, fixedColumns: 1 });
-            }
 
             for (var index in checkuserlist) {
                 var p = checkuserlist[index];
@@ -182,6 +177,7 @@ function inittAreaable(time, dept) {
 
             if (checkusersselect != null) {
                 reset();
+                checkusersselect = null;
             }
             checkusersselect = $('#check_users').comboTree({
                 source: checkuserlist,
@@ -205,15 +201,9 @@ function reset() {
 
     if (checkusersselect != null) {
         $("#check_users").val("");
-        checkusersselect.unbind();
-        checkusersselect.closeDropDownMenu();
-        checkusersselect.bindings();
-        $(".ComboTreeItemChlid").find("input").prop('checked', false);
-
-
+        checkusersselect.destroy();
+        checkusersselect = null;
     }
-    $("#starttime").val("");
-    $("#endtime").val("");
 
 }
 
@@ -345,9 +335,6 @@ function addTask() {
     // }
     // console.log(param);
 
-
-
-    var check_user_list = checkusersselect.getSelectedItemsId();
     var plist = []
     tasklist.forEach(t => {
         plist.push(t.recordInfo);

VisualInspection/qzd/js/task/check.js

@@ -32,10 +32,12 @@ function videorecordstart(type) {
         $("#video_btn_start").removeClass("hidden");
         endTimec = currentTime;
 
+        var idss = videoid.split("/");
+        var filename = idss[idss.length - 1];
         //开始截取视屏
         post_common_service_nohead(base_image_server_url + 'fileServer/file/videocut', {
-            "targetfilename": videoid,
-            "filename": videoid.split(".")[0],
+            "targetfilename": filename,
+            "filename": filename.split(".")[0],
             "startTime": startTimec,
             "endtime": endTimec
         }, function(data) {
@@ -43,11 +45,12 @@ function videorecordstart(type) {
         });
     }
     if (type == "screenshot") {
-
+        var idss = videoid.split("/");
+        var filename = idss[idss.length - 1];
         //开始截取视屏
         post_common_service_nohead(base_image_server_url + 'fileServer/file/videopiccut', {
-            "targetfilename": videoid,
-            "filename": videoid.split(".")[0],
+            "targetfilename": filename,
+            "filename": filename.split(".")[0],
             "startTime": currentTime,
         }, function(data) {
             addPic(data.path)
@@ -117,14 +120,14 @@ function initCheck() {
             $("#videoslist").html(htmlo);
         }
 
-        videoid = videos.split(",")[0]
+        videoid = videos.split(",")[0];
 
         var videoObject = {
             container: '.video', //“#”代表容器的ID，“.”或“”代表容器的class
             variable: 'player', //该属性必需设置，值等于下面的new chplayer()的对象
             //poster: 'pic/wdm.jpg', //封面图片
             autoplay: true,
-            video: base_image_server_url + 'file/' + videoid //视频地址
+            video: base_image_server_url + videoid //视频地址
         };
         videoPlayer = new ckplayer(videoObject);
         videoPlayer.addListener('time', timeHandler);
@@ -141,7 +144,7 @@ function onvideoselect(obj) {
         variable: 'player', //该属性必需设置，值等于下面的new chplayer()的对象
         //poster: 'pic/wdm.jpg', //封面图片
         autoplay: true,
-        video: base_image_server_url + 'file/' + videoid //视频地址
+        video: base_image_server_url + videoid //视频地址
     };
     videoPlayer = new ckplayer(videoObject);
     videoPlayer.addListener('time', timeHandler);

Visuallnspection_qzd/src/main/resources/application.properties

@@ -26,9 +26,9 @@ dubbo.consumer.check=false
 
 
 #master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection_3?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection_3?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
-#master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection_2?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection_3?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
 master.datasource.driver-class-name = com.mysql.jdbc.Driver