工地监护派工,测绘申请填写,巡检任务安排,应急上报

src/login/js/login.js

@@ -1,5 +1,5 @@
 /* CONFIGURE START */
-var HOST_NAME = "112.51.249.202:1111",//"192.168.2.248:1111"//"112.51.249.202:1111",//var HOST_NAME = "http://192.168.2.248:1111",
+var HOST_NAME = "192.168.2.248:1111";//"112.51.249.202:1111",//var HOST_NAME = "http://192.168.2.248:1111",
 SYS_ADDR = location.href.trim().toLowerCase().replace(/login\/+$/, ""),
     COOKIE_EXPIRES = 1,
     COOKIE_PATH = location.pathname.trim().toLowerCase().replace(/login\/+$/, "");

src/widgets/Header/Widget.ts

@@ -93,6 +93,7 @@ class Header extends BaseWidget {
                 if (results.code == 1) {
                     var data = results.result;
                     this.AppX.appConfig.userlevel = data.userLevel;
+                    this.AppX.appConfig.userId = data.id;
                     this.userinfor = data;
                     this.domObj.find(".detail-name").text(data.realName);
                     this.domObj.find(".detail-phone").text(data.phone);

src/widgets/MaintenanceManagerReport/Widget.ts

@@ -141,6 +141,7 @@ class MaintenanceManagerReport extends BaseWidget {
         }
         getHtml.getLinkHtml(this, Obj.conObj.find('.widget-MaintenanceManagerReport-pop'), [getHtml.state.maintenanceReport], state, data);
         getHtml.setDepartmentAndUser(this, Obj.conObj.find('.departmentId'), Obj.conObj.find('.dispatchUserId'), dataInfo);
+        getHtml.setAssistantDepartmentAndAssistantUser(this, Obj.conObj.find('.assistantDepartment'), Obj.conObj.find('.assistantUserId'), dataInfo);
         if(!dataInfo){
             Obj.conObj.find(".voicegroup").hide();
         }
@@ -302,6 +303,23 @@ class MaintenanceManagerReport extends BaseWidget {
                 value: dataDom[i].value
             })
         };
+        //获取多选select里面的数据
+        dataDom = obj.find('.form-group.form-inline .multipleSelect');
+        var selectOptions = obj.find('.form-group.form-inline .multipleSelect').find('option:selected');
+            var checkId = [];
+            for (var i=0;i<selectOptions.length;i++) {
+                checkId.push(selectOptions[i].value);
+            }
+        for (var i = 0; i < dataDom.length; i++) {
+            if(dataDom[i].name){
+                Object.defineProperty(data, dataDom[i].name, {
+                    configurable: true,
+                    writable: true,
+                    enumerable: true,
+                    value: checkId.join(",")
+                })
+            }
+        };
         return data;
     }
 

src/widgets/MaintenancePageInfo/Widget.html

@@ -42,12 +42,26 @@ $$
         </select>
     </div>
     <div class='item'>
-        <label class=" control-label">接单人员</label>
+        <label class=" control-label">责任人员</label>
         <select class="input-sm form-control  dispatchUserId" data-live-search="true"
             name='dispatchUserId' showname='dispatchUserName' data-max-options="1" data-style="btn-primary">
         </select>
     </div>
 </div>
+<div class="form-group form-inline userSelect">
+    <div class='item'>
+        <label class=" control-label">协助人员部门</label>
+        <select class="input-sm form-control  assistantDepartment" data-live-search="true"
+        name='assistantDepartment' showname='assistantDepartmentName' data-max-options="1" data-style="btn-primary">
+        </select>
+    </div>
+    <div class='item'>
+        <label class=" control-label">协助人员</label>
+        <select class="input-sm form-control  assistantUserId multipleSelect" multiple data-live-search="true"
+            name='assistantUserId' showname='assistantUserName'  data-style="btn-primary">
+        </select>
+    </div>
+</div>
 <div class="form-group form-inline">
     <div class='oneItem'>
         <label class=" control-label">详情描述</label>

src/widgets/MaintenancePageInfo/Widget.ts

@@ -83,7 +83,7 @@ class MaintenancePageInfo extends BaseWidget {
      * @param dom 需要初始化的dom
      * @param data 初始化数据列表
      * @param type 标识出本环节是查看还是填写
-     * 
+     *
      */
     initLinkHtml(that, dom, data, type) {
         //通过input的类型和name属性值对input控件进行初始化
@@ -93,7 +93,7 @@ class MaintenancePageInfo extends BaseWidget {
                 if (item.type == "text") {
                     if (item.attributes.fileType && item.attributes.fileType.value == 'date' && type == this.actionType.write) {
                         let planBegindate = {
-                            format: 'YYYY-MM-DD', //日期格式  
+                            format: 'YYYY-MM-DD', //日期格式
                             isinitVal: true,
                         }
                         $.jeDate(item, planBegindate);
@@ -510,7 +510,7 @@ class MaintenancePageInfo extends BaseWidget {
         // formDom.find(".precessInfo .complete").append('<span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span>');
     };
 
-    /**部门和人员的联动 
+    /**部门和人员的联动
      * @param that 用于获取全局的一些配置
      * @param dDom 部门下拉框dom
      * @param uDom 用户下拉框dom
@@ -559,7 +559,55 @@ class MaintenancePageInfo extends BaseWidget {
         }.bind(this));
     }
 
-    /**人员的变动
+    /**协助部门和人员的联动
+     * @param that 用于获取全局的一些配置
+     * @param dDom 部门下拉框dom
+     * @param uDom 用户下拉框dom
+     */
+     setAssistantDepartmentAndAssistantUser(that, dDom, uDom, dataInfo?) {
+        let data = {
+            current: 1,
+            size: 10000
+        }
+        this.ajaxSend.sendAjax(this, data, this.config.getDepartment, this.ajaxSend.type.get, function (results) {
+            if (this.ajaxSend.checkResults(that, results)) {
+                let dHtml = "";
+                if (!dDom.hasClass('synergyDepartment')) {
+                    $.each(results.result.records, function (i, item) {
+                        if (dataInfo && dataInfo.reportState && dataInfo.assistantDepartment) {
+                            if (dataInfo.assistantDepartment == item.id) {
+                                dHtml += "<option selected value='" + item.id + "'>" + item.name + "</option>"
+                            } else {
+                                dHtml += "<option value='" + item.id + "'>" + item.name + "</option>"
+                            }
+                        } else {
+                            if (i == 0) {
+                                dHtml += "<option selected value='" + item.id + "'>" + item.name + "</option>"
+                            } else {
+                                dHtml += "<option value='" + item.id + "'>" + item.name + "</option>"
+                            }
+                        }
+                    })
+                } else {
+                    $.each(results.result.records, function (i, item) {
+                        dHtml += "<option value='" + item.id + "'>" + item.name + "</option>";
+                    })
+                }
+                dDom.empty().append(dHtml);
+                dDom.selectpicker({
+                    noneResultsText: "未查询到{0}",
+                    noneSelectedText: "无选择项"
+                });
+                dDom.selectpicker('refresh');
+                dDom.off().change(e => {
+                    dDom.selectpicker('render');
+                    this.setAssistantUserList(that, dDom, uDom, dataInfo);
+                });
+                this.setAssistantUserList(that, dDom, uDom, dataInfo);
+            }
+        }.bind(this));
+    }
+    /**协助人员的变动
      * @param that 用于获取全局的一些配置
      * @param dDom 部门下拉框dom
      * @param uDom 用户下拉框dom
@@ -617,7 +665,64 @@ class MaintenancePageInfo extends BaseWidget {
             }
         });
     }
-
+     /**协助人员的变动
+     * @param that 用于获取全局的一些配置
+     * @param dDom 部门下拉框dom
+     * @param uDom 用户下拉框dom
+     */
+      setAssistantUserList(that, dDom, uDom, dataInfo) {
+        let deparmentDom = dDom.find('option:selected');
+        let deparment = "";
+        let url = ""
+        if (deparmentDom.length == 1) {
+            url = this.config.getUserList;
+            deparment = deparmentDom.val();
+        } else {
+            url = this.config.getUserListMore;
+            $.each(deparmentDom, (index, item) => {
+                if (index != deparmentDom.length - 1) {
+                    deparment += item.value + ","
+                } else {
+                    deparment += item.value;
+                }
+            })
+        }
+        let uData = {
+            current: 1,
+            size: 10000,
+            departmentId: deparment
+        }
+        this.ajaxSend.sendAjax(this, uData, url, this.ajaxSend.type.get, function (results) {
+            if (this.ajaxSend.checkResults(that, results)) {
+                let dHtml = "";
+                $.each(results.result.records, function (i, item) {
+                    if (dataInfo && dataInfo.reportState && dataInfo.assistantUserId && dataInfo.department) {
+                        if (dataInfo.assistantUserId == item.id) {
+                            dHtml += "<option selected value='" + item.id + "'>" + item.realName + "</option>"
+                        } else {
+                            dHtml += "<option value='" + item.id + "'>" + item.realName + "</option>"
+                        }
+                    } else {
+                        if (i == 0) {
+                            dHtml += "<option  value='" + item.id + "'>" + item.realName + "</option>"
+                        } else {
+                            dHtml += "<option value='" + item.id + "'>" + item.realName + "</option>"
+                        }
+                    }
+                })
+                if (dDom.hasClass('synergyDepartment') && dDom.val() == "") {
+                    dHtml = "";
+                }
+                uDom.empty().append(dHtml);
+                uDom.selectpicker({
+                    noneResultsText: "未查询到{0}",
+                    noneSelectedText: "无选择项"
+                });
+                uDom.selectpicker('refresh');
+                uDom.selectpicker('render');
+            }
+        });
+    }
     /**
      * 渲染的图层
      * @param seacherData 图层数据
@@ -778,4 +883,4 @@ class MaintenancePageInfo extends BaseWidget {
         this.domObj.remove();
         this.afterDestroy();
     }
-}
+}

src/widgets/MissionSchedule/Widget.html

@@ -144,7 +144,7 @@ $$
                     <!-- <select class="input-sm form-control  users" name='users' showname='levelName' data-live-search="true" data-max-options="2" data-style="btn-primary">
                     </select> -->
 
-                <select class="input-sm users minwidth" id="users" multiple="multiple"></select>
+                <select class="input-sm users minwidth" id="users"></select>
             </div>
             <div class="form-group">
                 <label for="user">

src/widgets/MissionSchedule/Widget.ts

@@ -75,7 +75,7 @@ class MissionSchedule extends BaseWidget {
         planMode: undefined,//车巡、人巡
         pointInfo: undefined,
         regionId: undefined,//巡检片区编码
-        userId: undefined,//用户id
+        userIds: undefined,//用户id
         description: undefined,//计划名称
         planRate: undefined,//计划完成率,
         geoType: undefined,//下发计划图形的样式类型
@@ -309,7 +309,7 @@ class MissionSchedule extends BaseWidget {
             planMode: undefined,//车巡、人巡
             pointInfo: undefined,//
             regionId: undefined,//巡检片区编码
-            userId: undefined,//用户id
+            userIds: undefined,//用户id
             description: undefined,//计划名称
             planRate: undefined,//计划完成率
             geoType: undefined,//图形样式类型
@@ -337,14 +337,28 @@ class MissionSchedule extends BaseWidget {
     initEvent2() {
         this.planClear();
         this.domObj.find(".department_btn").show();
-        this.getGroup(selectType.single);
         this.getPlanType();
+
+
         this.getPeriod();//巡检周期
         this.initTimes();//初始化周期时间
         //部门列表
         this.domObj.find('.department').off("change").on("change", function () {
             this.getUser(selectType.single, this.domObj.find(".department").val());
         }.bind(this));
+        this.domObj.find('.plantype').off("change").on("change", function () {
+            var pointType = this.domObj.find(".plantype option:selected").attr("data-type");
+            var pointTxt = this.domObj.find(".plantype option:selected").html();
+            if(pointType == "0" && pointTxt != "巡检点"){
+                this.domObj.find(".users").attr("multiple","multiple");
+            }else{
+                this.domObj.find(".users").removeAttr("multiple");
+            }
+            this.domObj.find(".users").multiselect("destroy").multiselect({
+                maxHeight:200,
+                inheritClass: false
+            });
+        }.bind(this));
         //设置常量-巡检周期、 日期区间
         if (this.addData.planBegindate) {
             this.domObj.find('.plan_begindate').val(this.addData.planBegindate.split(" ")[0]);
@@ -396,8 +410,7 @@ class MissionSchedule extends BaseWidget {
                     //checkContent[i].find("input[type=checkbox]");
                     checkContentVal.push(checkContent[i].getAttribute("value"));
                 }
-                debugger
-            this.addData.userId = checkContentVal.join(",")//parseInt(this.domObj.find('.users option:selected ').val());
+            this.addData.userIds = checkContentVal.join(",")//parseInt(this.domObj.find('.users option:selected ').val());
             this.addData.description = this.domObj.find('.plan_name').val();
             this.addData.planRate = parseFloat(this.domObj.find('.plan_rate').val());
             this.addData.geoType = this.domObj.find(".plantype  option:selected").attr("data-type");
@@ -417,7 +430,7 @@ class MissionSchedule extends BaseWidget {
                 this.toast.Show("请选择结束时间");
                 return;
             }
-            if (this.addData.userId + "" == "NaN" || this.addData.userId == "") {
+            if (this.addData.userIds + "" == "NaN" || this.addData.userIds == "") {
                 this.toast.Show("请选择巡检人员");
                 return;
             }
@@ -1280,12 +1293,26 @@ class MissionSchedule extends BaseWidget {
                 strusers = "<option selected value=''>暂无巡检人员</option>"
             } else {
                 $.each(results.result.records, function (index, item) {
-                    if (this.addData.userId) {
-                        if (optionType == selectType.single && this.addData.userId == item.id) {
-                            strusers += "<option  value='" + item.id + "'>" + item.realName + "</option>";
-                        } else {
-                            strusers += "<option  value='" + item.id + "'>" + item.realName + "</option>";
+                    if (this.addData.userIds) {
+                        for(var i = 0;i<this.addData.userIds.split(",").length;i++){
+                            var id = this.addData.userIds.split(",")[i];
+                            if(item.id==id){
+                                strusers+="<option value='"+item.id+"' selected='selected'>"+item.realName+"</option>";
+                                break;
+                            }else if(i == this.addData.userIds.split(",").length-1){
+                                strusers+="<option value='"+item.id+"'>"+item.realName+"</option>";
+                                break;
+                            }else{
+                                //html+="<option value='"+item.id+"'>"+item.name+"</option>";
+                                //break;
+                            }
+
                         }
+                        // if (optionType == selectType.single && this.addData.userId == item.id) {
+                        //     strusers += "<option  value='" + item.id + "'>" + item.realName + "</option>";
+                        // } else {
+                        //     strusers += "<option  value='" + item.id + "'>" + item.realName + "</option>";
+                        // }
                     } else {
                         if (optionType == selectType.single && index == 0) {
                             strusers += "<option  value='" + item.id + "'>" + item.realName + "</option>";
@@ -1297,9 +1324,20 @@ class MissionSchedule extends BaseWidget {
             }
 
             this.domObj.find(".users").empty().append(strusers);
-            this.domObj.find(".users").multiselect({
-                maxHeight:200
-            });
+            if(optionType == selectType.single){
+                var pointType = this.domObj.find(".plantype option:selected").attr("data-type");
+                var pointTxt = this.domObj.find(".plantype option:selected").html();
+                if(pointType == "0" && pointTxt != "巡检点"){
+                    this.domObj.find(".users").attr("multiple","multiple");
+                }else{
+                    this.domObj.find(".users").removeAttr("multiple");
+                }
+                this.domObj.find(".users").multiselect("destroy").multiselect({
+                    maxHeight:200,
+                    inheritClass: false
+                });
+            }
+
             // this.domObj.find(".users").selectpicker({
             //     noneResultsText: "未查询到{0}",
             //     noneSelectedText: "无选择项"
@@ -1344,6 +1382,7 @@ class MissionSchedule extends BaseWidget {
 
         }.bind(this));
         this.domObj.find(".plantype").empty().append(strplantype);
+        this.getGroup(selectType.single);
     }
 
     /**

src/widgets/PipeRecord/Widget.ts

@@ -127,6 +127,30 @@ class PipeRecord extends BaseWidget {
             }.bind(this))
         }else{
             Obj.submitObj.off("click").on("click", function () {
+                if(Obj.conObj.find('.name').val() == undefined || Obj.conObj.find('.name').val() == ""){
+                    this.toast.show("工程名称不能为空");
+                    return;
+                }
+                if(Obj.conObj.find('.contacts').val() == undefined || Obj.conObj.find('.contacts').val() == ""){
+                    this.toast.show("联系人不能为空");
+                    return;
+                }
+                // if(Obj.conObj.find('.createUser').val() == undefined || Obj.conObj.find('.createUser').val() == ""){
+                //     this.toast.show("申请人不能为空");
+                //     return;
+                // }
+                if(Obj.conObj.find('.buriedAddress').val() == undefined || Obj.conObj.find('.buriedAddress').val() == ""){
+                    this.toast.show("地址不能为空");
+                    return;
+                }
+                if(Obj.conObj.find('.houseHolds').val() == undefined || Obj.conObj.find('.houseHolds').val() == ""){
+                    this.toast.show("户数不能为空");
+                    return;
+                }
+                if(Obj.conObj.find('.contactsNumber').val() == undefined || Obj.conObj.find('.contactsNumber').val() == ""){
+                    this.toast.show("联系电话不能为空");
+                    return;
+                }
                 let data = this.getWriteInfo(Obj.conObj, actionInfo,dataInfo);
                 data=this.setDate(data);
                 let sendData = new FormData();
@@ -154,9 +178,9 @@ class PipeRecord extends BaseWidget {
         this.lookInfo=false;
     }
 
-    //处理时间格式数据选择时间是天的时候在最后追加00:00:00   
+    //处理时间格式数据选择时间是天的时候在最后追加00:00:00
     setDate(data){
-        let dateString=["buriedTime"];
+        let dateString=["createTime"];
         dateString.forEach(item=>{
             if(data[item]&&data[item]!=""){
                 let item2=data[item].split(" ");
@@ -253,7 +277,7 @@ class PipeRecord extends BaseWidget {
             buriedAddress: siteName ? siteName : "",
             state: this.pipeRecordPageInfo.constructionState.waitConduct,
             "orders[0].asc":false,
-            "orders[0].column":"buried_time"
+            "orders[0].column":"CREATE_TIME"
         }
     }
 
@@ -276,8 +300,8 @@ class PipeRecord extends BaseWidget {
             isCheck: false,
             // testData:this.config.dataInfo,
             searchInfo: that.searchInfo,//条件在不断变化，故需要有全局的条件监听
-            displayTitle: ["埋设时间", "埋设人员", "埋设地址", "状态","备注"],
-            displayField: ["buriedTime", "buriedUser", "buriedAddress","stateName", "description"],
+            displayTitle: ["工程名称", "工程性质", "联系人","联系电话", "申请人","地址","户数","申请时间"],
+            displayField: ["name", "type", "contacts","contactsNumber", "createUserName","buriedAddress","houseHolds","createTime"],
             extentDisplayTitle: ['详情'],
             extentDisplayContent: [{
                 field: "infoWrite",
@@ -323,4 +347,4 @@ class PipeRecord extends BaseWidget {
         this.domObj.remove();
         this.afterDestroy();
     }
-}
+}

src/widgets/PipeRecordPageInfo/Widget.html

@@ -7,24 +7,82 @@ $$
 <div class='stateInfo'><span class='titleInfo'>测绘前记录</span></div>
 <div class="form-group form-inline">
     <div class='item'>
-        <label class="mustWrite control-label">施工时间</label>
-        <input type="text" autocomplete="off" class="form-control buriedTime" name="buriedTime" showname='buriedTime'  fileType='date' placeholder="埋设时间">
+        <label class="mustWrite control-label">申请时间</label>
+        <input type="text" autocomplete="off" class="form-control createTime" name="createTime" showname='createTime'  fileType='date' placeholder="申请时间">
     </div>
     <div class='item'>
-        <label class=" control-label">施工人员</label>
-        <input type="text" autocomplete="off" class="form-control buriedUser" name="buriedUser" showname='buriedUser' placeholder="施工人员">
+        <label class="mustWrite control-label">工程名称</label>
+        <input type="text" autocomplete="off" class="form-control name" name="name" showname='name' placeholder="工程名称">
     </div>
 </div>
 <div class="form-group form-inline">
-    <div class='oneItem'>
-        <label class=" control-label">埋设地点</label>
-        <input type="text" autocomplete="off" class="form-control buriedAddress" name="buriedAddress" showname='buriedAddress' placeholder="埋设地点">
+    <div class='item'>
+        <label class="mustWrite control-label">工程性质</label>
+        <select class="input-sm form-control  type"
+            name='type' showname='typeName'>
+            <option value="1">商业</option>
+            <option value="2">工业</option>
+            <option value="3">民用</option>
+            <option value="4">公服</option>
+            <option value="5">燃气主管工程</option>
+            <option value="6">改造整改</option>
+        </select>
+    </div>
+    <div class='item'>
+        <label class=" control-label">新增设备</label>
+        <select class="input-sm form-control  addDevice"
+            name='addDevice' showname='addDeviceName'>
+            <option value="1">调压器(柜)</option>
+            <option value="2">阀井</option>
+            <option value="0">无</option>
+        </select>
     </div>
 </div>
 <div class="form-group form-inline">
-    <div class='oneItem'>
-        <label class=" control-label">备注</label>
-        <textarea class="form-control description" rows="3" name="description" placeholder="详情描述"></textarea>
+    <div class='item'>
+        <label class="mustWrite control-label">联系人</label>
+        <input type="text" autocomplete="off" class="form-control contacts" name="contacts" showname='contacts' placeholder="联系人">
+    </div>
+    <div class='item'>
+        <label class="mustWrite control-label">联系电话</label>
+        <input type="text" autocomplete="off" class="form-control contactsNumber" name="contactsNumber" showname='contactsNumber' placeholder="联系电话">
+    </div>
+
+</div>
+<div class="form-group form-inline">
+    <div class='item'>
+        <label class="mustWrite control-label">地址</label>
+        <input type="text" autocomplete="off" class="form-control buriedAddress" name="buriedAddress" showname='buriedAddress' placeholder="地址">
+    </div>
+    <div class='item'>
+        <label class="mustWrite control-label">户数</label>
+        <input type="text" autocomplete="off" class="form-control houseHolds" name="houseHolds" showname='houseHolds' placeholder="户数">
+    </div>
+</div>
+<div class="form-group form-inline">
+    <div class='item'>
+        <label class=" control-label">调压器编号</label>
+        <input type="text" autocomplete="off" class="form-control code" name="code" showname='code' placeholder="调压器编号">
+    </div>
+    <div class='item'>
+        <label class=" control-label">新增设备数量</label>
+        <input type="text" autocomplete="off" class="form-control addDeviceNum" name="addDeviceNum" showname='addDeviceNum' placeholder="新增设备数量">
+    </div>
+</div>
+<div class="form-group form-inline">
+    <div class='item'>
+        <label class=" control-label">有无埋地管</label>
+        <select class="input-sm form-control  isBuried"
+            name='isBuried' showname='isBuriedName'>
+            <option value="0">否</option>
+            <option value="1">是</option>
+        </select>
+    </div>
+    <div class='item'>
+        <label class="mustWrite control-label">申请人</label>
+        <select class="input-sm form-control  createUser"
+            name='createUser' showname='createUserName'>
+        </select>
     </div>
 </div>
 <div class="form-group form-inline">

src/widgets/PipeRecordPageInfo/Widget.ts

@@ -67,17 +67,21 @@ class PipeRecordPageInfo extends BaseWidget {
      * @param dom 需要初始化的dom
      * @param data 初始化数据列表
      * @param type 标识出本环节是查看还是填写
-     * 
+     *
      */
     initLinkHtml(that, dom, data, type) {
         //通过input的类型和name属性值对input控件进行初始化
+        //dom.find(".createUser").val(this.AppX.appConfig.userId)
+        if(type == this.actionType.write){
+            dom.find(".createUser").parent().css("display","none")
+        }
         for (var item of dom.find("input")) {
             if (this.initTag.indexOf(item) == -1) {
                 this.initTag.push(item);
                 if (item.type == "text") {
                     if (item.attributes.fileType && item.attributes.fileType.value == 'date' && type == this.actionType.write) {
                         let planBegindate = {
-                            format: 'YYYY-MM-DD', //日期格式  
+                            format: 'YYYY-MM-DD', //日期格式
                             isinitVal: true,
                         }
                         $.jeDate(item, planBegindate);
@@ -208,9 +212,12 @@ class PipeRecordPageInfo extends BaseWidget {
                 if (type == this.actionType.look) {
                     $(item).attr("readonly", "readonly");
                 } else {
-                    if ((this.verificationHelper.setNullAndUndefinedEnpty(data[item.name]) + "").trim() != "") {
-                        $(item).val(this.verificationHelper.setNullAndUndefinedEnpty(data[item.name]));
+                    if(data){
+                        if ((this.verificationHelper.setNullAndUndefinedEnpty(data[item.name]) + "").trim() != "") {
+                            $(item).val(this.verificationHelper.setNullAndUndefinedEnpty(data[item.name]));
+                        }
                     }
+
                 }
             }
         }
@@ -254,7 +261,7 @@ class PipeRecordPageInfo extends BaseWidget {
     * 根据id字段获取新型
     * @param  id 工地监护id
     * @param call 获取信息后的回调
-    */    
+    */
     getInfoByid(id,call){
         this.ajaxSend.sendAjax(this, {id:id}, this.config.getInfoById+id, this.ajaxSend.type.get, function (results) {
             if (this.ajaxSend.checkResults(this, results)) {
@@ -412,4 +419,4 @@ class PipeRecordPageInfo extends BaseWidget {
         this.domObj.remove();
         this.afterDestroy();
     }
-}
+}

src/widgets/SiteSupervisionTask/Widget.ts

@@ -10,7 +10,7 @@ import SimpleRenderer = require("esri/renderers/SimpleRenderer");
 import Point = require("esri/geometry/Point");
 import Polyline = require('esri/geometry/Polyline');
 // import glmatrix = require(dojoConfig.);
-  
+
 enum operation {
     create, destroy, clear
 }
@@ -109,7 +109,7 @@ class SiteSupervisionTask extends BaseWidget {
         this.searchInfo = {
             siteType: siteType ? siteType : "",
             siteName: siteName ? siteName : "",
-            userIds:this.AppX.appConfig.userId,
+            // userIds:this.AppX.appConfig.userId,
             constructionState:this.siteSupervisionPageInfo.constructionState.waitDispatching,
             "orders[0].asc":false,
             "orders[0].column":"creat_time"
@@ -151,7 +151,7 @@ class SiteSupervisionTask extends BaseWidget {
             current: 1,
             size: 10000,
             constructionState:this.siteSupervisionPageInfo.constructionState.waitDispatching,
-            userIds:this.AppX.appConfig.userId
+            // userIds:this.AppX.appConfig.userId
         }
         this.ajaxSend.sendAjax(this, data, this.config.getRushList, this.ajaxSend.type.get, function (results) {
             if (this.ajaxSend.checkResults(this, results)) {
@@ -313,13 +313,13 @@ class SiteSupervisionTask extends BaseWidget {
 	// 		var distance=0.05;//圆环的宽度
 	// 		var colorLength=0.0//颜色容差
 	// 		var g_lastTime=new Date();//当前时间
-			
+
 	// 		// var spiltSpeed=0;
 	// 		var currentLengthArr=[];//每个圆的初始长度
 	// 		for(var i=0;i<circleNumber;i++){
 	// 			currentLengthArr.push(i*radius/circleNumber);
     //         }
-            
+
     //          //顶点着色器
     //          var vshader_source =
     //          ' attribute vec4 a_Position;\n' +
@@ -388,7 +388,7 @@ class SiteSupervisionTask extends BaseWidget {
     //             let draw=function(gl,a_Position,u_Transparency){
 
     //                 let getPosition=function(){
-                        
+
 	// 			let speed=120;
 	// 			let circle=360;
 	// 			let currentData=new Date();
@@ -401,7 +401,7 @@ class SiteSupervisionTask extends BaseWidget {
 	// 				let trans_matrix=glmatrix.mat4.create();
 	// 				glmatrix.mat4.fromTranslation(trans_matrix,trans);
 	// 				// glmatrix.mat4.transpose(trans_matrix,trans_matrix)
-				
+
 	// 				for(var  m=0;m<circleNumber;m++){
 	// 					//当前长度
 	// 					currentLengthArr[m]=currentLengthArr[m]+dataS*speedLength;
@@ -433,25 +433,25 @@ class SiteSupervisionTask extends BaseWidget {
 	// 						pointArr.push(item);
 	// 					});
 	// 					pointArr.push(transparency)
-					
+
 	// 					//第二次开始重复添加
 	// 					if(i!=0){
 	// 						recordPoint.forEach(item=>{
 	// 							pointArr.push(item);
 	// 						});
 	// 						pointArr.push(transparency);
-							
+
 	// 						point3.forEach(item=>{
 	// 							pointArr.push(item);
 	// 						});
-	// 						pointArr.push(transparency);							
+	// 						pointArr.push(transparency);
 	// 					};
-						
+
 	// 					point4.forEach(item=>{
 	// 							pointArr.push(item);
-	// 						});						
+	// 						});
 	// 					pointArr.push(transparency);
-		
+
 	// 					//第二次开始重复添加,最后一次不添加
 	// 					if(i!=0&&i!=speed){
 	// 						point3.forEach(item=>{
@@ -460,11 +460,11 @@ class SiteSupervisionTask extends BaseWidget {
 	// 						pointArr.push(transparency);
 	// 						point4.forEach(item=>{
 	// 							pointArr.push(item);
-	// 						});						
+	// 						});
 	// 						pointArr.push(transparency );
-	// 					}						
+	// 					}
 	// 					recordPoint=point4;
-	// 					};					
+	// 					};
 	// 				}
 	// 			}
 	// 			let allPoint=new Float32Array(pointArr);
@@ -501,7 +501,7 @@ class SiteSupervisionTask extends BaseWidget {
     //         tick();
 
     //         })
-          
+
     //     }
     // }
 
@@ -518,4 +518,4 @@ class SiteSupervisionTask extends BaseWidget {
         this.domObj.remove();
         this.afterDestroy();
     }
-}
+}