巡检范围增删改查

assets/js/controllers/inspect/inspectPlanCtrl.js

@@ -81,9 +81,9 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
     };
 
     $scope.transfer = function (status) {
-        if (status === "正常") {
+        if (status === "执行中") {
             return "执行中"
-        } else if (status === "停止") {
+        } else if (status === "暂停中") {
             return "暂停中"
         }
     }
@@ -176,10 +176,10 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
             cellTemplate: '<div class="cl-effect-1 ui-grid-cell-contents pull-left">' +
                 // '<a ng-click="grid.appScope.selectRowFunction(row.entity)" tooltip="编辑" tooltip-placement="right"><i class="icon  iconfont icon-bianji bianjifont"></i></a>' +
                 '<a ng-click="grid.appScope.seeFunction(row.entity)" class="bianjifont">查看</a>' +
-                '<a ng-click="grid.appScope.selectRowFunction(row.entity)"  ng-show="{{(row.entity.status.name==\'配置中\'||row.entity.status.name==\'正常\'||row.entity.status.name==\'停止\')&&grid.appScope.bianji}}"  class="bianjifont">编辑</a>' +
+                '<a ng-click="grid.appScope.selectRowFunction(row.entity)"  ng-show="{{(row.entity.status.name==\'配置中\'||row.entity.status.name==\'执行中\'||row.entity.status.name==\'暂停中\')&&grid.appScope.bianji}}"  class="bianjifont">编辑</a>' +
                 // '<a ng-click="grid.appScope.runFunction(row.entity)" tooltip={{row.entity.runStatus}} tooltip-placement="left"><i class={{row.entity.style}}/></a>' +
-                '<a ng-click="grid.appScope.runFunction(row.entity)"  ng-show="{{row.entity.status.name==\'正常\'&&grid.appScope.zantingzhixing}}"   class="bianjifont">执行中</a>' +
-                '<a ng-click="grid.appScope.runFunction(row.entity)" ng-show="{{row.entity.status.name==\'停止\'&&grid.appScope.zantingzhixing}}"   class="bianjifont">暂停中</a>' +
+                '<a ng-click="grid.appScope.runFunction(row.entity)"  ng-show="{{row.entity.status.name==\'执行中\'&&grid.appScope.zantingzhixing}}"   class="bianjifont">暂停计划</a>' +
+                '<a ng-click="grid.appScope.runFunction(row.entity)" ng-show="{{row.entity.status.name==\'暂停中\'&&grid.appScope.zantingzhixing}}"   class="bianjifont">继续执行</a>' +
                 '</div>'
         },
         // { name: 'planTime2', displayName: '截止时间', width: 160, enableFiltering: false },
@@ -269,11 +269,11 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
             controller: function ($scope, $modalInstance) {
                 $scope.isRunFunction = true;
                 var status = "";
-                if (data.status.name == "正常") {
+                if (data.status.name == "执行中") {
                     $scope.title = '暂停巡检计划';
                     $scope.connect = '确定要暂停该巡检计划？';
                     // $scope.textLog = "是否暂停该巡检计划";
-                } else if (data.status.name == "停止") {
+                } else if (data.status.name == "暂停中") {
                     $scope.title = '开始巡检计划';
                     $scope.connect = '确定要开始该巡检计划？';
                     // $scope.textLog = "是否开始该巡检计划";
@@ -282,11 +282,11 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
                 $scope.ok = function () {
                     // var groupdata = "123";
                     // $modalInstance.dismiss('cancel');
-                    if (data.status.name == "正常") {
-                        upData.status = "停止";
+                    if (data.status.name == "执行中") {
+                        upData.status = "暂停中";
                         // data.style = "fa fa-pause";
-                    } else if (data.status.name == "停止") {
-                        upData.status = "正常";
+                    } else if (data.status.name == "暂停中") {
+                        upData.status = "执行中";
                         // data.style = "fa fa-play";
                     }
 
@@ -304,7 +304,7 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
 
         modalInstance.result.then(function (result) {
             if (result) {
-                // if(result.status=="停止"){
+                // if(result.status=="暂停中"){
                 //     result.status={"id":$scope.statusData[1].id}
                 // }else{
                 //     result.status={"id":$scope.statusData[2].id}
@@ -617,9 +617,9 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
                 }
                 console.log($scope.myData)
                 for (var i = 0; i < $scope.myData.length; i++) {
-                    if ($scope.myData[i].status == "正常") {
+                    if ($scope.myData[i].status == "执行中") {
                         $scope.myData[i].style = "fa fa-play";
-                    } else if ($scope.myData[i].status == "停止") {
+                    } else if ($scope.myData[i].status == "暂停中") {
                         $scope.myData[i].style = "fa fa-pause";
                     };
                     $scope.myData[i].runStatus = $scope.transfer($scope.myData[i].status);
@@ -662,9 +662,9 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
                 }
                 console.log($scope.myData)
                 for (var i = 0; i < $scope.myData.length; i++) {
-                    if ($scope.myData[i].status == "正常") {
+                    if ($scope.myData[i].status == "执行中") {
                         $scope.myData[i].style = "fa fa-play";
-                    } else if ($scope.myData[i].status == "停止") {
+                    } else if ($scope.myData[i].status == "暂停中") {
                         $scope.myData[i].style = "fa fa-pause";
                     };
                     $scope.myData[i].runStatus = $scope.transfer($scope.myData[i].status);

assets/views/system/tpl/incpectionchange.html

@@ -22,32 +22,6 @@
                     <multi-select-tree ng-model="add1data.parent" data-input-model="tree_1data" data-output-model="add1data.parent" theme="bootstrap" multi-select="false" data-default-label="{{thisParent.type}}" data-select-only-leafs="false" data-trans-label="label" data-switch-view="false" style="text-align: left;"></multi-select-tree>
                 </div>
             </div>
-            <!-- <div class="margin-bottom-15 anline">
-                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">线下巡检默认组:</div>
-                <div class="pull-right openaddinput">
-                    <ui-select class="tab-mainDiv-body-content" ng-model="group_user_Add.offlineGroup" theme="bootstrap">
-                        <ui-select-match placeholder="">
-                            {{$select.selected.groupName}}
-                        </ui-select-match>
-                        <ui-select-choices repeat="item in groupList | filter: $select.search">
-                            <div ng-bind-html="item.groupName | highlight: $select.search"></div>
-                        </ui-select-choices>
-                    </ui-select>
-                </div>
-            </div>
-            <div class="margin-bottom-15 anline">
-                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">线上巡检默认人:</div>
-                <div class="pull-right openaddinput">
-                    <ui-select class="tab-mainDiv-body-content" ng-model="group_user_Add.onlineUser" theme="bootstrap">
-                        <ui-select-match placeholder="">
-                            {{$select.selected.name}}
-                        </ui-select-match>
-                        <ui-select-choices repeat="item in userList | filter: $select.search">
-                            <div ng-bind-html="item.name | highlight: $select.search"></div>
-                        </ui-select-choices>
-                    </ui-select>
-                </div>
-            </div> -->
         </div>
     </form>
 </div>