1、gistoken的强制校正

2、隐患查询功能的调整
3、应急抢险功能的调整、
4、用户信息管理功能的调整

src/widgets/Header/Widget.ts

@@ -105,6 +105,14 @@ class Header extends BaseWidget {
                     this.AppX.appConfig.userlevel = data.userLevel;
                     this.AppX.appConfig.userId = data.id;
                     this.AppX.appConfig.companyId = data.companyId;
+                    
+                    //按公司强制校正gisToken（接口生成有bug）
+                    if (data.companyId == 1) {//绵竹公司
+                        this.AppX.appConfig.gisToken = 'eyJyZWFsTmFtZSI6Iue7teerueW6kyIsImNvbm5lY3RzdHIiOiJEQVRBQkFTRT16bWdlbztORVROQU1FPTExMi41MS4yNDkuMjAyL3ptZ2VvO1NFUlZFUj0xMTIuNTEuMjQ5LjIwMjtVU0VSSUQ9em1ycV9tel9zZGU7UEFTU1dPUkQ9Wm1ScW1aR2lzNTY7UE9SVD0xNTIxQDUxNTEvdGNwO1ZFUlNJT049c2RlLkRFRkFVTFQiLCJ1c2VyTmFtZSI6ImFkbWluX216IiwidXNlcklkIjoyNzZ9';
+                    } else if (data.companyId == 4) {//富平公司
+                        this.AppX.appConfig.gisToken = 'eyJyZWFsTmFtZSI6IuWvjOW5s+W6kyIsImNvbm5lY3RzdHIiOiJEQVRBQkFTRT16bWdlbztORVROQU1FPTExMi41MS4yNDkuMjAyL3ptZ2VvO1NFUlZFUj0xMTIuNTEuMjQ5LjIwMjtVU0VSSUQ9em1ycV9mcF9zZGU7UEFTU1dPUkQ9Wm1ScW1aR2lzNTY7UE9SVD0xNTIxQDUxNTEvdGNwO1ZFUlNJT049c2RlLkRFRkFVTFQiLCJ1c2VyTmFtZSI6ImFkbWluX2ZwIiwidXNlcklkIjoyNzZ9';
+                    } 
+
                     this.userinfor = data;
                     this.domObj.find(".detail-name").text(data.realName);
                     this.domObj.find(".detail-phone").text(data.phone);

src/widgets/HiddenTroubleSearchAll/Widget.html

@@ -1,5 +1,13 @@
 <div class="widget-HiddenTroubleSearchAll box">
     <div class='tool form-inline'>
+        <div class="form-group department_btn">
+            <label for="department">部门</label>
+            <select class="input-sm form-control department minwidth" id="department"></select>
+        </div>
+        <div class="form-group">
+            <label for="users">人员</label>
+            <select class="input-sm form-control users minwidth" id="users"></select>
+        </div>
         <div class="form-group">
             <label class=" control-label">隐患名称</label>
             <input type="text" autocomplete="off" class="form-control hiddenName" name="hiddenName" placeholder="隐患名称">
@@ -13,7 +21,6 @@
                 <option value='3'>协调处理</option>
                 <option value='5'>处理待审核</option>
                 <option value='4'>完成处理</option>
-
             </select>
         </div>
         <div class="form-group">

src/widgets/HiddenTroubleSearchAll/Widget.ts

@@ -11,6 +11,9 @@ import Polyline = require('esri/geometry/Polyline');
 enum operation {
     create, destroy, clear
 }
+enum selectType {
+    all, single
+}
 
 export = HiddenTroubleSearchAll;
 class HiddenTroubleSearchAll extends BaseWidget {
@@ -136,6 +139,13 @@ class HiddenTroubleSearchAll extends BaseWidget {
         this.domObj.find(".btn_delete").off().click(e => {
             this.deleteTroubleInfo();
         });
+
+        //部门列表
+        this.domObj.find('.department').on("change", function () {
+            this.getUser(selectType.all, this.domObj.find(".department").val());
+        }.bind(this));
+        //加载部门列表
+        this.getGroup(selectType.all);
     }
     getFileAddress(searchInfo,url,sendType){
         return new Promise<void>((resolve, reject) => {
@@ -208,7 +218,7 @@ class HiddenTroubleSearchAll extends BaseWidget {
             current: 1,
             size: 10000,
         }
-        this.ajaxSend.sendAjax(this, data, this.config.troubleInfo, this.ajaxSend.type.get, function (results) {
+        this.ajaxSend.sendAjax(this, data, this.config.troubleInfoNew, this.ajaxSend.type.get, function (results) {
             if (this.ajaxSend.checkResults(this, results)) {
                 this.allList = results.result.records;
                 this.renderPoint(this.allList);
@@ -233,6 +243,7 @@ class HiddenTroubleSearchAll extends BaseWidget {
       */
     getSearchInfo() {
         this.searchInfo = {
+            userId: this.domObj.find(".users option:selected").val(),
             troubleName: this.domObj.find(".hiddenName").val(),
             processId:this.domObj.find(".processId").val(),
             startTime:this.domObj.find(".report_begindate").val(),
@@ -264,6 +275,74 @@ class HiddenTroubleSearchAll extends BaseWidget {
         }
     }
 
+    /**
+     * @function 获取部门列表
+     */
+    getGroup(selectType: selectType) {
+        let data = {
+            // id: this.AppX.appConfig.deptId
+            current: 1,
+            size: 10000
+        }
+        this.ajaxSend.sendAjax(this, data, this.config.getGroupList, this.ajaxSend.type.get, this.getGroupListCallback.bind(this, selectType));
+    }
+    getGroupListCallback(optionType, results) {
+        if (results.code != 1) {
+            this.toast.Show(results.message);
+            return;
+        }
+        let strdepartment = "";
+        if (optionType == selectType.all) {
+            strdepartment = ("<option selected  value=''>全部</option>");
+        }
+
+        $.each(results.result.records, function (index, item) {
+            if (optionType == selectType.single && this.addData.companyid) {
+                if (this.addData.companyid == item.id) {
+                    strdepartment += "<option selected='selected' value='" + item.id + "'>" + item.name + "</option>";
+                } else {
+                    strdepartment += "<option value='" + item.id + "'>" + item.name + "</option>";
+                }
+            } else {
+                strdepartment += "<option value='" + item.id + "'>" + item.name + "</option>";
+            }
+        }.bind(this));
+        this.domObj.find(".department").empty().append(strdepartment);
+        this.getUser(optionType, this.domObj.find(".department").val());
+    }
+
+    /**
+     * @function 根据部门id获取用户列表，空代表查询全部
+     * @param isall 是否全部
+     */
+    getUser(optionType: selectType, companyid) {
+        let data = {
+            "current": 1,
+            "size": this.config.pagemaxsize,
+            // "sfbd": 1,
+            "departmentId": companyid
+        }
+        this.ajaxSend.sendAjax(this, data, this.config.getUserList, this.ajaxSend.type.get, function (results) {
+            var that = this;
+            if (results.code != 1) {
+                that.toast.Show(results.message);
+                return;
+            }
+            let strusers = "";
+            if (optionType == selectType.all) {
+                strusers = "<option selected value=''>全部</option>";
+            }
+            if (results.result.records.length == 0) {
+                strusers = "<option selected value=''>暂无巡检人员</option>"
+            } else {
+                $.each(results.result.records, function (index, item) {
+                    strusers += "<option  value='" + item.id + "'>" + item.realName + "</option>";
+                }.bind(this));
+            }
+            this.domObj.find(".users").empty().append(strusers);
+        }.bind(this));
+    }
+
     /**
     * 渲染出列表点选的点和线
     * */
@@ -280,7 +359,7 @@ class HiddenTroubleSearchAll extends BaseWidget {
             that: this,
             dataTable: that.dataTable,
             elementId: "HiddenTroubleSearchAllinfodata",
-            url: that.config.troubleInfo,
+            url: that.config.troubleInfoNew,
             // isCheck: false,
             // testData:this.config.dataInfo,
             searchInfo: that.searchInfo,//条件在不断变化，故需要有全局的条件监听

src/widgets/HiddenTroubleSearchAll/config.json

@@ -2,27 +2,29 @@
     "widgetUrl": "widgets/HiddenTroubleSearchAll",
     "tmplateUrl": "widgets/HiddenTroubleSearchAll/Widget.html",
     "styleUrl": "widgets/HiddenTroubleSearchAll/css/style.css",
-    "getDepartment":"/base/department/page",
+    "getGroupList": "/base/department/page",
     "getUserList": "/base/user/getUserByDepts/list",
-    "troubleInfo":"/zmrq/trouble/page",
-    "deleteTroublrInfo":"/zmrq/trouble/deleteByIds",
-    "trouble":"/zmrq/trouble/secretaryCheck",
-    "exportTrouble":"/zmrq/trouble/export",
-    "downloadFile":"/base/file/downloadFile",
+    "troubleInfo": "/zmrq/trouble/page",
+    "troubleInfoNew": "/zmrq/trouble/pageNew",
+    "deleteTroublrInfo": "/zmrq/trouble/deleteByIds",
+    "trouble": "/zmrq/trouble/secretaryCheck",
+    "exportTrouble": "/zmrq/trouble/export",
+    "downloadFile": "/base/file/downloadFile",
     "tolerance": 3,
     "zoomscale": 2000,
-    "dataInfo":{
-        "code":1,
-        "result":{
-            "records":[
+    "pagemaxsize": 500,
+    "dataInfo": {
+        "code": 1,
+        "result": {
+            "records": [
                 {
                     "troubleName": "隐患测试1",
-                    "reportUserName":"吴一",
-                    "processState":"1",
-                    "processId":"4",
-					"processName":"完成处理",
-                    "locationX":"103.95",
-                    "locationY":"31.24",
+                    "reportUserName": "吴一",
+                    "processState": "1",
+                    "processId": "4",
+                    "processName": "完成处理",
+                    "locationX": "103.95",
+                    "locationY": "31.24",
                     "address": "东一路",
                     "unitName": "建筑局",
                     "damageTypeName": "中压管线",
@@ -50,15 +52,15 @@
                             "path": "/语音.mp4"
                         }
                     ],
-                    "governPersonDepartment":"1",
-                    "governPersonDepartmentName":"安全部",
-                    "handleUserid":"2",
-                    "handleUserName":"张三",
-                    "governPersonDepartment2":"1,2",
-                    "governPersonDepartment2Name":"安全部,巡检部",
-                    "coprocessorId":"3,4",
-                    "coprocessorName":"王五、赵六",
-                    "rectifyFile":[
+                    "governPersonDepartment": "1",
+                    "governPersonDepartmentName": "安全部",
+                    "handleUserid": "2",
+                    "handleUserName": "张三",
+                    "governPersonDepartment2": "1,2",
+                    "governPersonDepartment2Name": "安全部,巡检部",
+                    "coprocessorId": "3,4",
+                    "coprocessorName": "王五、赵六",
+                    "rectifyFile": [
                         {
                             "fileName": "文件2",
                             "path": "/文件2.doc"
@@ -68,12 +70,12 @@
                             "path": "/照片2.png"
                         }
                     ],
-                    "dutyPlanNote":"请根据方案执行",
-                    "auditList":[
+                    "dutyPlanNote": "请根据方案执行",
+                    "auditList": [
                         {
-                            "handleTime":"2021-7-5",
-                            "handleNote":"已将压占处理完成",
-                            "handleFiles":[
+                            "handleTime": "2021-7-5",
+                            "handleNote": "已将压占处理完成",
+                            "handleFiles": [
                                 {
                                     "fileName": "文件3",
                                     "path": "/文件3.doc"
@@ -83,24 +85,29 @@
                                     "path": "/照片3.png"
                                 }
                             ],
-                            "handleVoice":[{
-                                "fileName": "语音1",
-                                "path": "/语音.mp4"
-                            }],
-                            "handleCheck":"审核未通过",
-                            "handleCheckNote":"请重新处理",
-                            "handleCheckFiles":[ {
-                                "fileName": "文件4",
-                                "path": "/文件4.doc"
-                            },
-                            {
-                                "fileName": "照片4",
-                                "path": "/照片4.png"
-                            }]
-                        },{
-                            "handleTime":"2021-7-5",
-                            "handleNote":"已将压占处理完成",
-                            "handleFiles":[
+                            "handleVoice": [
+                                {
+                                    "fileName": "语音1",
+                                    "path": "/语音.mp4"
+                                }
+                            ],
+                            "handleCheck": "审核未通过",
+                            "handleCheckNote": "请重新处理",
+                            "handleCheckFiles": [
+                                {
+                                    "fileName": "文件4",
+                                    "path": "/文件4.doc"
+                                },
+                                {
+                                    "fileName": "照片4",
+                                    "path": "/照片4.png"
+                                }
+                            ]
+                        },
+                        {
+                            "handleTime": "2021-7-5",
+                            "handleNote": "已将压占处理完成",
+                            "handleFiles": [
                                 {
                                     "fileName": "文件3",
                                     "path": "/文件3.doc"
@@ -110,38 +117,45 @@
                                     "path": "/照片3.png"
                                 }
                             ],
-                            "handleVoice":[{
-                                "fileName": "语音1",
-                                "path": "/语音.mp4"
-                            }],
-                            "handleCheck":"审核未通过",
-                            "handleCheckNote":"请重新处理",
-                            "handleCheckFiles":[ {
-                                "fileName": "文件4",
-                                "path": "/文件4.doc"
-                            },
-                            {
-                                "fileName": "照片4",
-                                "path": "/照片4.png"
-                            }]
-
+                            "handleVoice": [
+                                {
+                                    "fileName": "语音1",
+                                    "path": "/语音.mp4"
+                                }
+                            ],
+                            "handleCheck": "审核未通过",
+                            "handleCheckNote": "请重新处理",
+                            "handleCheckFiles": [
+                                {
+                                    "fileName": "文件4",
+                                    "path": "/文件4.doc"
+                                },
+                                {
+                                    "fileName": "照片4",
+                                    "path": "/照片4.png"
+                                }
+                            ]
                         }
                     ],
-                    "coordinateList":[{
-                        "coordinateTime":"2021-07-06",
-                        "coordinateNote":"已完成协调",
-                        "coordinateFiles":[{
-                            "fileName": "文件5",
-                            "path": "/文件5.doc"
-                        },
+                    "coordinateList": [
                         {
-                            "fileName": "照片6",
-                            "path": "/照片6.png"
-                        }]
-                    }]
+                            "coordinateTime": "2021-07-06",
+                            "coordinateNote": "已完成协调",
+                            "coordinateFiles": [
+                                {
+                                    "fileName": "文件5",
+                                    "path": "/文件5.doc"
+                                },
+                                {
+                                    "fileName": "照片6",
+                                    "path": "/照片6.png"
+                                }
+                            ]
+                        }
+                    ]
                 }
             ],
-            "total":1
+            "total": 1
         }
     }
-}
+}

src/widgets/MaintenancePageInfo/Widget.html

@@ -11,19 +11,19 @@ $$
     <div class='item'>
         <label class="mustWrite control-label">报警人姓名</label>
         <input type="text" autocomplete="off" class="form-control alarmPeopleName" name="alarmPeopleName"
-        placeholder="报警人姓名" >
+            placeholder="报警人姓名">
     </div>
     <div class='item'>
         <label class=" mustWrite control-label">地址</label>
-        <input type="text" autocomplete="off" class="form-control address" name="address"
-        data-bv-message="地址不能为空" data-bv-trigger="blur" required  placeholder="地址">
+        <input type="text" autocomplete="off" class="form-control address" name="address" data-bv-message="地址不能为空"
+            data-bv-trigger="blur" required placeholder="地址">
     </div>
 </div>
 <div class="form-group form-inline">
     <div class='item'>
         <label class=" control-label">一级抢修分类</label>
-        <select class="input-sm form-control   typeMain" data-live-search="true"
-            name='typeMain' data-max-options="1" showname='typeMainName'  data-style="btn-primary">
+        <select class="input-sm form-control   typeMain" data-live-search="true" name='typeMain' data-max-options="1"
+            showname='typeMainName' data-style="btn-primary">
             <!-- <option value='0' selected="selected">无气/气小</option>
             <option value='1'>户内漏气</option>
             <option value='2'>户外漏气</option>
@@ -32,8 +32,8 @@ $$
     </div>
     <div class='item'>
         <label class=" control-label">二级抢修分类</label>
-        <select class="input-sm form-control   type" data-live-search="true"
-            name='type' data-max-options="1" showname='typeName'  data-style="btn-primary">
+        <select class="input-sm form-control   type" data-live-search="true" name='type' data-max-options="1"
+            showname='typeName' data-style="btn-primary">
             <!-- <option value='0' selected="selected">无气/气小</option>
             <option value='1'>户内漏气</option>
             <option value='2'>户外漏气</option>
@@ -45,28 +45,28 @@ $$
 <div class="form-group form-inline userSelect">
     <div class='item'>
         <label class=" control-label">部门</label>
-        <select class="input-sm form-control  departmentId" data-live-search="true"
-        name='departmentId' showname='departmentName' data-max-options="1" data-style="btn-primary">
+        <select class="input-sm form-control  departmentId" data-live-search="true" name='departmentId'
+            showname='departmentName' data-max-options="1" data-style="btn-primary">
         </select>
     </div>
     <div class='item'>
         <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 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 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">
+            name='assistantUserId' showname='assistantUserName' data-style="btn-primary">
         </select>
     </div>
 </div>
@@ -86,7 +86,8 @@ $$
 <div class="form-group form-inline hideWrite">
     <div class='oneItem fileListHasnotPre'>
         <label class=" control-label">接单附件</label>
-        <input type="file" class="form-control file takeOrderFile" fileType='file' showname='takeOrderFile' name="file" placeholder="上报附件">
+        <input type="file" class="form-control file takeOrderFile" fileType='file' showname='takeOrderFile' name="file"
+            placeholder="上报附件">
     </div>
 </div>
 $$
@@ -95,19 +96,18 @@ $$
 <div class="form-group form-inline userSelect contentInfo">
     <div class='item'>
         <label class="mustWrite control-label">到位时间</label>
-        <input type="text" autocomplete="off" class="form-control signTime" name="signTime"
-        placeholder="到位时间" >
+        <input type="text" autocomplete="off" class="form-control signTime" name="signTime" placeholder="到位时间">
     </div>
     <div class='item'>
         <label class=" mustWrite control-label">处理时间</label>
-        <input type="text" autocomplete="off" class="form-control completeTime" name="completeTime"
-        placeholder="处理时间">
+        <input type="text" autocomplete="off" class="form-control completeTime" name="completeTime" placeholder="处理时间">
     </div>
 </div>
 <div class="form-group form-inline">
     <div class='oneItem'>
         <label class=" control-label">处置情况</label>
-        <textarea class="form-control  emergencyHandling" rows="3" name="emergencyHandling" placeholder="处置情况"></textarea>
+        <textarea class="form-control  emergencyHandling" rows="3" name="emergencyHandling"
+            placeholder="处置情况"></textarea>
     </div>
 </div>
 <div class="form-group form-inline reportVoice">
@@ -119,13 +119,15 @@ $$
 <div class="form-group form-inline hideWrite">
     <div class='oneItem fileListHasnotPre'>
         <label class=" control-label">处理附件</label>
-        <input type="file" class="form-control file emergencyFile" fileType='file' showname='emergencyFile' name="emergencyFile" placeholder="处理附件">
+        <input type="file" class="form-control file emergencyFile" fileType='file' showname='emergencyFile'
+            name="emergencyFile" placeholder="处理附件">
     </div>
 </div>
 <div class="form-group form-inline hideWrite">
     <div class='oneItem fileListHasnotPre'>
         <label class=" control-label">确认签字</label>
-        <input type="file" class="form-control file confirmingTheLink" fileType='file' showname='confirmingTheLink' name="confirmingTheLink" placeholder="确认签字">
+        <input type="file" class="form-control file confirmingTheLink" fileType='file' showname='confirmingTheLink'
+            name="confirmingTheLink" placeholder="确认签字">
     </div>
 </div>
 <div class="form-group form-inline">
@@ -143,13 +145,13 @@ $$
     <div class='item'>
         <label class=" control-label">部门</label>
         <select class="input-sm form-control  responsibleDepartment" data-live-search="true"
-        name='responsibleDepartment' showname='responsibleDepartmentName' data-style="btn-primary">
+            name='responsibleDepartment' showname='responsibleDepartmentName' data-style="btn-primary">
         </select>
     </div>
     <div class='item'>
         <label class=" control-label">抢修负责人</label>
-        <select class="input-sm form-control  responsibleUserId" data-live-search="true"
-            name='responsibleUserId' showname='responsibleUserName' data-style="btn-primary">
+        <select class="input-sm form-control  responsibleUserId" data-live-search="true" name='responsibleUserId'
+            showname='responsibleUserName' data-style="btn-primary">
         </select>
     </div>
 </div>
@@ -157,35 +159,48 @@ $$
     <div class='item'>
         <label class=" control-label">部门</label>
         <select class="input-sm form-control  mdispatchingDepartment" data-live-search="true"
-        name='mdispatchingDepartment' showname='mdispatchingDepartmentName' multiple data-style="btn-primary">
+            name='mdispatchingDepartment' showname='mdispatchingDepartmentName' multiple data-style="btn-primary">
         </select>
     </div>
     <div class='item'>
         <label class=" control-label">抢修人员</label>
-        <select class="input-sm form-control  mdispatchingUserId" data-live-search="true"
-            name='mdispatchingUserId' showname='mdispatchingUserName' multiple data-style="btn-primary">
+        <select class="input-sm form-control  mdispatchingUserId" data-live-search="true" name='mdispatchingUserId'
+            showname='mdispatchingUserName' multiple data-style="btn-primary">
         </select>
     </div>
 </div>
 <div class="form-group form-inline">
     <div class='oneItem'>
         <label class=" control-label">备注</label>
-        <textarea class="form-control  mdispatchingNotes" rows="3" name="mdispatchingNotes" showname='mdispatchingNotes' placeholder=""></textarea>
+        <textarea class="form-control  mdispatchingNotes" rows="3" name="mdispatchingNotes" showname='mdispatchingNotes'
+            placeholder=""></textarea>
     </div>
 </div>
 <div class="form-group form-inline hideWrite">
     <div class='oneItem fileListHasnotPre'>
         <label class=" control-label">附件</label>
-        <input type="file" class="form-control file mdispatchingFile" fileType='file' showname='mdispatchingFile' name="file" placeholder="附件">
+        <input type="file" class="form-control file mdispatchingFile" fileType='file' showname='mdispatchingFile'
+            name="file" placeholder="附件">
     </div>
 </div>
 $$
 <!--抢维修处理（4）-->
 <div class='stateInfo'><span class='titleInfo'>抢修处理</span></div>
+<div class="form-group form-inline userSelect contentInfo">
+    <div class='item'>
+        <label class="mustWrite control-label">到位时间</label>
+        <input type="text" autocomplete="off" class="form-control overTime" name="overTime" placeholder="抢修到位时间">
+    </div>
+    <div class='item'>
+        <label class=" mustWrite control-label">抢修时间</label>
+        <input type="text" autocomplete="off" class="form-control maintenanceTime" name="maintenanceTime" placeholder="抢修处理时间">
+    </div>
+</div>
 <div class="form-group form-inline">
     <div class='oneItem'>
         <label class=" control-label">抢修备注</label>
-        <textarea class="form-control  maintenanceNotes" rows="3" name="maintenanceNotes" showname='maintenanceNotes' placeholder=""></textarea>
+        <textarea class="form-control maintenanceNotes" rows="3" name="maintenanceNotes" showname='maintenanceNotes'
+            placeholder=""></textarea>
     </div>
 </div>
 <div class="form-group form-inline reportVoice">
@@ -197,7 +212,8 @@ $$
 <div class="form-group form-inline hideWrite">
     <div class='oneItem fileListHasnotPre'>
         <label class=" control-label">附件</label>
-        <input type="file" class="form-control file maintenanceFile" fileType='file' showname='maintenanceFile' name="maintenanceFile" placeholder="抢维修附件">
+        <input type="file" class="form-control file maintenanceFile" fileType='file' showname='maintenanceFile'
+            name="maintenanceFile" placeholder="抢维修附件">
     </div>
 </div>
 <div class="form-group form-inline">
@@ -223,7 +239,8 @@ $$
 <div class="form-group form-inline reportVoice">
     <div class='oneItem'>
         <label class=" control-label">审核意见</label>
-        <textarea class="form-control  auditNote" rows="3" name="auditNote" showname='auditNote' placeholder=""></textarea>
+        <textarea class="form-control auditNote" rows="3" name="auditNote" showname='auditNote'
+            placeholder=""></textarea>
     </div>
 </div>
 <div class="form-group form-inline">
@@ -240,7 +257,7 @@ $$
 <div class="form-group form-inline">
     <div class='oneItem'>
         <label class=" control-label">审核</label>
-        <select class="input-sm form-control  auditResult" name='auditResult' showname='auditResultName'>
+        <select class="input-sm form-control auditResult" name='auditResult' showname='auditResultName'>
             <option value="1">通过</option>
             <option value="0">驳回</option>
         </select>
@@ -249,7 +266,8 @@ $$
 <div class="form-group form-inline reportVoice">
     <div class='oneItem'>
         <label class=" control-label">审核备注</label>
-        <textarea class="form-control  auditNote" rows="3" name="auditNote" showname='auditNote' placeholder=""></textarea>
+        <textarea class="form-control  auditNote" rows="3" name="auditNote" showname='auditNote'
+            placeholder=""></textarea>
     </div>
 </div>
 <div class="form-group form-inline">
@@ -264,11 +282,11 @@ $$
 <!-- 地图上点击查看信息(7) -->
 <div class="MaintenancePageInfoPopInfo">
     <div class=${className}>
-    <span>报警人姓名：${alarmPeopleName}</span><br />
-    <span>地址：${address}</span><br />
-    <span>联系电话：${contactPhone}</span><br />
-    <span>详情描述：${description}</span><br />
-    <span class='maintenancePageInfoPopInfoLook operationLook' index=${index}>${state}</span><br />
+        <span>报警人姓名：${alarmPeopleName}</span><br />
+        <span>地址：${address}</span><br />
+        <span>联系电话：${contactPhone}</span><br />
+        <span>详情描述：${description}</span><br />
+        <span class='maintenancePageInfoPopInfoLook operationLook' index=${index}>${state}</span><br />
     </div>
 </div>
 $$
@@ -277,51 +295,52 @@ $$
 <div class="form-group form-inline userSelect">
     <div class='item'>
         <label class=" control-label">填报时间</label>
-        <input type="text" autocomplete="off" class="form-control createTime" name="createTime"
-        placeholder="地址" >
+        <input type="text" autocomplete="off" class="form-control createTime" name="createTime" placeholder="地址">
     </div>
     <div class='item'>
         <label class=" control-label">接警人姓名</label>
         <input type="text" autocomplete="off" class="form-control acceptUserName" name="acceptUserName"
-        placeholder="接警人姓名" >
+            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  phone" name="phone"
-        placeholder="电话" />
+        <input type="text" autocomplete="off" class="form-control  phone" name="phone" placeholder="电话" />
     </div>
     <div class='item'>
         <label class=" control-label">地址</label>
-        <input type="text" autocomplete="off" class="form-control address" name="address"
-        placeholder="地址" >
+        <input type="text" autocomplete="off" class="form-control address" name="address" placeholder="地址">
     </div>
 </div>
 <div class="form-group form-inline">
     <div class='oneItem'>
         <label class=" control-label">反映情况</label>
-        <textarea class="form-control  reportDescription" rows="3" name="reportDescription" showname='reportDescription' placeholder="反映情况"></textarea>
+        <textarea class="form-control  reportDescription" rows="3" name="reportDescription" showname='reportDescription'
+            placeholder="反映情况"></textarea>
     </div>
 </div>
 <div class="form-group form-inline hideWrite">
     <div class='oneItem fileListHasnotPre'>
         <label class=" control-label">反映情况附件</label>
-        <input type="file" class="form-control file reportDescriptionFile" fileType='file' showname='reportDescriptionFile' name="report" placeholder="反映情况附件">
+        <input type="file" class="form-control file reportDescriptionFile" fileType='file'
+            showname='reportDescriptionFile' name="report" placeholder="反映情况附件">
     </div>
 </div>
 <div class="form-group form-inline">
     <div class='oneItem'>
         <label class=" control-label">处置情况</label>
-        <textarea class="form-control  handleDescription" rows="3" name="handleDescription" showname='handleDescription' placeholder="处置情况"></textarea>
+        <textarea class="form-control  handleDescription" rows="3" name="handleDescription" showname='handleDescription'
+            placeholder="处置情况"></textarea>
     </div>
 </div>
 
 <div class="form-group form-inline hideWrite">
     <div class='oneItem fileListHasnotPre'>
         <label class=" control-label">处置情况附件</label>
-        <input type="file" class="form-control file handleDescriptionFile" fileType='file' showname='handleDescriptionFile' name="handle" placeholder="处置情况附件">
+        <input type="file" class="form-control file handleDescriptionFile" fileType='file'
+            showname='handleDescriptionFile' name="handle" placeholder="处置情况附件">
     </div>
 </div>
 $$
@@ -331,7 +350,7 @@ $$
     <div class='item'>
         <label class=" control-label">部门</label>
         <select class="input-sm form-control  dispatchDisposeDeptId" data-live-search="true"
-        name='dispatchDisposeDeptId' showname='dispatchDisposeDeptIdName' data-style="btn-primary">
+            name='dispatchDisposeDeptId' showname='dispatchDisposeDeptIdName' data-style="btn-primary">
         </select>
     </div>
     <div class='item'>
@@ -344,7 +363,7 @@ $$
 <div class="form-group form-inline">
     <div class='oneItem'>
         <label class=" control-label">调度处理意见</label>
-        <textarea class="form-control  dispatchDisposeNote" rows="3" name="dispatchDisposeNote" showname='dispatchDisposeNote' placeholder=""></textarea>
+        <textarea class="form-control  dispatchDisposeNote" rows="3" name="dispatchDisposeNote"
+            showname='dispatchDisposeNote' placeholder=""></textarea>
     </div>
-</div>
-
+</div>

src/widgets/MaintenancePageInfo/Widget.ts

@@ -996,7 +996,8 @@ class MaintenancePageInfo extends BaseWidget {
                 this.initTag.push(item);
                 //本次渲染数据将由执行过程数据和审核数据整理
                 //获取执行数据
-                let processData = data.schedulerAuditOneHisList;
+                // let processData = data.schedulerAuditOneHisList;
+                let processData = data.schedulerAuditOneList;
                 //let auditData = data['auditList'];
                 let header_action = "<tr><th>审核人</th><th>审核时间</th><th>审核状态</th><th>审核意见</th></tr>";
                 //let header_audit = "<tr><th>审核人</th><th>审核时间</th><th>审核状态</th><th>审核意见</th></tr>";
@@ -1086,7 +1087,8 @@ class MaintenancePageInfo extends BaseWidget {
                 this.initTag.push(item);
                 //本次渲染数据将由执行过程数据和审核数据整理
                 //获取执行数据
-                let processData = data.schedulerAuditTowHisList;
+                // let processData = data.schedulerAuditTowHisList;
+                let processData = data.schedulerAuditTowList;
                 //let auditData = data['auditList'];
                 let header_action = "<tr><th>审核人</th><th>审核时间</th><th>审核状态</th><th>审核意见</th></tr>";
                 //let header_audit = "<tr><th>审核人</th><th>审核时间</th><th>审核状态</th><th>审核意见</th></tr>";

src/widgets/UserInfoManagement/Widget.ts

@@ -268,12 +268,11 @@ class UserInfoManagement extends BaseWidget {
             elementId: "UserInfoManagementinfodata",
             url: that.config.getEquipmentListAll,
             searchInfo: that.searchInfo,//条件在不断变化，故需要有全局的条件监听
-            displayTitle: ["用户编码", "用户名称", "巡检周期", "气表编码", "供应商", "地址", "安装员", "用气性质", "区域","出厂日期", "电话", "调压器编号",
-            "投用时间", "户数", "设备状态", "安装时间", "规格", "表类型", "挂表方式", "上次巡检", "暖气", "立管位置", "表箱", "入户防腐", "立管方式",
-            "采集人"],
-            displayField: ["userCode", "userName", "period", "gasCode", "supplier", "address", "setter", "gasProperties", "area", "dateOfProduction",
-            "tel","voltageRegulatorCode", "useDate", "users", "deviceState", "installDate","specification", "gasMeterType", "gasMeterLoad",
-            "lastDate", "heating", "standPipe", "tableBox","aczoiling", "standPipeType", "gatherer"],
+            displayTitle: ["用户编码", "工程名称", "用户名称", "巡检周期", "气表编码", "供应商", "地址", "安装员", "用气性质", "项目负责人", "区域", "建档日期", "出厂日期", "电话", "调压器编号",
+                "验收合格日期", "投用时间", "户数", "设备状态", "安装时间", "规格", "表具方向", "表类型", "挂表方式", "上次巡检", "暖气", "立管位置", "表箱", "入户防腐", "立管方式", "采集人"],
+            displayField: ["userCode", "projectName", "userName", "period", "gasCode", "supplier", "address", "setter", "gasProperties", "projectLeader", "area", "filingDate", "dateOfProduction",
+                "tel", "voltageRegulatorCode", "acceptanceDate", "useDate", "users", "deviceState", "installDate", "specification", "surfaceDirection", "gasMeterType", "gasMeterLoad",
+                "lastDate", "heating", "standPipe", "tableBox", "aczoiling", "standPipeType", "gatherer"],
             extentDisplayTitle: [],
             extentDisplayField: [],
             beforeTrClickEvent: undefined,