应急上报修改

src/widgets/MaintenanceManagerReport/Widget.html

@@ -7,7 +7,14 @@
         </div>
         <div class="form-group">
             <label class=" control-label">类型</label>
-            <input type="text" autocomplete="off" class="form-control type" name="type" placeholder="类型">
+            <select class="input-sm form-control type minwidth">
+                <option value="" selected>全部</option>
+                <option value="0">无气/气小</option>
+                <option value="1">户内漏气</option>
+                <option value="2">户外漏气</option>
+                <option value="3">其他</option>
+            </select>
+            <!-- <input type="text" autocomplete="off" class="form-control type" name="type" placeholder="类型"> -->
         </div>
         <div class="form-group">
             <label class=" control-label">上报时间</label>
@@ -33,17 +40,12 @@
                 删除
             </button>
         </div>
-        <div class="form-group groupright">
+        <!-- <div class="form-group groupright">
             <div class="btn_exportExcel">
                 <img src="./widgets/KeyEquipment/images/export.png" />
                 <span>导出</span>
             </div>
-            <!-- <div class="btn_location">
-                <img src="./widgets/KeyEquipment/images/import.png" />
-                <span>上报</span>
-            </div> -->
-
-        </div>
+        </div> -->
 
     </div>
     <div class="planpath_content halfpaneltable">

src/widgets/MaintenanceManagerReport/Widget.ts

@@ -115,9 +115,9 @@ class MaintenanceManagerReport extends BaseWidget {
                 }.bind(this));
             }
         });
-        this.domObj.find(".btn_exportExcel").off().click(e => {
-            this.domObj.find(".buttons-excel").trigger("click");
-        });
+        // this.domObj.find(".btn_exportExcel").off().click(e => {
+        //     this.domObj.find(".buttons-excel").trigger("click");
+        // });
         $.jeDate("." + this.baseClass + " .plan_begindate", this.planBegindate);
     }
 
@@ -355,7 +355,7 @@ class MaintenanceManagerReport extends BaseWidget {
             // workOrderType: workOrderType ? workOrderType : "",
             address: address ? address : "",
             type: type ? type : "",
-            plan_begindate: plan_begindate ? plan_begindate : "",
+            createTime: plan_begindate ? plan_begindate +" 00:00:00" : "",
             // creatUser: this.AppX.appConfig.userId,
             workOrderState: this.AppX.runtimeConfig.maintenancePageInfo.workOrderState.waitConduct,
             "orders[0].asc":false,

src/widgets/MaintenancePageInfo/Widget.html

@@ -29,8 +29,10 @@ $$
         <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='1' selected="selected">漏气</option>
-            <option value='0'>非漏气</option>
+            <option value='0' selected="selected">无气/气小</option>
+            <option value='1'>户内漏气</option>
+            <option value='2'>户外漏气</option>
+            <option value='3'>其他</option>
         </select>
     </div>
 </div>

src/widgets/MaintenancePageInfo/Widget.ts

@@ -759,7 +759,7 @@ class MaintenancePageInfo extends BaseWidget {
             };
         })
         let html = this.template.split('$$')[5]
-        let popupTemplate = new PopupTemplate({ title: '抢维修点' });
+        let popupTemplate = new PopupTemplate({ title: '应急点' });
         popupTemplate.setContent(html);
         let clusterLayer = new ClusterLayer({
             "data": photoInfo.data,

src/widgets/MaintenanceSearch/Widget.html

@@ -15,6 +15,21 @@
             <label class=" control-label">地址</label>
             <input type="text" autocomplete="off" class="form-control siteName" name="siteName" placeholder="地址">
         </div>
+        <div class="form-group">
+            <label class=" control-label">类型</label>
+            <select class="input-sm form-control type minwidth">
+                <option value="" selected>全部</option>
+                <option value="0">无气/气小</option>
+                <option value="1">户内漏气</option>
+                <option value="2">户外漏气</option>
+                <option value="3">其他</option>
+            </select>
+            <!-- <input type="text" autocomplete="off" class="form-control type" name="type" placeholder="类型"> -->
+        </div>
+        <div class="form-group">
+            <label class=" control-label">上报时间</label>
+            <input type="text" readonly="readonly" class="form-control plan_begindate minwidth" id="plan_begindate" placeholder="年-月-日">
+        </div>
         <div class="form-group">
             <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>查询
@@ -25,6 +40,12 @@
                 <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>删除
             </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 halfpaneltable">
         <table class="table table-bordered  table-striped MaintenanceSearchinfodata" cellspacing="0"

src/widgets/MaintenanceSearch/Widget.ts

@@ -83,7 +83,11 @@ class MaintenanceSearch extends BaseWidget {
         this.selectLineSym = this.mapSet.setGraphSymbol("polyline", "blue");
         this.maintenancePageInfo=this.AppX.runtimeConfig.maintenancePageInfo;
     }
+    planBegindate = {
+        format: 'YYYY-MM-DD', //日期格式
+        isinitVal: false,
 
+    }
     /**
      * 选中图层渲染创建、销毁、清理
      * @param action 通过枚举operation控制操作
@@ -108,9 +112,13 @@ class MaintenanceSearch extends BaseWidget {
     getSearchInfo() {
         let workOrderState = this.domObj.find(".workOrderType option:selected").val();
         let siteName = this.domObj.find(".siteName").val();
+        let type = this.domObj.find(".type").val();
+        let createTime = this.domObj.find(".plan_begindate").val();
         this.searchInfo = {
             workOrderState: workOrderState ? workOrderState : "",
             address: siteName ? siteName : "",
+            type:type ? type : "",
+            createTime: createTime ? createTime +" 00:00:00" :"",
             "orders[0].asc":false,
             "orders[0].column":"create_time"
         }
@@ -127,6 +135,10 @@ class MaintenanceSearch extends BaseWidget {
         this.domObj.find(".btn_delete").off().click(e => {
             this.deleteScheduler();
         });
+        this.domObj.find(".btn_exportExcel").off().click(e => {
+            this.domObj.find(".buttons-excel").trigger("click");
+        });
+        $.jeDate("." + this.baseClass + " .plan_begindate", this.planBegindate);
     }
 
     /**

src/widgets/MaintenanceSearch/css/style.scss

@@ -5,6 +5,15 @@
             float: left;
             margin: 4px 0px 4px 4px;
         }
+        .groupright{
+            display: flex;
+            position: absolute;
+            right: 15px;
+            div{
+                margin-right: 15px;
+                cursor: pointer;
+            }
+        }
     }
     .halfpaneltable {
         overflow-y: hidden;
@@ -19,4 +28,4 @@
     width: 100%;
     height: 100%;
     overflow: auto;
-}
+}

src/widgets/PlanSearch/css/style.scss

@@ -366,7 +366,7 @@
         font-size: 16px;
         text-align: left;
         display: block;
-        line-height: 34px;
+        // line-height: 34px;
         vertical-align: middle;
         margin: 0px 12px;
     }