bug

VisualInspection/fwq/js/task/task_list.js

@@ -37,14 +37,14 @@ function initQueryParams() {
     var checked_dept = null;
     if (store_params) {
         checked_dept = store_params.checked_dept;
-
         // $("#start_time").val(store_params.end_time.substr(0, 7));
-        $("#start_time").val(moment(store_params.start_time).add(1, "d").format("YYYY-MM-DD"));
+        $("#start_time").val(store_params.start_time.substr(0, 11));
         $("#end_time").val(store_params.end_time.substr(0, 11));
         $("#hasScoreList").val(store_params.hasScore);
         cur_page = store_params.currentpage;
+        console.log(cur_page);
     } else {
-        var cm = getCurrentRealTimeFormat();
+        var cm = getCurrentTimeFormat();
         var tyt = getTimeByMonth(cm);
         $("#start_time").val((tyt.starttime.add(1, "d")).format("YYYY-MM-DD"));
         $("#end_time").val(tyt.endtime.format("YYYY-MM-DD"));
@@ -93,9 +93,6 @@ function initTableRowBtn() {
 }
 //查询任务
 function queryTask() {
-    console.log($("#start_time").val())
-    console.log($("#end_time").val())
-
     var start_time = "";
     if ($("#start_time").val()) start_time = (moment($("#start_time").val().trim()).subtract(1, "d")).format("YYYY-MM-DD") + " 23:00:00";
     var end_time = "";
@@ -231,10 +228,13 @@ function dispatchAllNoScoreTask() {
     layer.confirm('确定下发选择时间内所有无扣分任务？', {
         btn: ['确定', '取消'] //按钮
     }, function() {
-        var t = getTimeByMonth(GV("#start_time"));
+        var start_time = "";
+        if ($("#start_time").val()) start_time = (moment($("#start_time").val().trim()).subtract(1, "d")).format("YYYY-MM-DD") + " 23:00:00";
+        var end_time = "";
+        if ($("#end_time").val()) end_time = $("#end_time").val().trim() + " 23:00:00";
         var param = {
-            "start_time": getMomentTimeFormat(t.starttime),
-            "end_time": getMomentTimeFormat(t.endtime),
+            "start_time": start_time,
+            "end_time": end_time,
         };
         no_return_common_service('/f/task/dispatchAllNoScoreTask', param, function(data) {
             queryTask();

VisualInspection/js/assess_management/assess_item.js

@@ -261,20 +261,37 @@ function delete_check_item(id ){
      };
 
      post_common_service("/checkItem/getAll","",function(data){
+         console.log(data);
         zdata = [];
         z_cache = data ;
+        var user = $.zui.store.get("user");
          for (var i = 0; i < data.length; i++) {
-             var m = data[i];
-             var zdataItem = {};
-             zdataItem["id"] = m.id;
-             zdataItem["value"] = m.id;
-             zdataItem["pId"] = null;
-             zdataItem["score"] = m.score ;
-             zdataItem["name"] = m.name;
-             zdataItem["open"] = true;
-             zdataItem["children"] = addobj(m);
-              zdataItem.open = true ;
-             zdata.push(zdataItem);
+            var m = data[i];
+            var zdataItem = {};
+            zdataItem["id"] = m.id;
+            zdataItem["value"] = m.id;
+            zdataItem["pId"] = null;
+            zdataItem["score"] = m.score ;
+            zdataItem["name"] = m.name;
+            zdataItem["open"] = true;
+            zdataItem["children"] = addobj(m);
+             zdataItem.open = true ;
+             console.log(user.position_name);
+             if(user.position_name.indexOf('清障队稽查管理员') === 0){
+                 if(m.id == 291 || m.id == 305 || m.id == 306 || m.id == 307){
+                    zdata.push(zdataItem);
+                 }
+             }else if(user.position_name.indexOf('服务区稽查管理员') === 0){
+                if(m.id == 502){
+                    zdata.push(zdataItem);
+                 }
+             }else if(user.position_name.indexOf('收费站站长') === 0){
+                if(m.id == 47){
+                    zdata.push(zdataItem);
+                 }
+             }else{
+                    zdata.push(zdataItem);
+             }
          }
          check_item_tree = $.fn.zTree.init($("#check_rule_tree"), setting, zdata)
      },function(error){})

VisualInspection/js/mytask/check.js

@@ -969,7 +969,7 @@ function showInvalidView() {
     }, ['400px', '500px'], '#invalid_div', 'r');
 
     $('#apply_reason').tagsInput({ 'defaultText': '添加原因' });
-    getTags("q/checkApply/getTopReason", "#top_reason_div", '#apply_reason', 'apply_reason');
+    getTags("checkApply/getTopReason", "#top_reason_div", '#apply_reason', 'apply_reason');
 }
 
 

VisualInspection/qzd/js/task/check.js

@@ -5,13 +5,16 @@ var videoid;
 function dbclick() {
 
     if (isfullscreen) {
+        console.log(isfullscreen);
         if (layer_full) {
-            layer.close(layer_full)
+            layer.close(layer_full);
+            videoPlayer.videoPlay();
         }
         isfullscreen = false;
         $("#tabcontent").css("height", '400px');
     } else {
         fullscreen();
+        videoPlayer.videoPlay();
     }
 
 }
@@ -872,7 +875,7 @@ function showInvalidView() {
     }, ['400px', '500px'], '#invalid_div', 'r');
 
     $('#apply_reason').tagsInput({ 'defaultText': '添加原因' });
-    getTags("/q/checkApply/getTopReason", "#top_reason_div", '#apply_reason', 'apply_reason');
+    getTags("q/checkApply/getTopReason", "#top_reason_div", '#apply_reason', 'apply_reason');
 }
 
 

VisualInspection/qzd/js/task/task_list.js

@@ -33,6 +33,7 @@ function initQueryParams() {
     });
 
     var store_params = $.zui.store.get('store_param_' + current_url);
+    console.log(store_params);
     var checked_dept = null;
     if (store_params) {
         checked_dept = store_params.checked_dept;
@@ -43,7 +44,7 @@ function initQueryParams() {
         $("#hasScoreList").val(store_params.hasScore);
         cur_page = store_params.currentpage;
     } else {
-        var cm = getCurrentRealTimeFormat();
+        var cm = getCurrentTimeFormat();
         var tyt = getTimeByMonth(cm);
         $("#start_time").val((tyt.starttime.add(1, "d")).format("YYYY-MM-DD"));
         $("#end_time").val(tyt.endtime.format("YYYY-MM-DD"));
@@ -145,6 +146,7 @@ function queryTask() {
             'p_cur': cur_page
         }
     });
+    console.log(data);
     $.zui.store.set('store_param_' + current_url, data);
 }
 

VisualInspection/qzd/view/task/addtask.html

@@ -222,15 +222,35 @@
         }
         UserGetList(userData, function(data) {
             console.log(data);
+            var nameArray = new Array();
             for (var index in data) {
                 var p = data[index];
                 p.title = p.truename;
+                nameArray.push(p.title);
             }
+var resultArray = nameArray.sort(
+    function compareFunction(param1, param2) {
+        return param1.localeCompare(param2,"zh");
+    }
+);
+var objArray = new Array();
+for(var i in resultArray){
+    for(var j in data){
+       if(data[j].title == resultArray[i]){
+             var obj = {
+                 'title':resultArray[i],
+                 "id":data[j].id
+             };
+             objArray.push(obj);
+       }
+    }
+}
+//console.log(objArray);
             if (selectRecord != null) {
                 $("#recordUser").val("");
                 selectRecord.unbind();
                 selectRecord.options = {
-                    source: data,
+                    source: objArray,
                     isMultiple: true
                 };
                 selectRecord.closeDropDownMenu();

VisualInspection/qzd/view/task/checked.html

@@ -59,7 +59,7 @@
             $("#hasScoreList").val(store_params.hasScore);
             cur_page = store_params.currentpage;
         }
-        setSASelect("#fsList", checked_dept);
+        setWreckerGroupAllSelect("#fsList",checked_dept);
         queryCheckedTask();
     });
 </script>

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/QzdCheckTask.java

@@ -72,4 +72,7 @@ public class QzdCheckTask implements Serializable {
     private String pics;
     //状态
     private String  status_name;
+
+    //是否有效
+    private  int is_valid;
 }

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/QzdTaskDao.java

@@ -15,6 +15,7 @@ public interface QzdTaskDao {
     public void addtask(QzdCheckTask qzdCheckTask);
     public List<QzdCheckTask> getall(QzdCheckTask qzdCheckTask);
     public void updateStatus(QzdCheckTask qzdCheckTask);
+    public void deleteByRid(QzdCheckTask qzdCheckTask);
     public QzdCheckTask getone(QzdCheckTask qzdCheckTask);
     public void insertStatus(TaskStatus taskStatus);
     public void insertStatusBatch(List<TaskStatus> taskStatusList);

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/TaskMapper.xml

@@ -88,6 +88,7 @@
                 #{dispatch_id}
             </foreach>
         </if>
+        AND is_valid =0
         ORDER BY t.start_time DESC
     </select>
 
@@ -100,7 +101,13 @@
         id = #{id}
     </update>
 
-
+    <update id="deleteByRid" parameterType="com.xintong.visualinspection.bean.QzdCheckTask" >
+        update check_task set
+        <if test="is_valid != null">is_valid = #{is_valid},</if>
+        update_time=now()
+        WHERE
+        record_id = #{record_id}
+    </update>
 
 
 

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/RecordServiceImpl.java

@@ -15,6 +15,7 @@ import com.xintong.visualinspection.bean.*;
 import com.xintong.visualinspection.service.CommonService;
 import com.xintong.visualinspection.service.RecordService_Q;
 import com.xintong.visualinspection.visuallnspection_qzd.dao.QzdRecordDao;
+import com.xintong.visualinspection.visuallnspection_qzd.dao.QzdTaskDao;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import java.text.SimpleDateFormat;
@@ -34,6 +35,9 @@ public class RecordServiceImpl implements RecordService_Q {
     @Autowired
     private QzdRecordDao qzdRecordDao;
 
+    @Autowired
+    private QzdTaskDao qzdTaskDao;
+
 
     @Reference(version = "1.0.0",
             application = "${dubbo.application.id}",
@@ -138,5 +142,9 @@ public class RecordServiceImpl implements RecordService_Q {
     @Override
     public void deleteRecord(QzdRecord qzdRecord) {
         qzdRecordDao.deleteRecord(qzdRecord);
+        QzdCheckTask qzdCheckTask = new QzdCheckTask();
+        qzdCheckTask.setRecord_id(qzdRecord.getId());
+        qzdCheckTask.setIs_valid(1);
+        qzdTaskDao.deleteByRid(qzdCheckTask);
     }
 }