巡检安排

src/configure.ts

@@ -1843,14 +1843,13 @@ var AppX = {
         "gisResource": {
             "base": {
                 "name": "底图",
-                "type": "dynamic",
+                "type": "tiled",
                 "config": [
                     {
                         "key": "base1",
                         "name": "底图",
                         // "url": "http://218.200.166.203:1111/arcgis/rest/services/dyrq/DeYang_Image/MapServer" // 德阳
-                         "url": "http://218.200.166.203:8035/arcgis/rest/services/GUANGHAN/GUANGHAN_IMAGE/MapServer" // 广汉正式环境
-
+                         "url": "http://218.200.166.203:8035/arcgis/rest/services/GUANGHAN/GUANGHAN_IMAGE/MapServer", // 广汉正式环境
                     }
                 ]
             },
@@ -1868,14 +1867,13 @@ var AppX = {
             },
             "terrain": {
                 "name": "地形地图",
-                "type": "dynamic",
+                "type": "tiled",
                 "config": [
                     {
                         "key": "dixing1",
                         "name": "地形(天地图)",
                         // "url":"http://218.200.166.203:1111/arcgis/rest/services/dyrq/DeYang_Vector/MapServer" // 德阳
-                        "url": "http://218.200.166.203:8035/arcgis/rest/services/GUANGHAN/GUANGHAN_TDT/MapServer" // 广汉正式环境
-
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/GUANGHAN/GUANGHAN_TDT/MapServer", // 广汉正式环境
                     }
                 ]
             },
@@ -2001,6 +1999,19 @@ var AppX = {
                         "name": "图层过滤服务2",
                         "url": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/FilterMapRQ/MapServer",
                         // "mapServerUrl": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/FilterMapRQ2/MapServer"
+                    },
+                    // ||||以下是支持多图层过滤的
+                    {
+                        "key": "filterMapRQ3",
+                        "name": "图层过滤服务3",
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/FilterMapRQ2/GPServer/FilterMapRQ2",
+                        // "mapServerUrl": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/FilterMapRQ2/MapServer"
+                    },
+                    {
+                        "key": "filterMapRQ4",
+                        "name": "图层过滤服务4",
+                        "url": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/FilterMapRQ2/MapServer",
+                        // "mapServerUrl": "http://218.200.166.203:8035/arcgis/rest/services/dyrq/FilterMapRQ2/MapServer"
                     }
                 ]
             },

src/vendor/multiselect/js/bootstrap-multiselect.js

@@ -41,7 +41,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-!function ($) {
+ !function ($) {
     "use strict";// jshint ;_;
 
     if (typeof ko !== 'undefined' && ko.bindingHandlers && !ko.bindingHandlers.multiselect) {
@@ -415,9 +415,9 @@
             filterBehavior: 'text',
             includeFilterClearBtn: true,
             preventInputChangeEvent: false,
-            nonSelectedText: 'None selected',
-            nSelectedText: 'selected',
-            allSelectedText: 'All selected',
+            nonSelectedText: '请选择',
+            nSelectedText: '已选择',
+            allSelectedText: '全部选择',
             numberDisplayed: 3,
             disableIfEmpty: false,
             disabledText: '',

src/widgets/BaseMap/Widget.ts

@@ -69,7 +69,7 @@ class BaseMap extends BaseWidget {
     * @return {(Map)} (返回一个Map对象)
     */
     addToMap() {
-        var map = new Map(this.config.mapDiv, { logo: false, showLabels: true, showAttribution: false, slider: false});
+        var map = new Map(this.config.mapDiv, { logo: false, showLabels: true, showAttribution: false, slider: false });
         //添加对应图层到map对象
         for (var i = 0; i < this.config.mapService.length; i++) {
             var layername = this.config.mapService[i];
@@ -81,14 +81,10 @@ class BaseMap extends BaseWidget {
                         var tileLayer = new ArcGISTiledMapServiceLayer(url, { className: "tileLayer" });
                         tileLayer.id = layername + "_" + index;
                         if (this.config.baselayers.indexOf(layername) != -1) {//基础底图放置在最下层
-                            //add private terrain layer
-                            // if (this.AppX.appConfig.gisResource.privateterrain.config.length) {
-                            //     var privatelayer = new ArcGISTiledMapServiceLayer(this.AppX.appConfig.gisResource.privateterrain.config[0].url, { className: "tileLayer" });
-                            //     privatelayer.id = "privateterrain_0";
-                            //     privatelayer.setVisibility(false);
-                            //     map.addLayer(privatelayer, 0);
-                            // }
-                            //add private terrain layer
+                            // 设置默认关闭影像底图
+                            if (this.AppX.appConfig.gisResource[layername].config[index].key = "base1") {
+                                tileLayer.setVisibility(false);
+                            }
                             map.addLayer(tileLayer, 0);//管线图层最先添加，但地形图要插入到最底层，以保证地图的缩放比例尺与切片管线一致
                         }
                         else
@@ -360,37 +356,37 @@ class BaseMap extends BaseWidget {
     }
 
     initLegend(map) {
-        let layerName=this.map.layerIds.filter(e=>{
-            return e.indexOf("pipe")!=-1;
+        let layerName = this.map.layerIds.filter(e => {
+            return e.indexOf("pipe") != -1;
         })
-        let dom=$(".theMapLegendSet");
-        if(layerName.length>0){
-            let pipeLayer=[];
-            layerName.forEach(e=>{
-                let info={
-                    layer:this.map.getLayer(e),
-                    defaultSymbol:true,
-                    title:"图例："
+        let dom = $(".theMapLegendSet");
+        if (layerName.length > 0) {
+            let pipeLayer = [];
+            layerName.forEach(e => {
+                let info = {
+                    layer: this.map.getLayer(e),
+                    defaultSymbol: true,
+                    title: "图例："
                 }
                 pipeLayer.push(info);
             });
             var legend = new Legend({
                 map: map,
-                layerInfos:pipeLayer
+                layerInfos: pipeLayer
             }, "theMapLegend");
             legend.startup();
-            dom.find(".hideAndShow").click(e=>{
-                if($(e.currentTarget).hasClass("glyphicon-resize-small")){
+            dom.find(".hideAndShow").click(e => {
+                if ($(e.currentTarget).hasClass("glyphicon-resize-small")) {
                     dom.addClass('hide');
                     $(e.currentTarget).removeClass("glyphicon-resize-small").addClass("glyphicon-resize-full");
-                    $(e.currentTarget).attr("title",'点击显示图例');
-                }else{
+                    $(e.currentTarget).attr("title", '点击显示图例');
+                } else {
                     dom.removeClass('hide');
                     $(e.currentTarget).removeClass("glyphicon-resize-full").addClass("glyphicon-resize-small");
-                    $(e.currentTarget).attr("title",'点击隐藏图例');
+                    $(e.currentTarget).attr("title", '点击隐藏图例');
                 }
             })
-        }else{
+        } else {
             dom.remove();
         }
     }

src/widgets/HiddenTroubleSearchAll/Widget.html

@@ -34,9 +34,9 @@
             <button id="btn_add" type="button" class="btn btn-sm btn-default btn-success btn_search">
                 <span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询
             </button>
-            <!-- <button id="btn_export" type="button" class="btn btn-sm btn-default btn-success btn_export">
+            <button id="btn_export" type="button" class="btn btn-sm btn-default btn-success btn_export" style="margin-left: 10px;">
                 <span class="glyphicon glyphicon-export" aria-hidden="true"></span>导出
-            </button> -->
+            </button>
         </div>
     </div>
     <div class='tableList  halfpaneltable'>

src/widgets/MaintenanceSearch/Widget.html

@@ -17,6 +17,9 @@
             <button id="btn_add" type="button" class="btn btn-sm btn-default btn-success btn_search">
                 <span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询
             </button>
+            <button id="btn_export" type="button" class="btn btn-sm btn-default btn-success btn_export" style="margin-left: 10px;">
+                <span class="glyphicon glyphicon-export" aria-hidden="true"></span>导出
+            </button>
         </div>
     </div>
     <div class="planpath_content halfpaneltable">

src/widgets/MaintenanceSearch/Widget.ts

@@ -122,6 +122,9 @@ class MaintenanceSearch extends BaseWidget {
         this.domObj.find(".btn_search").off().click(e => {
             this.getMaintenanceList();
         });
+        this.domObj.find(".btn_export").off().click(e => {
+            this.domObj.find(".buttons-excel").trigger("click");
+        });
     }
 
     /**
@@ -288,9 +291,9 @@ class MaintenanceSearch extends BaseWidget {
                 }
             }
         }.bind(this),
-        errmassage: "抢险信息查询失败",
+        errmassage: "抢维修信息查询失败",
         nullmessage: undefined,
-        exportTitle: "抢险信息"
+        exportTitle: "抢维修信息"
     }
     that.dataTable = this.ajaxSend.DataTables_check(option);
 }

src/widgets/MissionSchedule/Widget.html

@@ -9,33 +9,39 @@
                 <label for="users">人员</label>
                 <select class="input-sm form-control users minwidth" id="users"></select>
             </div>
+            <div class="form-group">
+                <label for="region">任务创建人</label>
+                <input class="input-sm form-control createUser" id="createUser"></input>
+            </div>
             <div class="form-group">
                 <label for="plan_begindate">巡检日期</label>
-                <input type="text" readonly="readonly" class="form-control plan_begindate minwidth" id="plan_begindate" placeholder="年-月-日">
+                <input type="text" readonly="readonly" class="form-control plan_begindate minwidth" id="plan_begindate"
+                    placeholder="年-月-日">
                 <label for="plan_enddate">~</label>
-                <input type="text" readonly="readonly" class="form-control plan_enddate minwidth" id="plan_enddate" placeholder="年-月-日">
+                <input type="text" readonly="readonly" class="form-control plan_enddate minwidth" id="plan_enddate"
+                    placeholder="年-月-日">
             </div>
             <div id="toolbar" class=" btn-group btn-group-sm toolbar">
                 <div class="form-group">
-                    <button type="button" class="btn btn-default btn-primary btn-search">
-                    <span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询
-                </button>
+                    <button type="button" class="btn-search">
+                        查询
+                    </button>
                 </div>
                 <div class="form-group">
-                    <button title="新增计划" id="btn_addplans" type="button" class="btn btn-default btn-success btn_addplans" data-toggle="modal">
-                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>新增
-                        </button>
+                    <button title="新增计划" id="btn_addplans" type="button" class="btn_addplans" data-toggle="modal">
+                        新增
+                    </button>
                 </div>
-                <div class="form-group">
-                    <button title="删除计划" id="btn_deleteplans" type="button" class="btn btn-default btn-danger btn_deleteplans" data-toggle="modal">
-                        <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>删除
-                        </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 class="form-group">
                     <button title="转移计划" id="btn_transplans" type="button" class="btn btn-default btn-danger btn_transplans" data-toggle="modal">
                         <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>转移
                         </button>
-                </div>
+                </div> -->
             </div>
         </div>
     </div>
@@ -49,18 +55,18 @@ $$
     <div id="toolbar" class=" btn-group btn-group-sm toolbar">
         <div class="form-group">
             <button type="button" class="btn btn-default btn-success btn_previous_step">
-            <span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span>上一步
-        </button>
+                <span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span>上一步
+            </button>
         </div>
         <div class="form-group">
             <button type="button" class="btn btn-default btn-success btn_next_step">
-            <span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span>下一步
-        </button>
+                <span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span>下一步
+            </button>
         </div>
         <div class="form-group">
             <button type="button" class="btn btn-default btn-success btn_return">
-            <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>返回
-        </button>
+                <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>返回
+            </button>
         </div>
     </div>
     <div class="missionschedule">
@@ -75,7 +81,8 @@ $$
                         <label for="plantype">
                             <span style="color: red">*</span>巡检模式</label>
                         <div class="form-group">
-                            <input type="radio" class="input-sm radio plan_person" checked='true' value="0" name="radio" />
+                            <input type="radio" class="input-sm radio plan_person" checked='true' value="0"
+                                name="radio" />
                             <label for="plan_begindate">人巡</label>
                         </div>
                         <div class="form-group" style="margin-left: 5px">
@@ -88,9 +95,26 @@ $$
             <tr>
                 <th>
                     <div class="form-inline">
-                        <label for="plantype">
-                            <span style="color: red">*</span>巡检类型</label>
-                        <select class="input-sm  plantype minwidth" id="plantype" style="width: 238px;"></select>
+                        <div class="form-group">
+                            <label for="pointSelect">
+                                <input type="radio" class="input-sm radio pointSelect" checked='true' value="0"
+                                    name="typeSelect" />
+                                单选</label>
+                        </div>
+                        <div class="form-group" style="margin-left: 5px;margin-right: 20px;">
+                            <label for="lineSelect">
+                                <input type="radio" class="input-sm radio lineSelect" value="1" name="typeSelect" />
+                                多选</label>
+                        </div>
+                        <label for="planpointtype">
+                            <span style="color: red">*</span>单选巡检类型</label>
+                        <select class="input-sm  planpointtype minwidth" id="planpointtype"
+                            style="width: 238px;"></select>
+                        <label for="tip" class="existTip" style="color: red;"></label>
+                        <label for="planlinetype" style="margin-left:20px">
+                            <span style="color: red">*</span>多选巡检类型</label>
+                        <select class="input-sm  planlinetype minwidth" id="planlinetype" style="width: 238px;"
+                            multiple="multiple" disabled size="2"></select>
                         <label for="tip" class="existTip" style="color: red;"></label>
                     </div>
                 </th>
@@ -104,7 +128,8 @@ $$
                         </select>
                         <span class="glyphicon glyphicon-question-sign period_sign" title=""></span>
                         <span class="tianshu">周期为：
-                            <input type="text" class="form-control zidingyi_period minwidth" id="decday" placeholder="">天 </span>
+                            <input type="text" class="form-control zidingyi_period minwidth" id="decday"
+                                placeholder="">天 </span>
                     </div>
                 </th>
             </tr>
@@ -114,40 +139,68 @@ $$
                         <div class="form-group">
                             <label for="plan_begindate">
                                 <span style="color: red">*</span>起止时间</label>
-                            <input type="text" class="input-sm form-control plan_begindate minwidth" placeholder="年-月-日" readonly="readonly" />
+                            <input type="text" class="input-sm form-control plan_begindate minwidth" placeholder="年-月-日"
+                                readonly="readonly" />
                         </div>
                         <div class="form-group">
                             <label for="plan_enddate" style="margin-left: 11px;margin-right: 11px;">~</label>
-                            <input type="text" class="input-sm form-control plan_enddate minwidth" placeholder="年-月-日" readonly="readonly" />
+                            <input type="text" class="input-sm form-control plan_enddate minwidth" placeholder="年-月-日"
+                                readonly="readonly" />
                         </div>
                         <span class="glyphicon glyphicon-question-sign  " title="包含开始和结束时间"></span>
                     </div>
                 </th>
             </tr>
-            <tr>
-                <th>
-                    <div class="form-inline" style="margin-left: 27px;">
-                        <div class="form-group department_btn">
-                            <label for="department">
-                                <span style="color: red">*</span>部门</label>
-                            <select class="input-sm department minwidth" id="department"></select>
-                        </div>
-                        <div class="form-group">
-                            <label for="user">
-                                <span style="color: red">*</span>人员</label>
-                            <select class="input-sm users minwidth" id="users"></select>
-                        </div>
-                        <div class="form-group">
-                            <label for="user">
-                                <span style="color: red">*</span>计划完成率</label>
-                            <input type="number" class="input-sm  plan_rate" value="80" />%
-                        </div>
-                    </div>
-                </th>
-            </tr>
+            <!-- <tr>
+                <th> -->
+
+            <!-- </th>
+            </tr> -->
             <tbody class="planslist">
             </tbody>
         </table>
+        <div class="form-inline" style="margin-left: 27px;">
+            <div class="form-group department_btn">
+                <label for="department">
+                    <span style="color: red">*</span>部门</label>
+                <select class="input-sm department minwidth" id="department"></select>
+            </div>
+            <div class="form-group">
+                <label for="user">
+                    <span style="color: red">*</span>主要人员</label>
+                <!-- <select class="input-sm form-control  users" name='users' showname='levelName' data-live-search="true" data-max-options="2" data-style="btn-primary">
+                    </select> -->
+
+                <select class="input-sm users minwidth" id="users"></select>
+            </div>
+            <div class="form-group">
+                <label for="subUser">
+                    <span style="color: red">*</span>协助人员</label>
+                <select class="input-sm subUsers minwidth" id="subUsers" multiple="multiple"></select>
+            </div>
+            <div class="form-group">
+                <label for="user">
+                    <span style="color: red">*</span>计划完成率</label>
+                <input type="number" class="input-sm  plan_rate" value="80" />%
+            </div>
+            <div class="form-group" style="margin-left: 50px;">
+                <label for="tolerance">
+                    <span style="color: red">*</span>设备容差</label>
+                <input type="number" class="input-sm  plan_tolerance" value="100" min="0" />
+            </div>
+            <div class="form-group" style="margin-left: 50px;">
+                <label for="">
+                    <input type="radio" class="input-sm radio xunjianArea" checked='true' value="巡检区域"
+                        name="xunjianSelect" />
+                    巡检区域</label>
+            </div>
+            <div class="form-group" style="margin-left: 5px;margin-right: 20px;">
+                <label for="lineSelect">
+                    <input type="radio" class="input-sm radio xunjianUser" disabled value="巡检责任人"
+                        name="xunjianSelect" />
+                    巡检责任人</label>
+            </div>
+        </div>
     </div>
 </div>
 $$
@@ -169,7 +222,8 @@ $$
     </div>
 </div>
 <div class="halfpaneltable missionschedule planregionslist-table">
-    <table class="table table-bordered  table-striped " style="table-layout: fixed;" cellspacing="0" id='planregionslist_table'>
+    <table class="table table-bordered  table-striped " style="table-layout: fixed;" cellspacing="0"
+        id='planregionslist_table'>
         <thead>
             <tr>
                 <th title="片区名称">片区名称</th>
@@ -198,10 +252,10 @@ $$
                 <tr>
                     <th class='checkwidth'>
                         <input type='checkbox' name='deviceslist-select' data-index=0 class='deviceslist-selected' />
-                        <th title="区县代码">区县代码</th>
-                        <th title="设备类型">设备类型</th>
-                        <th title="设备编码">设备编码</th>
-                        <th title="设备地址">设备地址</th>
+                    <th title="区县代码">区县代码</th>
+                    <th title="设备类型">设备类型</th>
+                    <th title="设备编码">设备编码</th>
+                    <th title="设备地址">设备地址</th>
                 </tr>
             </tbody>
             <tbody class="deviceslist">
@@ -331,39 +385,48 @@ $$
 </div>
 $$
 <div class="widget-planregion_deviceselect">
-    <div id="toolbar" class=" btn-group btn-group-sm toolbar2 ">
+    <div id="toolbar" class=" btn-group btn-group-sm self-toolbar ">
         <!-- <div class="form-inline" style="float: left;margin-left: 5px;">
             <label for="users" class="serch_names">唯一编号</label>
             <input type="text" class="form-control serchcontent minwidth">
         </div> -->
-        <div class="form-group  form-inline setTime" style='display: none'>
-            <label>安装时间</label>
-            <input type="text" class="input-sm form-control setTimebegindate minwidth" placeholder="年-月-日" readonly="readonly" />
-            <label for="plan_enddate" style="margin-left: 11px;margin-right: 11px;">~</label>
-            <input type="text" class="input-sm form-control setTimeenddate minwidth" placeholder="年-月-日" readonly="readonly" />
+        <div>
+            <div class="form-group  form-inline setTime" style='display: none'>
+                <label>安装时间</label>
+                <input type="text" class="input-sm form-control setTimebegindate minwidth" placeholder="年-月-日"
+                    readonly="readonly" />
+                <label for="plan_enddate" style="margin-left: 11px;margin-right: 11px;">~</label>
+                <input type="text" class="input-sm form-control setTimeenddate minwidth" placeholder="年-月-日"
+                    readonly="readonly" />
+            </div>
+            <button type="button" class="btn btn-default btn-success  btn-search btn_search" style="margin-left: 4px;">
+                <span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询
+            </button>
+            <label for="MATERIAL">
+                <span style="color: red">*</span>材质选择</label>
+            <select class="input-sm  MATERIAL minwidth" id="MATERIAL" style="width: 150px;height: 32px;"></select>
+            <button id="btn_select" type="button" class="btn btn-success btn_select">
+                <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>图上选择
+            </button>
+            <button id="btn_part_removeall" type="button" class="btn btn-warning btn_part_removeall">
+                <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>清除部分选择
+            </button>
+            <button id="btn_removeall" type="button" class="btn  btn-danger btn_removeall">
+                <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>清除所有选择
+            </button>
+            <button id="btn_delete" type="button" class="btn btn-primary btn_confirm">
+                <span class="glyphicon glyphicon-check" aria-hidden="true"></span>完成
+            </button>
+            <span class='pipeType' style='display: none'>已选中管线长度<span class='pipeTypeLength'>0</span>米</span>
+        </div>
+        <div>
+            <button id="btn_add" type="button" class="btn btn-primary btn_previous_step">
+                <span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span>上一步
+            </button>
+            <button id="btn_return" type="button" class="btn btn-info btn_return">
+                <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>返回
+            </button>
         </div>
-        <button type="button" class="btn btn-default btn-success  btn-search btn_search"  style="margin-left: 4px;">
-            <span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询
-        </button>
-        <button id="btn_delete" type="button" class="btn btn-default btn-success btn_confirm">
-            <span class="glyphicon glyphicon-check" aria-hidden="true"></span>完成
-        </button>
-        <button id="btn_select" type="button" class="btn btn-default btn-success btn_select">
-            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>图上选择
-        </button>
-        <button id="btn_part_removeall" type="button" class="btn btn-default btn-success btn_part_removeall">
-            <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>清除部分选择
-        </button>
-        <button id="btn_removeall" type="button" class="btn btn-default btn-success btn_removeall">
-            <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>清除所有选择
-        </button>
-        <button id="btn_add" type="button" class="btn btn-default btn-success btn_previous_step">
-            <span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span>上一步
-        </button>
-        <button id="btn_return" type="button" class="btn btn-default btn_return">
-            <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>返回
-        </button>
-        <span class='pipeType' style='display: none'>已选中管线长度<span class='pipeTypeLength'>0</span>米</span>
     </div>
     <div class="halfpaneltable deviceslist-table">
         <table class="table table-bordered  table-striped " id='deviceslist_table' cellspacing="0">
@@ -435,7 +498,85 @@ $$
     <div class="pathmanagement">
         <div class="form-group">
             任务转移说明
-            <textarea class="form-control  notes" autocomplete="off" style="height: 130px" placeholder="任务转移说明"></textarea>
+            <textarea class="form-control  notes" autocomplete="off" style="height: 130px"
+                placeholder="任务转移说明"></textarea>
         </div>
     </div>
-</div>
+</div>
+$$
+<div class="widget-planregion_deviceselect">
+    <div id="toolbar" class=" btn-group btn-group-sm toolbar2 ">
+        <!-- <div class="form-inline" style="float: left;margin-left: 5px;">
+            <label for="users" class="serch_names">唯一编号</label>
+            <input type="text" class="form-control serchcontent minwidth">
+        </div> -->
+        <div class="form-group  form-inline setTime" style='display: none'>
+            <label>安装时间</label>
+            <input type="text" class="input-sm form-control setTimebegindate minwidth" placeholder="年-月-日"
+                readonly="readonly" />
+            <label for="plan_enddate" style="margin-left: 11px;margin-right: 11px;">~</label>
+            <input type="text" class="input-sm form-control setTimeenddate minwidth" placeholder="年-月-日"
+                readonly="readonly" />
+        </div>
+        <button type="button" class="btn btn-default btn-success  btn-search btn_search" style="margin-left: 4px;">
+            <span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询
+        </button>
+        <button id="btn_delete" type="button" class="btn btn-default btn-success btn_confirm">
+            <span class="glyphicon glyphicon-check" aria-hidden="true"></span>完成
+        </button>
+        <button id="btn_select" type="button" class="btn btn-default btn-success btn_select">
+            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>图上选择
+        </button>
+        <!-- <button id="btn_part_removeall" type="button" class="btn btn-default btn-success btn_part_removeall">
+            <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>清除部分选择
+        </button> -->
+        <button id="btn_removeall" type="button" class="btn btn-default btn-success btn_removeall">
+            <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>清除所有选择
+        </button>
+        <button id="btn_add" type="button" class="btn btn-default btn-success btn_previous_step">
+            <span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span>上一步
+        </button>
+        <button id="btn_return" type="button" class="btn btn-default btn_return">
+            <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>返回
+        </button>
+        <span class='pipeType' style='display: none'>已选中管线:<span class='pipeTypeLength'>0</span></span>
+    </div>
+    <div class="halfpaneltable deviceslist-table">
+        <ul id="myTabUl" class="nav nav-tabs" role="tablist"></ul>
+        <div id="myTabContent" class="tab-content"></div>
+        <!-- <table class="table table-bordered  table-striped " id='deviceslist_table' cellspacing="0">
+            <thead class="deviceslist-title">
+            </thead>
+        </table> -->
+    </div>
+</div>
+$$
+<div class="missionschedule_toolbar2">
+    <div id="toolbar" class=" btn-group btn-group-sm toolbar">
+        <div class="form-inline" style="float: left;margin-left: 5px;">
+            <label for="users" class="serch_names">人员名称</label>
+            <input type="text" class="form-control serchcontent minwidth">
+        </div>
+        <button type="button" class="btn btn-default btn-success btn-search btn_search" style="margin-left: 4px;">
+            <span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询
+        </button>
+        <button type="button" class="btn btn-default btn-success btn_previous_step" style="margin-left: 4px;">
+            <span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span>上一步
+        </button>
+        <button id="btn_delete" type="button" class="btn btn-default btn-success btn_return" style="margin-left: 4px;">
+            <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>返回
+        </button>
+    </div>
+</div>
+<div class="halfpaneltable missionschedule planregionslist-table">
+    <table class="table table-bordered  table-striped " style="table-layout: fixed;" cellspacing="0"
+        id='planuserlist_table'>
+        <thead>
+            <tr>
+                <th title="人员名称">人员名称</th>
+                <th title="人员区域">人员区域</th>
+                <th title="备注">备注</th>
+            </tr>
+        </thead>
+    </table>
+</div>

src/widgets/MissionSchedule/config - 副本.json

@@ -0,0 +1,208 @@
+{
+    "widgetUrl": "widgets/MissionSchedule",
+    "tmplateUrl": "widgets/MissionSchedule/Widget.html",
+    "styleUrl": "widgets/MissionSchedule/css/style.css",
+    "getGroupList": "/base/department/page",
+    "getUserList": "/base/user/getUserByDepts/list",
+    "getMissionScheduleList": "/gis/planchild/page",
+    "getGeometry": "/gis/planchild/geoInfo",
+    "getDistanceInfo": "/gis/tfsyssetting/getSysSetting",
+    "getPlanType": "/gis/planpointtype/page",
+    "getPeriod": "/gis/planperiodtype/page",
+    "isExitDevices": "/GpsRegion/Get_Region_Point_State/",
+    "getPlanRegionList": "/gis/gpsregion/page",
+    "addMissionScheduleInfo": "/gis/plan",
+    "deleteMissionSchedule": "/gis/planchild/deleteByIds",
+    "updateMissionSchedule": "/Plan/Update",
+    "cancelMissionSchedule": "/Plan/Cancell",
+    "getRegionInfo": "/gis/planpoint/page",
+    "copyPlan": "/Plan/Copy_Plan",
+    "submitPlan": "/Plan/Submit",
+    "getUserPlanPointList": "/Plan/Get_Curerent_Plan_Point",
+    "getDeviceList": "/plan/RemovalList",
+    "rangeall": "00",
+    "pagetotal": 1,
+    "pagenumber": 1,
+    "pagesize": 25,
+    "pagemaxsize": 100000,
+    "RegionColor": "red",
+    "color": "blue",
+    "select_color": "purple",
+    "lengthUnit": [
+        {
+            "name": "米",
+            "number": 9001
+        },
+        {
+            "name": "千米",
+            "number": 9036
+        }
+    ],
+    "showfieldnames": [
+        "OBJECTID",
+        "新编号",
+        "竣工日期",
+        "长度",
+        "管径",
+        "材质",
+        "地址"
+    ],
+    "lengthfield": "SHAPE.LEN",
+    "deviceForOther": {
+        "1": {
+            "showfields": [
+                "create_time"
+            ],
+            "showfieldnames": [
+                "创建时间"
+            ]
+        },
+        "5": {
+            "showfields": [
+                "troubletype",
+                "trouble_notes",
+                "trouble_username",
+                "trouble_findtime"
+            ],
+            "showfieldnames": [
+                "隐患类型",
+                "隐患说明",
+                "上报人",
+                "上报时间"
+            ]
+        },
+        "6": {
+            "showfields": [
+                "create_time"
+            ],
+            "showfieldnames": [
+                "创建时间"
+            ]
+        }
+    },
+    "layersymbol": {
+        "1": "./widgets/MissionSchedule/images/planpoint.png",
+        "5": "./widgets/MissionSchedule/images/warnpoint.png"
+    },
+    "mapindex": 0,
+    "unsubmit": 6,
+    "WarnMarkPictureSymbol": "./widgets/MissionSchedule/images/warnpoint.png",
+    "MarkPictureSymbol": "./widgets/MissionSchedule/images/planpoint.png",
+    "MarkPictureSymbol_tyx": "./widgets/MissionSchedule/images/surgetank.png",
+    "MarkPictureSymbol_tyg": "./widgets/MissionSchedule/images/pressurecabinet.png",
+    "MarkPictureSymbol_fj": "./widgets/MissionSchedule/images/valvedonburi.png",
+    "TextbgSymbol": "./widgets/MissionSchedule/images/textbg.png",
+    "DeviceSymbol": {
+        "1": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "2": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "5": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "3": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "4": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "12": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "7": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "8": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "9": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "10": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "11": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "6": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "13": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "14": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "15": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "16": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "17": [
+            0,
+            255,
+            255,
+            1
+        ],
+        "18": [
+            0,
+            255,
+            255,
+            1
+        ]
+    },
+    "getLayerId": "/gis/sysdevicetype/page",
+    "getLayerInfo": "/gis/Gis/exportList",
+    "planTransfer": "/gis/plan/transfer"
+}

src/widgets/MissionSchedule/config.json

@@ -5,12 +5,12 @@
     "getGroupList": "/base/department/page",
     "getUserList": "/base/user/getUserByDepts/list",
     "getMissionScheduleList": "/gis/planchild/page",
-    "getGeometry": "/gis/planchild/geoInfo",
     "getDistanceInfo": "/gis/tfsyssetting/getSysSetting",
     "getPlanType": "/gis/planpointtype/page",
     "getPeriod": "/gis/planperiodtype/page",
     "isExitDevices": "/GpsRegion/Get_Region_Point_State/",
     "getPlanRegionList": "/gis/gpsregion/page",
+    "getAllUserList": "/base/user/pageNew",
     "addMissionScheduleInfo": "/gis/plan",
     "deleteMissionSchedule": "/gis/planchild/deleteByIds",
     "updateMissionSchedule": "/Plan/Update",
@@ -28,7 +28,8 @@
     "RegionColor": "red",
     "color": "blue",
     "select_color": "purple",
-    "lengthUnit": [{
+    "lengthUnit": [
+        {
             "name": "米",
             "number": 9001
         },
@@ -37,7 +38,15 @@
             "number": 9036
         }
     ],
-    "showfieldnames": ["OBJECTID", "新编号", "竣工日期", "长度", "管径", "材质", "地址"],
+    "showfieldnames": [
+        "OBJECTID",
+        "新编号",
+        "竣工日期",
+        "长度",
+        "管径",
+        "材质",
+        "地址"
+    ],
     "lengthfield": "SHAPE.LEN",
     "deviceForOther": {
         "1": {
@@ -45,7 +54,12 @@
             "showfieldnames": ["创建时间"]
         },
         "5": {
-            "showfields": ["troubletype", "trouble_notes", "trouble_username", "trouble_findtime"],
+            "showfields": [
+                "troubletype",
+                "trouble_notes",
+                "trouble_username",
+                "trouble_findtime"
+            ],
             "showfieldnames": ["隐患类型", "隐患说明", "上报人", "上报时间"]
         },
         "6": {
@@ -87,5 +101,6 @@
     },
     "getLayerId": "/gis/sysdevicetype/page",
     "getLayerInfo": "/gis/Gis/exportList",
-    "planTransfer": "/gis/plan/transfer"
-}
+    "planTransfer": "/gis/plan/transfer",
+    "getUniqueValue": "/exts/TFGeoAPISOE/getFieldUniqueValue"
+}

src/widgets/MissionSchedule/css/style.scss

@@ -10,12 +10,23 @@
         color: rgba(0, 0, 255, 0.7) !important;
         cursor: pointer;
     }
+
     .missionschedule_toolbar {
         .toolbar,
         .form-group {
             float: left;
             margin: 4px 0px 4px 4px
         }
+        button{
+            min-width: 58px;
+            max-width: 100px;
+            height: 34px;
+            color: white;
+            background: #1A77E0;
+            border-radius: 3px;
+            border: none;
+            cursor: pointer;
+        }
     }
     .radio {
         padding: 4px 8px;
@@ -91,13 +102,16 @@
     }
     .missionschedule {
         height: calc(100% - 46px);
-        overflow-y: auto;
+        overflow-y: unset;
         .missionschedule_infoSet {
             height: calc(100% - 10px);
+            th{
+                overflow: unset;
+            }
         }
     }
     .widget-missionschedule_planadd {
-        height: calc(100% - 8px);
+        height: calc(100% - 45px);
         .toolbar {
             height: 46px;
         }
@@ -112,6 +126,15 @@
         .setTime {
             float: left;
         }
+        .tab-content{
+            height: 87%;
+            .tab-pane{
+                height: 100%;
+            }
+        }
+        .active{
+            background-color: rgba(0,0,0,.05);
+        }
     }
     .deviceslist-table {
         width: 100%;
@@ -182,6 +205,11 @@
         width: 100%;
         margin: 4px;
     }
+    .self-toolbar{
+        display: flex;
+        justify-content: space-between;
+        padding-right: 20px;
+    }
     .point_add {
         float: left;
         width: 70%;
@@ -261,4 +289,4 @@
     .pathmanagement{
         padding: 10px;
     }
-}
+}

src/widgets/SiteSupervisionAllSearch/Widget.html

@@ -17,6 +17,9 @@
             <button id="btn_add" type="button" class="btn btn-sm btn-default btn-success btn_search">
                 <span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询
             </button>
+            <button id="btn_export" type="button" class="btn btn-sm btn-default btn-success btn_export" style="margin-left: 10px;">
+                <span class="glyphicon glyphicon-export" aria-hidden="true"></span>导出
+            </button>
         </div>
     </div>
     <div class="planpath_content halfpaneltable">

src/widgets/SiteSupervisionAllSearch/Widget.ts

@@ -124,6 +124,9 @@ class SiteSupervisionAllSearch extends BaseWidget {
         this.domObj.find(".btn_search").off().click(e => {
             this.getsiteSupervisionList();
         });
+        this.domObj.find(".btn_export").off().click(e => {
+            this.domObj.find(".buttons-excel").trigger("click");
+        });
     }
 
     /**