bugfix

VisualInspection/fwq/js/task/add.js

@@ -16,6 +16,16 @@ $(document).ready(function() {
     //console.log(checked_dept);
     setSASelecttemp("#fwq", checked_dept);
 
+
+    post_common_service("/constant/getConstantByFlag", { "code_flag": "area_type" }, function(data) {
+
+        var optStr = '<option value="" selected="selected">全部</option>';
+        for (var i in data) {
+            optStr += '<option value="' + data[i].code_value + '" >' + data[i].code_name + '</option>';
+        }
+        $("#fwqareatype").html(optStr);
+    });
+
     //默认值 $("#fwq").val()
     var dd = 89;
     if ($("#fwq").val() != "") {
@@ -69,6 +79,13 @@ var layindex = null;
 var taskMap = new HashMap();
 
 function inittAreaable(time, dept) {
+    if (tabledatagride) {
+        tabledatagride.dataSource.data = null;
+        // tabledatagride.setDataSource(datac);
+        // tabledatagride.setPager(1, datac.array.length, datac.array.length);
+        tabledatagride.render();
+    }
+
 
     layindex = layer.load(0, { shade: false });
     var t = time.replace("/", "-") + "";
@@ -100,6 +117,18 @@ function inittAreaable(time, dept) {
 
             layer.close(layer.index);
             var data = redata.areas;
+
+            if ($("#fwqareatype").val() != "") {
+                var temps = [];
+                for (var d in data) {
+                    if (data[d].type == $("#fwqareatype").val()) {
+                        temps.push(data[d]);
+                    }
+                }
+                data = temps;
+
+            }
+
             checkuserlist = redata.checkusers;
 
             datatemp = {
@@ -142,6 +171,19 @@ function inittAreaable(time, dept) {
                         $(".datagrid-cell-index").mouseout(function() {
                             layer.close(layer.index);
                         });
+                        $(".datatime").mouseover(function() {
+                            // console.log(this.id);
+                            var id = this.id.split("-")[4] - 1;
+                            var titlehtml = "点击全选当天所有区域";
+                            layer.tips(titlehtml, "#" + this.id, {
+                                tips: [1, '#8e8e8e'],
+                                time: 0,
+                                width: '240px'
+                            });
+                        });
+                        $(".datatime").mouseout(function() {
+                            layer.close(layer.index);
+                        });
 
                         $(".btn_c").mouseover(function() {
                             var tempids = this.id.split("_");
@@ -364,12 +406,49 @@ function addTask() {
         inittAreaable($("#month_date").val(), $("#fwq").val());
 
     });
+}
 
 
-}
 
+function selectedall(sender) {
+
+
+    for (var i in datatemp.data) {
+        var id = datatemp.data[i].id + "_" + sender.id.split("_")[1];
+        var tempids = id.split("_");
+        var t = stimemonth.replace("/", "-") + "";
+        var starttime = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
+        var ctime = starttime.add(tempids[1], "day");
+
+        var feeList = $.zui.store.get("cache_sa_station_list");
+        var dept_info = null;
+        for (var index in feeList) {
+            var dept = feeList[index];
+            if (datatemp.data[i].dept_id == dept.deptid) {
+                dept_info = dept;
+            }
+        }
 
+        id = trim(id);
+        var btn = '<button class="btn btn-primary" type="button" onclick="removeListItem(this)" id="delete_' + id + '">删除</button>';
+        selectedData.array.push({ "time": ctime.format("YYYY-MM-DD"), "dept_name": dept_info.name, "area_name": datatemp.data[i].name, "option": btn, areaInfo: datatemp.data[i], deptInfo: dept_info });
 
+    }
+    var myDataGrid = $('#selected_table').data('zui.datagrid');
+    myDataGrid.dataSource.data = null;
+    myDataGrid.setDataSource(selectedData);
+    myDataGrid.setPager(1, selectedData.array.length, selectedData.array.length);
+
+    myDataGrid.render();
+
+    reloadtableData();
+    tabledatagride.dataSource.data = null;
+    tabledatagride.setDataSource(datac);
+    tabledatagride.setPager(1, datac.array.length, datac.array.length);
+    tabledatagride.render();
+
+
+}
 
 var datatemp = {};
 
@@ -390,7 +469,7 @@ function reloadtableData() {
         var temp = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
         var currentday = temp.add(i, "day");
         var day = currentday.date();
-        datac.cols.push({ width: 80, name: "day_" + i, label: currentday.format("MM-DD"), html: true, className: "table_content" });
+        datac.cols.push({ width: 80, name: "day_" + i, label: "<button class='datatime' onclick='selectedall(this)' id='datatimebtn_" + i + "' style='width:100%;height:100%;background:rgba(0,0,0,0)'>" + currentday.format("MM-DD") + "</button>", html: true, className: "table_content" });
     }
     arealist = data;
     stimemonth = time;

VisualInspection/fwq/view/task/add.html

@@ -51,6 +51,12 @@
             <select class="form-control" id="fwq"></select>
         </div>
 
+        <span style="float: left;
+        padding-top: 5px;">区域类型：</span>
+        <div class="div-station">
+            <select class="form-control" id="fwqareatype"></select>
+        </div>
+
         <div class="col-xs-1">
             <div class="input-group">
                 <button class="btn btn-primary " type="button" id="conditional_query" onclick="search()">查询</button>