部分模块调整

src/configure.ts

@@ -21,7 +21,10 @@ var AppX = {
         // "initextent": { xmin: 103.95, ymin: 31.24, xmax:  104.43, ymax:  31.48 },
         // "apiRoot": "http://112.51.249.202:1111",
         // "apiRoot":"http://192.168.2.248:1111",
+        //客户环节
         "apiRoot": "http://36.134.100.99:1111",
+        // "apiRoot": "http://192.168.2.80:11011",
+        
         //"apiRoot": "http://127.0.0.1:1111",
         "formMakingSystemRoot": "http://112.51.249.202:1001/FormMaking",
           // 天地图秘钥

src/login/js/login.js

@@ -3,6 +3,8 @@
 // var HOST_NAME = "192.168.2.248:1111";
 //var HOST_NAME = "127.0.0.1:1111";
 var HOST_NAME = "36.134.100.99:1111";
+
+// var HOST_NAME = "192.168.2.80:11011";
 SYS_ADDR = location.href.trim().toLowerCase().replace(/login\/+$/, ""),
     COOKIE_EXPIRES = 1,
     COOKIE_PATH = location.pathname.trim().toLowerCase().replace(/login\/+$/, "");

src/widgets/AttributeAnnotation/Widget.ts

@@ -479,7 +479,7 @@ class AttributeAnnotation extends BaseWidget {
             var value = item.feature.attributes[item2.name];
             if(item2.name==xjShow){
                 //重要备注：中民的管网数据SID有空，code也可能是空的所有这里先使用sid，sid没有值在使用code,最后使用objectid;后端逻辑和这里是一致的 20241015
-                value="<span class='xjlookInfo' sid='"+(item.feature.attributes['SID']||item.feature.attributes['CODE']||item.feature.attributes['OBJECTID'])+"' code='"+(item.feature.attributes['CODE']||item.feature.attributes['OBJECTID'])+"'>详情</span>"
+                value="<span class='xjlookInfo' layerId='"+item.layerId+"' layername='"+item.layername+"' sid='"+(item.feature.attributes['SID']||item.feature.attributes['CODE']||item.feature.attributes['OBJECTID'])+"' code='"+(item.feature.attributes['CODE']||item.feature.attributes['OBJECTID'])+"'>详情</span>"
             }
             if (regx.test(value) || value === undefined)
                 value = "";
@@ -512,10 +512,11 @@ class AttributeAnnotation extends BaseWidget {
             $(".onlyPictureDiv .pictureUl img").click();
         })
         this.domObj.off('click','.xjlookInfo').on('click','.xjlookInfo',e=>{
-            debugger
             let sid=$(e.currentTarget).attr("sid");
             let code=$(e.currentTarget).attr("code");
-            xjInfoShow.showXjInfo({sid:sid,code:code});
+            let layerId=$(e.currentTarget).attr("layerId");
+            let layername=$(e.currentTarget).attr("layername");
+            xjInfoShow.showXjInfo({sid:sid,code:code,layername,layerId});
         })
         // $.ajax({
         //     headers: {
@@ -724,7 +725,7 @@ class AttributeAnnotation extends BaseWidget {
                 this.map.setExtent(resultExtent);
             }
             //显示所选的要素的属性
-            this.attrannotation({ feature: results.features[0], alias: results.fieldAliases, fields: results.fields });
+            this.attrannotation({ layername:layername,layerId:layerid,feature: results.features[0], alias: results.fieldAliases, fields: results.fields });
         }.bind(this));
     }
 

src/widgets/HiddenCoordinate/Widget.ts

@@ -286,7 +286,7 @@ class HiddenCoordinate extends BaseWidget {
             isCheck: false,
             searchInfo: that.searchInfo,//条件在不断变化，故需要有全局的条件监听
             displayTitle: ["隐患名称", "所属单位", "隐患地址", "上报人", "备注"],
-            displayField: ["troubleName", "unitName", "address", "reportUserName", "troubleInfo"],
+            displayField: ["troubleName", "unitName", "address", "findUserName", "troubleInfo"],
             extentDisplayTitle: ['操作'],
             // testData:this.config.dataInfo,
             extentDisplayContent: [{

src/widgets/HiddenTroubleSearchAll/Widget.html

@@ -12,7 +12,7 @@
                 <option value='2'>待隐患处理</option>
                 <option value='3'>协调处理</option>
                 <option value='5'>处理待审核</option>
-                <option value='4'>完成处理</option>
+                <option value='4'>结束归档</option>
 
             </select>
         </div>

src/widgets/HiddenTroubleSearchAllAdmin/Widget.html

@@ -12,7 +12,7 @@
                 <option value='2'>待隐患处理</option>
                 <option value='3'>协调处理</option>
                 <option value='5'>处理待审核</option>
-                <option value='4'>完成处理</option>
+                <option value='4'>结束归档</option>
     
             </select>
         </div>

src/widgets/HiddenTroubleSearchPerson/Widget.html

@@ -12,7 +12,7 @@
                 <option value='2'>待隐患处理</option>
                 <option value='3'>协调处理</option>
                 <option value='5'>处理待审核</option>
-                <option value='4'>完成处理 </option>
+                <option value='4'>结束归档 </option>
             </select>
         </div>
         <div class="form-group">

src/widgets/HiddenTroubleTransAudit/Widget.ts

@@ -233,6 +233,7 @@ class HiddenTroubleTransAudit extends BaseWidget {
             troubleName: this.domObj.find(".troubleTypeName").val(),
             address: this.domObj.find(".address").val(),
             userId: this.domObj.find(".users").val(),
+            findUserDeptId: this.domObj.find(".department").val(),
             "orders[0].asc":false,
             "orders[0].column":"report_time"
         }

src/widgets/HiddenTroubleTransSearch/Widget.html

@@ -1,4 +1,4 @@
-<div class="widget-HiddenTroubleSearchAll box">
+<div class="widget-HiddenTroubleTransSearch box">
     <div class='tool form-inline'>
         <div class="form-group">
             <label class=" control-label">隐患名称</label>
@@ -35,10 +35,10 @@
         </div>
     </div>
     <div class='tableList  halfpaneltable'>
-        <table class="table table-bordered  table-stiriped " cellspacing="0" id='HiddenTroubleSearchAllinfodata'>
+        <table class="table table-bordered  table-stiriped " cellspacing="0" id='HiddenTroubleTransSearchinfodata'>
         </table>
     </div>
 </div>
 $$
-<div class='widget-HiddenTroubleSearchAll-pop'>
+<div class='widget-HiddenTroubleTransSearch-pop'>
 </div>

src/widgets/HiddenTroubleTransSearch/Widget.ts

@@ -13,9 +13,9 @@ enum operation {
     create, destroy, clear
 }
 
-export = HiddenTroubleSearchAll;
-class HiddenTroubleSearchAll extends BaseWidget {
-    baseClass = "widget-HiddenTroubleSearchAll";
+export = HiddenTroubleTransSearch;
+class HiddenTroubleTransSearch extends BaseWidget {
+    baseClass = "widget-HiddenTroubleTransSearch";
     preLayerId = 'HalfPanel' + this.baseClass;
     clusters = this.preLayerId + 'Clusters';
     popClass = this.baseClass + 'PopClass';
@@ -101,7 +101,7 @@ class HiddenTroubleSearchAll extends BaseWidget {
 
     start = {
         format: 'YYYY-MM-DD',
-        isinitVal: true,
+        isinitVal: false,
         choosefun: function (elem, val, date) {
             var dt = new Date(val.replace(/-/g, "/"));
             this.end.minDate = Functions.DateFormat(dt, "yyyy-MM-dd");
@@ -110,13 +110,13 @@ class HiddenTroubleSearchAll extends BaseWidget {
 
     end = {
         format: 'YYYY-MM-DD',
-        isinitVal: true,
+        isinitVal: false,
     };
 
 
     start2 = {
         format: 'YYYY-MM-DD',
-        isinitVal: true,
+        isinitVal: false,
         choosefun: function (elem, val, date) {
             var dt = new Date(val.replace(/-/g, "/"));
             this.end2.minDate = Functions.DateFormat(dt, "yyyy-MM-dd");
@@ -125,7 +125,7 @@ class HiddenTroubleSearchAll extends BaseWidget {
 
     end2 = {
         format: 'YYYY-MM-DD',
-        isinitVal: true,
+        isinitVal: false,
     };
 
     //初始化日期控件（pensiveant）
@@ -134,12 +134,12 @@ class HiddenTroubleSearchAll extends BaseWidget {
         $.jeDate("."+this.baseClass+" .endDispatchTime", this.end);
         $.jeDate("."+this.baseClass+" .startTransferTime", this.start2);
         $.jeDate("."+this.baseClass+" .endTransferTime", this.end2);
-        var sdate = new Date();
-        let edate = new Date();
-        this.domObj.find('.startDispatchTime').val(Functions.DateFormat(sdate, "yyyy-MM-dd"));
-        this.domObj.find('.endDispatchTime').val(Functions.DateFormat(edate, "yyyy-MM-dd"));
-        this.domObj.find('.startTransferTime').val(Functions.DateFormat(sdate, "yyyy-MM-dd"));
-        this.domObj.find('.endTransferTime').val(Functions.DateFormat(edate, "yyyy-MM-dd"));
+        // var sdate = new Date();
+        // let edate = new Date();
+        // this.domObj.find('.startDispatchTime').val(Functions.DateFormat(sdate, "yyyy-MM-dd"));
+        // this.domObj.find('.endDispatchTime').val(Functions.DateFormat(edate, "yyyy-MM-dd"));
+        // this.domObj.find('.startTransferTime').val(Functions.DateFormat(sdate, "yyyy-MM-dd"));
+        // this.domObj.find('.endTransferTime').val(Functions.DateFormat(edate, "yyyy-MM-dd"));
     }
 
     /**
@@ -151,7 +151,7 @@ class HiddenTroubleSearchAll extends BaseWidget {
         let getHtml = this.AppX.runtimeConfig.hiddenPageInfo;
         let lookInfo = null;
         lookInfo=this.initLookInfoState(dataInfo);
-        getHtml.getLinkHtml(this, Obj.conObj.find('.widget-HiddenTroubleSearchAll-pop'), lookInfo,undefined, dataInfo);
+        getHtml.getLinkHtml(this, Obj.conObj.find('.widget-HiddenTroubleTransSearch-pop'), lookInfo,undefined, dataInfo);
         Obj.submitObj.off("click").on("click", function () {
             this.popup.close();
         }.bind(this));
@@ -328,7 +328,7 @@ class HiddenTroubleSearchAll extends BaseWidget {
         let option = {
             that: this,
             dataTable: that.dataTable,
-            elementId: "HiddenTroubleSearchAllinfodata",
+            elementId: "HiddenTroubleTransSearchinfodata",
             url: that.config.troubleInfo,
             isCheck: false,
             searchInfo: that.searchInfo,//条件在不断变化，故需要有全局的条件监听
@@ -341,7 +341,7 @@ class HiddenTroubleSearchAll extends BaseWidget {
             }],
             beforeTrClickEvent: undefined,
             afterTrClickEvent: function () {
-                this.domObj.off('click', '#HiddenTroubleSearchAllinfodata tr').on('click', "#HiddenTroubleSearchAllinfodata tr", e => {
+                this.domObj.off('click', '#HiddenTroubleTransSearchinfodata tr').on('click', "#HiddenTroubleTransSearchinfodata tr", e => {
                     this.showTrouble();
                     this.AppX.runtimeConfig.hiddenPageInfo.goPoint(this.dataTable.aExtentData.currentTableData);
                 })

src/widgets/HiddenTroubleTransSearch/config.json

@@ -1,7 +1,7 @@
 {
-    "widgetUrl": "widgets/HiddenTroubleSearchAll",
-    "tmplateUrl": "widgets/HiddenTroubleSearchAll/Widget.html",
-    "styleUrl": "widgets/HiddenTroubleSearchAll/css/style.css",
+    "widgetUrl": "widgets/HiddenTroubleTransSearch",
+    "tmplateUrl": "widgets/HiddenTroubleTransSearch/Widget.html",
+    "styleUrl": "widgets/HiddenTroubleTransSearch/css/style.css",
     "getDepartment": "/base/department/page",
     "getUserList": "/base/user/getUserByDepts/list",
     "troubleInfo": "/zmrq/trouble/troubleTransferList",

src/widgets/HiddenTroubleTransSearch/css/style.scss

@@ -1,4 +1,4 @@
-.widget-HiddenTroubleSearchAll {
+.widget-HiddenTroubleTransSearch {
     height: 100%;
     .tool {
         .form-group {
@@ -76,7 +76,7 @@
 
 }
 
-.widget-HiddenTroubleSearchAll-pop {
+.widget-HiddenTroubleTransSearch-pop {
     width: 100%;
     height: 100%;
     overflow: auto;

src/widgets/InfoWindow/Widget.ts

@@ -142,6 +142,7 @@ class InfoWindow extends BaseWidget {
     }
 
     onIdentifyFinished(urlindex, results, center) {
+        debugger
         this.GraphicsLayer.clear();
         $(".xjWindowInfoShowbySid").off();
         //this.GraphicsLayer.add(feature);
@@ -153,6 +154,8 @@ class InfoWindow extends BaseWidget {
         //重要备注：中民的管网数据SID有空，code也可能是空的所有这里先使用sid，sid没有值在使用code,最后使用objectid;后端逻辑和这里是一致的 20241015
         let searchSid=(feature.attributes["SID"]||feature.attributes["sid"])||feature.attributes["唯一编号"]||feature.attributes["CODE"]||feature.attributes["code"]||feature.attributes["OBJECTID"];
         let searchCode=((feature.attributes["CODE"]||feature.attributes["code"])||feature.attributes["设备编码"])||feature.attributes["objectid"];
+        let layerId=results[0].layerId;
+        let layername=results[0].layerName;
         if(results[0]&&results[0].feature&&results[0].feature.geometry&&results[0].feature.geometry.type){
             if(results[0].feature.geometry.type=="polyline"){
                 results[0].feature.attributes["设备名称"]=( results[0].feature.attributes["设备名称"].toLowerCase()=="null"?"": results[0].feature.attributes["设备名称"])
@@ -193,9 +196,9 @@ class InfoWindow extends BaseWidget {
         // this.GraphicsLayer.setInfoTemplate(template);
          this.map.infoWindow.setFeatures([feature]);
          this.map.infoWindow.show(center);
-         $(".xjWindowInfoShowbySid").click(e=>{
+         $(".xjWindowInfoShowbySid").off().click(e=>{
             if(searchSid){
-                xjInfoShow.showXjInfo({sid:searchSid,code:searchCode})
+                xjInfoShow.showXjInfo({sid:searchSid,code:searchCode,layerId,layername})
             }
          })
         // this.map.infoWindow.setFeatures(graphic)

src/widgets/MapWatching/Widget.ts

@@ -538,8 +538,10 @@ class MapWatching extends BaseWidget {
             } else {
                 var rows = result.result.records;
                 for (var i = 0, length = rows.length; i < length; i++) {
-                    var finder = rows[i].reportUserName;//上报人员
-                    var finderId = rows[i].reportUserId;//上报人员id
+                    // var finder = rows[i].reportUserName;//上报人员
+                    // var finderId = rows[i].reportUserId;//上报人员id
+                    var finder = rows[i].findUserName;//上报人员
+                    var finderId = rows[i].findUserId;//上报人员id
                     var departmentId = rows[i].deptId;//上报人员部门id
                     var departmentName = rows[i].deptName;//上报人员部门名称
                     var type = rows[i].troubleTypeName || "";//隐患类型

src/widgets/MissionSchedule/Widget.html

@@ -403,7 +403,7 @@ $$
             <button type="button" class="btn btn-default btn-success  btn-search btn_search" style="margin-left: 4px;">
                 <span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询
             </button>
-            <label for="MATERIAL">
+            <label class="MATERIALTitle" for="MATERIAL">
                 <span style="color: red">*</span>材质选择</label>
             <select class="input-sm  MATERIAL minwidth" id="MATERIAL" style="width: 150px;height: 32px;"></select>
             <button id="btn_select" type="button" class="btn btn-success btn_select">

src/widgets/MissionSchedule/Widget.ts

@@ -1159,9 +1159,9 @@ class MissionSchedule extends BaseWidget {
                     var where;
                     if(obj.sqlfilter) {
                         where = '('+obj.sqlfilter+')';
-                        if(Material != '') where += ` and MATERIAL='${Material}'`
+                        if(Material&&Material != '') where += ` and MATERIAL='${Material}'`
                     }else{
-                        if(Material != '') where = `MATERIAL='${Material}'`
+                        if(Material&&Material != '') where = `MATERIAL='${Material}'`
                     }
 
                     var param = { "where": where, "spatialRel": "esriSpatialRelIntersects", "returnGeometry": false, "geometryType": "esriGeometryPolygon", "geometry": JSON.stringify(geometry), "returnIdsOnly": true, "f": "json" };
@@ -1388,12 +1388,17 @@ class MissionSchedule extends BaseWidget {
                 f: "pjson"
             },
             success: function(res){
-                var strplanpointtype = "<option value=''>全部</option>";
-                var strplanlinetype = "";
-                $.each(res.result.rows, function (index, item) {
-                    strplanpointtype += "<option value='" + item + "'>" + item + "</option>";
-                }.bind(this));
-                this.domObj.find(".MATERIAL").empty().append(strplanpointtype);
+                if(res.result){
+                    var strplanpointtype = "<option value=''>全部</option>";
+                    var strplanlinetype = "";
+                    $.each(res.result.rows, function (index, item) {
+                        strplanpointtype += "<option value='" + item + "'>" + item + "</option>";
+                    }.bind(this));
+                    this.domObj.find(".MATERIAL").empty().append(strplanpointtype);
+                }else{
+                    this.domObj.find(".MATERIAL").hide();
+                    this.domObj.find(".MATERIALTitle").hide();
+                }
             }.bind(this),
             dataType: "json"
 

src/widgets/PlanSearchWithSid/Widget.html

@@ -1,31 +1,7 @@
 <div class='widget-PlanSearchWithSid box'>
     <div class="PlanSearchWithSid_toolbar boxtool">
         <div class="form-inline">
-            <div class="form-group department_btn">
-                <label for="department">任务状态</label>
-                <select class="input-sm form-control state minwidth" id="state">
-                    <option selected value=''>全部 </option>
-                    <option  value='2'>正在执行 </option>
-                    <option value='3'>已完成 </option>
-                    <option value='1'>未开始 </option>
-                    <!-- <option value='5'>申请转移(任务未开始) </option>
-                    <option value='6'>申请转移(任务正在执行) </option>
-                    <option value='7'>计划已转移 </option> -->
-                    <option value='4'>超时未完成 </option>
-                </select>
-            </div>
-            <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 for="region">片区</label>
-                <select class="input-sm form-control region minwidth" id="region"></select>
-            </div>
+
             <div class="form-group">
                 <label for="region">任务创建人</label>
                 <input class="input-sm form-control createUser" id="createUser"></input>
@@ -42,23 +18,19 @@
                         查询
                     </button>
                 </div>
-                <!-- <div class="form-group">
-                    <button type="button" class="btn-delete">
-                        删除
-                    </button>
-                </div> -->
-                <!-- <div class="form-group">
-                    <button title="转移计划" id="btn_transplans" type="button" class="btn btn-default btn-danger btn_transplans" data-toggle="modal">
-                        <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>转移审核
-                        </button>
-                </div> -->
             </div>
         </div>
     </div>
-    <div class="halfpaneltable PlanSearchWithSid_content boxcontent">
-        <table class="table table-bordered  table-striped" id='planslist_table' cellspacing="0">
+    <div class="halfpaneltable PlanSearchWithSidInfo boxcontent">
+        <table class="table table-bordered  table-striped" id='PlanSearchWithSidInfo_table' cellspacing="0">
+            <thead></thead>
+            <tbody></tbody>
         </table>
     </div>
+    <!-- <div class="halfpaneltable PlanSearchWithSid_content boxcontent">
+        <table class="table table-bordered  table-striped" id='planslist_table' cellspacing="0">
+        </table>
+    </div> -->
 </div>
 $$
 <div class='widget-PlanSearchWithSid-Info box'>
@@ -80,12 +52,12 @@ $$
                 <span class="glyphicon glyphicon-export" aria-hidden="true"></span>导出
         </button> -->
     </div>
-    <div class="halfpaneltable PlanSearchWithSidInfo boxcontent">
+    <!-- <div class="halfpaneltable PlanSearchWithSidInfo boxcontent">
         <table class="table table-bordered  table-striped" id='PlanSearchWithSidInfo_table' cellspacing="0">
             <thead></thead>
             <tbody></tbody>
         </table>
-    </div>
+    </div> -->
 </div>
 $$
 <div class='checkContent widget-PlanSearchWithSid-Pop'>

src/widgets/PlanSearchWithSid/Widget.ts

@@ -72,7 +72,7 @@ class PlanSearchWithSid extends BaseWidget {
     startup() {
         this.configure();
         this.initHtml();
-        this.getPlanLayers();
+        // this.getPlanLayers();
         this.initEvent();
     }
 
@@ -133,7 +133,6 @@ class PlanSearchWithSid extends BaseWidget {
         this.configTimes();
         this.domObj.find(".planslist-title").empty().append(this.template.split('$$')[10]);
         this.companyid = this.AppX.appConfig.deptId;
-        this.getGroup(selectType.all);
     }
 
     planEnddate = {
@@ -166,26 +165,11 @@ class PlanSearchWithSid extends BaseWidget {
      */
     initEvent() {
         this.initLoginUser();
-        this.getAllPlanRegionToMap();
-        this.getRegion(selectType.all);
-        this.getPlanSearchWithSid();
-        var that = this;
-        //部门列表
-        this.domObj.find('.department').on("change", function () {
-            this.getUser(selectType.all, this.domObj.find(".department").val());
-        }.bind(this));
         //查询计划
         this.domObj.find(".btn-search").off("click").on("click", function () {
-            this.clearCurrentTr();
-            this.getPlanSearchWithSid();
-        }.bind(this));
-        //删除计划
-        this.domObj.find(".btn-delete").off("click").on("click", function () {
-            this.deletePlanSearchWithSid();
+            this.getPlanInfo()
         }.bind(this));
-
-
-        
+        this.getPlanInfo()
     }
 
     /**
@@ -196,20 +180,20 @@ class PlanSearchWithSid extends BaseWidget {
         this.initEvent();
     }
 
-    /**
-     * 获取设备类型
-     * */
-    getPlanLayers() {
-        let data = {
-            current: 1,
-            size: 1000
-        }
-        this.ajaxSend.sendAjax(this, data, this.config.getLayerId, this.ajaxSend.type.get, function (results) {
-            if (results.code != -1) {
-                this.deviceTypes = results.result.records
-            }
-        }.bind(this));
-    }
+    // /**
+    //  * 获取设备类型
+    //  * */
+    // getPlanLayers() {
+    //     let data = {
+    //         current: 1,
+    //         size: 1000
+    //     }
+    //     this.ajaxSend.sendAjax(this, data, this.config.getLayerId, this.ajaxSend.type.get, function (results) {
+    //         if (results.code != -1) {
+    //             this.deviceTypes = results.result.records
+    //         }
+    //     }.bind(this));
+    // }
 
     //设置点、线或多边形的样式
     setGraphSymbol(type, size?) {
@@ -324,246 +308,27 @@ class PlanSearchWithSid extends BaseWidget {
         return symbol;
     }
 
-    /**--------------------第一页 计划查询显示、新增、复制、提交------------------- */
-    /**
-     * @function 查询所有计划信息
-     */
-    getPlanSearchWithSid() {
-        this.loadWait.show("正在查询数据，请耐心等待...", this.domObj);
-        this.clearCurrentTr();
-        let that = this;
-        let dom = this.domObj.find('#planslist_table .dataTables_scroll');
-        let startTime = this.domObj.find("#plan_begindate").val();
-        let endTime = this.domObj.find("#plan_enddate").val();
-        that.dataTable_all_searchInfo = {
-            sidInfo:window.tempSearchXjHalf.searchSid.sid,
-            deptId: this.domObj.find(".department option:selected").val(),
-            userId: this.domObj.find(".users option:selected").val(),
-            regionId: this.domObj.find(".region option:selected").val(),
-            createUser:this.domObj.find(".createUser").val(),
-            isResultPoint:"1",
-            companyId:this.AppX.appConfig.companyId,
-            childPlanState: this.domObj.find(".state option:selected").val(),
-            "orders[0].asc": false,
-            "orders[0].column": 'CREATE_TIME',
-            childBeginDate: startTime == "" ? "" : this.ajaxSend.conductAddTime(startTime),
-            childEndDate: endTime == "" ? "" : this.ajaxSend.conductAddEndTime(endTime)
-        }
-        if (dom.length > 0) {
-            if (that.dataTable_all) {
-                that.dataTable_all.ajax.reload();
-                return;
-            };
-        } else {
-            if (that.dataTable_all) {
-                that.dataTable_all.destroy();
-                that.dataTable_all = null;
-            };
-        }
-        let option = {
-            that: this,
-            dataTable: that.dataTable_all,
-            elementId: "planslist_table",
-            url: that.config.getPlanSearchWithSidList,
-            searchInfo: that.dataTable_all_searchInfo,//条件在不断变化，故需要有全局的条件监听
-            displayTitle: ["部门", "姓名", "巡检名称", "巡检周期", "巡检类型", "所属片区", "计划开始时间", "计划结束时间", "计划完成率(%)", "完成情况(%)", "状态","审核结果"],
-            displayField: ["deptName", "userIdName", "description", "preiodName", "deviceTypeName", "regionName", "childBeginDate", "childEndDate", "planRate", "percent1Tostring", "chilePlanStateName",'planChildAuditStatus'],
-            extentDisplayTitle: ['定位查看', '详情'],
-            extentDisplayContent: [
-                {
-                    field: "planLocaltion",
-                    fieldContent: "<a class='planLocaltion'>定位查看</a>"
-                }, {
-                    field: "planInfoLook",
-                    fieldContent: "<a class='planInfoLook'>详情</a>"
-                }],
-            beforeTrClickEvent: undefined,
-            afterTrClickEvent: function () {
-            },
-            serachCallBack:data=>{
-                data.result.records.forEach(item=>{
-                    if(!item['planChildAuditStatus']){
-                        if(!item.planChildAudit){
-                            item.planChildAuditStatus="/";
-                        }else{
-                            let state=item.planChildAudit.auditStatus;
-                            item['planChildAuditStatus']=(state==2?'/':(state==1?'合格':"不合格"))
-                        }
-                    }
-                })
-            },
-            drawEvent: function () {
-                $.each(that.domObj.find("#planslist_table tr[class]"), function (index, item) {
-                    if (that.dataTable_all.aExtentData.currentAllData.length > 0) {
-                        $($(item).find('td')[9]).text(that.dataTable_all.aExtentData.currentAllData[index].planRate + "%");
-                    }
-                })
-                that.domObj.off('click', '.planInfoLook').on('click', ".planInfoLook", e => {
-                    that.getPlanInfo(that.dataTable_all.aExtentData.currentTableData);
-                });
-                that.domObj.off('click', '.planLocaltion').on('click', ".planLocaltion", e => {
-                    let dataInfo = that.dataTable_all.aExtentData.currentTableData;
-                    that.ajaxSend.sendAjax(that, {id:dataInfo.id}, that.config.getMissionScheduleById+dataInfo.id, that.ajaxSend.type.get, that.showPlanInfoMap.bind(that));
-                });
-                that.loadWait.hide();
-            }.bind(this),
-            errmassage: "巡检计划查询失败",
-            nullmessage: undefined,
-            exportTitle: "巡检计划导出"
-        }
-        that.dataTable_all = this.ajaxSend.DataTables_check(option);
-    }
-
-    showPlanInfoMap(res){
-        if(res&&res.result){
-            let dataInfo=res.result;
-            let that=this;
-            if (that.dynamicMapServer) {
-                that.map.removeLayer(that.dynamicMapServer);
-                that.dynamicMapServer = null;
-            }
-            that.plan_ptype_layer.clear();
-            if (dataInfo.deviceTypeId == 1 || dataInfo.deviceTypeId == 2) {
-                let datageo = JSON.parse(dataInfo.pointInfo);
-                that.showPlanSearchWithSidListPlans(datageo);
-            } else {
-                that.loadWait.show("正在查询任务范围，请等待...", that.domObj);
-                let url = that.AppX.appConfig.gisResource.pipe.config[that.config.mapindex].url;//pipe
-                let obj = that.getDeviceType(dataInfo.deviceTypeId);
-                that.gp = new Geoprocessor(that.analyzeUrl);
-                let fields = that.getLayerShowFieldNames(obj.cnContactLayerName);
-                let outfields = fields.map(e => { return e.name })
-                //此次gp服务，管线图层查询是传入图层名称必须是管线
-                let layerName = "";
-                layerName = obj.cnContactLayerName;
-                var options = {
-                    "layername": layerName,
-                    "objectids": dataInfo.objectIds,
-                    "outfields": outfields.join(","),
-                    usertoken: that.AppX.appConfig.gisToken
-                };
-                var delayResult = that.gp.submitJob(
-                    options,
-                    function (jobinfo) {
-                        let mapServerUrl = that.mapServerUrl + "/jobs/" + jobinfo.jobId;
-                        that.dynamicMapServer = new ArcGISDynamicMapServiceLayer(mapServerUrl);
-                        that.dynamicMapServer.id = that.preLayerId + "dynamicMapServer";
-                        that.map.addLayer(that.dynamicMapServer);
-                        $.ajax({
-                            type: "get",
-                            dataType: "json",
-                            url: that.analyzeUrl + "/jobs/" + jobinfo.jobId + "/" + jobinfo.results.summary.paramUrl + "?f=pjson",
-                            success: function (result) {
-                                let data = result.value.result.summary;
-                                // let pointMax = that.ajaxSend.mercator2lonlat({ x: data.xmax, y: data.ymax });
-                                // let pointMin = that.ajaxSend.mercator2lonlat({ x: data.xmin, y: data.ymin });
-                                //that.map.setExtent(new Extent(pointMin.x, pointMin.y, pointMax.x, pointMax.y, that.map.spatialReference))
-                                that.map.setExtent(new Extent(data.xmin, data.ymin, data.xmax, data.ymax, that.map.spatialReference))
-                            }.bind(that)
-                        })
-                        that.loadWait.hide();
-                    }.bind(this),
-                    function (jobinfo) {
-                        that.jobid = jobinfo.jobId;
-                    }.bind(this),
-                    function (jobinfo) {
-                        that.AppX.runtimeConfig.toast.show("分析失败，请联系管理员");
-                        that.loadWait.hide();
-                        console.error(jobinfo);
-                    }.bind(this)
-                );
-            }
-        }
-    }
-    deletePlanSearchWithSid(){
-        var senddata = [];
-        this.dataTable_all.aExtentData.checkCurrentData.forEach(element => {
-            senddata.push(element.id);
-        });
-        this.ajaxSend.sendAjax(this, senddata, this.config.deleteMainList, this.ajaxSend.type.delete, function (results) {
-            if (results.code != 1) {
-                this.toast.Show(results.message);
-                return;
-            }
-            this.toast.Show(results.message);
-            this.getPlanSearchWithSid();
-        }.bind(this))
-    }
-
-    /**
-     * @function 根据编号进行查询
-     * @param data 查询的计划
-     */
-    seachInfoList(onlyCode){
-        if(this.dataTable){
-            let tempData=[];
-            let code=this.domObj.find('.searchCode').val();
-            if(onlyCode){
-                code=onlyCode
-            }
-            for(let i=0;i<this.allSearchList.length;i++){
-                let tempValue=this.allSearchList[i];
-                if(code){
-                    if(this.allSearchList[i].number.indexOf(code)!=-1){
-                        //tempData.push([tempValue.bh,tempValue.name,tempValue.dw,tempValue.dwsj])
-                        tempData.push(this.allSearchList[i])
-                    }
-                }else{
-                    // tempData.push([tempValue.bh,tempValue.name,tempValue.dw,tempValue.dwsj])
-                    tempData.push(this.allSearchList[i])
-                }
-            }
-            this.dataTable.clear();
-            this.dataTable.rows.add(tempData);
-            this.dataTable.draw();
-        }  
-    }
-
     /**
      * @function 获取巡检计划详情
      * @param data 查询的计划
      */
-    getPlanInfo(data) {
+    getPlanInfo() {
         let senddata = {
-            childPlanId: data.id,
+            sid:window.tempSearchXjHalf.searchSid.sid,
+            startTime:this.domObj.find(".plan_begindate").val(),
+            endTime:this.domObj.find(".plan_enddate").val(),
             size: 100000,
             current: 1
         }
         this.allSearchList=[];
-        debugger
         this.ajaxSend.sendAjax(this, senddata, this.config.planInfo, this.ajaxSend.type.get, function (results) {
             var that = this;
             if (results.code != 1) {
                 that.toast.Show(results.message);
                 return;
             }
-            if (results.result && results.result.length > 0) {
-                this.hideOrShowSearch(hideOrShow.hide);
                 let info = results.result;
-                let html = _.template(this.template.split('$$')[1])();
-                this.domObj.append(html);
-                if(data.childPlanState == "3"){
-                    this.domObj.find(".btn_exportExcel").show();
-                }
-                //返回查询首页
-                this.domObj.find('.returnSearch').off().click(e => {
-                    this.hideOrShowSearch(hideOrShow.show);
-                })
-                //导出
-                this.domObj.find(".btn_exportExcel").off().click(e => {
-                    this.domObj.find(".buttons-excel").eq(1).trigger("click");
-                    // var a = this.domObj.find(".buttons-excel");
-                    //     a[0].trigger("click");
-                });
-                this.domObj.find(".searchCodebutton").off("click").on("click", function () {
-                    this.seachInfoList();
-                    this.addSeachInfoEvent(tableDom,isCheck)
-                }.bind(this));
-                this.domObj.find(".searchCodebuttonByCode").off("click").on("click", function () {
-                    this.seachInfoList( window.tempSearchXjHalf.searchSid.code);
-                    this.addSeachInfoEvent(tableDom,isCheck)
-                }.bind(this));
-                
+                let deviceTypeId=info[0].deviceTypeId
                 //详情
                 let listHmtl = "";
                 let mapData = {
@@ -571,21 +336,34 @@ class PlanSearchWithSid extends BaseWidget {
                     dwObjectGeo: [],//到位图形
                     wdwObjectId: [],//未到位编号
                     wdwObjectGeo: [],//未到位图形
-                    layerName: this.dataTable_all.aExtentData.currentTableData.layerName,
-                    layerId: this.dataTable_all.aExtentData.currentTableData.layerId
+                    // layerName: this.dataTable_all.aExtentData.currentTableData.layerName,
+                    layerId:window.tempSearchXjHalf.searchSid.layerId
                 }
                 let thHtml = "";
                 let isCheck = true;
                 //除开巡检点、巡检线、节点、管线外，其余设备可以查看检查项
-                if (this.dataTable_all.aExtentData.currentTableData.checkContent == null || this.dataTable_all.aExtentData.currentTableData.checkContent == "null") {
-                    isCheck = false;
-                }
+                // if (this.dataTable_all.aExtentData.currentTableData.checkContent == null || this.dataTable_all.aExtentData.currentTableData.checkContent == "null") {
+                //     isCheck = false;
+                // }
                 this.dataTable_plan = info;
                 let tableData = [];
-                console.log(info)
+                let tempTitle=[];
+                let tempField=[];
+                if(deviceTypeId==20){
+                    tempTitle=["调压柜运行压力(单位:Kpa)","调压柜放散压力(单位:Kpa)","流量计工作压力(单位:Kpa)"];
+                    tempField=["runPressure","diffusePressure","workPressure"]
+                }else if(deviceTypeId==18){
+                    tempTitle=["调压箱运行压力(单位:Kpa)","调压箱截断压力(单位:Kpa)"];
+                    tempField=["runPressure","truncationPressure"]
+                }else if(deviceTypeId==16){
+                    tempTitle=["阀门材质","阀门规格"];
+                    tempField=["material","specification"]
+                }else if(deviceTypeId==21){
+                    tempTitle=["检测桩编号","标准电位值","检测电位值","检测人员"];
+                    tempField=["deviceId","standardPotential","detectionPotential","createUserName"]
+                }
                 info.forEach((item, index) => {
                     if (item.checkContent && item.checkContent != "null" && item.checkContent != "") {
-
                         item.overDate = item.checkDate;
                         item.isoverName=item.checkStateName;
                     }
@@ -624,14 +402,23 @@ class PlanSearchWithSid extends BaseWidget {
                         name: null,
                         dw: null,
                         dwsj: null,
-                        lookInfo: null
+                        lookInfo: null,
+                        description:null,
+                        childBeginDate:null,
+                        childEndDate:null
                     }
+                    tempField.forEach(itemT=>{
+                        tableDataItem[itemT]= item[itemT]||""
+                    })
                     tableDataItem.index = index;
                     tableDataItem.number=bh+"";
                     tableDataItem.bh = "<a class='indexTd' index='" + index + "'>" + bh + "</a>";
                     tableDataItem.name = name;
                     tableDataItem.dw = dw;
                     tableDataItem.dwsj = dwsj;
+                    tableDataItem.childBeginDate=item.childBeginDate;
+                    tableDataItem.description=item.description;
+                    tableDataItem.childEndDate=item.childEndDate
                     if (isCheck) {
                         // listHmtl += "<td title='查看检查项目' class='planCheckInfo' index='" + index + "'>查看检查项目</td></tr>";
                         tableDataItem.lookInfo = "<a class='lookInfo' index='" + index + "'>查看检查项目</a>";
@@ -660,8 +447,8 @@ class PlanSearchWithSid extends BaseWidget {
                     elementId: "PlanSearchWithSidInfo_table",
                     url: that.config.getEquipmentNormalManagementList,//这个接口没有用到url
                     searchInfo: that.getSearchInfo,//条件在不断变化，故需要有全局的条件监听
-                    displayTitle: ["设备编码", "名称 ", "检查情况", "检查时间"],
-                    displayField: ['bh', 'name', 'dw', 'dwsj'],
+                    displayTitle: ["设备编码", "所属巡检计划","计划开始时间","计划结束时间","设备类型 ", "检查情况", "检查时间",...tempTitle],
+                    displayField: ['bh', 'description',"childBeginDate","childEndDate",'name', 'dw', 'dwsj',...tempField],
                     extentDisplayTitle: extendTitle,
                     extentDisplayContent: extendContent,
                     beforeTrClickEvent: undefined,
@@ -682,7 +469,7 @@ class PlanSearchWithSid extends BaseWidget {
                 // tableDom.find("thead").append(thHtml);
                 // tableDom.find("tbody").append(listHmtl);
                 this.addSeachInfoEvent(tableDom,isCheck)
-            }
+            // }
         }.bind(this));
     }
 /**
@@ -704,21 +491,21 @@ addSeachInfoEvent(tableDom,isCheck){
             let data = this.dataTable_plan[parseInt(dom.attr('index'))];
             let url = this.config.xjpage;
             let type = null;
-            if (this.dataTable_all.aExtentData.currentTableData.deviceTypeId == 18) {//调压设备
+            if (data.deviceTypeId == 18) {//调压设备
                 //url = this.config.loudongtiaoyaxiang;//调压箱
                 type = 1;
-            } else if (this.dataTable_all.aExtentData.currentTableData.deviceTypeId == 20) {//调压
+            } else if (data.deviceTypeId == 20) {//调压
                 //url = this.config.loudongtiaoyagui;//调压柜
                 type = 2;
-            }else if(this.dataTable_all.aExtentData.currentTableData.deviceTypeId == 16){
+            }else if(data.deviceTypeId == 16){
                 //url = this.config.fajin;//阀井
                 type = 3;
-            }else if(this.dataTable_all.aExtentData.currentTableData.deviceTypeId == 21){
+            }else if(data.deviceTypeId == 21){
                 type = 4;
             }
             let sendPointData = {
                 typeId:type,
-                childPlanId: this.dataTable_all.aExtentData.currentTableData.id,
+                childPlanId: data.childPlanId,
                 planTempPointId: data.pointId
             }
             this.ajaxSend.sendAjax(this, sendPointData, url, this.ajaxSend.type.get, function (results) {
@@ -728,11 +515,11 @@ addSeachInfoEvent(tableDom,isCheck){
                     return;
                 }
                 let info = results.result.records[0];
-                type=info.typeId;
                 if (!info) {
                     this.toast.show("未查询到巡检登记记录！")
                     return;
                 }
+                type=info.typeId;
                 let setSize = { width: undefined, height: undefined };
                 let appendHtml = null;
                 let html = "";
@@ -934,253 +721,6 @@ addSeachInfoEvent(tableDom,isCheck){
                 this.planLayer.add(new Graphic(item, wdwSymPoint));
             })
         }
-        // let geo=null;
-        // let sym=null;
-        // if(geoJson.hasOwnProperty("paths")){
-        //     sym=this.mapSet.setGraphSymbol('polyline','#FFD700');
-        //     geo=new Polyline(geoJson);
-        // }else{
-        //     sym=this.mapSet.setGraphSymbol('point','#FFD700');
-        //     geo=new Point(geoJson);
-        // }
-        // geo.setSpatialReference(this.map.spatialReference);
-        // let graphic=new Graphic(geo,sym);
-        // this.selectLayer.add(graphic);
-        // if (graphic.geometry&&graphic.geometry.type&&graphic.geometry.type!="point"&&graphic["_extent"]) {
-        //     this.map.setExtent(graphic["_extent"]);
-        // } else {
-        //     // 定位
-        //     this.map.setZoom(9);
-        //     this.map.setExtent(graphic["_extent"]);
-        // }
-    }
-
-    /**
-     * @function 显示计划所有内容
-     * @param infos
-     */
-    showPlanSearchWithSidListPlans(infos) {
-        if (infos != null) {
-            var gxs = {
-                "polygon": [],
-                "polyline": [],
-                "point": []
-            };
-            let geometrys = [];
-            for (var i = 0; i < infos.length; i++) {
-                var info = infos[i];
-                if (info) {
-                    var device_type_id = info.device_type_id, color = [0, 255, 255, 1];
-                    if (device_type_id != "")
-                        color = this.config.DeviceSymbol[device_type_id];
-                    var pobj = null, sym = null, graphic = null;
-                    if (info.geometry == undefined) {
-                        return;
-                    }
-                    if (info.geometry.hasOwnProperty("paths")) {//线
-                        pobj = new Polyline(info.geometry);
-                        sym = this.setGraphSymbolByType("polyline", color, 2);
-                        graphic = new Graphic(pobj, sym);
-                        gxs.polyline.push(graphic);
-                    } else if (info.geometry.hasOwnProperty("rings")) {//面
-                        pobj = new Polygon(info.geometry);
-                        sym = this.setGraphSymbolByType("polygon", color, 1);
-                        graphic = new Graphic(pobj, sym);
-                        gxs.polygon.push(graphic);
-                    } else {
-                        pobj = new Point(info.geometry);
-                        sym = this.setGraphSymbolByType("point", color, 6);
-                        graphic = new Graphic(pobj, sym);
-                        gxs.point.push(graphic);
-                    }
-                    geometrys.push(pobj)
-                }
-            }
-            gxs.polygon.forEach((p, index) => {
-                this.plan_ptype_layer.add(p);
-            });
-            gxs.polyline.forEach((p, index) => {
-                this.plan_ptype_layer.add(p);
-            });
-            gxs.point.forEach((p, index) => {
-                this.plan_ptype_layer.add(p);
-            })
-            var geometry = geometryEngine.union(geometrys);
-            if(geometry.type&&geometry.type=="point"){
-                this.map.centerAt(geometry)
-            }else{
-                this.map.setExtent(geometry.getExtent());
-            }
-        }
-    }
-
-    /**
-     * @function 清除当前选中列表图层信息
-     */
-    clearCurrentTr() {
-        if (this.dynamicMapServer) {
-            this.map.removeLayer(this.dynamicMapServer);
-            this.dynamicMapServer = null;
-        }
-        if (this.plan_ptype_layer) {
-            this.plan_ptype_layer.clear();
-        }
-    }
-
-    /**
-      * @function 获取存在该类型的片区,加载到地图上
-      */
-    getAllPlanRegionToMap() {
-        let data = {
-            "current": 1,
-            "size": this.config.pagemaxsize,
-        };
-        this.ajaxSend.sendAjax(this, data, this.config.getPlanRegionList, this.ajaxSend.type.get, function (results) {
-            var that = this;
-            if (results.code != 1) {
-                that.toast.Show(results.message);
-                return;
-            }
-            this.addPolygonGraphic(results);
-        }.bind(this));
-    }
-
-    /**
-     * 添加片区结果在地图上展示
-     */
-    addPolygonGraphic(queryResult) {
-        this.plan_pontype_layer.clear();
-        for (var i = 0, length = queryResult.result.records.length; i < length; i++) {
-            var row = queryResult.result.records[i];
-            if (row.geometry == undefined || row.geometry == "") { continue; }
-            var polygon = new Polygon(JSON.parse(row.geometry));
-            var graphic = new Graphic(polygon, this.setSymbol(row.regionname)[2], "");
-            graphic.attr("id", "graphic" + i);
-            this.plan_pontype_layer.add(graphic);
-            if (row.regionname != null && row.regionname != "") {
-                //添加背景
-                var point = polygon.getExtent().getCenter();
-                var graphictextbg = new Graphic(point, this.setSymbol(row.regionname)[1].setOffset(0, -20), "");
-                this.plan_pontype_layer.add(graphictextbg);
-                //添加文字
-                var peopleTextSymbol = new TextSymbol(row.regionname);
-                peopleTextSymbol.setOffset(0, -25);
-                var font = new Font();
-                font.setSize("10pt");
-                font.setWeight(Font.WEIGHT_BOLD);
-                peopleTextSymbol.setFont(font);
-                var graphicText = new Graphic(point, peopleTextSymbol, "");
-                this.plan_pontype_layer.add(graphicText);
-            }
-        }
-    }
-
-    /**
- * @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) {
-                    if (optionType == selectType.single && index == 0) {
-                        strusers += "<option selected value='" + item.id + "'>" + item.realName + "</option>";
-                    } else {
-                        strusers += "<option  value='" + item.id + "'>" + item.realName + "</option>";
-                    }
-                }.bind(this));
-            }
-            this.domObj.find(".users").empty().append(strusers);
-        }.bind(this));
-    }
-
-    /**
-    * @function 获取巡检片区，空代表查询全部
-    * @param isall 是否全部
-    */
-    getRegion(optionType: selectType) {
-        let data = {
-            "current": 1,
-            "size": this.config.pagemaxsize
-        }
-        this.ajaxSend.sendAjax(this, data, this.config.getPlanRegionList, this.ajaxSend.type.get, function (results) {
-            var that = this;
-            if (results.code != 1) {
-                that.toast.Show(results.message);
-                return;
-            }
-            let strregion = "";
-            if (optionType == selectType.all) {
-                strregion = "<option selected value=''>全部</option>";
-            }
-            if (results.result.records.length == 0) {
-                strregion = "<option selected value=''>暂无巡检片区</option>"
-            } else {
-                $.each(results.result.records, function (index, item) {
-                    if (optionType == selectType.single && index == 0) {
-                        strregion += "<option selected value='" + item.id + "'>" + item.regionname + "</option>";
-                    } else {
-                        strregion += "<option  value='" + item.id + "'>" + item.regionname + "</option>";
-                    }
-                }.bind(this));
-            }
-            this.domObj.find(".region").empty().append(strregion);
-        }.bind(this));
     }
 
     /**
@@ -1208,33 +748,4 @@ addSeachInfoEvent(tableDom,isCheck){
         this.domObj.remove();
         this.afterDestroy();
     }
-
-    /**
-    * (方法说明)通过设备类型编号获取设备类型详情
-    * @method (方法名)
-    * @for (所属类名)
-    * @param {(参数类型)} (参数名) (参数说明)
-    * @return {(返回值类型)} (返回值说明)
-    */
-    private getDeviceType(devicetypeID) {
-        var index = _.findIndex(this.deviceTypes, function (o) { return (o["pointTypeId"] + "") == devicetypeID; });
-        if (index == -1) return null;
-        var devicetype = this.deviceTypes[index];
-        return devicetype;
-    }
-
-    private getLayerShowFieldNames(cn_layerName) {
-        var layerfields = this.AppX.runtimeConfig.fieldConfig.GetLayerFields(cn_layerName);
-        var showFields = layerfields.slice(0, 5);//默认显示前4个属性
-        //从配置中查找4个可用属性
-        for (var i = 0; i < 5; i++) {
-            var index = _.findIndex(this.config.showfieldnames, function (o: any) { return o == showFields[i].alias });
-            if (index == -1) {
-                var index2 = _.findIndex(layerfields, function (o: any) { return this.config.showfieldnames[i] == o.alias }.bind(this));
-                if (index2 != -1)
-                    showFields[i] = layerfields[index2];
-            }
-        }
-        return showFields;
-    }
 }

src/widgets/PlanSearchWithSid备份/Widget.html

@@ -0,0 +1,138 @@
+<div class='widget-PlanSearchWithSid box'>
+    <div class="PlanSearchWithSid_toolbar boxtool">
+        <div class="form-inline">
+            <div class="form-group department_btn">
+                <label for="department">任务状态</label>
+                <select class="input-sm form-control state minwidth" id="state">
+                    <option selected value=''>全部 </option>
+                    <option  value='2'>正在执行 </option>
+                    <option value='3'>已完成 </option>
+                    <option value='1'>未开始 </option>
+                    <!-- <option value='5'>申请转移(任务未开始) </option>
+                    <option value='6'>申请转移(任务正在执行) </option>
+                    <option value='7'>计划已转移 </option> -->
+                    <option value='4'>超时未完成 </option>
+                </select>
+            </div>
+            <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 for="region">片区</label>
+                <select class="input-sm form-control region minwidth" id="region"></select>
+            </div>
+            <div class="form-group">
+                <label for="region">任务创建人</label>
+                <input class="input-sm form-control createUser" id="createUser"></input>
+            </div>
+            <div class="form-group">
+                <label for="plan_begindate">巡检日期</label>
+                <input type="text" readonly="readonly" class="form-control plan_begindate minwidth" id="plan_begindate" placeholder="年-月-日">
+                <label for="plan_enddate">~</label>
+                <input type="text" readonly="readonly" class="form-control plan_enddate minwidth" id="plan_enddate" placeholder="年-月-日">
+            </div>
+            <div id="toolbar" class=" btn-group btn-group-sm toolbar">
+                <div class="form-group">
+                    <button type="button" class="btn-search">
+                        查询
+                    </button>
+                </div>
+                <!-- <div class="form-group">
+                    <button type="button" class="btn-delete">
+                        删除
+                    </button>
+                </div> -->
+                <!-- <div class="form-group">
+                    <button title="转移计划" id="btn_transplans" type="button" class="btn btn-default btn-danger btn_transplans" data-toggle="modal">
+                        <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>转移审核
+                        </button>
+                </div> -->
+            </div>
+        </div>
+    </div>
+    <div class="halfpaneltable PlanSearchWithSid_content boxcontent">
+        <table class="table table-bordered  table-striped" id='planslist_table' cellspacing="0">
+        </table>
+    </div>
+</div>
+$$
+<div class='widget-PlanSearchWithSid-Info box'>
+    <div class="returnSearchDiv">
+        <div class="form-group">
+            <label for="region">设备编码</label>
+            <input class="input-sm form-control searchCode" id="searchCode"></input>
+        </div>
+        <button type="button" class="btn btn-default btn-primary searchCodebutton">
+            <span  aria-hidden="true">计划所有设备查询
+        </button>
+        <button type="button" class="btn btn-default btn-primary searchCodebuttonByCode">
+            <span  aria-hidden="true">指定设备查看
+        </button>
+        <button type="button" class="btn btn-default btn-primary returnSearch">
+        </span>返回
+        </button>
+        <!-- <button id="btn_export" type="button" class="btn btn-sm btn-default btn-success btn_exportExcel" style="display:none !important;">
+                <span class="glyphicon glyphicon-export" aria-hidden="true"></span>导出
+        </button> -->
+    </div>
+    <div class="halfpaneltable PlanSearchWithSidInfo boxcontent">
+        <table class="table table-bordered  table-striped" id='PlanSearchWithSidInfo_table' cellspacing="0">
+            <thead></thead>
+            <tbody></tbody>
+        </table>
+    </div>
+</div>
+$$
+<div class='checkContent widget-PlanSearchWithSid-Pop'>
+<span class='checkContentInfo'></span>
+</div>
+$$
+<div class='checkContent widget-PlanSearchWithSid-Pop'>
+    <table class='table table-bordered  table-striped'  cellspacing="0">
+        <thead>
+            <tr>
+                <th>检查类型</th>
+                <th>检查结果</th>
+            </tr>
+        </thead>
+        <tbody class='checkContentInfo'></tbody>
+    </table>
+</div>
+$$
+<div class=".widget-PlanSearchWithSid-Pop">
+    <div class="title">设备设施运行、维修、保养登记表</div>
+    <div style="text-align: center;">
+        <table class="device_table" style="margin: auto;">
+            <tr>
+                <td>设备名称</td>
+                <td>型号</td>
+                <td>主要技术参数</td>
+                <td>已使用年限</td>
+            </tr>
+            <tr>
+                <td><%=totalWeight%></td>
+                <td><%=totalWeight%></td>
+                <td><%=totalWeight%></td>
+                <td><%=totalWeight%></td>
+            </tr>
+            <tr>
+                <td></td>
+                <td><%=originalValue%></td>
+            </tr>
+            <tr>
+                <td></td>
+                <td><%=originalValue%></td>
+            </tr>
+
+        </table>
+    </div>
+</div>
+$$
+<div class="check_content">
+
+</div>

src/widgets/PlanSearchWithSid备份/config.json

@@ -0,0 +1,82 @@
+{
+    "widgetUrl": "widgets/PlanSearchWithSid",
+    "tmplateUrl": "widgets/PlanSearchWithSid/Widget.html",
+    "styleUrl": "widgets/PlanSearchWithSid/css/style.css",
+    "getGroupList": "/base/department/page",
+    "getUserList": "/base/user/getUserByDepts/list",
+    "getPlanSearchWithSidList": "/zmrq/planchild/page",
+    "getMissionScheduleById": "/zmrq/planchild/geoInfo/",
+    "getDistanceInfo":"/zmrq/tfsyssetting/getSysSetting",
+    "getPlanType": "/zmrq/planpointtype/page",
+    "getPeriod": "/zmrq/planperiodtype/page",
+    "getPlanRegionList": "/zmrq/gpsregion/page",
+    "deleteMainList":"/zmrq/plan/deleteByIds",
+    "addTrans":"/zmrq/plan/checkTransfer",
+    "getRegionInfo": "/zmrq/planpoint/page",
+    "getUserPlanPointList": "/Plan/Get_Curerent_Plan_Point",
+    "getDeviceList": "/plan/RemovalList",
+    "planInfo":"/zmrq/pointInfo",
+    "loudongtiaoyaxiang":"/zmrq/xjldtyx/page",
+    "loudongtiaoyagui":"/zmrq/xjtyg/page",
+    "fajin":"/zmrq/xjfj/page",
+    "xjpage":"/zmrq/xj/page",
+    "rangeall": "00",
+    "pagetotal": 1,
+    "pagenumber": 1,
+    "pagesize": 25,
+    "pagemaxsize": 100000,
+    "RegionColor": "red",
+    "color": "blue",
+    "select_color": "purple",
+    "showfieldnames":["OBJECTID","新编号","竣工日期","长度","管径","材质","地址"],
+    "lengthfield":"SHAPE.LEN",
+    "deviceForOther": {
+        "1": {
+            "showfields": ["create_time"],
+            "showfieldnames": ["创建时间"]
+        },
+        "5": {
+            "showfields": ["troubletype", "trouble_notes", "trouble_username", "trouble_findtime"],
+            "showfieldnames": ["隐患类型", "隐患说明", "上报人", "上报时间"]
+        },
+        "6": {
+            "showfields": ["create_time"],
+            "showfieldnames": ["创建时间"]
+        }
+    },
+    "layersymbol": {
+        "1": "./widgets/PlanSearchWithSid/images/planpoint.png",
+        "5": "./widgets/PlanSearchWithSid/images/warnpoint.png"
+    },
+    "mapindex": 0,
+    "unsubmit": 6,
+    "WarnMarkPictureSymbol": "./widgets/PlanSearchWithSid/images/warnpoint.png",
+    "MarkPictureSymbol": "./widgets/PlanSearchWithSid/images/planpoint.png",
+    "MarkPictureSymbol_tyx": "./widgets/PlanSearchWithSid/images/surgetank.png",
+    "MarkPictureSymbol_tyg": "./widgets/PlanSearchWithSid/images/pressurecabinet.png",
+    "MarkPictureSymbol_fj": "./widgets/PlanSearchWithSid/images/valvedonburi.png",
+    "TextbgSymbol": "./widgets/PlanSearchWithSid/images/textbg.png",
+    "DeviceSymbol": {
+        "1": [0, 255, 255, 1],
+        "2": [0, 255, 255, 1],
+        "5": [0, 255, 255, 1],
+        "3": [0, 255, 255, 1],
+        "4": [0, 255, 255, 1],
+        "12": [0, 255, 255, 1],
+        "7": [0, 255, 255, 1],
+        "8": [0, 255, 255, 1],
+        "9": [0, 255, 255, 1],
+        "10": [0, 255, 255, 1],
+        "11": [0, 255, 255, 1],
+        "6": [0, 255, 255, 1],
+        "13": [0, 255, 255, 1],
+        "14": [0, 255, 255, 1],
+        "15": [0, 255, 255, 1],
+        "16": [0, 255, 255, 1],
+        "17": [0, 255, 255, 1],
+        "18": [0, 255, 255, 1]
+    },
+    "getLayerId":"/zmrq/sysdevicetype/page",
+    "getLayerInfo":"/zmrq/Gis/exportList"
+}
+ 

src/widgets/PlanSearchWithSid备份/css/style.scss

@@ -0,0 +1,467 @@
+.widget-PlanSearchWithSid {
+    height: 100%;
+
+    .go {
+        width: 200px;
+    }
+
+    .hide {
+        display: none;
+    }
+
+    .planInfoLook,
+    .planLocaltion,
+    .lookInfo {
+        color: rgba(0, 0, 255, 0.7) !important;
+        cursor: pointer;
+    }
+
+    .form-control {
+        padding: 4px 8px;
+    }
+
+    .PlanSearchWithSid_toolbar {
+
+        .toolbar,
+        .form-group {
+            float: left;
+            margin: 4px 0px 4px 4px
+        }
+        button{
+            min-width: 58px;
+            max-width: 100px;
+            height: 34px;
+            color: white;
+            background: #1A77E0;
+            border-radius: 3px;
+            border: none;
+            cursor: pointer;
+        }
+    }
+
+    .radio {
+        padding: 4px 8px;
+        vertical-align: middle;
+        margin: 0;
+    }
+
+    .dynamic_pagesize {
+        border-radius: 3px;
+    }
+
+    .PlanSearchWithSid_toolbar2 {
+        height: 30px;
+        margin: 4px;
+
+        .form-group {
+            float: left;
+            margin: 4px 0px 4px 4px
+        }
+    }
+
+    .widget-PlanSearchWithSid-Info {
+        .returnSearchDiv{
+            display: flex;
+            justify-content: left;
+            align-items: center;
+            .form-group{
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                padding-left: 10px;
+                margin: 0px;
+                label{
+                    margin: 0px;
+                    width: 80px;
+                }
+            }
+        }
+        button.btn.btn-default.btn-primary.returnSearch {
+            margin: 10px 0px 10px 10px;
+        }
+        button.btn.btn-default.btn-primary.searchCodebuttonByCode {
+            margin: 0px 0px 0px 10px;
+        }
+
+        table {
+            margin-bottom: 20px !important;
+
+            td,
+            th {
+                padding: 5px !important;
+            }
+        }
+
+    }
+
+    .PlanSearchWithSid_content {
+        padding-left: 4px;
+
+        table {
+            margin-bottom: 5px;
+            table-layout: fixed;
+
+            tbody {
+                border-top: 1px solid #ddd;
+            }
+
+            tr {
+                text-align: center;
+                vertical-align: middle;
+            }
+
+            th {
+                text-align: center;
+                vertical-align: middle;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+            }
+
+            td {
+                padding: 3px !important;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+
+                a:hover {
+                    cursor: pointer
+                }
+            }
+
+            // tr.active {
+            //     color: #FFF;
+            //     td {
+            //         // background-color: #337ab7 !important;
+            //     }
+            //     a {
+            //         color: #FFF;
+            //     }
+            //     a:hover {
+            //         color: #eee;
+            //     }
+            // }
+            .goto {
+                min-height: 26px;
+            }
+        }
+    }
+
+    .halfpaneltable {
+        overflow-y: auto;
+
+        tr.currentTr {
+            background: #edf4ff !important;
+        }
+    }
+
+    .PlanSearchWithSid_pagecontrol {
+        bottom: 0px;
+        width: 100%;
+        background-color: white;
+        margin-left: 4px;
+    }
+
+    .hidden {
+        display: none
+    }
+
+    .PlanSearchWithSid {
+        height: calc(100% - 46px);
+        overflow-y: auto;
+
+        .PlanSearchWithSid_infoSet {
+            height: calc(100% - 10px);
+        }
+    }
+
+    .widget-PlanSearchWithSid_planadd {
+        height: calc(100% - 8px);
+
+        .toolbar {
+            height: 46px;
+        }
+
+        .form-group {
+            float: left;
+            margin: 4px 0px 4px 4px
+        }
+    }
+
+    .widget-planregion_pointselect,
+    .widget-planregion_deviceselect {
+        height: 100%;
+
+        .setTime {
+            float: left;
+        }
+    }
+
+    .deviceslist-table {
+        width: 100%;
+    }
+
+    .deviceslist-select-table {
+        width: calc(30% - 5px);
+        float: right;
+    }
+
+    .pointlist-table,
+    .deviceslist-table,
+    .deviceslist-select-table,
+    .planregionslist-table {
+        height: calc(100% - 60px) !important;
+        overflow-y: auto;
+
+        table {
+            margin-bottom: 5px;
+            table-layout: fixed;
+
+            tbody {
+                border-top: 1px solid #ddd;
+            }
+
+            tr {
+                text-align: center;
+                vertical-align: middle;
+            }
+
+            th {
+                text-align: center;
+                vertical-align: middle;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+            }
+
+            td {
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+            }
+
+            .goto {
+                min-height: 26px;
+            }
+
+            // tr.active {
+            //     color: #FFF;
+            //     td {
+            //         overflow: hidden;
+            //         text-overflow: ellipsis;
+            //         white-space: nowrap;
+            //         background-color: #337ab7 !important;
+            //     }
+            //     a {
+            //         color: #FFF;
+            //     }
+            //     a:hover {
+            //         color: #eee;
+            //     }
+            // }
+            input[type=checkbox] {
+                margin-top: 0px !important;
+            }
+        }
+    }
+
+    .deviceslist-pagecontrol {
+        position: absolute;
+        bottom: 0px;
+        background-color: white;
+        margin-left: 4px;
+        width: 100%;
+    }
+
+    .toolbar2 {
+        display: inline-block;
+        width: 100%;
+        margin: 4px;
+    }
+
+    .point_add {
+        float: left;
+        width: 70%;
+        height: 100%;
+        margin: 4px;
+        table {
+            margin-bottom: 10px;
+        }
+    }
+
+    .point_add_info {
+        float: left;
+        width: 25%;
+        margin: 4px;
+        height: 250px;
+        overflow-y: auto;
+    }
+
+    .tianshu {
+        display: none;
+        width: 100px;
+    }
+
+    .minwidth {
+        width: 142px;
+        height: 30px;
+    }
+
+    .unsubmit {
+        color: red;
+    }
+}
+
+.SY,
+.SM,
+.SD {
+    width: 100px;
+}
+
+.timecal {
+    margin: 9px;
+}
+
+.copyplanslist-table {
+    height: calc(100% - 44px);
+
+    .goto {
+        height: 26px;
+    }
+
+    .minwidth {
+        width: 100px;
+    }
+
+    .form-control {
+        padding: 4px 8px;
+    }
+
+    tr th {
+        text-align: center !important;
+        vertical-align: middle !important;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    td {
+        text-align: center !important;
+        vertical-align: middle !important;
+        padding: 2px !important;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}
+
+.esriPopup {
+    z-index: 1;
+}
+
+.checkwidth {
+    width: 40px;
+}
+
+.widget-PlanSearchWithSid_transpopup {
+    .pathmanagement {
+        padding: 10px;
+    }
+}
+
+.widget-PlanSearchWithSid-Pop {
+    margin: 0 5px 0 5px;
+    span.checkContentInfo {
+        font-size: 16px;
+        text-align: center;
+        display: flex;
+        line-height: 36px;
+        vertical-align: middle;
+        margin-left: 0px;
+    }
+
+    span {
+        // width: calc(100% - 80px);
+        font-size: 16px;
+        text-align: left;
+        display: block;
+        // line-height: 34px;
+        vertical-align: middle;
+        margin: 0px 12px;
+    }
+    .noteOverflow{
+        //overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+    .sTitle {
+        width: 200px;
+        // text-align: right;
+        float: left;
+    }
+
+    table {
+        // position: absolute;
+        margin-top: 20px;
+        width: calc(100% - 30px);
+        left: 15px;
+        top: 70px;
+        th,
+        td {
+            text-align: center;
+            vertical-align: middle !important;
+            padding: 5px !important;
+            background-color: white;
+            min-width: 400px;
+            /* max-width: 200px; */
+            min-height: 25px;
+            word-wrap: break-word;
+            border: 1px solid #ddd;
+        }
+    }
+
+    .fileInfoList {
+        // background-color: #e9ecef;
+        text-align: left;
+        border-radius: 10px;
+        width: 100%;
+
+        .photo {
+            margin-left: 12px;
+            float: none;
+            // text-align: right;
+        }
+
+        .fileItemUl {
+            border-radius: 10px;
+            background-color: #e9ecef;
+            position: relative;
+            float: left;
+            width: calc(100% - 20px);
+            margin-left: 10px;
+        }
+
+        .fileInfoListItem {
+            list-style: none;
+            margin: 0px;
+            padding: 0px;
+
+            li {
+                float: left;
+                padding: 10px;
+
+                img {
+                    width: 80px;
+                    // border-radius: 20px;
+                    cursor: pointer;
+                }
+
+                a {
+                    color: rgba(0, 0, 255, 0.7) !important;
+                    cursor: pointer;
+                }
+            }
+
+        }
+    }
+}

src/widgets/Search/Widget.ts

@@ -6,7 +6,7 @@ import FindTask = require("esri/tasks/FindTask");
 import Query = require("esri/tasks/query");
 import QueryTask = require("esri/tasks/QueryTask");
 import FindParameters = require("esri/tasks/FindParameters");
-
+import xjInfoShow from "widgets/AttributeAnnotation/xjInfoShow";
 // import watchUtils = require("esri/core/watchUtils");
 import Popup = require("esri/dijit/Popup");
 import PopupTemplate = require("esri/dijit/PopupTemplate");
@@ -30,6 +30,8 @@ class Search extends BaseWidget {
     private moreResultsId: string = "show_more_results";
     private results: any[] = [];
     private resultsSelectedIndex: number = 0;
+    private className='xjSeachWindowInfoShowbySid';
+    private  queryLayerId="";
     private css = {
         base: "widget-search-popup",
         hasValue: "widget-search--has-value",
@@ -349,6 +351,7 @@ class Search extends BaseWidget {
         var url = this.AppX.appConfig.gisResource[this.currentFilterType.queryurl].config[0].url;
         //var find: FindTask = new FindTask(url);
         var querUrl = url +"/"+ this.currentFilterType.layerids[0];
+        this.queryLayerId=this.currentFilterType.layerids[0];
         var queryTask = new QueryTask(querUrl);
         var query: Query = new Query();
         query.returnGeometry = true;
@@ -426,6 +429,16 @@ class Search extends BaseWidget {
         this.map.infoWindow.setContent(mixedTemplate);
         this.map.infoWindow.show(point);
         this.zoomToCenter(point);
+        $("."+this.className).off().click(e=>{
+            if(selectedItem){
+                let searchSid=(selectedItem.attributes["SID"]||selectedItem.attributes["sid"])||selectedItem.attributes["唯一编号"]||selectedItem.attributes["CODE"]||selectedItem.attributes["code"]||selectedItem.attributes["OBJECTID"];
+                let searchCode=((selectedItem.attributes["CODE"]||selectedItem.attributes["code"])||selectedItem.attributes["设备编码"])||selectedItem.attributes["objectid"];
+                // let searchSid=(selectedItem.attributes["SID"]||selectedItem.attributes["sid"])||selectedItem.attributes["唯一编号"]||selectedItem.attributes["CODE"]||selectedItem.attributes["code"]||selectedItem.attributes["OBJECTID"];
+                // let searchCode=((selectedItem.attributes["CODE"]||selectedItem.attributes["code"])||selectedItem.attributes["设备编码"])||selectedItem.attributes["objectid"];
+                let layerId=this.queryLayerId;
+                xjInfoShow.showXjInfo({sid:searchSid,code:searchCode,layerId})
+            }
+         })
         // this.initEventHandler();
         this.initPopupHander();
     }
@@ -585,6 +598,7 @@ class Search extends BaseWidget {
         html += "<p>地址:"+result.attributes.ADDR+"</p>";
         html += "<p>开关状态:"+result.attributes.STATUS_C+"</p>";
         html += "<p>设施状态:"+result.attributes.STATUS+"</p>";
+        html+=("<p>巡检信息:<span class='"+this.className+"'>详情查看</span></p>")
         // html += "<div class=\"" + this.css.moreResultsLatLonHeader + "\">" + strings + "</div>";
         // html += originalCoords;
         // html += "</div>";

src/widgets/Search/css/style.scss

@@ -106,3 +106,8 @@
 .widget-search__more-results--show-more-results .widget-search__more-results-list {
     display: block;
 }
+.xjSeachWindowInfoShowbySid{
+    font-size: 12px;
+    color: rgb(63, 119, 187);
+    cursor: pointer;
+}

src/widgets/SiteDispatchAction/Widget.ts

@@ -149,7 +149,7 @@ class SiteDispatchAction extends BaseWidget {
     rushReport(results) {
         if (this.ajaxSend.checkResults(this, results)) {
             this.popup.close();
-            this.toast.show("探测确认成功！");
+            this.toast.show("执行成功！");
             this.getpipeRecordList();
         }
     }

src/widgets/SiteMonitoringReport/Widget.ts

@@ -227,7 +227,7 @@ class SiteMonitoringReport extends BaseWidget {
             for (var i = 0; i < results.result.length; i++) {
                 var info = results.result[i];
                 if(info['patrolDays']&&info['patrolOverRate']){
-                    info['realPatrolNum']=Math.ceil(info['patrolDays']/(info['patrolOverRate']/100)); 
+                    info['realPatrolNum']=parseInt((info['patrolDays']/(info['patrolOverRate']/100)).toFixed(0)); 
                 }else{
                     info['realPatrolNum']=0; 
                 }

src/widgets/XJPathAnalysis/Widget.ts

@@ -313,7 +313,7 @@ class XJPathAnalysis extends BaseWidget {
             analysisPathGraphicLayer.clear();
             var analysisPointGraphicLayer = <GraphicsLayer>this.map.getLayer("analysisPointGraphicLayer");
             analysisPointGraphicLayer.clear();
-            this.requestPathAnalysisResult(1, 100000, this.queryData.userid, this.queryData.date + " " + this.queryData.startTime, this.queryData.date + " " + this.queryData.endTime, this.addPathToMap.bind(this));
+            this.requestPathAnalysisResult(1, 10000, this.queryData.userid, this.queryData.date + " " + this.queryData.startTime, this.queryData.date + " " + this.queryData.endTime, this.addPathToMap.bind(this));
             //分页显示分析结果
             this.pageIndex = 1;
             this.pageSize = 25;
@@ -449,7 +449,7 @@ class XJPathAnalysis extends BaseWidget {
                         "pointInfo": {
                             "x": guiji[i].locationX, //轨迹点经度
                             "y": guiji[i].locationY,//轨迹点纬度
-                            "checkTime": guiji[i].checkTime,//轨迹点手机检测时间
+                            "checkTime": guiji[i].gpstime,//轨迹点手机检测时间
                             "timeSpan": guiji[i].gpsTimespan,//距离上一个点耗时
                             "distance": guiji[i].distance == null ? 0 : guiji[i].distance,//距离上一个点距离
                             "speed": guiji[i].speed,//速度