巡检任务增加材质筛选,

package.json

@@ -34,6 +34,5 @@
     "lodash-amd": "^4.16.2",
     "minimatch": "^3.0.3",
     "vue": "^2.6.11"
-  },
-  "__npminstall_done": false
-}
+  }
+}

src/configure.ts

@@ -2363,7 +2363,7 @@ var AppX = {
                     {
                         "groupname": "geometry1",
                         "name": "几何分析服务",
-                        "url": "http://192.168.2.246:6080/arcgis/rest/services/Utilities/Geometry/GeometryServerf"
+                        "url": "http://192.168.2.246:6080/arcgis/rest/services/Utilities/Geometry/GeometryServer"
                     }
                 ]
             },

src/widgets/Header/Widget.ts

@@ -378,7 +378,11 @@ class Header extends BaseWidget {
             data: senddata,
             success: callBack.bind(this),
             error: function (data) {
-                this.toast.show("服务端ajax出错，获取数据失败!");
+                if (data.status === 401) {
+                    alert("登陆失效,请重新登陆")
+                    this.exitsystem();
+                }
+                //this.toast.show("服务端ajax出错，获取数据失败!");
                 console.error(data.statusText);
                 this.AppX.runtimeConfig.loadMask.hide();
             }.bind(this),

src/widgets/MissionSchedule/Widget.html

@@ -15,9 +15,11 @@
             </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">
@@ -53,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">
@@ -79,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">
@@ -94,21 +97,24 @@ $$
                     <div class="form-inline">
                         <div class="form-group">
                             <label for="pointSelect">
-                            <input type="radio" class="input-sm radio pointSelect" checked='true' value="0" name="typeSelect" />
-                           单选</label>
+                                <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>
+                                <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>
+                        <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></select>
+                        <select class="input-sm  planlinetype minwidth" id="planlinetype" style="width: 238px;"
+                            multiple="multiple" disabled></select>
                         <label for="tip" class="existTip" style="color: red;"></label>
                     </div>
                 </th>
@@ -122,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>
@@ -132,11 +139,13 @@ $$
                         <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>
@@ -145,7 +154,7 @@ $$
             <!-- <tr>
                 <th> -->
 
-                <!-- </th>
+            <!-- </th>
             </tr> -->
             <tbody class="planslist">
             </tbody>
@@ -159,7 +168,7 @@ $$
             <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 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>
@@ -177,17 +186,19 @@ $$
             <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"/>
+                <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>
+                    <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>
+                    <input type="radio" class="input-sm radio xunjianUser" disabled value="巡检责任人"
+                        name="xunjianSelect" />
+                    巡检责任人</label>
             </div>
         </div>
     </div>
@@ -211,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>
@@ -240,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">
@@ -373,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">
@@ -477,7 +498,8 @@ $$
     <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>
@@ -490,11 +512,13 @@ $$
         </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" />
+            <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" />
+            <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;">
+        <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">
@@ -545,7 +569,8 @@ $$
     </div>
 </div>
 <div class="halfpaneltable missionschedule planregionslist-table">
-    <table class="table table-bordered  table-striped " style="table-layout: fixed;" cellspacing="0" id='planuserlist_table'>
+    <table class="table table-bordered  table-striped " style="table-layout: fixed;" cellspacing="0"
+        id='planuserlist_table'>
         <thead>
             <tr>
                 <th title="人员名称">人员名称</th>

src/widgets/MissionSchedule/config.json

@@ -88,5 +88,6 @@
     },
     "getLayerId":"/zmrq/sysdevicetype/page",
     "getLayerInfo":"/zmrq/Gis/exportList",
-    "planTransfer":"/zmrq/plan/transfer"
+    "planTransfer":"/zmrq/plan/transfer",
+    "getUniqueValue":"/exts/TFGeoAPISOE/getFieldUniqueValue"
 }

src/widgets/MissionSchedule/css/style.scss

@@ -205,6 +205,11 @@
         width: 100%;
         margin: 4px;
     }
+    .self-toolbar{
+        display: flex;
+        justify-content: space-between;
+        padding-right: 20px;
+    }
     .point_add {
         float: left;
         width: 70%;

src/widgets/PipeRecordPageInfo/Widget.html

@@ -66,7 +66,7 @@ $$
     </div>
     <div class='item'>
         <label class=" control-label">新增调压器数量</label>
-        <input type="text" autocomplete="off" class="form-control addDeviceNum" name="addDeviceNum" showname='addDeviceNum' placeholder="新增设备数量">
+        <input type="number" autocomplete="off" class="form-control addDeviceNum" name="addDeviceNum" showname='addDeviceNum' placeholder="新增设备数量">
     </div>
 </div>
 <div class="form-group form-inline">
@@ -76,7 +76,7 @@ $$
     </div>
     <div class='item'>
         <label class=" control-label">新增阀井数量</label>
-        <input type="text" autocomplete="off" class="form-control valveWellNum" name="valveWellNum" showname='valveWellNum' placeholder="新增阀井数量">
+        <input type="number" autocomplete="off" class="form-control valveWellNum" name="valveWellNum" showname='valveWellNum' placeholder="新增阀井数量">
     </div>
 </div>
 <div class="form-group form-inline">

src/widgets/SiteDispatchSearch/Widget.html

@@ -11,6 +11,12 @@
                 查询
             </button>
         </div>
+        <div class="form-group groupright">
+            <div class="btn_exportExcel">
+                <img src="./widgets/KeyEquipment/images/export.png" />
+                <span>导出</span>
+            </div>
+        </div>
     </div>
     <div class="planpath_content fullpaneltable">
         <table class="table table-bordered  table-striped SiteDispatchSearchinfodata" cellspacing="0"

src/widgets/SiteDispatchSearch/Widget.ts

@@ -101,7 +101,7 @@ class SiteDispatchSearch extends BaseWidget {
             endTime:endTime!=""?(endTime+timeStr):"",
             "orders[0].asc":false,
             "orders[0].column":"create_time"
-        } 
+        }
     }
 
     /**
@@ -111,6 +111,9 @@ class SiteDispatchSearch extends BaseWidget {
         this.domObj.find(".btn_search").off().click(e => {
             this.getpipeRecordList();
         });
+        this.domObj.find(".btn_exportExcel").off().click(e => {
+            this.domObj.find(".buttons-excel").trigger("click");
+        });
     }
 
     /**
@@ -149,7 +152,7 @@ class SiteDispatchSearch extends BaseWidget {
             isCheck: false,
             searchInfo: that.searchInfo,//条件在不断变化，故需要有全局的条件监听
             // testData:this.config.dataInfo,
-            displayTitle: ["发令人员", "接令人员", "发令时间", "执行时间","状态","备注"],
+            displayTitle: ["发令人员", "接令人员", "发令时间", "执行时间","状态","调度指令"],
             displayField: ["sendUserName", "receiveUserName", "createTime","actionTime","stateName","description"],
             extentDisplayTitle: ['详情'],
             extentDisplayContent: [{
@@ -166,9 +169,9 @@ class SiteDispatchSearch extends BaseWidget {
             }.bind(this),
             serachCallBack: function (results) {
             }.bind(this),
-            errmassage: "测绘记录查询失败",
+            errmassage: "门站调度查询失败",
             nullmessage: undefined,
-            exportTitle: "测绘记录"
+            exportTitle: "门站调度记录"
         }
         that.dataTable = this.ajaxSend.DataTables_check(option);
     }
@@ -180,4 +183,4 @@ class SiteDispatchSearch extends BaseWidget {
         this.domObj.remove();
         this.afterDestroy();
     }
-}
+}

src/widgets/SiteDispatchSearch/css/style.scss

@@ -6,6 +6,11 @@
             margin: 4px 0px 4px 4px;
         }
     }
+    .groupright{
+        display: flex;
+        position: absolute;
+        right: 15px;
+    }
     .fullpaneltable {
         overflow-y: hidden;
         height: calc(100% - 44px) !important;