事件列表样式调整

assets/css/styles.css

@@ -1838,8 +1838,8 @@ fieldset[disabled] .btn-statebutton.btn-o.active {
 }
 
 .incidentsearch {
-    width: 200px;
-    margin-right: 8px;
+    width: 210px;
+    margin-right: 6px;
     /* padding-top: 10px; */
     /* padding-bottom: 5px; */
 }

assets/js/controllers/incident/incidentCtrl.js

@@ -731,6 +731,11 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
 
     };
     $scope.my_data = [];
+    // 清除事件分类筛选
+    $scope.clearSj = function() {
+        $scope.searchkeys.levelCategory = undefined;
+        $scope.select_treedata = angular.copy($scope.my_data);
+    }
 
 
     function convertListToTree(data, treeMap) {

assets/views/incident/list.html

@@ -83,7 +83,7 @@
                         <div class="form-group incidentsearch" ng-if="repairMain.valueconfig == 1">
                             <div class="">
                                 <div class="control-label pull-left margin-top-5">报修人:</div>
-                                <ui-select class="pull-right selectzise wt_width1 wt_width3"
+                                <ui-select style="margin-right:24px;" class="pull-right selectzise wt_width1 wt_width3"
                                     ng-model="searchkeys.requester" theme="bootstrap">
                                     <ui-select-match placeholder="请选择">
                                         {{$select.selected.name}}
@@ -93,6 +93,9 @@
                                         <div ng-bind-html="item.name | highlight: $select.search"></div>
                                     </ui-select-choices>
                                 </ui-select>
+                                <button style="position:absolute;right:0;padding:2px 4px;" ng-click="searchkeys.requester = undefined" class="btn btn-default">
+                                    <span class="glyphicon glyphicon-trash"></span>
+                                </button>
 
                                 <!-- <ui-select class="pull-left" style="width:101px" ng-model="searchkeys.handlingPersonnelUser" theme="bootstrap">
                                     <ui-select-match placeholder="">
@@ -107,8 +110,11 @@
                         <div class="form-group incidentsearch" ng-if="repairMain.valueconfig == 1">
                             <div class="">
                                 <div class="control-label pull-left margin-top-5">联系电话:</div>
-                                <input class=" inputcolor wt_width1 wt_width3 pull-right" type="text"
+                                <input style="margin-right:24px;" class=" inputcolor wt_width1 wt_width3 pull-right" type="text"
                                     ng-model="searchkeys.requester.mphone" placeholder="" />
+                                <button style="position:absolute;right:0;padding:2px 4px;" ng-click="searchkeys.requester.mphone = undefined" class="btn btn-default">
+                                    <span class="glyphicon glyphicon-trash"></span>
+                                </button>
                             </div>
                         </div>
 
@@ -129,7 +135,7 @@
                         <div class="form-group incidentsearch">
                             <!-- <div class="pull-right"> -->
                             <div class="control-label pull-left margin-top-5 ">区域:</div>
-                            <ui-select class="pull-right selectzise wt_width1 wt_width3" ng-model="searchkeys.area" theme="bootstrap"
+                            <ui-select style="margin-right:24px;" class="pull-right selectzise wt_width1 wt_width3" ng-model="searchkeys.area" theme="bootstrap"
                                 ng-change="onChangearea(searchkeys)">
                                 <ui-select-match placeholder="请选择">
                                     {{$select.selected.area}}
@@ -138,12 +144,15 @@
                                     <div ng-bind-html="item.area | highlight: $select.search"></div>
                                 </ui-select-choices>
                             </ui-select>
+                            <button style="position:absolute;right:0;padding:2px 4px;" ng-click="searchkeys.area = undefined" class="btn btn-default">
+                                <span class="glyphicon glyphicon-trash"></span>
+                            </button>
                             <!-- </div> -->
                         </div>
                         <div class="form-group incidentsearch">
                             <!-- <div class="pull-right"> -->
                             <div class="control-label pull-left margin-top-5">地点:</div>
-                            <ui-select class="pull-right selectzise wt_width1 wt_width3" ng-model="searchkeys.place" theme="bootstrap"
+                            <ui-select style="margin-right:24px;" class="pull-right selectzise wt_width1 wt_width3" ng-model="searchkeys.place" theme="bootstrap"
                                 ng-change="onChangeplace(key)">
                                 <ui-select-match placeholder="请选择">
                                     {{$select.selected.place}}
@@ -152,11 +161,14 @@
                                     <div ng-bind-html="item.place | highlight: $select.search"></div>
                                 </ui-select-choices>
                             </ui-select>
+                            <button style="position:absolute;right:0;padding:2px 4px;" ng-click="searchkeys.place = undefined" class="btn btn-default">
+                                <span class="glyphicon glyphicon-trash"></span>
+                            </button>
                             <!-- </div> -->
                         </div>
                         <div class="form-group incidentsearch">
                             <div class="control-label pull-left margin-top-5">状态:</div>
-                            <ui-select ng-disabled="isDisabledState" class="pull-right selectzise wt_width1 wt_width3" ng-model="othcode.state"
+                            <ui-select style="margin-right:24px;" ng-disabled="isDisabledState" class="pull-right selectzise wt_width1 wt_width3" ng-model="othcode.state"
                                 theme="bootstrap">
                                 <ui-select-match placeholder="请选择">
                                     {{$select.selected.name}}
@@ -165,19 +177,25 @@
                                     <div ng-bind-html="item.name | highlight: $select.search"></div>
                                 </ui-select-choices>
                             </ui-select>
+                            <button style="position:absolute;right:0;padding:2px 4px;" ng-click="othcode.state = undefined" class="btn btn-default">
+                                <span class="glyphicon glyphicon-trash"></span>
+                            </button>
                         </div>
                         <div class="form-group incidentsearch">
                             <div class="control-label pull-left margin-top-5">事件分类:</div>
-                            <multi-select-tree data-default-label="请选择" class="pull-right selectzise wt_width1 wt_width3"
+                            <multi-select-tree style="margin-right:24px;" data-default-label="请选择" class="pull-right selectzise wt_width1 wt_width3"
                                 ng-model="cifilter_classic" data-input-model="select_treedata"
                                 data-output-model="cifilter_classics" theme="bootstrap" multi-select="false"
                                 data-callback="onFilterCallback(item)" data-select-only-leafs="false"
                                 reset-search-input="false" data-trans-label="category" data-switch-view="false">
                             </multi-select-tree>
+                            <button style="position:absolute;right:0;padding:2px 4px;" ng-click="clearSj()" class="btn btn-default">
+                                <span class="glyphicon glyphicon-trash"></span>
+                            </button>
                         </div>
                         <div class="form-group incidentsearch">
                             <div class="control-label pull-left margin-top-5 ">受理人:</div>
-                            <ui-select class="pull-right selectzise wt_width1 wt_width3"
+                            <ui-select style="margin-right:24px;" class="pull-right selectzise wt_width1 wt_width3"
                                 ng-model="searchkeys.acceptUser" theme="bootstrap">
                                 <ui-select-match placeholder="请选择">
                                     {{$select.selected.name}}
@@ -187,10 +205,13 @@
                                     <div ng-bind-html=" item.name | highlight: $select.search "></div>
                                 </ui-select-choices>
                             </ui-select>
+                            <button style="position:absolute;right:0;padding:2px 4px;" ng-click="searchkeys.acceptUser = undefined" class="btn btn-default">
+                                <span class="glyphicon glyphicon-trash"></span>
+                            </button>
                         </div>
                         <div class="form-group incidentsearch">
                             <div class="control-label pull-left margin-top-5">处理人:</div>
-                            <ui-select class="pull-right selectzise wt_width1 wt_width3"
+                            <ui-select style="margin-right:24px;" class="pull-right selectzise wt_width1 wt_width3"
                                 ng-model="searchkeys.handlingPersonnelUser" theme="bootstrap">
                                 <ui-select-match placeholder="请选择">
                                     {{$select.selected.name}}
@@ -200,11 +221,14 @@
                                     <div ng-bind-html="item.name | highlight: $select.search"></div>
                                 </ui-select-choices>
                             </ui-select>
+                            <button style="position:absolute;right:0;padding:2px 4px;" ng-click="searchkeys.handlingPersonnelUser = undefined" class="btn btn-default">
+                                <span class="glyphicon glyphicon-trash"></span>
+                            </button>
                         </div>
                         <div class="form-group incidentsearch">
                             <div class="">
                                 <div class="control-label pull-left margin-top-5">登记时间:</div>
-                                <input type="text" class=" incidentsearchsize wt_width5"
+                                <input style="margin-right:24px;" type="text" class=" incidentsearchsize wt_width5"
                                     datepicker-popuptime="yyyy-MM-dd" ng-model="searchkeys.acceptDate"
                                     max-date="searchkeys.acceptDateEnd" is-open="startOpened" hour-time=true
                                     ng-init="startOpened = false" close-text="关闭" ng-click="startOpen($event)"
@@ -214,7 +238,7 @@
                         <div class="form-group incidentsearch">
                             <div class="">
                                 <div class="control-label pull-left margin-top-5">至</div>
-                                <input type="text" class=" selectzise incidentsearchsize wt_width5"
+                                <input style="margin-right:24px;" type="text" class=" selectzise incidentsearchsize wt_width5"
                                     datepicker-popuptime="yyyy-MM-dd" ng-model="searchkeys.acceptDateEnd" hour-time=true
                                     min-date="searchkeys.acceptDate" is-open="endOpened" ng-init="endOpened = false"
                                     close-text="关闭" ng-click="endOpen($event)" placeholder="" />
@@ -222,14 +246,17 @@
                         </div>
                         <div class="form-group incidentsearch">
                             <div>
-                                <div class="control-label pull-left margin-top-5 margin-right-5">事件单号:</div>
-                                <input class="f inputcolor wt_width1 wt_width3 pull-right" type="text"
+                                <div class="control-label pull-left margin-top-5">事件单号:</div>
+                                <input style="margin-right:24px;" class="f inputcolor wt_width1 wt_width3 pull-right" type="text"
                                     ng-model="searchkeys.incidentsign" placeholder="" />
+                                <button style="position:absolute;right:0;padding:2px 4px;" ng-click="searchkeys.incidentsign = undefined" class="btn btn-default">
+                                    <span class="glyphicon glyphicon-trash"></span>
+                                </button>
                             </div>
                         </div>
                         <div class="form-group incidentsearch">
                             <div class="control-label pull-left margin-top-5">是否逾期:</div>
-                            <ui-select ng-change="selectTypeChange()" ng-model="searchkeys.selectType" class="pull-right selectzise wt_width1 wt_width3" theme="bootstrap">
+                            <ui-select style="margin-right:24px;" ng-change="selectTypeChange()" ng-model="searchkeys.selectType" class="pull-right selectzise wt_width1 wt_width3" theme="bootstrap">
                                 <ui-select-match placeholder="请选择">
                                     <span ng-bind="$select.selected.name"></span>
                                 </ui-select-match>
@@ -237,6 +264,9 @@
                                     <span ng-bind="item.name"></span>
                                 </ui-select-choices>
                              </ui-select>
+                             <button style="position:absolute;right:0;padding:2px 4px;" ng-click="searchkeys.selectType = undefined" class="btn btn-default">
+                                <span class="glyphicon glyphicon-trash"></span>
+                            </button>
                         </div>
                         <!-- <div class='wt_width6' style="">
                             <span class="panel-title text-dark">至</span>