11

src/configure.ts

@@ -36,6 +36,7 @@ var AppX = {
         "userSkyBox": "",
         "usertoken": "",
         "userMusicId": "",
+        "apirootx":'scada',
         "userlevel": "",//当前用户系统权限级别
         "collisionDetection": false,//碰撞检测
         "handlers": {},//所有事件
@@ -2031,7 +2032,7 @@ var AppX = {
                     {
                         "key": "createversion",
                         "name": "版本创建",
-                        "url": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/TFSDEVersion/GPServer/TFCreateVersion",
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/TFCreateVersion/GPServer/TFCreateVersion",
                     }
                 ]
             },
@@ -2041,7 +2042,7 @@ var AppX = {
                     {
                         "key": "deleteversion",
                         "name": "版本创建",
-                        "url": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/TFSDEVersion/GPServer/TFDeleteVersion",
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/TFDeleteVersion/GPServer/TFDeleteVersion",
                     }
                 ]
             },

src/widgets/BaseMap/Widget.ts

@@ -78,7 +78,10 @@ class BaseMap extends BaseWidget {
                     var url = this.AppX.appConfig.gisResource[layername].config[index].url;
                     var layerAlias = this.AppX.appConfig.gisResource[layername].config[index].name;
                     if (this.AppX.appConfig.gisResource[layername].type == "tiled") {
-                        var tileLayer = new ArcGISTiledMapServiceLayer(url, { className: "tileLayer" });
+                        var tileLayer = new ArcGISTiledMapServiceLayer(url, { 
+                            className: "tileLayer",
+                            // displayLevels:[0, 1, 2, 3, 4, 5, 6, 7,8,9,10,11] 
+                        });
                         tileLayer.id = layername + "_" + index;
                         if (this.config.baselayers.indexOf(layername) != -1) {//基础底图放置在最下层
                             // 设置默认关闭影像底图

src/widgets/DataPanel/Data2Table.ts

@@ -22,6 +22,7 @@ const nullValue = "<空>";
 
 // 数据转表格格式
 export = function Data2Table(data) {
+    debugger
     switch (true) {
         case (data === undefined || data === null):
             // 数据为空

src/widgets/DataPanel/Widget.ts

@@ -77,7 +77,7 @@ class DataPanel extends BaseWidget {
     isFold = true;
     /** 暂存变量 */
     data: Data = null;
-
+    Total:true;
     // 启动函数
     startup() {
         let currentSelector = this.AppX.appConfig.mainContainerMinor;
@@ -296,7 +296,13 @@ class DataPanel extends BaseWidget {
 
     // 废弃的命名方法，此处做兼容
     show(data) {
-        this.Show(data);
+        if(data.data){
+            this.Total = data.Total;
+            this.Show(data.data);
+        }else{
+            this.Show(data);
+        }
+
     }
     // 展示数据面板方法
     public Show(sourceData: any) {
@@ -364,7 +370,7 @@ class DataPanel extends BaseWidget {
     */
     createTable(tableObj: JQuery, dataTab: DataTabs) {
         //添加总计
-        if (dataTab.table.tbody.length > 1) {
+        if (dataTab.table.tbody.length > 1 && this.Total) {
             let total = 0;
             dataTab.table.tbody.forEach(item => {
                 total += parseFloat(item[item.length - 1] + "");
@@ -388,9 +394,9 @@ class DataPanel extends BaseWidget {
             "order": [[dataTab.table.tbody[0].length - 1, "desc"]],
             dom: 't' +
                 '     <"row"' +
-                '           <"col-3 information"ri>' +
+                '           <"col-1 information"ri>' +
                 '           <"col-1 length-changing"l>' +
-                '           <"col-4 col-sm-6 col-md-8 pull-right pagination"p>' +
+                '           <"col-5 col-sm-6 col-md-8 pull-right pagination"p>' +
                 '     >',
             language: {
                 "lengthMenu": "每页 _MENU_ 条",
@@ -627,6 +633,8 @@ class DataPanel extends BaseWidget {
         param.objectIds = objectids.join(",");
         param.returnGeometry = false;
         param.outFields = "*";
+        //lgq注释
+        //加上outFields之后会出现不返回objectid的bug,所以用 param.outFields = "*" 代替
         if (dataTab.outFields)
             param.outFields = dataTab.outFields.join(',');
         if (!dataTab.objectidVisible) {
@@ -634,6 +642,7 @@ class DataPanel extends BaseWidget {
                 param.outFields = "OBJECTID," + param.outFields;//手动添加objectid字段，用于排序。
             }
         }
+
         param.returnIdsOnly = false;
         param.f = "json";
         $.ajax({
@@ -715,7 +724,7 @@ class DataPanel extends BaseWidget {
     * @return {(返回值类型)} (返回值说明)
     */
     queryCurrenPageData(queryurl, param, dataTab, callback) {
-        // param.orderByFields = undefined;
+        param.outFields = "*";//将outFields重置为返回所有字段
         $.ajax({
             type: "POST",
             url: queryurl,
@@ -730,10 +739,13 @@ class DataPanel extends BaseWidget {
                 var tbodyData = [];
                 //根据结果进行渲染
                 var currentobjectids = param.objectIds.split(',');
-                for (var i = 0; i < result.features.length; i++) {
-                    var index = _.findIndex(currentobjectids, function (item: any) { return item == result.features[i].attributes["OBJECTID"] });
+                //var objectid = parseInt(currentobjectids[i]);
+                 //   var index = _.findIndex(response.features, function (item: any) { return item.attributes["OBJECTID"] == objectid });
+                for (var i = 0; i < currentobjectids.length; i++) {
+                    var objectid = parseInt(currentobjectids[i]);
+                    var index = _.findIndex(result.features, function (item: any) { return item.attributes["OBJECTID"] == objectid});
                     if (index != -1) {
-                        var feature = result.features[i];
+                        var feature = result.features[index];
                         var row = [];
                         var val = null;
                         if (dataTab.outFields != null) {
@@ -864,9 +876,9 @@ class DataPanel extends BaseWidget {
                 ulhtml += "<ul class='pictureUl' style='display:none'>"
             }
             if (index < 2) {
-                ulhtml += "<li class='pictureLi'><img class='pictureImg' src='" +  this.apiRoot + "/base/file/loadImg?remotePath=" + item3 + "&access_token=" + this.userToken + "'></li>"
+                ulhtml += "<li class='pictureLi'><img class='pictureImg' src='" +  this.apiRoot + "/base2/file/loadImg?remotePath=" + item3 + "&access_token=" + this.userToken + "'></li>"
             } else {
-                ulhtml += "<li class='pictureLi' style='display:none'><img class='pictureImg' src='" +  this.apiRoot + "/base/file/loadImg?remotePath=" + item3 + "&access_token=" + this.userToken + "'></li>"
+                ulhtml += "<li class='pictureLi' style='display:none'><img class='pictureImg' src='" +  this.apiRoot + "/base2/file/loadImg?remotePath=" + item3 + "&access_token=" + this.userToken + "'></li>"
             }
             if (index == imgList.length - 1) {
                 ulhtml += "</ul>"

src/widgets/DataPanel/css/style.scss

@@ -261,7 +261,7 @@
     .length-changing {
         margin: 10px 0px;
         label {
-            color: #ffffff;
+            color: #000000;
         }
         select {
             // background: url(../images/selectback.png) no-repeat right 0 center !important;

src/widgets/Fufengzhan/config.json

@@ -1,4 +1,4 @@
 {
-    "modelurl":"http://localhost:8021/",
+    "modelurl":"http://218.200.166.203:8035/ghrq3d/",
     "dataUrl":"/gis/scada/realData"
 }

src/widgets/MissionSchedule/Widget.html

@@ -32,11 +32,11 @@
                         新增
                     </button>
                 </div>
-                <!-- <div class="form-group">
+                <div class="form-group">
                     <button title="删除计划" id="btn_deleteplans" type="button" class="btn_deleteplans" data-toggle="modal">
                         删除
                     </button>
-                </div> -->
+                </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>转移

src/widgets/MissionSchedule/Widget.ts

@@ -115,8 +115,8 @@ class MissionSchedule extends BaseWidget {
         this.ajaxSend = new AjaxSend();
         this.loadWait = this.AppX.runtimeConfig.loadWait;
         if (this.AppX.appConfig.gisResource.filterMapRQ.config.length > 0) {
-            this.analyzeUrl = this.AppX.appConfig.gisResource.filterMapRQ.config[2].url;
-            this.mapServerUrl = this.AppX.appConfig.gisResource.filterMapRQ.config[3].url;
+            this.analyzeUrl = this.AppX.appConfig.gisResource.filterMapRQ.config['filterMapRQ3'].url;
+            this.mapServerUrl = this.AppX.appConfig.gisResource.filterMapRQ.config['filterMapRQ4'].url;
         } else {
             this.toast.show("图层过滤服务未配置");
         }
@@ -158,11 +158,11 @@ class MissionSchedule extends BaseWidget {
         this.setHtml(html);
         this.ready();
         //单选下拉框
-    	$('.planlinetype').multiselect({
-    		nonSelectedText: '请选择',
-    		enableFiltering: true,
-    		buttonWidth: '350px'
-    	});
+        $('.planlinetype').multiselect({
+            nonSelectedText: '请选择',
+            enableFiltering: true,
+            buttonWidth: '350px'
+        });
     }
 
     /**
@@ -724,6 +724,282 @@ class MissionSchedule extends BaseWidget {
             this.initEventVal();
         }.bind(this));
     }
+    queryPipes(geometry: any) {
+        var url = this.AppX.appConfig.gisResource.pipe.config[this.config.mapindex].url;//pipe
+        if (this.addData.deviceTypeIds.split(",").length > 1) {
+            var device_Type_Ids = this.addData.deviceTypeIds.split(",");
+            var forCounter = 0;//for循环计数
+            var forGpCounter = 0;
+            var layernameStr = [];
+            //var objectIdsStr = {};
+            var outfields = null;
+            this.objectIdsStr = {};
+            this.loadWait.show("正在查询选择" + this.current_device_type_name + "信息，请等待...", this.domObj);
+            for (let i = 0; i < device_Type_Ids.length; i++) {
+                var obj = this.getDeviceType(device_Type_Ids[i]);
+                var fields = this.getLayerShowFieldNames(obj.cnContactLayerName);
+
+                var where = obj.sqlfilter;
+                var param = { "where": where, "spatialRel": "esriSpatialRelIntersects", "returnGeometry": false, "geometryType": "esriGeometryPolygon", "geometry": JSON.stringify(geometry), "returnIdsOnly": true, "f": "json" };
+                $.ajax({
+                    type: "POST",
+                    url: url + "/" + obj.contactLayerId + "/query",
+                    cache: false,
+                    async: false,//用同步请求来解决返回数据顺序问题
+                    data: param,
+                    dataType: "json",
+                    success: function (response) {
+                        forCounter++;
+                        if (response.error !== undefined) {
+                            this.AppX.runtimeConfig.toast.Show("查询失败，请联系管理员");
+                            return;
+                        }
+                        outfields = fields.map(e => { return e.name });
+
+                        if (!response.objectIds) {
+                            //this.loadWait.hide();
+                            //objectIdsStr[forCounter-1] = "无objectid"
+                            //return;
+                        } else {
+                            var objid = this.getDeviceType(device_Type_Ids[forCounter - 1]);
+                            layernameStr.push(objid.cnContactLayerName);
+                            //let data = _.union(response.objectIds, this.objectids);
+                            this.objectIdsStr[objid.cnContactLayerName] = response.objectIds.join();
+                        }
+                        //let layerName = "";
+
+                        if (forCounter == device_Type_Ids.length) {
+                            this.gp = new Geoprocessor(this.analyzeUrl);
+                            var objStr = "";
+                            for (var i in this.objectIdsStr) {
+                                objStr += this.objectIdsStr[i] + ";"
+                            }
+                            //this.objectids = data;
+                            this.addData.objectIds = objStr;
+                            //此次gp服务，管线图层查询是传入图层名称必须是管线
+
+                            // if (obj.cnContactLayerName.indexOf('管线') == -1) {
+                            //
+                            // } else {
+                            //     layerName = '管线';
+                            // }
+                            var options = {
+                                "layername": layernameStr.join(","),
+                                "objectids": objStr,
+                                "outfields": outfields.join(","),
+                                usertoken: this.AppX.appConfig.gisToken
+                            };
+                            var delayResult = this.gp.submitJob(
+                                options,
+                                function (jobinfo) {
+                                    //forGpCounter++;
+                                    if (this.dynamicMapServer) {
+                                        this.map.removeLayer(this.dynamicMapServer);
+                                        this.dynamicMapServer = null;
+                                    }
+                                    let mapServerUrl = this.mapServerUrl + "/jobs/" + jobinfo.jobId;
+                                    for (let k = 0; k < device_Type_Ids.length; k++) {
+                                        var gpCounterId = this.getDeviceType(device_Type_Ids[k]);
+                                        this.gisUrlList[gpCounterId.cnContactLayerName] = url + "/" + gpCounterId.contactLayerId + "/query";
+                                    }
+
+                                    //this.addData.gisUrl = url + "/" + obj.contactLayerId + "/query";
+
+                                    $.ajax({
+                                        type: "get",
+                                        dataType: "json",
+                                        url: this.analyzeUrl + "/jobs/" + jobinfo.jobId + "/" + jobinfo.results.summary.paramUrl + "?f=pjson",
+                                        success: function (result) {
+                                            var pipeTypeLength = "";
+                                            if (result.value.result) {
+                                                for (let j = 0; j < result.value.result.summary.layersummary.length; j++) {
+                                                    pipeTypeLength += result.value.result.summary.layersummary[j].layername + ":" + result.value.result.summary.layersummary[j].length + "米;"
+                                                }
+                                                this.domObj.find(".pipeTypeLength").text(pipeTypeLength);
+                                            } else {
+                                                this.domObj.find(".pipeTypeLength").text(result.value.message);
+                                            }
+
+                                        }.bind(this)
+                                    })
+                                    this.dynamicMapServer = new ArcGISDynamicMapServiceLayer(mapServerUrl);
+                                    this.dynamicMapServer.id = this.preLayerId + "dynamicMapServer";
+                                    this.map.addLayer(this.dynamicMapServer);
+                                    this.addSelectItems_more(this);
+                                    this.loadWait.hide();
+                                }.bind(this),
+                                function (jobinfo) {
+                                    this.jobid = jobinfo.jobId;
+                                }.bind(this),
+                                function (jobinfo) {
+                                    this.AppX.runtimeConfig.toast.show("分析失败，请联系管理员");
+                                    this.loadWait.hide();
+                                    console.error(jobinfo);
+                                }.bind(this)
+                            );
+                        }
+
+                    }.bind(this),
+                    error: function (results) {
+                        forCounter++;
+                        this.loadWait.hide();
+                        this.toast.Show("查询片区巡检信息出错！");
+                        return;
+                        // forCounter++;
+                        // //this.loadWait.hide();
+                        // this.toast.Show("查询片区巡检信息出错！");
+                        // var objid = this.getDeviceType(device_Type_Ids[forCounter-1]);
+
+
+                        // if(forCounter == device_Type_Ids.length){
+                        //     this.gp = new Geoprocessor(this.analyzeUrl);
+                        //     for(var i in this.objectIdsStr){
+                        //         this.objectids += this.objectIdsStr[i]+";"
+                        //     }
+                        // //this.objectids = data;
+                        // this.addData.objectIds = this.objectids;
+                        // //此次gp服务，管线图层查询是传入图层名称必须是管线
+
+                        // // if (obj.cnContactLayerName.indexOf('管线') == -1) {
+                        // //
+                        // // } else {
+                        // //     layerName = '管线';
+                        // // }
+                        // var options = {
+                        //     "layername": layernameStr.join(","),
+                        //     "objectids": this.objectids,
+                        //     "outfields": outfields.join(","),
+                        //     usertoken: this.AppX.appConfig.gisToken
+                        // };
+                        // var delayResult = this.gp.submitJob(
+                        //     options,
+                        //     function (jobinfo) {
+                        //         if (this.dynamicMapServer) {
+                        //             this.map.removeLayer(this.dynamicMapServer);
+                        //             this.dynamicMapServer = null;
+                        //         }
+                        //         let mapServerUrl = this.mapServerUrl + "/jobs/" + jobinfo.jobId;
+                        //         //this.addData.gisUrl = url + "/" + obj.contactLayerId + "/query";
+                        //         for(let k =0;k<device_Type_Ids.length;k++){
+                        //             var gpCounterId = this.getDeviceType(device_Type_Ids[k]);
+                        //             this.gisUrlList[gpCounterId.cnContactLayerName] = url + "/" + gpCounterId.contactLayerId + "/query";
+                        //         }
+                        //         //this.gisUrlList[objid.cnContactLayerName] = url + "/" + objid.contactLayerId + "/query";
+                        //         $.ajax({
+                        //             type: "get",
+                        //             dataType: "json",
+                        //             url: this.analyzeUrl + "/jobs/" + jobinfo.jobId + "/" + jobinfo.results.summary.paramUrl + "?f=pjson",
+                        //             success: function (result) {
+                        //                 this.domObj.find(".pipeTypeLength").text(result.value.result.summary.layersummary[0].length);
+                        //             }.bind(this)
+                        //         })
+                        //         this.dynamicMapServer = new ArcGISDynamicMapServiceLayer(mapServerUrl);
+                        //         this.dynamicMapServer.id = this.preLayerId + "dynamicMapServer";
+                        //         this.map.addLayer(this.dynamicMapServer);
+                        //         this.addSelectItems_more(this);
+                        //         this.loadWait.hide();
+                        //     }.bind(this),
+                        //     function (jobinfo) {
+                        //         this.jobid = jobinfo.jobId;
+                        //     }.bind(this),
+                        //     function (jobinfo) {
+                        //         this.AppX.runtimeConfig.toast.show("分析失败，请联系管理员");
+                        //         this.loadWait.hide();
+                        //         console.error(jobinfo);
+                        //     }.bind(this)
+                        // );
+                        // }
+                    }.bind(this)
+                });
+            }
+        } else {
+            var Material = this.domObj.find(".MATERIAL option:selected").val()
+            var obj = this.getDeviceType(this.addData.deviceTypeIds);
+            var fields = this.getLayerShowFieldNames(obj.cnContactLayerName);
+            this.loadWait.show("正在查询选择" + this.current_device_type_name + "信息，请等待...", this.domObj);
+            var where;
+            if (obj.sqlfilter) {
+                where = '(' + obj.sqlfilter + ')';
+                if (Material != '') where += ` and MATERIAL='${Material}'`
+            } else {
+                if (Material) where = `MATERIAL='${Material}'`
+            }
+
+            var param = { "where": where, "spatialRel": "esriSpatialRelIntersects", "returnGeometry": false, "geometryType": "esriGeometryPolygon", "geometry": JSON.stringify(geometry), "returnIdsOnly": true, "f": "json" };
+            $.ajax({
+                type: "POST",
+                url: url + "/" + obj.contactLayerId + "/query",
+                cache: false,
+                data: param,
+                dataType: "json",
+                success: function (response) {
+                    if (response.error !== undefined) {
+                        this.AppX.runtimeConfig.toast.Show("查询失败，请联系管理员");
+                        return;
+                    }
+                    let outfields = fields.map(e => { return e.name })
+                    if (!response.objectIds) {
+                        this.loadWait.hide();
+                        return;
+                    }
+                    this.gp = new Geoprocessor(this.analyzeUrl);
+                    let data = _.union(response.objectIds, this.objectids);
+                    this.objectids = data;
+                    this.addData.objectIds = _.join(this.objectids, ",");
+                    //此次gp服务，管线图层查询是传入图层名称必须是管线
+                    let layerName = "";
+                    layerName = obj.cnContactLayerName;
+                    // if (obj.cnContactLayerName.indexOf('管线') == -1) {
+                    //
+                    // } else {
+                    //     layerName = '管线';
+                    // }
+                    var options = {
+                        "layername": layerName,
+                        "objectids": this.objectids.join(","),
+                        "outfields": outfields.join(","),
+                        usertoken: this.AppX.appConfig.gisToken
+                    };
+                    var delayResult = this.gp.submitJob(
+                        options,
+                        function (jobinfo) {
+                            if (this.dynamicMapServer) {
+                                this.map.removeLayer(this.dynamicMapServer);
+                                this.dynamicMapServer = null;
+                            }
+                            let mapServerUrl = this.mapServerUrl + "/jobs/" + jobinfo.jobId;
+                            this.addData.gisUrl = url + "/" + obj.contactLayerId + "/query";
+                            $.ajax({
+                                type: "get",
+                                dataType: "json",
+                                url: this.analyzeUrl + "/jobs/" + jobinfo.jobId + "/" + jobinfo.results.summary.paramUrl + "?f=pjson",
+                                success: function (result) {
+                                    this.domObj.find(".pipeTypeLength").text(result.value.result.summary.layersummary[0].length);
+                                }.bind(this)
+                            })
+                            this.dynamicMapServer = new ArcGISDynamicMapServiceLayer(mapServerUrl);
+                            this.dynamicMapServer.id = this.preLayerId + "dynamicMapServer";
+                            this.map.addLayer(this.dynamicMapServer);
+                            this.addSelectItems(this);
+                            this.loadWait.hide();
+                        }.bind(this),
+                        function (jobinfo) {
+                            this.jobid = jobinfo.jobId;
+                        }.bind(this),
+                        function (jobinfo) {
+                            this.AppX.runtimeConfig.toast.show("分析失败，请联系管理员");
+                            this.loadWait.hide();
+                            console.error(jobinfo);
+                        }.bind(this)
+                    );
+                }.bind(this),
+                error: function (results) {
+                    this.loadWait.hide();
+                    this.toast.Show("查询片区巡检信息出错！");
+                }.bind(this)
+            });
+        }
+    };
     //设备选择 完成新增计划
     initEvent4() {
         if (this.addData.geoType == 1) {
@@ -967,280 +1243,282 @@ class MissionSchedule extends BaseWidget {
                 }
                 geometry = geometryEngine.intersect(this.currentRegionPolygon, evt.geometry);
                 this.drawToolbar.deactivate();
-                var url = this.AppX.appConfig.gisResource.pipe.config[this.config.mapindex].url;//pipe
-                if (this.addData.deviceTypeIds.split(",").length > 1) {
-                    var device_Type_Ids = this.addData.deviceTypeIds.split(",");
-                    var forCounter = 0;//for循环计数
-                    var forGpCounter = 0;
-                    var layernameStr = [];
-                    //var objectIdsStr = {};
-                    var outfields = null;
-                    this.objectIdsStr = {};
-                    this.loadWait.show("正在查询选择" + this.current_device_type_name + "信息，请等待...", this.domObj);
-                    for (let i = 0; i < device_Type_Ids.length; i++) {
-                        var obj = this.getDeviceType(device_Type_Ids[i]);
-                        var fields = this.getLayerShowFieldNames(obj.cnContactLayerName);
-
-                        var where = obj.sqlfilter;
-                        var param = { "where": where, "spatialRel": "esriSpatialRelIntersects", "returnGeometry": false, "geometryType": "esriGeometryPolygon", "geometry": JSON.stringify(geometry), "returnIdsOnly": true, "f": "json" };
-                        $.ajax({
-                            type: "POST",
-                            url: url + "/" + obj.contactLayerId + "/query",
-                            cache: false,
-                            async: false,//用同步请求来解决返回数据顺序问题
-                            data: param,
-                            dataType: "json",
-                            success: function (response) {
-                                forCounter++;
-                                if (response.error !== undefined) {
-                                    this.AppX.runtimeConfig.toast.Show("查询失败，请联系管理员");
-                                    return;
-                                }
-                                outfields = fields.map(e => { return e.name });
-
-                                if (!response.objectIds) {
-                                    //this.loadWait.hide();
-                                    //objectIdsStr[forCounter-1] = "无objectid"
-                                    //return;
-                                } else {
-                                    var objid = this.getDeviceType(device_Type_Ids[forCounter - 1]);
-                                    layernameStr.push(objid.cnContactLayerName);
-                                    //let data = _.union(response.objectIds, this.objectids);
-                                    this.objectIdsStr[objid.cnContactLayerName] = response.objectIds.join();
-                                }
-                                //let layerName = "";
-
-                                if (forCounter == device_Type_Ids.length) {
-                                    this.gp = new Geoprocessor(this.analyzeUrl);
-                                    var objStr = "";
-                                    for (var i in this.objectIdsStr) {
-                                        objStr += this.objectIdsStr[i] + ";"
-                                    }
-                                    //this.objectids = data;
-                                    this.addData.objectIds = objStr;
-                                    //此次gp服务，管线图层查询是传入图层名称必须是管线
-
-                                    // if (obj.cnContactLayerName.indexOf('管线') == -1) {
-                                    //
-                                    // } else {
-                                    //     layerName = '管线';
-                                    // }
-                                    var options = {
-                                        "layername": layernameStr.join(","),
-                                        "objectids": objStr,
-                                        "outfields": outfields.join(","),
-                                        usertoken: this.AppX.appConfig.gisToken
-                                    };
-                                    var delayResult = this.gp.submitJob(
-                                        options,
-                                        function (jobinfo) {
-                                            //forGpCounter++;
-                                            if (this.dynamicMapServer) {
-                                                this.map.removeLayer(this.dynamicMapServer);
-                                                this.dynamicMapServer = null;
-                                            }
-                                            let mapServerUrl = this.mapServerUrl + "/jobs/" + jobinfo.jobId;
-                                            for (let k = 0; k < device_Type_Ids.length; k++) {
-                                                var gpCounterId = this.getDeviceType(device_Type_Ids[k]);
-                                                this.gisUrlList[gpCounterId.cnContactLayerName] = url + "/" + gpCounterId.contactLayerId + "/query";
-                                            }
-
-                                            //this.addData.gisUrl = url + "/" + obj.contactLayerId + "/query";
-
-                                            $.ajax({
-                                                type: "get",
-                                                dataType: "json",
-                                                url: this.analyzeUrl + "/jobs/" + jobinfo.jobId + "/" + jobinfo.results.summary.paramUrl + "?f=pjson",
-                                                success: function (result) {
-                                                    var pipeTypeLength = "";
-                                                    if (result.value.result) {
-                                                        for (let j = 0; j < result.value.result.summary.layersummary.length; j++) {
-                                                            pipeTypeLength += result.value.result.summary.layersummary[j].layername + ":" + result.value.result.summary.layersummary[j].length + "米;"
-                                                        }
-                                                        this.domObj.find(".pipeTypeLength").text(pipeTypeLength);
-                                                    } else {
-                                                        this.domObj.find(".pipeTypeLength").text(result.value.message);
-                                                    }
-
-                                                }.bind(this)
-                                            })
-                                            this.dynamicMapServer = new ArcGISDynamicMapServiceLayer(mapServerUrl);
-                                            this.dynamicMapServer.id = this.preLayerId + "dynamicMapServer";
-                                            this.map.addLayer(this.dynamicMapServer);
-                                            this.addSelectItems_more(this);
-                                            this.loadWait.hide();
-                                        }.bind(this),
-                                        function (jobinfo) {
-                                            this.jobid = jobinfo.jobId;
-                                        }.bind(this),
-                                        function (jobinfo) {
-                                            this.AppX.runtimeConfig.toast.show("分析失败，请联系管理员");
-                                            this.loadWait.hide();
-                                            console.error(jobinfo);
-                                        }.bind(this)
-                                    );
-                                }
-
-                            }.bind(this),
-                            error: function (results) {
-                                forCounter++;
-                                this.loadWait.hide();
-                                this.toast.Show("查询片区巡检信息出错！");
-                                return;
-                                // forCounter++;
-                                // //this.loadWait.hide();
-                                // this.toast.Show("查询片区巡检信息出错！");
-                                // var objid = this.getDeviceType(device_Type_Ids[forCounter-1]);
-
-
-                                // if(forCounter == device_Type_Ids.length){
-                                //     this.gp = new Geoprocessor(this.analyzeUrl);
-                                //     for(var i in this.objectIdsStr){
-                                //         this.objectids += this.objectIdsStr[i]+";"
-                                //     }
-                                // //this.objectids = data;
-                                // this.addData.objectIds = this.objectids;
-                                // //此次gp服务，管线图层查询是传入图层名称必须是管线
-
-                                // // if (obj.cnContactLayerName.indexOf('管线') == -1) {
-                                // //
-                                // // } else {
-                                // //     layerName = '管线';
-                                // // }
-                                // var options = {
-                                //     "layername": layernameStr.join(","),
-                                //     "objectids": this.objectids,
-                                //     "outfields": outfields.join(","),
-                                //     usertoken: this.AppX.appConfig.gisToken
-                                // };
-                                // var delayResult = this.gp.submitJob(
-                                //     options,
-                                //     function (jobinfo) {
-                                //         if (this.dynamicMapServer) {
-                                //             this.map.removeLayer(this.dynamicMapServer);
-                                //             this.dynamicMapServer = null;
-                                //         }
-                                //         let mapServerUrl = this.mapServerUrl + "/jobs/" + jobinfo.jobId;
-                                //         //this.addData.gisUrl = url + "/" + obj.contactLayerId + "/query";
-                                //         for(let k =0;k<device_Type_Ids.length;k++){
-                                //             var gpCounterId = this.getDeviceType(device_Type_Ids[k]);
-                                //             this.gisUrlList[gpCounterId.cnContactLayerName] = url + "/" + gpCounterId.contactLayerId + "/query";
-                                //         }
-                                //         //this.gisUrlList[objid.cnContactLayerName] = url + "/" + objid.contactLayerId + "/query";
-                                //         $.ajax({
-                                //             type: "get",
-                                //             dataType: "json",
-                                //             url: this.analyzeUrl + "/jobs/" + jobinfo.jobId + "/" + jobinfo.results.summary.paramUrl + "?f=pjson",
-                                //             success: function (result) {
-                                //                 this.domObj.find(".pipeTypeLength").text(result.value.result.summary.layersummary[0].length);
-                                //             }.bind(this)
-                                //         })
-                                //         this.dynamicMapServer = new ArcGISDynamicMapServiceLayer(mapServerUrl);
-                                //         this.dynamicMapServer.id = this.preLayerId + "dynamicMapServer";
-                                //         this.map.addLayer(this.dynamicMapServer);
-                                //         this.addSelectItems_more(this);
-                                //         this.loadWait.hide();
-                                //     }.bind(this),
-                                //     function (jobinfo) {
-                                //         this.jobid = jobinfo.jobId;
-                                //     }.bind(this),
-                                //     function (jobinfo) {
-                                //         this.AppX.runtimeConfig.toast.show("分析失败，请联系管理员");
-                                //         this.loadWait.hide();
-                                //         console.error(jobinfo);
-                                //     }.bind(this)
-                                // );
-                                // }
-                            }.bind(this)
-                        });
-                    }
-                } else {
-                    var Material = this.domObj.find(".MATERIAL option:selected").val()
-                    var obj = this.getDeviceType(this.addData.deviceTypeIds);
-                    var fields = this.getLayerShowFieldNames(obj.cnContactLayerName);
-                    this.loadWait.show("正在查询选择" + this.current_device_type_name + "信息，请等待...", this.domObj);
-                    var where;
-                    if (obj.sqlfilter) {
-                        where = '(' + obj.sqlfilter + ')';
-                        if (Material != '') where += ` and MATERIAL='${Material}'`
-                    } else {
-                        if (Material != '') where = `MATERIAL='${Material}'`
-                    }
-
-                    var param = { "where": where, "spatialRel": "esriSpatialRelIntersects", "returnGeometry": false, "geometryType": "esriGeometryPolygon", "geometry": JSON.stringify(geometry), "returnIdsOnly": true, "f": "json" };
-                    $.ajax({
-                        type: "POST",
-                        url: url + "/" + obj.contactLayerId + "/query",
-                        cache: false,
-                        data: param,
-                        dataType: "json",
-                        success: function (response) {
-                            if (response.error !== undefined) {
-                                this.AppX.runtimeConfig.toast.Show("查询失败，请联系管理员");
-                                return;
-                            }
-                            let outfields = fields.map(e => { return e.name })
-                            if (!response.objectIds) {
-                                this.loadWait.hide();
-                                return;
-                            }
-                            this.gp = new Geoprocessor(this.analyzeUrl);
-                            let data = _.union(response.objectIds, this.objectids);
-                            this.objectids = data;
-                            this.addData.objectIds = _.join(this.objectids, ",");
-                            //此次gp服务，管线图层查询是传入图层名称必须是管线
-                            let layerName = "";
-                            layerName = obj.cnContactLayerName;
-                            // if (obj.cnContactLayerName.indexOf('管线') == -1) {
-                            //
-                            // } else {
-                            //     layerName = '管线';
-                            // }
-                            var options = {
-                                "layername": layerName,
-                                "objectids": this.objectids.join(","),
-                                "outfields": outfields.join(","),
-                                usertoken: this.AppX.appConfig.gisToken
-                            };
-                            var delayResult = this.gp.submitJob(
-                                options,
-                                function (jobinfo) {
-                                    if (this.dynamicMapServer) {
-                                        this.map.removeLayer(this.dynamicMapServer);
-                                        this.dynamicMapServer = null;
-                                    }
-                                    let mapServerUrl = this.mapServerUrl + "/jobs/" + jobinfo.jobId;
-                                    this.addData.gisUrl = url + "/" + obj.contactLayerId + "/query";
-                                    $.ajax({
-                                        type: "get",
-                                        dataType: "json",
-                                        url: this.analyzeUrl + "/jobs/" + jobinfo.jobId + "/" + jobinfo.results.summary.paramUrl + "?f=pjson",
-                                        success: function (result) {
-                                            this.domObj.find(".pipeTypeLength").text(result.value.result.summary.layersummary[0].length);
-                                        }.bind(this)
-                                    })
-                                    this.dynamicMapServer = new ArcGISDynamicMapServiceLayer(mapServerUrl);
-                                    this.dynamicMapServer.id = this.preLayerId + "dynamicMapServer";
-                                    this.map.addLayer(this.dynamicMapServer);
-                                    this.addSelectItems(this);
-                                    this.loadWait.hide();
-                                }.bind(this),
-                                function (jobinfo) {
-                                    this.jobid = jobinfo.jobId;
-                                }.bind(this),
-                                function (jobinfo) {
-                                    this.AppX.runtimeConfig.toast.show("分析失败，请联系管理员");
-                                    this.loadWait.hide();
-                                    console.error(jobinfo);
-                                }.bind(this)
-                            );
-                        }.bind(this),
-                        error: function (results) {
-                            this.loadWait.hide();
-                            this.toast.Show("查询片区巡检信息出错！");
-                        }.bind(this)
-                    });
-                }
+                this.queryPipes(geometry)
+                // return
+                // var url = this.AppX.appConfig.gisResource.pipe.config[this.config.mapindex].url;//pipe
+                // if (this.addData.deviceTypeIds.split(",").length > 1) {
+                //     var device_Type_Ids = this.addData.deviceTypeIds.split(",");
+                //     var forCounter = 0;//for循环计数
+                //     var forGpCounter = 0;
+                //     var layernameStr = [];
+                //     //var objectIdsStr = {};
+                //     var outfields = null;
+                //     this.objectIdsStr = {};
+                //     this.loadWait.show("正在查询选择" + this.current_device_type_name + "信息，请等待...", this.domObj);
+                //     for (let i = 0; i < device_Type_Ids.length; i++) {
+                //         var obj = this.getDeviceType(device_Type_Ids[i]);
+                //         var fields = this.getLayerShowFieldNames(obj.cnContactLayerName);
+
+                //         var where = obj.sqlfilter;
+                //         var param = { "where": where, "spatialRel": "esriSpatialRelIntersects", "returnGeometry": false, "geometryType": "esriGeometryPolygon", "geometry": JSON.stringify(geometry), "returnIdsOnly": true, "f": "json" };
+                //         $.ajax({
+                //             type: "POST",
+                //             url: url + "/" + obj.contactLayerId + "/query",
+                //             cache: false,
+                //             async: false,//用同步请求来解决返回数据顺序问题
+                //             data: param,
+                //             dataType: "json",
+                //             success: function (response) {
+                //                 forCounter++;
+                //                 if (response.error !== undefined) {
+                //                     this.AppX.runtimeConfig.toast.Show("查询失败，请联系管理员");
+                //                     return;
+                //                 }
+                //                 outfields = fields.map(e => { return e.name });
+
+                //                 if (!response.objectIds) {
+                //                     //this.loadWait.hide();
+                //                     //objectIdsStr[forCounter-1] = "无objectid"
+                //                     //return;
+                //                 } else {
+                //                     var objid = this.getDeviceType(device_Type_Ids[forCounter - 1]);
+                //                     layernameStr.push(objid.cnContactLayerName);
+                //                     //let data = _.union(response.objectIds, this.objectids);
+                //                     this.objectIdsStr[objid.cnContactLayerName] = response.objectIds.join();
+                //                 }
+                //                 //let layerName = "";
+
+                //                 if (forCounter == device_Type_Ids.length) {
+                //                     this.gp = new Geoprocessor(this.analyzeUrl);
+                //                     var objStr = "";
+                //                     for (var i in this.objectIdsStr) {
+                //                         objStr += this.objectIdsStr[i] + ";"
+                //                     }
+                //                     //this.objectids = data;
+                //                     this.addData.objectIds = objStr;
+                //                     //此次gp服务，管线图层查询是传入图层名称必须是管线
+
+                //                     // if (obj.cnContactLayerName.indexOf('管线') == -1) {
+                //                     //
+                //                     // } else {
+                //                     //     layerName = '管线';
+                //                     // }
+                //                     var options = {
+                //                         "layername": layernameStr.join(","),
+                //                         "objectids": objStr,
+                //                         "outfields": outfields.join(","),
+                //                         usertoken: this.AppX.appConfig.gisToken
+                //                     };
+                //                     var delayResult = this.gp.submitJob(
+                //                         options,
+                //                         function (jobinfo) {
+                //                             //forGpCounter++;
+                //                             if (this.dynamicMapServer) {
+                //                                 this.map.removeLayer(this.dynamicMapServer);
+                //                                 this.dynamicMapServer = null;
+                //                             }
+                //                             let mapServerUrl = this.mapServerUrl + "/jobs/" + jobinfo.jobId;
+                //                             for (let k = 0; k < device_Type_Ids.length; k++) {
+                //                                 var gpCounterId = this.getDeviceType(device_Type_Ids[k]);
+                //                                 this.gisUrlList[gpCounterId.cnContactLayerName] = url + "/" + gpCounterId.contactLayerId + "/query";
+                //                             }
+
+                //                             //this.addData.gisUrl = url + "/" + obj.contactLayerId + "/query";
+
+                //                             $.ajax({
+                //                                 type: "get",
+                //                                 dataType: "json",
+                //                                 url: this.analyzeUrl + "/jobs/" + jobinfo.jobId + "/" + jobinfo.results.summary.paramUrl + "?f=pjson",
+                //                                 success: function (result) {
+                //                                     var pipeTypeLength = "";
+                //                                     if (result.value.result) {
+                //                                         for (let j = 0; j < result.value.result.summary.layersummary.length; j++) {
+                //                                             pipeTypeLength += result.value.result.summary.layersummary[j].layername + ":" + result.value.result.summary.layersummary[j].length + "米;"
+                //                                         }
+                //                                         this.domObj.find(".pipeTypeLength").text(pipeTypeLength);
+                //                                     } else {
+                //                                         this.domObj.find(".pipeTypeLength").text(result.value.message);
+                //                                     }
+
+                //                                 }.bind(this)
+                //                             })
+                //                             this.dynamicMapServer = new ArcGISDynamicMapServiceLayer(mapServerUrl);
+                //                             this.dynamicMapServer.id = this.preLayerId + "dynamicMapServer";
+                //                             this.map.addLayer(this.dynamicMapServer);
+                //                             this.addSelectItems_more(this);
+                //                             this.loadWait.hide();
+                //                         }.bind(this),
+                //                         function (jobinfo) {
+                //                             this.jobid = jobinfo.jobId;
+                //                         }.bind(this),
+                //                         function (jobinfo) {
+                //                             this.AppX.runtimeConfig.toast.show("分析失败，请联系管理员");
+                //                             this.loadWait.hide();
+                //                             console.error(jobinfo);
+                //                         }.bind(this)
+                //                     );
+                //                 }
+
+                //             }.bind(this),
+                //             error: function (results) {
+                //                 forCounter++;
+                //                 this.loadWait.hide();
+                //                 this.toast.Show("查询片区巡检信息出错！");
+                //                 return;
+                //                 // forCounter++;
+                //                 // //this.loadWait.hide();
+                //                 // this.toast.Show("查询片区巡检信息出错！");
+                //                 // var objid = this.getDeviceType(device_Type_Ids[forCounter-1]);
+
+
+                //                 // if(forCounter == device_Type_Ids.length){
+                //                 //     this.gp = new Geoprocessor(this.analyzeUrl);
+                //                 //     for(var i in this.objectIdsStr){
+                //                 //         this.objectids += this.objectIdsStr[i]+";"
+                //                 //     }
+                //                 // //this.objectids = data;
+                //                 // this.addData.objectIds = this.objectids;
+                //                 // //此次gp服务，管线图层查询是传入图层名称必须是管线
+
+                //                 // // if (obj.cnContactLayerName.indexOf('管线') == -1) {
+                //                 // //
+                //                 // // } else {
+                //                 // //     layerName = '管线';
+                //                 // // }
+                //                 // var options = {
+                //                 //     "layername": layernameStr.join(","),
+                //                 //     "objectids": this.objectids,
+                //                 //     "outfields": outfields.join(","),
+                //                 //     usertoken: this.AppX.appConfig.gisToken
+                //                 // };
+                //                 // var delayResult = this.gp.submitJob(
+                //                 //     options,
+                //                 //     function (jobinfo) {
+                //                 //         if (this.dynamicMapServer) {
+                //                 //             this.map.removeLayer(this.dynamicMapServer);
+                //                 //             this.dynamicMapServer = null;
+                //                 //         }
+                //                 //         let mapServerUrl = this.mapServerUrl + "/jobs/" + jobinfo.jobId;
+                //                 //         //this.addData.gisUrl = url + "/" + obj.contactLayerId + "/query";
+                //                 //         for(let k =0;k<device_Type_Ids.length;k++){
+                //                 //             var gpCounterId = this.getDeviceType(device_Type_Ids[k]);
+                //                 //             this.gisUrlList[gpCounterId.cnContactLayerName] = url + "/" + gpCounterId.contactLayerId + "/query";
+                //                 //         }
+                //                 //         //this.gisUrlList[objid.cnContactLayerName] = url + "/" + objid.contactLayerId + "/query";
+                //                 //         $.ajax({
+                //                 //             type: "get",
+                //                 //             dataType: "json",
+                //                 //             url: this.analyzeUrl + "/jobs/" + jobinfo.jobId + "/" + jobinfo.results.summary.paramUrl + "?f=pjson",
+                //                 //             success: function (result) {
+                //                 //                 this.domObj.find(".pipeTypeLength").text(result.value.result.summary.layersummary[0].length);
+                //                 //             }.bind(this)
+                //                 //         })
+                //                 //         this.dynamicMapServer = new ArcGISDynamicMapServiceLayer(mapServerUrl);
+                //                 //         this.dynamicMapServer.id = this.preLayerId + "dynamicMapServer";
+                //                 //         this.map.addLayer(this.dynamicMapServer);
+                //                 //         this.addSelectItems_more(this);
+                //                 //         this.loadWait.hide();
+                //                 //     }.bind(this),
+                //                 //     function (jobinfo) {
+                //                 //         this.jobid = jobinfo.jobId;
+                //                 //     }.bind(this),
+                //                 //     function (jobinfo) {
+                //                 //         this.AppX.runtimeConfig.toast.show("分析失败，请联系管理员");
+                //                 //         this.loadWait.hide();
+                //                 //         console.error(jobinfo);
+                //                 //     }.bind(this)
+                //                 // );
+                //                 // }
+                //             }.bind(this)
+                //         });
+                //     }
+                // } else {
+                //     var Material = this.domObj.find(".MATERIAL option:selected").val()
+                //     var obj = this.getDeviceType(this.addData.deviceTypeIds);
+                //     var fields = this.getLayerShowFieldNames(obj.cnContactLayerName);
+                //     this.loadWait.show("正在查询选择" + this.current_device_type_name + "信息，请等待...", this.domObj);
+                //     var where;
+                //     if (obj.sqlfilter) {
+                //         where = '(' + obj.sqlfilter + ')';
+                //         if (Material != '') where += ` and MATERIAL='${Material}'`
+                //     } else {
+                //         if (Material) where = `MATERIAL='${Material}'`
+                //     }
+
+                //     var param = { "where": where, "spatialRel": "esriSpatialRelIntersects", "returnGeometry": false, "geometryType": "esriGeometryPolygon", "geometry": JSON.stringify(geometry), "returnIdsOnly": true, "f": "json" };
+                //     $.ajax({
+                //         type: "POST",
+                //         url: url + "/" + obj.contactLayerId + "/query",
+                //         cache: false,
+                //         data: param,
+                //         dataType: "json",
+                //         success: function (response) {
+                //             if (response.error !== undefined) {
+                //                 this.AppX.runtimeConfig.toast.Show("查询失败，请联系管理员");
+                //                 return;
+                //             }
+                //             let outfields = fields.map(e => { return e.name })
+                //             if (!response.objectIds) {
+                //                 this.loadWait.hide();
+                //                 return;
+                //             }
+                //             this.gp = new Geoprocessor(this.analyzeUrl);
+                //             let data = _.union(response.objectIds, this.objectids);
+                //             this.objectids = data;
+                //             this.addData.objectIds = _.join(this.objectids, ",");
+                //             //此次gp服务，管线图层查询是传入图层名称必须是管线
+                //             let layerName = "";
+                //             layerName = obj.cnContactLayerName;
+                //             // if (obj.cnContactLayerName.indexOf('管线') == -1) {
+                //             //
+                //             // } else {
+                //             //     layerName = '管线';
+                //             // }
+                //             var options = {
+                //                 "layername": layerName,
+                //                 "objectids": this.objectids.join(","),
+                //                 "outfields": outfields.join(","),
+                //                 usertoken: this.AppX.appConfig.gisToken
+                //             };
+                //             var delayResult = this.gp.submitJob(
+                //                 options,
+                //                 function (jobinfo) {
+                //                     if (this.dynamicMapServer) {
+                //                         this.map.removeLayer(this.dynamicMapServer);
+                //                         this.dynamicMapServer = null;
+                //                     }
+                //                     let mapServerUrl = this.mapServerUrl + "/jobs/" + jobinfo.jobId;
+                //                     this.addData.gisUrl = url + "/" + obj.contactLayerId + "/query";
+                //                     $.ajax({
+                //                         type: "get",
+                //                         dataType: "json",
+                //                         url: this.analyzeUrl + "/jobs/" + jobinfo.jobId + "/" + jobinfo.results.summary.paramUrl + "?f=pjson",
+                //                         success: function (result) {
+                //                             this.domObj.find(".pipeTypeLength").text(result.value.result.summary.layersummary[0].length);
+                //                         }.bind(this)
+                //                     })
+                //                     this.dynamicMapServer = new ArcGISDynamicMapServiceLayer(mapServerUrl);
+                //                     this.dynamicMapServer.id = this.preLayerId + "dynamicMapServer";
+                //                     this.map.addLayer(this.dynamicMapServer);
+                //                     this.addSelectItems(this);
+                //                     this.loadWait.hide();
+                //                 }.bind(this),
+                //                 function (jobinfo) {
+                //                     this.jobid = jobinfo.jobId;
+                //                 }.bind(this),
+                //                 function (jobinfo) {
+                //                     this.AppX.runtimeConfig.toast.show("分析失败，请联系管理员");
+                //                     this.loadWait.hide();
+                //                     console.error(jobinfo);
+                //                 }.bind(this)
+                //             );
+                //         }.bind(this),
+                //         error: function (results) {
+                //             this.loadWait.hide();
+                //             this.toast.Show("查询片区巡检信息出错！");
+                //         }.bind(this)
+                //     });
+                // }
 
             }.bind(this));
         }.bind(this));
@@ -1589,8 +1867,8 @@ class MissionSchedule extends BaseWidget {
             searchInfo: that.dataTable_all_searchInfo,//条件在不断变化，故需要有全局的条件监听
             // displayTitle: ["部门", "姓名", "巡检名称", "巡检周期", "巡检类型", "所属片区", "计划开始时间", "计划结束时间", "创建人", "创建时间", "状态"],
             // displayField: ["deptName", "userIdName", "description", "preiodName", "deviceTypeName", "regionName", "childBeginDate", "childEndDate", "createUserName", "createTime", "chilePlanStateName"],
-            displayTitle: ["部门", "姓名", "巡检名称", "巡检周期", "巡检类型", "计划开始时间", "计划结束时间", "计划完成率(%)", "巡检模式", "创建人", "创建时间", "状态"],
-            displayField: ["deptName", "userIdName", "description", "preiodName", "deviceTypeName", "childBeginDate", "childEndDate", "planRate", "modeName", "createUserName", "createTime", "chilePlanStateName"],
+            displayTitle: ["部门", "姓名", "巡检名称", "巡检周期", "巡检类型", "计划开始时间", "计划结束时间", "工作量", "计划完成率(%)", "巡检模式", "创建人", "创建时间", "状态"],
+            displayField: ["deptName", "userIdName", "description", "preiodName", "deviceTypeName", "childBeginDate", "childEndDate", "total", "planRate", "modeName", "createUserName", "createTime", "chilePlanStateName"],
             extentDisplayTitle: ['定位查看'],
             extentDisplayContent: [{
                 field: "planInfoLook",
@@ -1601,7 +1879,9 @@ class MissionSchedule extends BaseWidget {
             },
             drawEvent: function () {
                 $.each(that.domObj.find("#planslist_table tr[class]"), function (index, item) {
-                    $($(item).find('td')[8]).text(that.dataTable_all.aExtentData.currentAllData[index].planRate + "%");
+                    $($(item).find('td')[9]).text(that.dataTable_all.aExtentData.currentAllData[index].planRate + "%");
+                    const row = that.dataTable_all.aExtentData.currentAllData[index];
+                    $($(item).find('td')[8]).text(row.type == '1' ? row.total : row.pointNum);
                 })
                 that.domObj.off('click', '.planInfoLook').on('click', ".planInfoLook", e => {
                     if (that.dynamicMapServer) {
@@ -2345,7 +2625,7 @@ class MissionSchedule extends BaseWidget {
         var where = "1=1";
         if (devicetype.sqlfilter != null && devicetype.sqlfilter.length > 0)
             where += " and " + devicetype.sqlfilter;
-        var param = { "where": where, "spatialRel": "esriSpatialRelContains", "returnGeometry": true, "geometryType": "esriGeometryPolygon", "geometry": JSON.stringify(polygon), "returnCountOnly": true, "returnIdsOnly": false, "f": "json" };
+        var param = { "where": where, "spatialRel": "esriSpatialRelContains", "returnGeometry": true, "geometryType": "esriGeometryPolygon", "geometry": JSON.stringify(polygon), "returnCountOnly": true, "returnIdsOnly": true, "f": "json" };
         $.ajax({
             type: "POST",
             url: url + "/" + devicetype.contactLayerId + "/query",
@@ -2618,6 +2898,7 @@ class MissionSchedule extends BaseWidget {
                         // } else {
 
                         // }
+                        that.queryPipes(mapPolygon) // 查询所有
                         if (that.addData.deviceTypeIds.split(",").length > 1) {
                             that.checkExistPlanDeviceByLayer_more(dom.data("geometry"), that.addData.deviceTypeIds + "", that.current_device_type_name);
                         } else {

src/widgets/Popup/css/style.scss

@@ -226,7 +226,7 @@
     .length-changing{
         margin: 7px 0 0px 0px;
         label{
-            color: #ffffff;
+            color: #000000;
         }
 
         select{

src/widgets/SiteSupervisionAllSearch/Widget.ts

@@ -289,8 +289,8 @@ class SiteSupervisionAllSearch extends BaseWidget {
             url: that.config.getRushList,
             isCheck: false,
             searchInfo: that.searchInfo,//条件在不断变化，故需要有全局的条件监听
-            displayTitle: ["工地名称", "工地类型", "施工单位", "工地负责人", "主管单位", "主管人", "施工地点", "描述", '状态'],
-            displayField: ["siteName", "siteTypeName", "constructionUnit", "personInCharge", "manageUnit", "manager", "constructionAddress", "description", "constructionStateName"],
+            displayTitle: ["工地名称", "工地类型", "施工单位","上报人", "工地负责人", "主管单位", "主管人", "施工地点", "描述", '状态'],
+            displayField: ["siteName", "siteTypeName", "constructionUnit","creatUserName", "personInCharge", "manageUnit", "manager", "constructionAddress", "description", "constructionStateName"],
             extentDisplayTitle: ['详情'],
             extentDisplayContent: [{
                 field: "infoWrite",

src/widgets/SiteSupervisionPageInfo/Widget.html

@@ -67,6 +67,12 @@ $$
         <input type="text" autocomplete="off" class="form-control y" disabled='disabled' name="y" data-bv-trigger="blur" placeholder="Y坐标">
     </div>
 </div>
+<div class="form-group form-inline creatUserName-form-item">
+    <div class='item'>
+        <label class=" control-label">上报人</label>
+        <input type="text" autocomplete="off" class="form-control creatUserName" disabled='disabled' name="creatUserName" data-bv-trigger="blur" placeholder="上报人">
+    </div>
+</div>
 <div class="form-group form-inline">
     <div class='oneItem'>
         <label class=" control-label">详情描述</label>

src/widgets/SiteSupervisionReport/Widget.ts

@@ -124,6 +124,7 @@ class SiteSupervisionReport extends BaseWidget {
         this.title = dataInfo ? "工地监护修改" : "工地监护上报";
         let actionInfo = dataInfo ? action.update : action.add;
         var Obj = this.popup.Show(this.title, this.template.split('$$')[1], undefined, this.colsePop.bind(this));
+        
         let getHtml = this.AppX.runtimeConfig.siteSupervisionPageInfo;
         var data = null;
         if (dataInfo) {
@@ -134,6 +135,10 @@ class SiteSupervisionReport extends BaseWidget {
             }, 200);
         } else {
             data = { x: this.localPoint.x, y: this.localPoint.y };
+            setTimeout(function () {
+                Obj.conObj.find('.creatUserName-form-item').hide()
+            }, 200);
+            
         }
         getHtml.getLinkHtml(this, Obj.conObj.find('.widget-SiteSupervisionReport-pop'), [getHtml.state.siteSupervisionReport], getHtml.state.siteSupervisionReport, data);
         getHtml.setDepartmentAndUser(this, Obj.conObj.find('.department'), Obj.conObj.find('.dispatchUserId'), dataInfo);