优化

assets/js/controllers/incident/incidentCtrl.js

@@ -722,14 +722,17 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         angular.extend(fildata.incident, transitiondata)
         $scope.memoryfilterData = fildata;
         console.log(fildata,78777);
-        if($scope.searchstate === 'all'){
-            if(fildata.incident&&fildata.incident.selectType){
-                fildata.incident.selectType = fildata.incident.selectType.id;
-            }
-        }else{
-            if(fildata.incident&&fildata.incident.selectType){
-                delete fildata.incident.selectType;
-            }
+        // if($scope.searchstate === 'all'){
+        //     if(fildata.incident&&fildata.incident.selectType){
+        //         fildata.incident.selectType = fildata.incident.selectType.id;
+        //     }
+        // }else{
+        //     if(fildata.incident&&fildata.incident.selectType){
+        //         delete fildata.incident.selectType;
+        //     }
+        // }
+        if(fildata.incident&&fildata.incident.selectType){
+            fildata.incident.selectType = fildata.incident.selectType.id;
         }
         // /seimin
         $scope.refreshData('expand-right', fildata, isInit);

assets/js/controllers/report/chargingCtrl.js

@@ -178,7 +178,7 @@ app.controller("chartingCtrl", [
     }
     // 重置
     $scope.reset = function () {
-      $scope.parameters = {};
+      $scope.parameters = {userIds:[]};
       $scope.starttimes = moment(
         new Date(moment().startOf("month")).setMonth(new Date().getMonth() - 1)
       ).format("YYYY-MM-DD HH:mm:ss");

assets/views/inspect/summaryDetail.html

@@ -4,6 +4,7 @@
         line-height: 50px;
         border-bottom: 1px solid #eeeeee;
         text-align: center;
+        font-weight: bold;
     }
     .btnWrap{
         display: flex;
@@ -290,7 +291,7 @@
                 <div class="mainDivRight">
                     <div class="mainDiv-head">
                         <i style="font-size: 18px !important;" class="icon iconfont icon-quyu bluefont"></i>
-                        <span>工时清单</span>
+                        <b>工时清单</b>
                         <div class="mainDiv-head-right"></div>
                     </div>
                     <div class="mainDiv-body fixHeight">
@@ -314,7 +315,7 @@
                 <div class="mainDivLeft">
                     <div class="mainDiv-head">
                         <i style="font-size: 18px !important;" class="icon iconfont icon-quyu bluefont"></i>
-                        <span style="cursor: pointer;" ng-click="clear()">耗材清单</span>
+                        <b style="cursor: pointer;" ng-click="clear()">耗材清单</b>
                         <div class="mainDiv-head-right"></div>
                     </div>
                     <div class="mainDiv-body">
@@ -339,7 +340,7 @@
                     </div>
                 </div>
             </div>
-            <div class="totalPrice">汇总单总价：{{ totalMaintenancePrice }}元</div>
+            <div class="totalPrice" style="font-size: 16px;">汇总单总价：{{ totalMaintenancePrice }}元</div>
             <div class="btnWrap">
                 <div class="btn btn_search" ng-click="goToIncident()"><span>查看事件</span></div>
                 <div class="btn btn_search" style="margin-left: 8px;" ng-click="goToList()"><span>返回列表</span></div>