巡检优化

assets/css/styles.css

@@ -10309,6 +10309,7 @@ div .tab-content {
 
 .progress-bar-success {
     background-color: #5cb85c;
+    color: #000;
 }
 
 .progress-bar-info {

assets/js/controllers/inspect/inspectPlanCtrl.js

@@ -148,12 +148,21 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
         //     cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.executionTime + "分钟"}}</div>'
         // },
         {
-            name: 'executionTime1',
-            displayName: '当前批次进度',
+            name: 'onPercent',
+            displayName: '当前批次进度（线上）',
             width: '12%',
             enableFiltering: false,
-            cellTemplate: `<div class="ui-grid-cell-contents" title="{{row.entity.percent}}%">
-            <progressbar value="row.entity.percent" type="success">{{row.entity.percent}}%</progressbar>
+            cellTemplate: `<div class="ui-grid-cell-contents" title="{{row.entity.onPercent}}%">
+            <progressbar value="row.entity.onPercent" type="success">{{row.entity.onPercent}}%</progressbar>
+            </div>`
+        },
+        {
+            name: 'offPercent',
+            displayName: '当前批次进度（线下）',
+            width: '12%',
+            enableFiltering: false,
+            cellTemplate: `<div class="ui-grid-cell-contents" title="{{row.entity.offPercent}}%">
+            <progressbar value="row.entity.offPercent" type="success">{{row.entity.offPercent}}%</progressbar>
             </div>`
         },
         {
@@ -649,12 +658,20 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
                 $scope.myData = myData.list;
                 for (var i = 0; i < $scope.myData.length; i++) {
                     $scope.myData[i]['item'] = i + 1 + filterData.idx * filterData.sum
-                    if($scope.myData[i].doing + $scope.myData[i].completed != 0){
-                        $scope.myData[i].percent = ($scope.myData[i].completed*100/($scope.myData[i].doing + $scope.myData[i].completed)).toFixed(1);
-                    }else if($scope.myData[i].completed == 0){
-                        $scope.myData[i].percent = '0.0';
+                    if($scope.myData[i].onDoing + $scope.myData[i].onCompleted != 0){
+                        $scope.myData[i].onPercent = ($scope.myData[i].onCompleted*100/($scope.myData[i].onDoing + $scope.myData[i].onCompleted)).toFixed(1);
+                    }else if($scope.myData[i].onCompleted == 0){
+                        $scope.myData[i].onPercent = '0.0';
                     }else{
-                        $scope.myData[i].percent = '0.0';
+                        $scope.myData[i].onPercent = '0.0';
+                    }
+
+                    if($scope.myData[i].offDoing + $scope.myData[i].offCompleted != 0){
+                        $scope.myData[i].offPercent = ($scope.myData[i].offCompleted*100/($scope.myData[i].offDoing + $scope.myData[i].offCompleted)).toFixed(1);
+                    }else if($scope.myData[i].offCompleted == 0){
+                        $scope.myData[i].offPercent = '0.0';
+                    }else{
+                        $scope.myData[i].offPercent = '0.0';
                     }
                 }
                 console.log($scope.myData)

assets/js/controllers/inspect/inspectionScopeCtrl.js

@@ -72,6 +72,12 @@ app.controller("inspectionScope", [
       }, 0);
     };
 
+    // 全选
+    // 把指令的方法绑定到控制器
+    $scope.setDirectiveFn = function (fn) {
+      $scope.selectAll = fn;
+    }
+
     // 事件分类开始
     var loginUser = $rootScope.user;
     //组
@@ -760,6 +766,7 @@ app.directive("zTree", function () {
       stateModel: "=",
       changecate: "=",
       cachehttp: "=",
+      setFn: '&'
     },
     controller: function ($rootScope,$scope, $element, api_bpm_data, api_simple) {
       console.log($scope);
@@ -814,6 +821,8 @@ app.directive("zTree", function () {
                 result = result.map((v) => v.inspectionType);
                 console.log(result);
                 var zTree = $.fn.zTree.getZTreeObj("z-tree");
+                var nodesAll = zTree.transformToArray(zTree.getNodes());//全部节点转换成数组array
+                $('#c_all').prop('checked', nodesAll.length === result.length);
                 result.forEach((v) => {
                   // 设置路径树节点选中
                   // 1、根据id获取树的某个节点：
@@ -930,8 +939,10 @@ app.directive("zTree", function () {
         console.log(event, treeId, treeNode);
         $scope.changecate = false;
         var treeObj = $.fn.zTree.getZTreeObj("z-tree");
+        var nodesAll = treeObj.transformToArray(treeObj.getNodes());//全部节点转换成数组array
         var nodes_arr = treeObj.getCheckedNodes(true);
         var nodes = angular.copy(nodes_arr);
+        $('#c_all').prop('checked', nodesAll.length === nodes_arr.length);
         console.log(nodes);
         if ($scope.cachehttp && $scope.cachehttp.length) {
           var result = angular.copy($scope.cachehttp);
@@ -963,6 +974,25 @@ app.directive("zTree", function () {
         });
         return arr;
       }
+      $scope.clickDirective = function () {
+        console.log('全选');
+        var zTree = $.fn.zTree.getZTreeObj("z-tree");//得到tree对象 treeMenu是我的treeid
+        var node = zTree.getNodes();//得到全部节点
+        var nodes = zTree.transformToArray(node);//全部节点转换成数组array
+        var checkNode = zTree.getCheckedNodes().length;//得到被选中的节点数量,zTree.getCheckedNodes()和zTree.getCheckedNodes(true)一样,可以传参(true/false),默认是true
+
+        if (checkNode < nodes.length) {//已选中的节点数小于总数 - 全选
+            zTree.checkAllNodes(true);//给全部节点设置为true
+            zTreeOnCheckCommon([], nodes)
+        } else{
+            zTree.checkAllNodes(false);//给全部节点设置为false
+            zTreeOnCheckCommon([], [])
+        }
+      }
+      
+      $scope.setFn.call($scope,  {
+        params: $scope.clickDirective
+      })
       // 点击复选框-common
       function zTreeOnCheckCommon(result, nodes) {
         // 如果有值，则不覆盖

assets/views/customform/tpl/ui-responsetime.html

@@ -1,6 +1,6 @@
 <div class="form-group">
     <div class="input-group">
         <input class="form-control" ng-model="model[options.key]" type="text" ng-disabled={{to.readOnly}} />
-        <div class="input-group-addon">小时</div>
+        <div class="input-group-addon">天</div>
     </div>
 </div>

assets/views/inspect/inspectionScope.html

@@ -491,6 +491,7 @@
             </div> -->
             <div class="mainDiv-head">
                 <!-- <span>巡检范围设置</span> -->
+                <label style="font-size:14px;cursor: pointer;"><input id="c_all" type="checkbox" ng-click="selectAll()" style="margin-right: 2px;position: relative;top: 2px;">全选</label>
                 <div class="mainDiv-head-right">
                     <div class="btn btn_search" ng-click="addType1('add')" ng-show="xinzeng">新增</div>
                     <div class="btn btn_search" ng-click="addType1('edit')" ng-show="xinzeng">修改</div>
@@ -499,7 +500,7 @@
             </div>
             <div class="leftBox">
                 <!-- <span ng-if="!selectedInspection.isShowZtree">...加载中...</span> -->
-                <z-tree ng-if="selectedInspection.isShowZtree" id="z-tree" class="ztree" select-inspection-type="selectedInspection.tree" copy-inspection-type="copyInspection.tree" state-model="stateModel" changecate="changecateObj.changecate" cachehttp="cacheHttp.value"></z-tree>
+                <z-tree set-fn="setDirectiveFn(params)" ng-if="selectedInspection.isShowZtree" id="z-tree" class="ztree" select-inspection-type="selectedInspection.tree" copy-inspection-type="copyInspection.tree" state-model="stateModel" changecate="changecateObj.changecate" cachehttp="cacheHttp.value"></z-tree>
                 <!-- <abn-tree tree-data="my_1data" tree-control="my_tree" on-select="my_tree_1handler(branch)" expand-level="2" icon-leaf="iconfont icon-fenlei" icon-expand="ti-plus" icon-collapse="ti-minus"></abn-tree> -->
             </div>
         </div>