Parcourir la source

系统权限控制,清障队清障记录修改

MSI\liwei il y a 7 ans
Parent
commit
9b632535dd

+ 49 - 1
VisualInspection/js/lib/mytable.js

@@ -249,7 +249,55 @@ String.prototype.replaceAll = function(s1, s2) {
                         '</div></div>';
                         picStr += "</div>";
                         dArr.push(picStr);
-                    } else if (cols[i].oper != null) {
+                    }  else if (cols[i].type == "monitor") {
+                       var monitor = $.zui.store.get("monitor");
+                       var vice_monitor = $.zui.store.get("vice_monitor");
+                        var str =  "<div>";
+                            str += "<div style='height:25px'>"+
+                           ' <label for="exampleInputAccount1" class="col-sm-4" style="font-size:12px">班长</label>'+
+                            '<div class="col-sm-6">'+
+                                '<select class="form-control" style="height:25px;font-size:10px" id="select'+obj.id+'">';
+                                str +='<option value="0" >'+"暂无选择"+'</option>'
+                                for(var i =0 ; i< monitor.length ; i++){
+                                    var u = monitor[i];
+                                    if(obj.monitor != null && obj.monitor != ''){
+                                        if(u.id == obj.monitor){
+                                            str += '<option value="'+u.id+'" selected="selected">'+u.truename+'</option>'
+                                        }else{
+                                            str += '<option value="'+u.id+'" >'+u.truename+'</option>'
+                                        }
+                                    }else{
+                                        str += '<option value="'+u.id+'" >'+u.truename+'</option>'
+                                    }
+                                 }
+                             str += '</select>'+
+                            '</div>'+
+                            '</div>'+
+                            // "<br/>"+
+                           " <div style='height:25px;margin-top:5px'>"+
+                            ' <label for="exampleInputAccount1" class="col-sm-4" style="font-size:12px">副班长</label>'+
+                            '<div class="col-sm-6">'+
+                                '<select class="form-control" style="height:25px;font-size:10px" id="vselect'+obj.id+'">';
+                                str +='<option value="0" >'+"暂无选择"+'</option>'
+                                for(var i =0 ; i< vice_monitor.length ; i++){
+                                    var u = vice_monitor[i];
+                                    if(obj.vice_monitor != null && obj.vice_monitor != ''){
+                                        if(u.id == obj.vice_monitor){
+                                            str += '<option value="'+u.id+'" selected="selected">'+u.truename+'</option>'
+                                        }else{
+                                            str += '<option value="'+u.id+'" >'+u.truename+'</option>'
+                                        }
+                                    }else{
+                                        str += '<option value="'+u.id+'" >'+u.truename+'</option>'
+                                    }
+                                 }
+                                 str +=  '</select>'+
+                            '</div>'+
+                            "</div>"+
+                            "</div>"+
+                            "<button onclick='saveMonitor(\""+obj.id+"\")' style='width:80%;background-color:#2196F3;color:white'>保存</button>"
+                    dArr.push(str);
+                    }else if (cols[i].oper != null) {
                         var oper = cols[i].oper;
                         var operStr = "";
                         for (var j = 0; j < oper.length; j++) {

+ 5 - 2
VisualInspection/js/main.js

@@ -53,8 +53,11 @@ $(document).ready(function() {
     } else {
         //收费站
         mbody.type = 10;
-        var deptname="收费站稽查";
-
+        if( $.zui.store.get("openid")){
+            var deptname="配置管理";
+        }else{ 
+             var deptname="收费站稽查";
+    }
     }
     //获取用户信息
     var user = $.zui.store.get("user")

+ 7 - 2
VisualInspection/js/new.js

@@ -406,7 +406,6 @@ function opennew(a, id) {
     $.zui.store.set("openid", id);
     var user = $.zui.store.get("user");
     if (user.roles[0].level > 2) {
-        console.log(user);
         if (a == 0) {
             if (user.position_name.indexOf('收费站') === 0 || user.position_name.indexOf('稽查员') === 0) {
                 window.location.href = base_ui_url + furl[a] + "view/main.html?";
@@ -425,9 +424,15 @@ function opennew(a, id) {
             } else {
                 alert("权限不足");
             }
+        }else if (a == 4) {
+                window.location.href = base_ui_url + furl[0] + "view/main.html?";
         }
     } else {
-        window.location.href = base_ui_url + furl[a] + "view/main.html?";
+        if(a != 4){
+            window.location.href = base_ui_url + furl[a] + "view/main.html?";
+        }else{
+            window.location.href = base_ui_url + furl[0] + "view/main.html?";
+        }
     }
 
 }

+ 3 - 4
VisualInspection/qzd/js/task/add.js

@@ -217,7 +217,6 @@ function reset() {
 
 
 function selectedTask(obj) {
-
     changeListItem(obj.id);
 }
 
@@ -249,7 +248,6 @@ function changeListItem(id) {
             cobj = taskMap.get(taskMapid)[i];
         }
     }
-
     if ($("#" + id).prop('checked')) {
         activteChange(cobj, tempids);
         addlisttable(cobj, id);
@@ -269,7 +267,7 @@ function addlisttable(record, id) {
     var stime = moment(record.received_time).format("HH:mm");
     var etime = moment(record.back_time).format("HH:mm");
 
-    var taskname = currentday.format("YYYY-MM-DD") + " " + stime + "~" + etime + " " + record.car_info + "清障任务";
+    var taskname = currentday.format("YYYY-MM-DD") + " " + stime + "~" + etime + " " + record.addr + "号桩清障任务";
     record.rname = taskname;
 
     var feeList = $.zui.store.get("cache_wrecker_group_list");
@@ -458,8 +456,9 @@ function reloadtableData() {
                         if (r.videos == null || r.videos == undefined || r.videos == "") {
                             if(r.pics == null || r.pics == undefined || r.pics == ""){
                                 temphtml += '<button data-toggle="button" class="btc novideoc" style="margin:10px;background:#fff;border-color:#fff;color:#03b8cf"  type="button" id="' + user.id + '_' + i + '_' + r.id + '">' + moment(r.received_time).format("HH:mm") + "~" + moment(r.back_time).format("HH:mm") + '</button>';
+                            }else{
+                                temphtml += '<div class="btn-group normal" style="margin:10px;" data-toggle="buttons" id="btn_u_' + user.id + '_r_' + r.id + '"> <label class="btn btn-info7 "> <input type="checkbox"  onchange="selectedTask(this)" id="' + user.id + '_' + i + '_' + r.id + '">' + moment(r.received_time).format("HH:mm") + "~" + moment(r.back_time).format("HH:mm") + '</label></div>';
                             }
-                            temphtml += '<div class="btn-group normal" style="margin:10px;" data-toggle="buttons" id="btn_u_' + user.id + '_r_' + r.id + '"> <label class="btn btn-info7 "> <input type="checkbox"  onchange="selectedTask(this)" id="' + user.id + '_' + i + '_' + r.id + '">' + moment(r.received_time).format("HH:mm") + "~" + moment(r.back_time).format("HH:mm") + '</label></div>';
                         } else {
                             temphtml += '<div class="btn-group normal" style="margin:10px;" data-toggle="buttons" id="btn_u_' + user.id + '_r_' + r.id + '"> <label class="btn btn-info2 "> <input type="checkbox"  onchange="selectedTask(this)" id="' + user.id + '_' + i + '_' + r.id + '">' + moment(r.received_time).format("HH:mm") + "~" + moment(r.back_time).format("HH:mm") + '</label></div>';
                             //temphtml += '<button data-toggle="button" class="btc normal" style="margin:10px" onclick="selectedTask(this)" type="button" id="' + user.id + '_' + i + '_' + r.id + '">' + moment(r.received_time).format("HH:mm") + "~" + moment(r.back_time).format("HH:mm") + '</button>';

+ 58 - 6
VisualInspection/qzd/js/task/new.js

@@ -54,14 +54,13 @@ function initQueryParams() {
     if (cur_status == 4 || cur_status == 5 || cur_status == 6) {
         $("#hasScoreDiv").show();
     }
-
 }
 //初始化表行按钮
 function initTableRowBtn() {
     $.zui.store.set("task_table_btn_1", [{ func: 'checkUpdate', text: '修改', icon_class: '' },
         { func: 'deleteRecord', text: '删除', icon_class: 'text-center' }
     ]);
-    $.zui.store.set("task_table_btn_2", [{ func: 'showCheck', text: '开始稽查', icon_class: 'icon-eye-open' }]);
+    $.zui.store.set("task_table_btn_2", [{ func: 'checkUpdate', text: '修改', icon_class: '' }]);
     // $.zui.store.set("task_table_btn_2", [{ func: 'showCheck', text: '开始稽查', icon_class: 'icon-eye-open' }]);
     // $.zui.store.set("task_table_btn_3", [{ func: 'showCheck', text: '开始稽查', icon_class: 'icon-eye-open' }]);
     // $.zui.store.set("task_table_btn_7", [{ func: 'showContinueCheck', text: '继续稽查', icon_class: 'icon-eye-open' }]);
@@ -108,17 +107,34 @@ function queryTask() {
         cols.push(colFunc);
         $("#saveButton").show();
     } else if (hasRole(ROLE_WRECKER_MANAGER) || hasRole(ROLE_WRECKER_NQ) || hasRole(ROLE_WRECKER)) {
+        setMonitor();
+        cols = [
+            { width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
+            { width: 80, text: '桩号', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'addr' },
+            { width: 80, text: '车牌号', type: 'string', flex: true, hide: hide, colClass: 'text-center', field: 'car_info' },,
+            { width: 120, text: '接警时间', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'received_time' },
+            // { width: 160, text: '最后时间', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'last_time' },
+            { width: 120, text: '出勤人员', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'userNames' },
+            // {width: 120, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'}
+        ];
+        var colFunc3 = { width: 160, text: '正副班长', type: 'monitor', flex: true, field: 'id', colClass: 'text-center' };
         var colFunc1 = { width: 160, text: '视频上传', type: 'imagebutton', flex: true, field: 'videos', colClass: 'text-center' };
         var colFunc2 = { width: 160, text: '图片上传', type: 'imagebutton', flex: true, field: 'pics', colClass: 'text-center' };
-        // colFunc.oper = $.zui.store.get("task_table_btn_1");
+        var colFunc = { width: 40, text: '操作', type: 'string', flex: true, field: 'id', colClass: 'text-center' };
+        colFunc.oper = $.zui.store.get("task_table_btn_2");
+        cols.push(colFunc3);
         cols.push(colFunc1);
         cols.push(colFunc2);
+        cols.push(colFunc);
+        $("#isCompleteDiv").hide();
+        $("#isComplete").val(1);
+        data.isComplete = 1;
     }
     //只有下发才显示复选框
     var checkable = false;
-    if ((hasRole(ROLE_JICHA_ADMIN) && cur_status == 4) || (roleContains("STATION") && cur_status == 5)) {
-        checkable = true;
-    }
+    // if ((hasRole(ROLE_JICHA_ADMIN) && cur_status == 4) || (roleContains("STATION") && cur_status == 5)) {
+    //     checkable = true;
+    // }
     // console.log("checkable:" + checkable);
     // if (cur_status == 2 || cur_status == 3) {
     //     data.check_status_arr = [2, 3];
@@ -381,4 +397,40 @@ function removeVideo(id, videos, field, index) {
         queryTask();
     });
 
+}
+
+function saveMonitor(id){
+  var data = {
+      "id":id,
+      "monitor": $("#select"+id).val(),
+      "vice_monitor":$("#vselect"+id).val(),
+      "isComplete":1
+  }
+  post_common_service('q/record/update', data, function(redata) {
+    layer.msg('已添加', { icon: 1 });
+});
+
+}
+
+function setMonitor(){
+        var dept = $("#dept").val();
+        var userData = {
+            "organid": dept
+        }
+        UserGetList(userData, function(data) {
+            var monitor = new Array();
+            var vice_monitor = new Array();
+            for(var index in data){
+                var u = data[index];
+                  if(u.positionid == 13){
+                       monitor.push(u);
+                  }else if(u.positionid == 14){
+                    vice_monitor.push(u);
+               }
+            }
+            $.zui.store.set("monitor", monitor);
+            $.zui.store.set("vice_monitor", vice_monitor);
+            console.log($.zui.store.get("monitor"));
+            console.log($.zui.store.get("vice_monitor"));
+        });
 }

+ 1 - 1
VisualInspection/qzd/view/record/record_list.html

@@ -22,7 +22,7 @@
                         </select>
                     </div>
                 </div>
-                <div class="form-group col-sm-3">
+                <div class="form-group col-sm-3" id="isCompleteDiv">
                     <label for="exampleInputAccount1" class="col-sm-4">是否完成</label>
                     <div class="col-sm-8">
                         <select class="form-control" id="isComplete">

+ 84 - 90
VisualInspection/qzd/view/task/addtask.html

@@ -24,12 +24,6 @@
                             </select>
                 </div>
             </div>
-            <div class="form-group col-xs-4">
-                <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">里程数:</label>
-                <div class="col-xs-8">
-                    <input type="text" id="km" class="form-control form-date" placeholder="公里" onchange="changestatus()">
-                </div>
-            </div>
         </div>
 </div>
 <div class="form-group" style="margin:0px;vertical-align: middle">
@@ -104,27 +98,27 @@
         </div>
     </div>
     <div class="form-group col-xs-7">
-        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">接受时间:</label>
+        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">到达现场时间:</label>
         <div class="col-xs-6">
-            <input type="text" style="width:100%;" id="accept_time" class="form-control">
+            <input type="text" style="width:100%;" id="arrive_time" class="form-control">
         </div>
     </div>
 </div>
 <div class="form-group" style="margin:0px;">
     <div class="form-group col-xs-5">
-        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">出发时间:</label>
+        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">离场时间:</label>
         <div class="col-xs-8">
-            <input type="text" style="width:100%;" id="startTime" class="form-control" autocomplete="off">
+            <input type="text" style="width:100%;" id="back_time" class="form-control" autocomplete="off">
         </div>
     </div>
-    <div class="form-group col-xs-7">
-        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">到达时间:</label>
+    <!-- <div class="form-group col-xs-7">
+        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">离场时间:</label>
         <div class="col-xs-6">
-            <input type="text" style="width:100%;" id="arrive_time" class="form-control">
+            <input type="text" style="width:100%;" id="back_time" class="form-control">
         </div>
-    </div>
+    </div> -->
 </div>
-<div class="form-group" style="margin:0px;">
+<!-- <div class="form-group" style="margin:0px;">
     <div class="form-group col-xs-5">
         <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">施救时间:</label>
         <div class="col-xs-8">
@@ -137,8 +131,8 @@
             <input type="text" style="width:100%;" id="back_time" class="form-control">
         </div>
     </div>
-</div>
-<div class="form-group" style="margin:0px;">
+</div> -->
+<!-- <div class="form-group" style="margin:0px;">
     <div class="form-group col-xs-5">
         <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">解脱时间:</label>
         <div class="col-xs-8">
@@ -151,7 +145,7 @@
             <input type="text" style="width:100%;" id="backfield_time" class="form-control">
         </div>
     </div>
-</div>
+</div> -->
 <div class="form-group" style="margin:0px;">
 </div>
 <div class="form-group" style="margin-top:50px;float: right;margin-right: 40px">
@@ -174,11 +168,11 @@
         type: 'datetime',
         format: 'yyyy-MM-dd HH:mm'
     });
-    laydate.render({
-        elem: '#accept_time',
-        type: 'datetime',
-        format: 'yyyy-MM-dd HH:mm'
-    });
+    // laydate.render({
+    //     elem: '#accept_time',
+    //     type: 'datetime',
+    //     format: 'yyyy-MM-dd HH:mm'
+    // });
     laydate.render({
         elem: '#startTime',
         type: 'datetime',
@@ -189,27 +183,27 @@
         type: 'datetime',
         format: 'yyyy-MM-dd HH:mm'
     });
-    laydate.render({
-        elem: '#rescue_time',
-        type: 'datetime',
-        format: 'yyyy-MM-dd HH:mm'
-    });
+    // laydate.render({
+    //     elem: '#rescue_time',
+    //     type: 'datetime',
+    //     format: 'yyyy-MM-dd HH:mm'
+    // });
 
     laydate.render({
         elem: '#back_time',
         type: 'datetime',
         format: 'yyyy-MM-dd HH:mm'
     });
-    laydate.render({
-        elem: '#relief_time',
-        type: 'datetime',
-        format: 'yyyy-MM-dd HH:mm'
-    });
-    laydate.render({
-        elem: '#backfield_time',
-        type: 'datetime',
-        format: 'yyyy-MM-dd HH:mm'
-    });
+    // laydate.render({
+    //     elem: '#relief_time',
+    //     type: 'datetime',
+    //     format: 'yyyy-MM-dd HH:mm'
+    // });
+    // laydate.render({
+    //     elem: '#backfield_time',
+    //     type: 'datetime',
+    //     format: 'yyyy-MM-dd HH:mm'
+    // });
 
     setRecordUser();
 
@@ -282,20 +276,6 @@ function setRecordUserID(usersid) {
     }
 
     function save() {
-        var arriveIntime;
-        var unimpededInTime;
-        var arriveHour = new Date($("#arriveTime").val()) - new Date($("#startTime").val());
-        var umipededHour = new Date($("#backTime").val()) - new Date($("#arriveTime").val());
-        if (arriveHour / 100 / 60 > arrive) {
-            arriveIntime = 0;
-        } else {
-            arriveIntime = 1;
-        }
-        if (umipededHour / 100 / 60 > back) {
-            unimpededInTime = 0;
-        } else {
-            unimpededInTime = 1;
-        }
         // var userids = new Array();
         // userids = selectRecord.getSelectedItemsId();
         // var userid = userids.join(',');
@@ -303,26 +283,26 @@ function setRecordUserID(usersid) {
         var data = {
             "isComplete":1
         }  
-        if($("#backfield_time").val() != null && $("#backfield_time").val() !=''){
-                data.backfield_time =moment($("#backfield_time").val()).format("YYYY-MM-DD HH:mm:ss");
-        }else{
-                data.isComplete = 0;
-        }
-        if($("#relief_time").val() != null && $("#relief_time").val() !=''){
-                data.relief_time =moment($("#relief_time").val()).format("YYYY-MM-DD HH:mm:ss");
-        }else{
-                data.isComplete = 0;
-        }
-        if($("#rescue_time").val() != null && $("#rescue_time").val() !=''){
-                data.rescue_time =moment($("#rescue_time").val()).format("YYYY-MM-DD HH:mm:ss");
-        }else{
-                data.isComplete = 0;
-        }
-        if($("#accept_time").val() != null && $("#accept_time").val() !=''){
-                data.accept_time =moment($("#accept_time").val()).format("YYYY-MM-DD HH:mm:ss");
-        }else{
-                data.isComplete = 0;
-        }
+        // if($("#backfield_time").val() != null && $("#backfield_time").val() !=''){
+        //         data.backfield_time =moment($("#backfield_time").val()).format("YYYY-MM-DD HH:mm:ss");
+        // }else{
+        //         data.isComplete = 0;
+        // }
+        // if($("#relief_time").val() != null && $("#relief_time").val() !=''){
+        //         data.relief_time =moment($("#relief_time").val()).format("YYYY-MM-DD HH:mm:ss");
+        // }else{
+        //         data.isComplete = 0;
+        // }
+        // if($("#rescue_time").val() != null && $("#rescue_time").val() !=''){
+        //         data.rescue_time =moment($("#rescue_time").val()).format("YYYY-MM-DD HH:mm:ss");
+        // }else{
+        //         data.isComplete = 0;
+        // }
+        // if($("#accept_time").val() != null && $("#accept_time").val() !=''){
+        //         data.accept_time =moment($("#accept_time").val()).format("YYYY-MM-DD HH:mm:ss");
+        // }else{
+        //         data.isComplete = 0;
+        // }
         if($("#delivery_time").val() != null && $("#delivery_time").val() !=''){
                 data.delivery_time =moment($("#delivery_time").val()).format("YYYY-MM-DD HH:mm:ss");
         }else{
@@ -338,21 +318,43 @@ function setRecordUserID(usersid) {
         }else{
                 data.isComplete = 0;
         }
-        if($("#startTime").val() != null && $("#startTime").val() !=''){
-                data.start_time =moment($("#startTime").val()).format("YYYY-MM-DD HH:mm:ss");
-        }else{
-                data.isComplete = 0;
+        if($("#delivery_time").val() != null && $("#arriveTime").val() !=null){
+        var arriveHour = new Date($("#arriveTime").val()) - new Date($("#delivery_time").val());
+        if (arriveHour / 100 / 60 > arrive) {
+            data.arrive_in_time = 0;
+        } else {
+            data.arrive_in_time  = 1;
+        }
         }
+        if($("#backTime").val() != null && $("#arriveTime").val() != null){
+        var umipededHour = new Date($("#backTime").val()) - new Date($("#arriveTime").val());
+        if (umipededHour / 100 / 60 > back) {
+            data.unimpeded_in_time  = 0;
+        } else {
+            data.unimpeded_in_time  = 1;
+        }
+        }
+        // if($("#startTime").val() != null && $("#startTime").val() !=''){
+        //         data.start_time =moment($("#startTime").val()).format("YYYY-MM-DD HH:mm:ss");
+        // }else{
+        //         data.isComplete = 0;
+        // }
         if($("#carinfo").val() != null && $("#carinfo").val() != ''){
             data.car_info = $("#carinfo").val();
+        }
+        if($("#carUserinfo").val() != null && $("#carUserinfo").val() !=''){
+                data.car_user_info =$("#carUserinfo").val();
+        }
+        if($("#carUserSatisfaction").val() != null && $("#carUserSatisfaction").val() !=''){
+                data.car_user_satisfaction =$("#carUserSatisfaction").val();
+        }
+        if($("#type").val() != null && $("#type").val() !=''){
+                data.type =$("#type").val();
+        }
             if($("#received_time").val() != null && $("#received_time").val() !=''){
                 data.received_time =moment($("#received_time").val()).format("YYYY-MM-DD HH:mm:ss");
-                if($("#carUserinfo").val() != null && $("#carUserinfo").val() !=''){
-                data.car_user_info =$("#carUserinfo").val();
                 if($("#dept").val() != null && $("#dept").val() !=''){
                   data.dept =$("#dept").val();
-                  if($("#carUserSatisfaction").val() != null && $("#carUserSatisfaction").val() !=''){
-                        data.car_user_satisfaction =$("#carUserSatisfaction").val();
                         if($("#addr").val() != null && $("#addr").val() !=''){
                             data.addr =$("#addr").val();
                             var userids = new Array();
@@ -369,27 +371,19 @@ function setRecordUserID(usersid) {
                                     post_common_service('q/record/update', data, function(redata) {
                                         window.parent.location.reload();
                                     });
-                                }
+                               }
                             }else{
                                 alert("请选择清障队员");
                             }
                         }else{
                             alert("请输入桩号");
                         }
-                    }else{
-                alert("请选择客户满意度");
-            }
                 }else{
                 alert("请选择清障队");
             }
-                }else{
-                alert("请输入客户信息");
-            } 
             }else{
                 alert("请输入接警时间");
             }
-        }else{
-            alert("请输入车牌号");
-        }
+        
     }
 </script>

+ 1 - 1
VisualInspection/view/home.html

@@ -137,7 +137,7 @@
                                 <p style="margin-right:40px;font-size:28px"><img class="imgsize" src="/images/area-chart.png"></img><span>统计分析</span></p>
                             </div>
                         </div>
-                        <div onclick="opennew(0,'14')" class="appdiv" style="text-align: center;bottom: 6%;right: 0;height: 40%">
+                        <div onclick="opennew(4,'14')" class="appdiv" style="text-align: center;bottom: 6%;right: 0;height: 40%">
                             <div class="colorbackground3">
                                 <p style="margin-right:40px;font-size:28px"><img class="imgsize" src="/images/wood.png"></img><span>配置管理</span></p>
                             </div>

+ 4 - 1
Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/QzdRecord.java

@@ -75,7 +75,10 @@ public class QzdRecord implements Serializable {
     private String rname;
 
     private String last_time;
-
+   //是否完成(0:未完成,1:完成)
     private  int isComplete;
 
+    private  int monitor;
+
+    private  int vice_monitor;
 }

+ 2 - 0
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/RecordMapper.xml

@@ -69,6 +69,8 @@
         <if test="relief_time != null">relief_time = #{relief_time},</if>
         <if test="backfield_time != null">backfield_time = #{backfield_time},</if>
         <if test="isComplete != null">isComplete = #{isComplete},</if>
+        <if test="monitor != null">monitor = #{monitor},</if>
+        <if test="vice_monitor != null">vice_monitor = #{vice_monitor},</if>
         id=#{id}
         WHERE
         id = #{id}