消息通知,应急上报二级分离,巡检片区分类型展示,巡检片区类型管理,SCADA实时监控,顶部查询优化,

src/configure.ts

@@ -1136,6 +1136,17 @@ var AppX = {
                 "label": "巡检工作管理",
                 "icon": "/images/xunjiangonzuoguanli.png",
                 "data": [
+                    {
+                        "subsys": "xunjian",
+                        "id": "xunjianpianquleixinguanli",
+                        "label": "巡检片区类型管理",
+                        "widget": "widgets/PlanRegionTypeManager",
+                        "main": "Widget",
+                        "icon": "/images/choose.png",
+                        "inpanel": true,
+                        "panel": "FullPanel",
+                        "autorun": false
+                    },
                     {
                         "subsys": "xunjian",
                         "id": "xunjianpianquhuafen",
@@ -1860,18 +1871,18 @@ var AppX = {
                         "inpanel": true,
                         "autorun": false
                     }
-                    //,
-                    // {
-                    //     "subsys": "gis",
-                    //     "id": "scadabaojingshezhi",
-                    //     "label": "报警配置",
-                    //     "widget": "widgets/SCADASetting",
-                    //     "main": "Widget",
-                    //     "icon": "/images/choose.png",
-                    //     "inpanel": true,
-                    //     "panel": "FullPanel",
-                    //     "autorun": false
-                    // },
+                    ,
+                    {
+                        "subsys": "gis",
+                        "id": "scadabaojingshezhi",
+                        "label": "报警配置",
+                        "widget": "widgets/SCADASetting",
+                        "main": "Widget",
+                        "icon": "/images/choose.png",
+                        "inpanel": true,
+                        "panel": "FullPanel",
+                        "autorun": false
+                    },
                     // {
                     //     "subsys": "gis",
                     //     "id": "fufengzhan",

src/widgets/HalfPanel/css/style.scss

@@ -641,7 +641,7 @@
         padding-right: 90px;
         width: 100%;
         li {
-            width: 140px;
+            width: 215px;
             height: 100%;
             position: relative;
             a {

src/widgets/Header/Widget.ts

@@ -315,6 +315,7 @@ class Header extends BaseWidget {
             this.domObj.find(".weidu_message").css("color","red");
             this.warning.playAudio();
         }else{
+            this.domObj.find(".weidu_message").css("color","yellow");
             this.warning.stopAudio();
         }
         this.domObj.find(".weidu_message").text("未读消息(" + length + ")");

src/widgets/HomePage/Widget.ts

@@ -237,7 +237,6 @@ class HomePage extends BaseWidget {
                 this.clickChart(value);
             }
         });
-
         this.gsgxtotal(data);//分公司管线长度
 
     }

src/widgets/MaintenanceManagerReport/Widget.ts

@@ -142,6 +142,7 @@ class MaintenanceManagerReport extends BaseWidget {
         getHtml.getLinkHtml(this, Obj.conObj.find('.widget-MaintenanceManagerReport-pop'), [getHtml.state.maintenanceReport], state, data);
         getHtml.setDepartmentAndUser(this, Obj.conObj.find('.departmentId'), Obj.conObj.find('.dispatchUserId'), dataInfo);
         getHtml.setAssistantDepartmentAndAssistantUser(this, Obj.conObj.find('.assistantDepartment'), Obj.conObj.find('.assistantUserId'), dataInfo);
+        getHtml.setMaintenceType(this,Obj.conObj.find('.typeMain'),Obj.conObj.find('.type'))
         if(!dataInfo){
             Obj.conObj.find(".voicegroup").hide();
         }

src/widgets/MaintenancePageInfo/Widget.html

@@ -21,21 +21,27 @@ $$
 </div>
 <div class="form-group form-inline">
     <div class='item'>
-        <label class=" control-label">联系电话</label>
-        <input type="text" autocomplete="off" class="form-control contactPhone" name="contactPhone"
-            data-bv-trigger="blur" placeholder="联系电话">
+        <label class=" control-label">一级抢修分类</label>
+        <select class="input-sm form-control   typeMain" data-live-search="true"
+            name='typeMain' data-max-options="1" showname='typeMainName'  data-style="btn-primary">
+            <!-- <option value='0' selected="selected">无气/气小</option>
+            <option value='1'>户内漏气</option>
+            <option value='2'>户外漏气</option>
+            <option value='3'>其他</option> -->
+        </select>
     </div>
     <div class='item'>
-        <label class=" control-label">分类</label>
+        <label class=" control-label">二级抢修分类</label>
         <select class="input-sm form-control   type" data-live-search="true"
             name='type' data-max-options="1" showname='typeName'  data-style="btn-primary">
-            <option value='0' selected="selected">无气/气小</option>
+            <!-- <option value='0' selected="selected">无气/气小</option>
             <option value='1'>户内漏气</option>
             <option value='2'>户外漏气</option>
-            <option value='3'>其他</option>
+            <option value='3'>其他</option> -->
         </select>
     </div>
 </div>
+
 <div class="form-group form-inline userSelect">
     <div class='item'>
         <label class=" control-label">部门</label>
@@ -64,6 +70,13 @@ $$
         </select>
     </div>
 </div>
+<div class="form-group form-inline">
+    <div class='oneItem'>
+        <label class=" control-label">联系电话</label>
+        <input type="text" autocomplete="off" class="form-control contactPhone" name="contactPhone"
+            data-bv-trigger="blur" placeholder="联系电话">
+    </div>
+</div>
 <div class="form-group form-inline">
     <div class='oneItem'>
         <label class=" control-label">详情描述</label>

src/widgets/MaintenancePageInfo/Widget.ts

@@ -571,7 +571,42 @@ class MaintenancePageInfo extends BaseWidget {
         // formDom.find(".precessInfo .complete .glyphicon").remove();
         // formDom.find(".precessInfo .complete").append('<span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span>');
     };
-
+    /**一级类型和二级类型的联动
+     * @param that 用于获取全局的一些配置
+     * @param dDom 部门下拉框dom
+     * @param uDom 用户下拉框dom
+     */
+    setMaintenceType(that,dDom,uDom){
+        let dHtml = "";
+        $.each(this.config.typeList, function (i, item) {
+            dHtml += "<option value='" + item.value + "' index='"+i+"'>" + item.name + "</option>";
+        })
+        dDom.empty().append(dHtml);
+                dDom.selectpicker({
+                    noneResultsText: "未查询到{0}",
+                    noneSelectedText: "无选择项"
+                });
+        dDom.selectpicker('refresh');
+        dDom.off().change(e => {
+            dDom.selectpicker('render');
+            this.setSubtype(that, dDom, uDom);
+        });
+        this.setSubtype(that, dDom, uDom);
+    }
+    setSubtype(that, dDom, uDom){
+        let dDomIndex = dDom.find('option:selected').attr("index");
+        let dHtml = "";
+        $.each(this.config.typeList[dDomIndex].subtype, function (i, item) {
+            dHtml += "<option value='" + item.value + "'>" + item.name + "</option>"
+        });
+        uDom.empty().append(dHtml);
+        uDom.selectpicker({
+            noneResultsText: "未查询到{0}",
+            noneSelectedText: "无选择项"
+        });
+        uDom.selectpicker('refresh');
+        uDom.selectpicker('render');
+    }
     /**部门和人员的联动
      * @param that 用于获取全局的一些配置
      * @param dDom 部门下拉框dom

src/widgets/MaintenancePageInfo/config.json

@@ -16,5 +16,43 @@
     "pagenumber": 1,
     "pagesize": 25,
     "maxsize": 100000,
-    "zoomscale": 200
+    "zoomscale": 200,
+    "typeList":[
+        {
+            "name":"泄漏抢险",
+            "value":1,
+            "subtype":[{
+                "name":"第三方挖断管道",
+                "value":1
+            },{
+                "name":"室内泄露",
+                "value":2
+            },{
+                "name":"室外泄露",
+                "value":3
+            },{
+                "name":"调压器阀井泄露",
+                "value":4
+            }]
+        },{
+            "name":"非泄露处置",
+            "value":2,
+            "subtype":[{
+                "name":"无气",
+                "value":5
+            },{
+                "name":"气小",
+                "value":6
+            },{
+                "name":"其他情况",
+                "value":7
+            }]
+        },{
+            "name":"调压装置失效超压",
+            "value":3,
+            "subtype":[]
+        }
+    ]
+
+
 }

src/widgets/MaintenanceSearch/Widget.ts

@@ -315,8 +315,8 @@ class MaintenanceSearch extends BaseWidget {
         // isCheck: false,
         // testData:this.config.dataInfo,
         searchInfo: that.searchInfo,//条件在不断变化，故需要有全局的条件监听
-        displayTitle: ["报警人", "创建人", "派工人","派工时间","类型", "地址", "联系电话","状态","描述","签到时间","处置情况"],
-        displayField: ["alarmPeopleName", "createUserName","dispatchUserName","createTime","typeName", "address", "contactPhone","workOrderStateName", "description","signTime","emergencyHandling"],
+        displayTitle: ["报警人", "创建人", "派工人","派工时间","一级类型", "地址", "联系电话","状态","描述","签到时间","处置情况"],
+        displayField: ["alarmPeopleName", "createUserName","dispatchUserName","createTime","typeMainName", "address", "contactPhone","workOrderStateName", "description","signTime","emergencyHandling"],
         extentDisplayTitle: ['详情'],
         extentDisplayContent: [{
             field: "infoWrite",

src/widgets/MapWatching/Widget.html

@@ -17,7 +17,7 @@
                     <div class="form-group">
                         <label for="name">单位</label>
                         <select class="form-control xjDepartment department">
-                            
+
                         </select>
                         <label for="name" class="state">状态</label>
                         <select class="form-control userstate">>
@@ -48,7 +48,7 @@
                                     <span class="tool">
                                      <a  class="detail thumbnail collapse" title="轨迹" data-toggle="collapse" data-target="#%datapath" data-parent="#workerlist" requesttype="path"><img src="widgets/MapWatching/css/img/path.png" width=20 height=20/></a>
                                     <a  class="detail thumbnail collapse" title="日志" data-toggle="collapse" data-target="#%datalog" data-parent="#workerlist"  requesttype="log"><img src="widgets/MapWatching/css/img/journal.png" width=20 height=20/></a>
-                                    <a  class="detail thumbnail collapse" title="巡检计划" data-toggle="collapse" data-target="#%datacheckpoint" data-parent="#workerlist" requesttype="checkpoint"><img src="widgets/MapWatching/css/img/checkpoint.png" width=20 height=20/></a> 
+                                    <a  class="detail thumbnail collapse" title="巡检计划" data-toggle="collapse" data-target="#%datacheckpoint" data-parent="#workerlist" requesttype="checkpoint"><img src="widgets/MapWatching/css/img/checkpoint.png" width=20 height=20/></a>
                                      </span>
                                     <span class="right" title="%data">%data</span>
                                 </div>
@@ -94,7 +94,7 @@
                             <div id="%data" class="panel-collapse collapse">
                                 <div class="panel-body checkpoints">
                                     <!-- <item>
-                                             <p class="checkpointitem"> 
+                                             <p class="checkpointitem">
                                                 <img src="widgets/MapWatching/css/img/%data" width="30" height="30" alt="轨迹" />
                                                 <span class="checkpointname" title="%data">%data</span>
                                                 <span class="checktime">%data</span>
@@ -153,7 +153,7 @@
                     <div class="form-group">
                         <label for="name">单位</label>
                         <select class="form-control xjlayer_department department">
-                            
+
                         </select>
                     </div>
                 </div>
@@ -187,9 +187,23 @@
                     <label for="0-checkbox">巡检线</label>
                     <input type="checkbox" data-source-layer-index="0" data-source-check-group="grid" class="pull-right  list-group-item-check">
                 </li>
-                <li class="list-group-item" layerName="GraphicLayer_xjregion" choosed="no">
+                <li class="list-group-item" layerName="GraphicLayer_xjregion">
                     <label for="0-checkbox">巡检片区</label>
-                    <input type="checkbox" data-source-layer-index="0" data-source-check-group="grid" class="pull-right  list-group-item-check">
+                    <!-- <input type="checkbox" data-source-layer-index="0" data-source-check-group="grid" class="pull-right  list-group-item-check"/> -->
+                    <ul class="nav nav-pills nav-stacked list-group GraphicLayer_xjregion_ul">
+                        <!-- <li class="list-group-item" layerName="GraphicLayer_xjregion" regionType="巡检片区类型1" choosed="no">
+                            <label for="checkbox-1">巡检片区类型1</label>
+                            <input type="checkbox" name="checkbox-1" data-source-layer-index="0" data-source-check-group="grid" class="pull-right  list-group-item-check"/>
+                        </li>
+                        <li class="list-group-item" layerName="GraphicLayer_xjregion" regionType="巡检片区类型2" choosed="no">
+                            <label for="checkbox-2">巡检片区类型2</label>
+                            <input type="checkbox" name="checkbox-2" data-source-layer-index="0" data-source-check-group="grid" class="pull-right  list-group-item-check"/>
+                        </li>
+                        <li class="list-group-item" layerName="GraphicLayer_xjregion" regionType="巡检片区类型3" choosed="no">
+                            <label for="checkbox-3">巡检片区类型3</label>
+                            <input type="checkbox" name="checkbox-3" data-source-layer-index="0" data-source-check-group="grid" class="pull-right  list-group-item-check"/>
+                        </li> -->
+                    </ul>
                 </li>
             </ul>
 
@@ -374,4 +388,4 @@ $$
 </div>
 $$
 <div class='widget-MapSiteSupervisionSearch-pop'>
-</div>
+</div>

src/widgets/MapWatching/Widget.ts

@@ -26,6 +26,7 @@ import Font = require("esri/symbols/Font");
 import HiddenInfoSearch = require("./HiddenInfoSearch");
 import MaintenanceSearch = require("./MaintenanceSearch");
 import SiteSearch = require("./SiteSearch");
+import AjaxSend = require("common/AjaxSend.class")
 declare var jscolor;
 export = MapWatching;
 class MapWatching extends BaseWidget {
@@ -60,13 +61,15 @@ class MapWatching extends BaseWidget {
     /**图层管理模块 */
     XJGraphicLayers: XJGraphicLayer;
     untilTodayHideDangerList = [];//截至当天上报的所有隐患（未处理）
-
+    ajaxSend = null;
     startup() {
         this.setHtml(_.template(this.template.split("$$")[0])({
             hello: this.config.hello + (/\/([a-zA-Z]+)$/g.exec(this.widgetPath)[1])
         }));
+        this.ajaxSend = new AjaxSend();
         //设置panel的top属性，以适应屏幕高度
         this.domObj.parents(".panel").css("bottom", "50px");
+        this.getRegionType()
         this.hiddenInfohSearch = new HiddenInfoSearch(this);
         this.maintenanceSearch = new MaintenanceSearch(this);
         this.siteSearch = new SiteSearch(this);
@@ -82,7 +85,23 @@ class MapWatching extends BaseWidget {
         this.destoryWidget();
     }
 
-
+    getRegionType(){
+        var sendData = {
+            current:1,
+            size:10
+        }
+        this.ajaxSend.sendAjax(this, sendData, this.config.gpsregiontype, this.ajaxSend.type.get, result =>{
+            var regionTypes = result.result.records;
+            var regionTypeStr = "";
+            for(let i of regionTypes){
+                regionTypeStr += "<li class='list-group-item' layerName='GraphicLayer_xjregion' regionType='"+i.id+"' choosed='no'>";
+                regionTypeStr += "<label for='checkbox_"+i.id+"'>"+i.regionTypeName+"</label>";
+                regionTypeStr += "<input type='checkbox' name='checkbox-"+i.id+"' data-source-layer-index='0' data-source-check-group='grid' class='pull-right  list-group-item-check'/>";
+                regionTypeStr += "</li>";
+            }
+            this.domObj.find('.GraphicLayer_xjregion_ul').empty().append(regionTypeStr);
+        });
+    }
 
     //模块关闭时，清除相关资源
     destoryWidget() {
@@ -93,7 +112,7 @@ class MapWatching extends BaseWidget {
         //隐藏infowindow
         this.map.infoWindow.hide();
         this.AppX.runtimeConfig.routeplayer.Hide();
-        //清除定时器   
+        //清除定时器
         if (this.setIntervalNumber != undefined) {
             clearInterval(this.setIntervalNumber);
             this.setIntervalNumber = undefined;
@@ -139,15 +158,16 @@ class MapWatching extends BaseWidget {
         // this.requestHideDangerInfo(trouble_departmentid, 1, 1000, this.initHideDangerInfo.bind(this));
         //this.requestAllWorkerInfo(departmentid, 1, 1000, this.initAllWorkInfo.bind(this));  //获取所有巡检人员信息,并添加到地图
         //this.addBaseLayerToLayer(requestCompanyId);
-        
+
         let dom=this.domObj.find("#xunjianlayer li input[type='checkbox']:checked");
         if(dom.length>0){
             $.each(dom,function(index,event){
                 var layerName = $(event).parent("li").attr("layername");
+                var regionType = $(event).parent("li").attr("regionType");
                 var choosedState = $(event).parent("li").attr("choosed");
                 var curentObject = $(event).parent("li");
                 var checkboxObjec = $(this);
-                this.layerControl2(layerName, choosedState, curentObject, checkboxObjec);
+                this.layerControl2(layerName, choosedState, curentObject, checkboxObjec,regionType);
             }.bind(this))
         }
     }
@@ -165,7 +185,7 @@ class MapWatching extends BaseWidget {
             console.log(results.message);
             return;
         }
-        var refrshTimeSpan = results.result.refreshInternal * 1000;
+        var refrshTimeSpan = results.result.refreshInternal * 2000;
         var pathLineColor = results.result.trailLineColor;
         var pathLineWidth = results.result.trailLineWidth;
         var pathPointColor = results.result.trailPointColor;
@@ -272,12 +292,12 @@ class MapWatching extends BaseWidget {
         this.XJGraphicLayers.clearGraphics();
     }
 
-    //初始化事件 
+    //初始化事件
     initEvent() {
         // this.map.on("zoom-end", function () {
         //     var scale = this.map.getScale();
         //    if(scale<2000){
-        //         this.map.setScale(2000);      
+        //         this.map.setScale(2000);
         //    }
         // }.bind(this));
         //绑定公司下拉改变事件
@@ -338,15 +358,24 @@ class MapWatching extends BaseWidget {
             //显示该用户上传的隐患
             this.displayHidedangerOfUser(departmentid, userid);
         }.bind(this));
-
         /*图层控制 */
-        this.domObj.find("#xunjianlayer li input[type='checkbox']").bind("click", function (event) {
-            var layerName = $(event.currentTarget).parent("li").attr("layername");
-            var choosedState = $(event.currentTarget).parent("li").attr("choosed");
+        this.domObj.find("#xunjianlayer").on("click","li input[type='checkbox']",function(event){
+            var layerName = $(event.currentTarget).parent("li").attr("layername");//GraphicLayer_xjregion
+            var regionType = $(event.currentTarget).parent("li").attr("regionType");//巡检区域专有属性
+            var choosedState = $(event.currentTarget).parent("li").attr("choosed");//choosed="no"
             var curentObject = $(event.currentTarget).parent("li");
             var checkboxObjec = $(this);
-            this.layerControl(layerName, choosedState, curentObject, checkboxObjec);
-        }.bind(this)); //图层关闭和打开
+            this.layerControl(layerName, choosedState, curentObject, checkboxObjec,regionType);
+        }.bind(this));//图层关闭和打开
+        /*图层控制 */
+        // this.domObj.find("#xunjianlayer li input[type='checkbox']").bind("click", function (event) {
+        //     var layerName = $(event.currentTarget).parent("li").attr("layername");//GraphicLayer_xjregion
+        //     var regionType = $(event.currentTarget).parent("li").attr("regionType");//巡检区域专有属性
+        //     var choosedState = $(event.currentTarget).parent("li").attr("choosed");//choosed="no"
+        //     var curentObject = $(event.currentTarget).parent("li");
+        //     var checkboxObjec = $(this);
+        //     this.layerControl(layerName, choosedState, curentObject, checkboxObjec,regionType);
+        // }.bind(this)); //图层关闭和打开
         //人员分页查询
         this.domObj.find(".workerpagination .pageturning").on("click", this.workerListPageTurning.bind(this));
         //隐患分页查询
@@ -374,7 +403,7 @@ class MapWatching extends BaseWidget {
                 checkingPoint: new PictureMarkerSymbol(this.root + config.PNGPATH_CheckPointPng.checking, 45, 45),
                 checkedPath: new SimpleLineSymbol({
                     color: new Color("#0000ff"),
-                    style: "solid",   //线的样式 dash|dash-dot|solid等	
+                    style: "solid",   //线的样式 dash|dash-dot|solid等
                     width: 3
                 }),
                 checkingPath: new SimpleLineSymbol({
@@ -405,7 +434,7 @@ class MapWatching extends BaseWidget {
             path: {
                 oraginalPath: new SimpleLineSymbol({
                     color: new Color("#0000FF"),
-                    style: "solid",   //线的样式 dash|dash-dot|solid等	
+                    style: "solid",   //线的样式 dash|dash-dot|solid等
                     width: 1
                 })
             }
@@ -1467,7 +1496,7 @@ class MapWatching extends BaseWidget {
                         "periodName": rows[i].preiodName,//巡检方式
                         "deviceTypeName": rows[i].deviceTypeName,//巡检设备类型
                         "type": rows[i].chilePlanStateName,//巡检类型
-                        "percent": rows[i].percent1,//计划完成量  
+                        "percent": rows[i].percent1,//计划完成量
                         "description": rows[i].description //描述
                     }
                     mainPlanInfos.push(mainPlanInfo);
@@ -1584,12 +1613,12 @@ class MapWatching extends BaseWidget {
         var linePath: Array<any> = [];
         var lineSymbol = new SimpleLineSymbol({
             color: new Color(this.watchingSetting._workerPathColor),
-            style: "solid",   //线的样式 dash|dash-dot|solid等	
+            style: "solid",   //线的样式 dash|dash-dot|solid等
             width: this.watchingSetting.pathLineWith
         });
         var carLineSymbol = new SimpleLineSymbol({
             color: new Color(this.watchingSetting._carPathColor),
-            style: "solid",   //线的样式 dash|dash-dot|solid等	
+            style: "solid",   //线的样式 dash|dash-dot|solid等
             width: this.watchingSetting.pathLineWith
         });
         var allPolyline = [];
@@ -1799,7 +1828,7 @@ class MapWatching extends BaseWidget {
         var lineSymbol = new SimpleLineSymbol({
             // color: new Color("#0000FF"),
             color: new Color(this.watchingSetting.pathLineColor),
-            style: "solid",   //线的样式 dash|dash-dot|solid等	
+            style: "solid",   //线的样式 dash|dash-dot|solid等
             width: this.watchingSetting.pathLineWith
         });
         //添加轨迹线
@@ -1918,7 +1947,7 @@ class MapWatching extends BaseWidget {
 
     /*
      * 可通过部门或人员姓名进行查询。
-     * 
+     *
      */
     //显示符合条件的人员列表
     displayQualifiedUser(departmentId, userState) {
@@ -2021,15 +2050,33 @@ class MapWatching extends BaseWidget {
      * 初始化图层管理模块
      */
     //图层控制（显示和隐藏）
-    layerControl(layerName, choosedState, curentObject, checkboxObjec) {
+    layerControl(layerName, choosedState, curentObject, checkboxObjec,regionType) {
         var activeGraphicLayer = <GraphicsLayer>this.map.getLayer("worker_activeGraphicLayer");
         activeGraphicLayer.clear();
         var config = this.config.layerControl;
         var layer = this.map.getLayer(layerName);
         if (choosedState == "yes") {
-            layer.hide();
-            curentObject.attr("choosed", "no");
-            checkboxObjec.prop("checked", false);
+            if(regionType){
+                var XJRegionGraphicLayer = <GraphicsLayer>this.map.getLayer("GraphicLayer_xjregion");
+                var graphics = layer.graphics.filter(element => {
+                    // if(element.attributes == regionType){
+                    //     layer.remove(element);
+
+                    // }
+                    return element.attributes != regionType
+                });
+                XJRegionGraphicLayer.clear();
+                graphics.forEach(element => {
+                    XJRegionGraphicLayer.add(element);
+                });
+                curentObject.attr("choosed", "no");
+                checkboxObjec.prop("checked", false);
+            }else{
+                layer.hide();
+                curentObject.attr("choosed", "no");
+                checkboxObjec.prop("checked", false);
+            }
+
         } else {
             layer.show();
             curentObject.attr("choosed", "yes");
@@ -2049,11 +2096,12 @@ class MapWatching extends BaseWidget {
                 case "GraphicLayer_xjregion":
                     var xjRegionUrl = this.apiRoot + config.URL_region;
                     var xjRegionData = {
-                        "companyid": AppX.appConfig.deptId,
+                        // "companyid": AppX.appConfig.deptId,
+                        "regionType":regionType,
                         "current": 1,
                         "size": 100000
                     };
-                    var xjRegionInfoInterface = new BackGroundInterface(xjRegionUrl, headers, xjRegionData, this.requestXJRegionInfoCallback.bind(this));
+                    var xjRegionInfoInterface = new BackGroundInterface(xjRegionUrl, headers, xjRegionData, this.requestXJRegionInfoCallback.bind(this,regionType));
                     break;
                 case "GraphicLayer_buildsite":
                     var buildSiteUrl = this.apiRoot + config.URL_buildsite;
@@ -2111,7 +2159,7 @@ class MapWatching extends BaseWidget {
      * 初始化图层管理模块
      */
     //图层控制（显示和隐藏）
-    layerControl2(layerName, choosedState, curentObject, checkboxObjec) {
+    layerControl2(layerName, choosedState, curentObject, checkboxObjec,regionType) {
         var activeGraphicLayer = <GraphicsLayer>this.map.getLayer("worker_activeGraphicLayer");
         activeGraphicLayer.clear();
         var config = this.config.layerControl;
@@ -2134,11 +2182,12 @@ class MapWatching extends BaseWidget {
                 case "GraphicLayer_xjregion":
                     var xjRegionUrl = this.apiRoot + config.URL_region;
                     var xjRegionData = {
-                        "companyid": AppX.appConfig.deptId,
+                        // "companyid": AppX.appConfig.deptId,
+                        "regionType":regionType,
                         "current": 1,
                         "size": 100000
                     };
-                    var xjRegionInfoInterface = new BackGroundInterface(xjRegionUrl, headers, xjRegionData, this.requestXJRegionInfoCallback.bind(this));
+                    var xjRegionInfoInterface = new BackGroundInterface(xjRegionUrl, headers, xjRegionData, this.requestXJRegionInfoCallback.bind(this,regionType));
                     break;
                 case "GraphicLayer_buildsite":
                     var buildSiteUrl = this.apiRoot + config.URL_buildsite;
@@ -2278,7 +2327,7 @@ class MapWatching extends BaseWidget {
         var config = this.config.requestXJLineInfoCallback;
         var symbol = new SimpleLineSymbol({
             color: new Color("#FF0000"),
-            style: "solid",   //线的样式 dash|dash-dot|solid等	
+            style: "solid",   //线的样式 dash|dash-dot|solid等
             width: 2
         })
         var XJLineGraphicLayer = <GraphicsLayer>this.map.getLayer("GraphicLayer_xjline");
@@ -2291,16 +2340,27 @@ class MapWatching extends BaseWidget {
         }
     }
 
-    requestXJRegionInfoCallback(result) {
+    requestXJRegionInfoCallback(regionType,result) {
         var config = this.config.requestXJRegionInfoCallback;
         var symbol = new SimpleFillSymbol(SimpleFillSymbol.STYLE_SOLID, new SimpleLineSymbol(SimpleLineSymbol.STYLE_DASHDOT, new Color([255, 0, 0]), 2), new Color([0, 0, 0, 0.1]));
         var XJRegionGraphicLayer = <GraphicsLayer>this.map.getLayer("GraphicLayer_xjregion");
+        var graphics = XJRegionGraphicLayer.graphics.filter(ele=>{
+            // if(ele.attributes == regionType){
+            //     XJRegionGraphicLayer.remove(ele);
+            // }
+            return ele.attributes != regionType;
+        });
+        console.log(XJRegionGraphicLayer.graphics);
+        XJRegionGraphicLayer.clear();
+        graphics.forEach(element =>{
+            XJRegionGraphicLayer.add(element)
+        })
         var rows = result.result.records;
         var polygons = [];
         for (var i = 0, length = rows.length; i < length; i++) {
             if (rows[i].geometry !== "") {
                 var polygon = new Polygon(JSON.parse(rows[i].geometry));
-                var graphic = new Graphic(polygon, symbol);
+                var graphic = new Graphic(polygon, symbol,regionType);
                 var creatTime = rows[i].createDate.split(" ")[0];
                 XJRegionGraphicLayer.add(graphic);
                 //添加片区名
@@ -2492,7 +2552,7 @@ class MapWatching extends BaseWidget {
 class Animation {
     timespan: number; //时间间隔
     progress: Function; //处理函数
-    easing: Function;  // 
+    easing: Function;  //
     constructor(timespan, process, easing) {
         this.timespan = timespan;
         this.progress = process;

src/widgets/MapWatching/config.json

@@ -3,7 +3,7 @@
     "tmplateUrl": "widgets/PanelDemo/Widget.html",
     "styleUrl": "widgets/PanelDemo/css/style.css",
 
-
+    "gpsregiontype":"/zmrq/gpsregiontype/page",
     "requestCompanyInfo":  "/Device/Get_Company_List",
     "relativeLayerIds": ["worker_allPathGraphicLayer", "worker_pathShowGraphicLayer", "worker_pathMoveGraphicLayer", "worker_checkPointGraphicLayer", "worker_activeGraphicLayer"],
     "baseLayerIds": ["GraphicLayer_xjregion", "GraphicLayer_buildsite","GraphicLayer_repaired", "GraphicLayer_xjpoint", "GraphicLayer_xjline", "GraphicLayer_worker", "GraphicLayer_hidedanger", "GraphicLayer_car"],

src/widgets/MapWatching/css/style.scss

@@ -347,6 +347,11 @@
         }
         #xunjianlayer {
             height: 300px;
+            .GraphicLayer_xjregion_ul{
+                position: relative;
+                width: 100%;
+                margin-left: 21px;
+            }
             .selector {
                 height: 45px;
                 padding: 10px 4px 4px;
@@ -364,7 +369,7 @@
                 }
             }
             li {
-                height: 30px;
+                min-height: 30px;
                 label {
                     font-weight: initial;
                     float: left;
@@ -494,4 +499,4 @@ a.MapWatching-hidedangerdetail{
         color: rgba(0, 0, 255, 0.7) !important;
         cursor: pointer;
     }
-}
+}

src/widgets/PlanRegion/Widget.html

@@ -47,6 +47,11 @@ $$
         <div class="form-group">
             <span>片区名称</span>
             <input type="text" autocomplete="off"  class="form-control regionname" maxlength="20" placeholder="片区名称">
+            <span>片区类型</span>
+            <select class="form-control regionTypeName">
+
+            </select>
+            <!-- <input type="text" autocomplete="off"  class="form-control regionname" maxlength="20" placeholder="片区名称"> -->
             <span>片区位置</span>
             <input type="text" autocomplete="off"  class="form-control address" placeholder="位置信息">
             <span>管线长度（m）</span>

src/widgets/PlanRegion/Widget.ts

@@ -34,6 +34,7 @@ import Geometry = require("esri/geometry/Geometry");
 import graphicsUtils = require("esri/graphicsUtils");
 import Edit = require("esri/toolbars/edit");
 import AjaxSend = require("common/AjaxSend.class")
+import { result } from 'lodash/fp';
 export = PlanRegion;
 
 class PlanRegion extends BaseWidget {
@@ -265,8 +266,8 @@ class PlanRegion extends BaseWidget {
             elementId: "plan_region_tableid",
             url: that.config.getPlanRegionList,
             searchInfo: {},
-            displayTitle: ["片区名称", "片区位置", "片区备注", "管线长度(m)", "管线数量(条)", "创建用户", "创建时间"],
-            displayField: ["regionname", "address", "notes", "pipeLength", "pipeNum", "createUserName", "createDate"],
+            displayTitle: ["片区名称","片区类型", "片区位置", "片区备注", "管线长度(m)", "管线数量(条)", "创建用户", "创建时间"],
+            displayField: ["regionname", "regionTypeName","address", "notes", "pipeLength", "pipeNum", "createUserName", "createDate"],
             beforeTrClickEvent: this.beforeTrClickEvent.bind(this),
             afterTrClickEvent: this.afterTrClickEvent.bind(this),
             drawEvent: undefined,
@@ -373,8 +374,9 @@ class PlanRegion extends BaseWidget {
         this.popup.setSize(500, 500);
         var Obj = this.popup.Show("修改", this.template.split('$$')[1]);
         this.objpup = Obj;
-        let data = this.dataTable.aExtentData.currentTableData
+        let data = this.dataTable.aExtentData.currentTableData;
         Obj.conObj.find('.regionname').val(data.regionname);
+        this.getRegionType(Obj,data.regionType);
         Obj.conObj.find('.address').val(data.address);
         Obj.conObj.find('.notes').val(data.notes);
         Obj.conObj.find('.pipelength').val(data.pipeLength);
@@ -385,6 +387,7 @@ class PlanRegion extends BaseWidget {
             var notes = Obj.conObj.find('.notes');
             var pipelength = Obj.conObj.find('.pipelength');
             var pipenum = Obj.conObj.find('.pipenum');
+            var regionType = Obj.conObj.find('.regionTypeName option:selected');
             if (regionname.val() == "") {
                 regionname.addClass('has-error');
                 regionname.attr("placeholder", "不能为空！");
@@ -400,6 +403,7 @@ class PlanRegion extends BaseWidget {
             let data = {
                 "id": this.dataTable.aExtentData.currentTableData.id,
                 "regionname": regionname.val(),
+                "regionType":regionType.val(),
                 "geometry": this.tempregionjson,
                 "address": address.val(),
                 "notes": notes.val(),
@@ -409,7 +413,24 @@ class PlanRegion extends BaseWidget {
             this.ajaxSend.sendAjax(this, data, this.config.addPlanRegionInfo, this.ajaxSend.type.put, this.updatePlanRegionInfoCallback.bind(this));
         }.bind(this));
     }
-
+    getRegionType(Obj,regionType?){
+        var sendData = {
+            current:1,
+            size:10
+        }
+        this.ajaxSend.sendAjax(this, sendData, this.config.gpsregiontype, this.ajaxSend.type.get, result =>{
+            var regionTypes = result.result.records;
+            var regionTypeStr = "";
+            for(let i of regionTypes){
+                if(regionType&&regionType == i.id){
+                    regionTypeStr += "<option value='"+i.id+"' selected>"+i.regionTypeName+"</option>";
+                }else{
+                    regionTypeStr += "<option value='"+i.id+"'>"+i.regionTypeName+"</option>";
+                }
+            }
+            Obj.conObj.find('.regionTypeName').empty().append(regionTypeStr);
+        });
+    }
     /**
      * 巡检片区范围修改
      * @param e 修改的片区范围
@@ -563,7 +584,7 @@ class PlanRegion extends BaseWidget {
                 layerids: JSON.stringify(pipeids),
                 group_fields: [],
                 // statistic_field: (calculateType == 2 ? "SHAPE.LEN" : "OBJECTID"),
-                statistic_field: (calculateType == 2 ? "PIPELENGTH" : "OBJECTID"), 
+                statistic_field: (calculateType == 2 ? "PIPELENGTH" : "OBJECTID"),
                 statistic_type: ((calculateType == 3 || calculateType == 1) ? 1 : 2),
                 where: "",
                 geometry: this.tempregionjson,
@@ -644,7 +665,7 @@ class PlanRegion extends BaseWidget {
             that.toast.Show("统计长度出错！请检查");
             console.log(data.error);
         }
-        if (that.calculateStatus == 3 && !that.isEidt) {//添加    
+        if (that.calculateStatus == 3 && !that.isEidt) {//添加
             that.loadWait.hide();
             //弹出popup
             that.popup.setSize(500, 500);
@@ -652,6 +673,7 @@ class PlanRegion extends BaseWidget {
             that.objpup = Obj;
             Obj.conObj.find('.pipelength').val(that.pipe_length);
             Obj.conObj.find('.pipenum').val(that.pipe_num);
+            that.getRegionType(Obj);
             Obj.domObj.find('.btn-close').off("click").on("click", function () {
                 this.templanregion.clear();
                 this.popup.Close();
@@ -665,6 +687,7 @@ class PlanRegion extends BaseWidget {
             Obj.submitObj.off("click").on("click", function () {
 
                 var regionname = Obj.conObj.find('.regionname');
+                var regionType = Obj.conObj.find('.regionTypeName option:selected');
                 var address = Obj.conObj.find('.address');
                 var notes = Obj.conObj.find('.notes');
                 var len = Obj.conObj.find('.pipelength');
@@ -689,6 +712,7 @@ class PlanRegion extends BaseWidget {
                 }
                 let data = {
                     "regionname": regionname.val(),
+                    "regionType":regionType.val(),
                     "geometry": that.tempregionjson,
                     "address": address.val(),
                     "notes": notes.val(),
@@ -720,7 +744,7 @@ class PlanRegion extends BaseWidget {
                     this.templanregion.clear();
                     if(that.dataTable.aExtentData&&that.dataTable.aExtentData.currentTableData&&that.dataTable.aExtentData.currentTableData.geometry){
                         that.tempregionjson = that.dataTable.aExtentData.currentTableData.geometry;
-                    }  
+                    }
                 }.bind(this));
                 Obj.submitObj.off("click").on("click", function () {
                     this.popup.Close();
@@ -912,4 +936,4 @@ class PlanRegion extends BaseWidget {
     private zoom2MapHalf(geo) {
         this.map.setExtent(geo.getExtent());
     }
-}
+}

src/widgets/PlanRegion/config.json

@@ -3,13 +3,14 @@
     "tmplateUrl": "widgets/PlanRegion/Widget.html",
     "styleUrl": "widgets/PlanRegion/css/style.css",
     "getPlanRegionList": "/zmrq/gpsregion/page",
-    "addPlanRegionInfo": "/zmrq/gpsregion",   
+    "addPlanRegionInfo": "/zmrq/gpsregion",
     "deletePlanRegion": "/zmrq/gpsregion/deleteByIds",
+    "gpsregiontype":"/zmrq/gpsregiontype/page",
     "pagenumber": 1,
-    "pagesize": 25,    
+    "pagesize": 25,
     "MarkPictureSymbol": "./widgets/PlanRegion/images/planpoint.png",
     "WarnMarkPictureSymbol": "./widgets/PlanRegion/images/point.png",
-    "TextbgSymbol": "./widgets/PlanRegion/images/textbg.png",    
+    "TextbgSymbol": "./widgets/PlanRegion/images/textbg.png",
     "device_type_id":{
         "path":"6",
         "point":"1",

src/widgets/PlanRegionTypeManager/Widget.html

@@ -0,0 +1,55 @@
+<div class="widget-PlanRegionTypeManager">
+    <div class="PlanRegionTypeManager_tit">
+        <div class="form-inline">
+            <div class="form-group">
+                <button id="btn_add" type="button" class="btn_addSiteTypeManager">
+                           新增
+                </button>
+            </div>
+            <div class="form-group">
+                <button id="btn_edit" type="button" class="btn_editSiteTypeManager">
+                        修改
+                </button>
+            </div>
+            <div class="form-group">
+                <button id="btn_delete" type="button" class="btn_deleteSiteTypeManager">
+                           删除
+                </button>
+            </div>
+            <div class="form-group groupright">
+                <div class="btn_expSiteTypeManager">
+                    <img src="./widgets/KeyEquipment/images/export.png" />
+                    <span>导出</span>
+                </div>
+                <!-- <button id="btn_delete" type="button" class="btn_expSiteTypeManager">
+                           导出
+                </button> -->
+            </div>
+        </div>
+    </div>
+    <div class="fullpaneltable PlanRegionTypeManagerinfo" id='PlanRegionTypeManagerinfo'>
+        <table class="table table-bordered  table-striped" id='PlanRegionTypeManagerdata' cellspacing="0">
+        </table>
+    </div>
+    $$
+    <div class="widget-PlanRegionTypeManager_addpopup">
+        <form id='widget-PlanRegionTypeManager_addpopup_form' class="form-horizontal" data-bv-message="不能为空">
+            <div class="usersmanagement">
+                <div class="form-group">
+                    <label class=" control-label" style="margin-left:20px">区域类型</label>
+                    <div style="width:calc(100% - 40px);margin-left:20px">
+                        <input type="text" autocomplete="off"  maxlength="6" class="form-control name" name="regionTypeName" data-bv-message="区域类型不能为空" data-bv-trigger="blur" required placeholder="区域类型">
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class=" control-label" style="margin-left:20px">备注</label>
+                    <div style="width:calc(100% - 40px);margin-left:20px">
+                        <input type="text" autocomplete="off" maxlength="20"  class="form-control  note" name=" note" placeholder="备注">
+                    </div>
+                </div>
+            </div>
+    </div>
+    </form>
+</div>
+$$
+</div>

src/widgets/PlanRegionTypeManager/Widget.ts

@@ -0,0 +1,233 @@
+import BaseWidget = require('core/BaseWidget.class');
+import Functions = require('core/Functions.module');
+import AjaxSend = require("common/AjaxSend.class");
+import VerificationHelper = require("common/VerificationHelper.class")
+export = PlanRegionTypeManager;
+class PlanRegionTypeManager extends BaseWidget {
+    baseClass = "widget-PlanRegionTypeManager";
+    map = null;
+    toast = null;
+    popup = null;
+    loadWait = null;
+    dataTable = null;
+    ajaxSend = null;
+    dataTableValue = null;
+    currentData = null;
+    verificationHelper = null;
+    searchInfo = {};
+
+    /**
+     * @function 初始化启动
+     */
+    startup() {
+        this.configure();
+        this.initHtml();
+        this.initEvent();
+    }
+
+    /**
+     * @function 页面初始化
+     */
+    initHtml() {
+        var html = _.template(this.template.split('$$')[0] + "</div>")();
+        this.setHtml(html);
+        this.ready();
+        this.getSiteTypeManager();
+    }
+
+    configure() {
+        this.toast = this.AppX.runtimeConfig.toast;
+        this.popup = this.AppX.runtimeConfig.popup;
+        this.map = this.AppX.runtimeConfig.map;
+        this.ajaxSend = new AjaxSend();
+        this.verificationHelper = new VerificationHelper();
+        this.loadWait = this.AppX.runtimeConfig.loadWait;
+    }
+
+    /**
+     * 初始化事件
+     */
+    initEvent() {
+        this.domObj.find(".btn_addSiteTypeManager").off().click(e => {
+            this.addVehicleGPSInfo();
+        });
+        this.domObj.find(".btn_editSiteTypeManager").off().click(e => {
+            this.editVehicleGPSInfo();
+        });
+        this.domObj.find(".btn_deleteSiteTypeManager").off().click(e => {
+            this.deleteVehicleGPSInfo();
+        });
+        this.domObj.find(".btn_expSiteTypeManager").off().click(e => {
+            this.domObj.find(".buttons-excel").trigger("click");
+        });
+    }
+
+    addVehicleGPSInfo() {
+        let planBegindate = {
+            format: 'YYYY-MM-DD', //日期格式
+            isinitVal: true,
+        }
+        //弹出popup
+        this.popup.setSize(500, 430);
+        var Obj = this.popup.Show("新增", this.template.split('$$')[1]);
+        //验证
+        (<any>$('#widget-PlanRegionTypeManager_addpopup_form')).bootstrapValidator();
+        Obj.domObj.find('.btn-close').off("click").on("click", function () {
+            this.popup.Close();
+        }.bind(this));
+        Obj.domObj.find('.btn-hide').off("click").on("click", function () {
+            this.popup.Close();
+        }.bind(this));
+        //提交
+        Obj.submitObj.off("click").on("click", function () {
+            let name = Obj.conObj.find(".name").val();
+            let note = Obj.conObj.find(".note").val();
+            if (!name || name.trim() == "") {
+                Obj.conObj.find(".name").addClass('has-error');
+                Obj.conObj.find(".name").attr("placeholder", "不能为空！");
+                this.toast.show("区域类型不能为空");
+                return;
+            }
+            var data = {
+                "regionTypeName": name,
+                "note": note,
+            };
+            //区域类型唯一性判断
+            // let fieldIsExistsData = {
+            //     columnValue: "",
+            //     tableColumn: "",
+            //     tableName: ""
+            // }
+            // this.ajaxSend.sendAjax(this, fieldIsExistsData, this.config.fieldIsExists, this.ajaxSend.type.GET, function (results) {
+            //     if (results.result) {
+            //         this.ajaxSend.sendAjax(this, data, this.config.addSiteTypeManagerInfo, this.ajaxSend.type.post, this.addSiteTypeManagerInfoCallback.bind(this));
+            //     } else {
+            //         this.toast.show("区域类型已存在请重新输入");
+            //         return;
+            //     }
+            // }.bind(this));
+            this.ajaxSend.sendAjax(this, data, this.config.addSiteTypeManagerInfo, this.ajaxSend.type.post, this.addSiteTypeManagerInfoCallback.bind(this));
+        }.bind(this));
+    }
+
+    addSiteTypeManagerInfoCallback(results) {
+        if (this.ajaxSend.checkResults(this, results)) {
+            this.toast.show("区域类型添加成功！")
+            this.getSiteTypeManager();
+        }
+        this.popup.Close();
+    }
+
+    /**
+     * 修改区域类型
+     */
+    editVehicleGPSInfo() {
+        if (!this.dataTable.aExtentData.currentTableData) {
+            this.toast.show("请选择区域类型信息进行调整!");
+            return;
+        }
+        let planBegindate = {
+            format: 'YYYY-MM-DD', //日期格式
+            isinitVal: true,
+            initDate: this.dataTable.aExtentData.currentTableData.useTime,
+        }
+        //弹出popup
+        this.popup.setSize(500, 430);
+        var Obj = this.popup.Show("修改", this.template.split('$$')[1]);
+        let name = Obj.conObj.find(".name").val(this.dataTable.aExtentData.currentTableData.name);
+        let note = Obj.conObj.find(".note").val(this.dataTable.aExtentData.currentTableData.note);
+        //验证
+        (<any>$('#widget-PlanRegionTypeManager_addpopup_form')).bootstrapValidator();
+        Obj.domObj.find('.btn-close').off("click").on("click", function () {
+            this.popup.Close();
+        }.bind(this));
+        Obj.domObj.find('.btn-hide').off("click").on("click", function () {
+            this.popup.Close();
+        }.bind(this));
+        //提交
+        Obj.submitObj.off("click").on("click", function () {
+            let name = Obj.conObj.find(".name").val();
+            let note = Obj.conObj.find(".note").val();
+            if (!name || name.trim() == "") {
+                Obj.conObj.find(".name").addClass('has-error');
+                Obj.conObj.find(".name").attr("placeholder", "不能为空！");
+                this.toast.show("区域类型不能为空");
+                return;
+            }
+            var data = {
+                "id": this.dataTable.aExtentData.currentTableData.id,
+                "regionTypeName": name,
+                "note": note,
+            };
+            this.ajaxSend.sendAjax(this, data, this.config.addSiteTypeManagerInfo, this.ajaxSend.type.put, this.updateSiteTypeManagerInfoCallback.bind(this));
+        }.bind(this))
+    }
+
+    updateSiteTypeManagerInfoCallback(results) {
+        if (this.ajaxSend.checkResults(this, results)) {
+            this.toast.show("区域类型修改成功！")
+            this.getSiteTypeManager();
+        }
+        this.popup.Close();
+    }
+
+    deleteVehicleGPSInfo() {
+        if (!this.dataTable.aExtentData.checkCurrentData||this.dataTable.aExtentData.checkCurrentData.length == 0) {
+            this.toast.show("请选择需要删除的区域类型");
+            return;
+        }
+        this.popup.setSize(300, 200);
+        var Obj = this.popup.ShowMessage("提示", "是否删除选择数据？");
+        Obj.submitObj.off("click").on("click", function () {
+            let data = [];
+            for (let i = 0; i < this.dataTable.aExtentData.checkCurrentData.length; i++) {
+                let item = this.dataTable.aExtentData.checkCurrentData[i];
+                data.push(item.id);
+            }
+            this.ajaxSend.sendAjax(this, data, this.config.deleteSiteTypeManager, this.ajaxSend.type.delete, this.deleteSiteTypeManagerCallback.bind(this));
+        }.bind(this));
+    }
+
+    deleteSiteTypeManagerCallback(results) {
+        if (this.ajaxSend.checkResults(this, results)) {
+            this.toast.show("区域类型删除成功！")
+            this.getSiteTypeManager();
+        }
+        this.popup.Close();
+    }
+
+    getSiteTypeManager() {
+        this.loadWait.show("正在查询数据，请耐心等待...", this.domObj);
+        let that = this;
+        if (that.dataTable) {
+            that.dataTable.ajax.reload();
+            return;
+        };
+        let option = {
+            that: this,
+            dataTable: that.dataTable,
+            elementId: "PlanRegionTypeManagerdata",
+            url: that.config.getSiteTypeManagerList,
+            searchInfo: that.searchInfo,//条件在不断变化，故需要有全局的条件监听
+            displayTitle: ["区域类型", "备注 ", "录入人员", "录入时间"],
+            displayField: ["regionTypeName", "note", "createUserName", "createDate"],
+            extentDisplayTitle: [],
+            extentDisplayField: [],
+            beforeTrClickEvent: undefined,
+            afterTrClickEvent: undefined,
+            drawEvent: undefined,
+            errmassage: "区域类型查询失败",
+            nullmessage: undefined,
+            exportTitle: "区域类型信息"
+        }
+        that.dataTable = this.ajaxSend.DataTables_check(option);
+    }
+
+    /**
+     * 销毁对象
+     */
+    destroy() {
+        this.domObj.remove();
+        this.afterDestroy();
+    }
+}

src/widgets/PlanRegionTypeManager/config.json

@@ -0,0 +1,13 @@
+{
+    "widgetUrl": "widgets/PlanRegionTypeManager",
+    "tmplateUrl": "widgets/PlanRegionTypeManager/Widget.html",
+    "styleUrl": "widgets/PlanRegionTypeManager/css/style.css",
+    "getSiteTypeManagerList": "/zmrq/gpsregiontype/page",
+    "addSiteTypeManagerInfo": "/zmrq/gpsregiontype",
+    "deleteSiteTypeManager": "/zmrq/gpsregiontype/deleteByIds",
+    "fieldIsExists":"/zmrq/common/isExists",
+    "pagenumber": 1,
+    "pagesize": 25,
+    "maxsize": 100000,
+    "zoomscale": 2000
+}

src/widgets/PlanRegionTypeManager/css/style.scss

@@ -0,0 +1,41 @@
+.widget-PlanRegionTypeManager {
+    height: 100%;
+    .PlanRegionTypeManager_tit {
+        .form-group {
+            float: left;
+            margin: 4px 0px 4px 4px;
+        }
+        .groupright{
+            display: flex;
+            position: absolute;
+            right: 15px;
+            div{
+                margin-right: 15px;
+                cursor: pointer;
+            }
+        }
+        button{
+            width: 58px;
+            height: 34px;
+            color: white;
+            background: #1A77E0;
+            border-radius: 3px;
+            border: none;
+            cursor: pointer;
+        }
+    }
+    .fullpaneltable {
+        overflow-y: hidden;
+        height: calc(100% - 44px) !important;
+    }
+}
+
+.widget-PlanRegionTypeManager_addpopup {
+    height: 100%;
+    overflow: auto;
+    .usersmanagement {
+        height: 100%;
+        padding-left: 20px;
+        padding-right: 20px;
+    }
+}

src/widgets/SCADASetting/Widget.html

@@ -55,26 +55,38 @@ $$
     <div class="select-tab">
         <a class="select-tab-item current" data-index="1">
             <em data-index="1">
-                <%=ptname%>
+                <%=obj.dtuName%>
             </em>
         </a>
     </div>
     <div class="select-content">
         <div class="select-content-item open" data-index="1">
             <ul class="select-content-list">
-                <% scadaRealdataResults.forEach(function(item) { %>
+                <% obj.scadaDyuDataList.forEach(function(item) { %>
                     <li>
-                        <div class="form-inline" data-name="<%=item.tag%>">
+                        <div class="form-inline" data-dtuId="<%=item.dtuId%>" data-name="<%=item.fieldName%>">
                             <label class="paratitle">
-                                <%=item.tagExplain%>(
-                                    <%=item.ue%>)</label>
+                                <%=item.fieldShortDesc%>(
+                                    <%=item.fieldUnit%>)</label>
                             <div class="form-group">
                                 <label for="maxval">上限值</label>
-                                <input type="number" class="form-control maxval"  step='0.01' data-name="<%=item.tag%>" value="<%=item.maxval%>">
+                                <input type="number" class="form-control maxval"  step='0.01' data-name="<%=item.fieldName%>" data-dtuId="<%=item.dtuId%>" value="<%=item.thresholdValueMax%>">
                             </div>
                             <div class="form-group">
                                 <label for="minval">下限值</label>
-                                <input type="number" class="form-control minval" step='0.01' data-name="<%=item.tag%>" value="<%=item.minval%>">
+                                <input type="number" class="form-control minval" step='0.01' data-name="<%=item.fieldName%>" data-dtuId="<%=item.dtuId%>" value="<%=item.thresholdValueMin%>">
+                            </div>
+                            <div class="form-group">
+                                <label for="minval">是否报警</label>
+                                <select class="form-control flag" data-name="<%=item.fieldName%>" data-dtuId="<%=item.dtuId%>">
+                                    <%if(item.flag == 1){%>
+                                        <option value="1" selected>报警</option>
+                                        <option value="0">不报警</option>
+                                    <%}else{%>
+                                        <option value="1">报警</option>
+                                        <option value="0" selected>不报警</option>
+                                    <%}%>
+                                </select>
                             </div>
                         </div>
                     </li>

src/widgets/SCADASetting/Widget.ts

@@ -31,6 +31,7 @@ class SCADASetting extends BaseWidget {
             .on("click", ".pageturning", this.goPage.bind(this))
             .on('change', '.dynamic_pagesize', this.onPagesizeChange.bind(this))
             .on('input propertychange keyup', 'li input', this.onInputChange.bind(this))
+            .on("change",".flag",this.onInputChange.bind(this))
             .on('click', '.btn_rsearch', this.onSearchClick.bind(this))
             .on('click', '.btn_save', this.onSaveClick.bind(this))
             .on('click', '.btn_editbatch', this.onEditbatchClick.bind(this));
@@ -48,29 +49,30 @@ class SCADASetting extends BaseWidget {
     * @function 加载所有测站信息
     */
     InitStcds() {
-        let data = {
-            size: 10000,
-            current: 1,
-            searchText: this.domObj.find("#worckspace-input-add").val()
-        }
-        this.ajaxSend.sendAjax(this, data, this.config.searchInfo, this.ajaxSend.type.get, function(data){
-            var htmlStr = "";
-            if (data.result.length > 0) {
-                this.stations = data.result;
-                var alldata = {
-                    ptid: -1,
-                    ptname: "全部"
-                }
-                htmlStr += "<option value='" + alldata.ptid + "'>" + alldata.ptname + "</option>";
-            }
-            for (var i = 0, length = data.result.length; i < length; i++) {
-                var row = data.result[i];
-                htmlStr += "<option value='" + row.ptid + "'>" + row.ptname + "</option>";
-            }
-            this.domObj.find(".stcds").empty().append(htmlStr);
-            this.queryDetailValue(this.config.onePageCount, 1);
-            this.onStationChange();
-        },undefined,false);
+        // let data = {
+        //     size: 10000,
+        //     current: 1,
+        //     searchText: this.domObj.find("#worckspace-input-add").val()
+        // }
+        // this.ajaxSend.sendAjax(this, data, this.config.searchInfo, this.ajaxSend.type.get, function(data){
+        //     // var htmlStr = "";
+        //     // if (data.result.length > 0) {
+        //     //     this.stations = data.result;
+        //     //     var alldata = {
+        //     //         ptid: -1,
+        //     //         ptname: "全部"
+        //     //     }
+        //     //     htmlStr += "<option value='" + alldata.ptid + "'>" + alldata.ptname + "</option>";
+        //     // }
+        //     // for (var i = 0, length = data.result.length; i < length; i++) {
+        //     //     var row = data.result[i];
+        //     //     htmlStr += "<option value='" + row.ptid + "'>" + row.ptname + "</option>";
+        //     // }
+        //     // this.domObj.find(".stcds").empty().append(htmlStr);
+
+        // },undefined,false);
+        this.queryDetailValue(this.config.onePageCount, 1);
+        this.onStationChange();
     }
 
     private onStationChange() {
@@ -78,18 +80,19 @@ class SCADASetting extends BaseWidget {
     }
 
     private queryDetailValue(pageSize: number, pageIndex: number) {
-        var ids = [];
-        var ptid = this.domObj.find(".stcds option:selected").val();
-        if (ptid == -1) {
-            ids = this.stations.map(station => { return station.ptid });
-        }
-        else {
-            ids.push(ptid);
-        }
+        // var ids = [];
+        // var ptid = this.domObj.find(".stcds option:selected").val();
+        // if (ptid == -1) {
+        //     ids = this.stations.map(station => { return station.ptid });
+        // }
+        // else {
+        //     ids.push(ptid);
+        // }
         let data={
             searchText: this.domObj.find("#worckspace-input-add").val(),
-            size: pageSize,
-            current: pageIndex
+            size: 10000,
+            current: 1,
+            companyId:this.AppX.appConfig.companyId,
         }
         this.ajaxSend.sendAjax(this, data, this.config.searchInfo, this.ajaxSend.type.get, function(data){
             this.currentPage = data;
@@ -100,13 +103,13 @@ class SCADASetting extends BaseWidget {
     private showTable(data) {
         this.domObj.find('.foldable').empty();
         if (data.result == null) return;
-        var content = "第" + (data.result.current) + "页" + "共" + data.result.pages + "页";
-        this.domObj.find("button.content").text(content);
-        content = "总共" + data.result.total + "条，每页";
-        this.domObj.find('.pagecontrol').text(content);
+        // var content = "第" + (data.result.current) + "页" + "共" + data.result.pages + "页";
+        // this.domObj.find("button.content").text(content);
+        // content = "总共" + data.result.total + "条，每页";
+        // this.domObj.find('.pagecontrol').text(content);
         data.result.forEach(station => {
-            if (station.scadaRealdataResults == null) {
-                this.AppX.runtimeConfig.toast.show('站点：' + station.station + "缺少监控参数!")
+            if (station.scadaDyuDataList.length == 0) {
+                this.AppX.runtimeConfig.toast.show('站点：' + station.dtuName + "缺少监控参数!")
                 return;
             }
             var tableTemplate = _.template(this.template.split('$$')[1])(station);
@@ -218,8 +221,8 @@ class SCADASetting extends BaseWidget {
     * @return {(返回值类型)} (返回值说明)
     */
     private onInputChange(e) {
-        var paraName = $(e.currentTarget).attr("data-name");
-        this.domObj.find('.form-inline[data-name="' + paraName + '"]').removeClass("edit").addClass("edit");
+        var paraName = $(e.currentTarget).attr("data-dtuid");
+        this.domObj.find('.form-inline[data-dtuid="' + paraName + '"]').removeClass("edit").addClass("edit");
     }
     /**
     * (方法说明)刷新当页数据
@@ -248,25 +251,30 @@ class SCADASetting extends BaseWidget {
         var editData = [];
         let isOk=true;
         this.domObj.find('.form-inline.edit').each((index, element) => {
+            var dtuId = $(element).attr("data-dtuId");
             var name = $(element).attr("data-name");
             var maxval = parseFloat($(element).find('.maxval').val());
             var minval = parseFloat($(element).find('.minval').val());
+            var flag = ($(element).find('.flag option:selected').val())
             if(maxval<minval){
                 isOk=false;
             }
             editData.push({
-                tag: name,
-                maxval: maxval,
-                minval: minval
+                fieldName:name,
+                dtuId: dtuId,
+                flag:flag,
+                thresholdValueMax: maxval,
+                thresholdValueMin: minval,
+                companyId:this.AppX.appConfig.companyId
             })
         });
         if(!isOk){
             this.toast.show("上限值应大于下限值！");
             return ;
         }
-        let data={scadaConfigs:editData}
+        let data={list:editData}
         this.ajaxSend.sendAjax(this, data, this.config.updateValue, this.ajaxSend.type.post, function(data){
-            if (data.code == 1 && data.result) {
+            if (data.code == 1) {
                 var pageNumber = this.currentPage.result.current;
                 this.queryDetailValue(this.config.onePageCount, pageNumber);
                 this.AppX.runtimeConfig.toast.show("保存成功！");
@@ -283,7 +291,7 @@ class SCADASetting extends BaseWidget {
         //     dataType: "json",
         //     data:{scadaConfigs:editData},
         //     success: function (data) {
-               
+
         //     }.bind(this)
         // });
     }

src/widgets/SCADASetting/config.json

@@ -1,8 +1,8 @@
 {
     "updateInterval":6000,
     "onePageCount":15,
-    "searchInfo":"/zmrq/scada/realData",
-    "updateValue":"/zmrq/scada/updateConfig",
+    "searchInfo":"/zmrq/scadadtu/realData",
+    "updateValue":"/zmrq/scadacustomalarm/updateScadaCustomAlarmDetail",
     "testdata": {
         "code": 10000,
         "message": "查询成功!",

src/widgets/SCADAwatchingOnly/Warnings.ts

@@ -139,7 +139,7 @@ class Warnings extends Base {
             this.containerDom.append(this.autoTemplate);
             alarm=this.containerDom.find("#SCADAwatchingOnly-Warnings-mp3")[0];
             alarm.play();
-        }      
+        }
     }
 
     hideMusic(){
@@ -157,7 +157,7 @@ class Warnings extends Base {
     * @return {(返回值类型)} (返回值说明)
     */
     hilightPoints(item) {
-        var p = new Point(item.x, item.y, this.map.spatialReference);
+        var p = new Point(item.longitude, item.latitude, this.map.spatialReference);
         this.alarmPoints.AddNewInfoWindow({
             id: item.ptid,
             title: item.ptname,

src/widgets/SCADAwatchingOnly/Widget.ts

@@ -235,7 +235,7 @@ class SCADAwatchingOnly extends BaseWidget {
         let isWarn = false;
         data.scadaDyuDataList.forEach(item => {
             let isWarnClass = "";
-            if (item.fieldValue < item.minval || item.fieldValue > item.maxval) {
+            if (item.flag == "1" && item.alarmFlag == "1") {
                 isWarnClass = "warnString";
                 if (!isWarn) {
                     isWarn = true;

src/widgets/SCADAwatchingOnly/css/style.scss

@@ -41,7 +41,7 @@
     .infoItem{
         border: 1px solid #ddd;
         margin: 4px;
-        padding: 5px;    
+        padding: 5px;
         .goToPoint{
             display: inline-block;
             width: calc(100% - 40px);
@@ -137,7 +137,7 @@
     position: absolute;
     left: -10px;
     bottom: 10px;
-    min-width: 260px;
+    min-width: 350px;
     .warnString{
         color:red;
     }
@@ -523,4 +523,4 @@
     .warnString {
         color: red;
     }
-}
+}

src/widgets/Search/Widget.ts

@@ -3,6 +3,8 @@ import Map = require("esri/map");
 import MapImageLayer = require("esri/layers/MapImageLayer");
 import Point = require("esri/geometry/Point");
 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 watchUtils = require("esri/core/watchUtils");
@@ -165,7 +167,7 @@ class Search extends BaseWidget {
                     this.delay(this.queryOptionsByPOI.bind(this), 1000);
                 }
             }.bind(this))
-        this.jDom.find(".btn-search").on('click', $.proxy(this.onSearchClick, this));
+        this.jDom.find(".btn-search").on('click', $.proxy(this.queryOptionsByPOI.bind(this), this));
         this.jDom.find(".input-value").on('keydown', $.proxy(this.onInputKeyPress, this));
         this.domObj
             .on('click', '.list-group-item', this.onOptionClick.bind(this))
@@ -345,27 +347,33 @@ class Search extends BaseWidget {
         if (this.AppX.appConfig.gisResource[this.currentFilterType.queryurl].config.length == 0)
             return;
         var url = this.AppX.appConfig.gisResource[this.currentFilterType.queryurl].config[0].url;
-        var find: FindTask = new FindTask(url);
-
+        //var find: FindTask = new FindTask(url);
+        var querUrl = url +"/"+ this.currentFilterType.layerids[0];
+        var queryTask = new QueryTask(querUrl);
+        var query: Query = new Query();
+        query.returnGeometry = true;
+        query.outFields = ["*"];
         // Set parameters to only query the Counties layer by name
-        var params: FindParameters = new FindParameters();
-        params.layerIds = this.currentFilterType.layerids || [0];
+        //var params: FindParameters = new FindParameters();
+        //params.layerIds = this.currentFilterType.layerids || [0];
         if(searchField =="OBJECTID"){
-            params.searchFields = ["OBJECTID"] || this.currentFilterType.queryFields;
+            query.where = '"OBJECTID"=' +filterValue.trim();
         }else if(searchField == "设备编码"){
-            params.searchFields = ["CODE"] || this.currentFilterType.queryFields;
+            query.where = "CODE = '" + filterValue.trim() + "'";
         }else if(searchField == "地址"){
-            params.searchFields = ["ADDR"] || this.currentFilterType.queryFields;
+            query.where = "ADDR = '" + filterValue.trim() + "'";
         }else{
-            params.searchFields = this.currentFilterType.queryFields;
+            query.where = this.currentFilterType.queryFields;
         }
+        queryTask.on("complete", this.showResults.bind(this));
+        queryTask.on("error", this.rejectedError.bind(this));
+        queryTask.execute(query);
+        //params.returnGeometry = true;
 
-        params.returnGeometry = true;
-
-        params.searchText = filterValue.trim();
-        find.execute(params)
-            .then(this.showResults.bind(this))
-            .otherwise(this.rejectedError.bind(this));
+        //params.searchText = filterValue.trim();
+        // find.execute(params)
+        //     .then(this.showResults.bind(this))
+        //     .otherwise(this.rejectedError.bind(this));
     };
     /**
     * (方法说明)以信息窗方式显示搜索结果
@@ -375,9 +383,9 @@ class Search extends BaseWidget {
     * @return {(返回值类型)} (返回值说明)
     */
     private showResults(response) {
-        if (response && response.length > 0) {
+        if (response && response.featureSet.features.length > 0) {
             this.resultsSelectedIndex = 0;
-            this.results = response;
+            this.results = response.featureSet.features;
             this.initPopupShow(this.currentFilterType.label);
         }
         else {
@@ -393,11 +401,11 @@ class Search extends BaseWidget {
     */
     private initPopupShow(title: string) {
         var selectedItem: any = this.results[0];
-        var geometry = selectedItem.feature.geometry;
+        var geometry = selectedItem.geometry;
         var point: Point;
         if (geometry.type == "point")
-            point = selectedItem.feature.geometry;
-        else point = selectedItem.feature.geometry.getExtent().getCenter();
+            point = selectedItem.geometry;
+        else point = selectedItem.geometry.getExtent().getCenter();
         point.spatialReference = this.map.spatialReference;
         var findeValue = selectedItem.value;
         var mixedTemplate = _.template(this.popUpContent)({
@@ -564,16 +572,13 @@ class Search extends BaseWidget {
         // var switchedCoords = lat + ", " + lon;
         // var strings = "i18n";
         var html = "";
-        html += "<p>设备编码:"+result.feature.attributes["设备编码"]+"</p>";
-        html += "<p>设备名称:"+result.feature.attributes["设备名称"]+"</p>";
-        html += "<p>管径:"+result.feature.attributes["管径"]+"</p>";
-        html += "<p>材质:"+result.feature.attributes["材质"]+"</p>";
-        html += "<p>地址:"+result.feature.attributes["地址"]+"</p>";
-        if(result.layerName=="阀门"){
-            html += "<p>开关状态:"+result.feature.attributes["开关状态"]+"</p>";
-        }else{
-            html += "<p>工作状态:"+result.feature.attributes["工作状态"]+"</p>";
-        }
+        html += "<p>设备编码:"+result.attributes.CODE+"</p>";
+        html += "<p>设备名称:"+result.attributes.NAME+"</p>";
+        html += "<p>管径:"+result.attributes.DIAMETER +"</p>";
+        html += "<p>材质:"+result.attributes.MATERIAL+"</p>";
+        html += "<p>地址:"+result.attributes.ADDR+"</p>";
+        html += "<p>状态:"+result.attributes.RUNSTATUS+"</p>";
+
         // html += "<div class=\"" + this.css.moreResultsLatLonHeader + "\">" + strings + "</div>";
         // html += originalCoords;
         // html += "</div>";

src/widgets/SiteSupervisionAudit/Widget.ts

@@ -109,7 +109,7 @@ class SiteSupervisionAudit extends BaseWidget {
         this.searchInfo = {
             siteType: siteType ? siteType : "",
             siteName: siteName ? siteName : "",
-            dispatchUserId:this.AppX.appConfig.userId,
+            // dispatchUserId:this.AppX.appConfig.userId,
             constructionState:this.siteSupervisionPageInfo.constructionState.waitAudit,
             "orders[0].asc":false,
             "orders[0].column":"creat_time"
@@ -174,7 +174,7 @@ class SiteSupervisionAudit extends BaseWidget {
         let data = {
             current: 1,
             size: 10000,
-            dispatchUserId:this.AppX.appConfig.userId,
+            //dispatchUserId:this.AppX.appConfig.userId,取消只能查看当前登陆人的信息  限制
             constructionState:this.siteSupervisionPageInfo.constructionState.waitAudit
         }
         this.ajaxSend.sendAjax(this, data, this.config.getRushList, this.ajaxSend.type.get, function (results) {
@@ -322,4 +322,4 @@ class SiteSupervisionAudit extends BaseWidget {
         this.domObj.remove();
         this.afterDestroy();
     }
-}
+}

src/widgets/SiteSupervisionPageInfo/Widget.html

@@ -86,7 +86,7 @@ $$
         <div class='voice form-control' name='voice' showname='voice'></div>
     </div>
 </div>
-<div class="form-group form-inline workDay userSelect">
+<!-- <div class="form-group form-inline workDay userSelect">
     <div class='item'>
         <label class=" control-label">部门</label>
         <select class="input-sm form-control  department" data-live-search="true"
@@ -99,7 +99,7 @@ $$
             name='dispatchUserId' data-max-options="1" data-style="btn-primary">
         </select>
     </div>
-</div>
+</div> -->
 $$
 <!--抢险人员指定（2）-->
 <div class='stateInfo'><span class='titleInfo'>派工信息</span> <span class='spanValue' name='dispatchDate'></span></div>

src/widgets/SiteSupervisionReport/Widget.ts

@@ -136,7 +136,11 @@ class SiteSupervisionReport extends BaseWidget {
             data = { x: this.localPoint.x, y: this.localPoint.y };
         }
         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);
+        //getHtml.setDepartmentAndUser(this, Obj.conObj.find('.department'), Obj.conObj.find('.dispatchUserId'), dataInfo);//渲染部门和人员列表
+        /**
+         * 现在取消部门和人员列表的渲染,上报阶段直接使用当前登陆人的部门和id进行上报
+         * 如果要恢复,请在SiteSupervisionPageInfo中将部门和人员的html注释恢复
+         */
         getHtml.getSiteType(Obj.conObj.find(".siteType"), false);
         if (!dataInfo) {
             Obj.conObj.find(".voicegroup").hide();
@@ -175,6 +179,8 @@ class SiteSupervisionReport extends BaseWidget {
                 sendData.append('id', dataInfo.id);
             }
             sendData.append('constructionState', getHtml.constructionState.waitDispatching);
+            sendData.append('department',this.AppX.appConfig.deptId);
+            sendData.append('dispatchUserId',this.AppX.appConfig.userId);
             this.ajaxSend.sendFileAjax(this, sendData, this.config.rushReport, this.ajaxSend.type.post, this.rushReport.bind(this));
         }.bind(this));
     }
@@ -394,4 +400,4 @@ class SiteSupervisionReport extends BaseWidget {
         this.domObj.remove();
         this.afterDestroy();
     }
-}
+}