巡检

assets/js/config.router.js

@@ -1402,7 +1402,7 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
 
             //巡检管理>巡检范围设置
             .state('app.inspectionScope', {
-                url: '/inspectionScope',
+                url: '/inspectionScope/{model}',
                 templateUrl: "assets/views/inspect/inspectionScope.html",
                 resolve: loadSequence('ui.select', 'multi.select.tree', 'angularBootstrapNavTree', 'spin', 'ladda', 'angular-ladda', 'inspectionScopeCtrl'),
                 title: 'Nav Manager',

assets/js/controllers/inspect/inspectForm.js

@@ -620,21 +620,23 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
                                 }
                             }
                             if (vm.model.inspection.id) {
+                                vm.model.inspection.status = {id:1716};//强制扭转状态为配置中
                                 if (vm.model.inspection.requestCategoryDTO) {
                                     vm.model.inspection.requestCategoryDTO = { id: vm.model.inspection.requestCategoryDTO.id }
                                 }
                                 vm.model.inspection
-                                serviceWatch.updData($scope.formData.modelName, vm.model).then(function(response) {
+                                serviceWatch.addData($scope.formData.modelName, vm.model).then(function(response) {
                                     if (response) {
                                         var resData = Restangular.stripRestangular(response);
                                         if (resData && resData.status == 200) {
-                                            SweetAlert.swal({
-                                                title: "提交成功!",
-                                                type: "success",
-                                                confirmButtonColor: "#007AFF"
-                                            }, function() {
-                                                $state.go($scope.formData.cancelUrl);
-                                            });
+                                            // SweetAlert.swal({
+                                            //     title: "提交成功!",
+                                            //     type: "success",
+                                            //     confirmButtonColor: "#007AFF"
+                                            // }, function() {
+                                            //     $state.go($scope.formData.cancelUrl);
+                                            // });
+                                            $state.go('app.inspectionScope',{ 'model': JSON.stringify(resData.data) });//跳转巡检范围设置-编辑
                                         } else {
                                             SweetAlert.swal({
                                                 title: "提交失败",
@@ -655,6 +657,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
                                 });
                             } else {
                                 vm.model.inspection['createUser'] = $rootScope.user;
+                                vm.model.inspection.status = {id:1716};//强制扭转状态为配置中
                                 // vm.model.inspection['sign']=$scope.xjSign;
                                 serviceWatch.addData($scope.formData.modelName, vm.model).then(function(response) {
                                     if (response) {
@@ -667,7 +670,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
                                             // }, function() {
                                             //     $state.go($scope.formData.cancelUrl);
                                             // });
-                                            $state.go('app.inspectionScope');//跳转巡检范围设置
+                                            $state.go('app.inspectionScope',{ 'model': JSON.stringify(resData.data) });//跳转巡检范围设置-新增
                                         } else {
                                             SweetAlert.swal({
                                                 title: "系统错误",

assets/js/controllers/inspect/inspectPlanCtrl.js

@@ -176,7 +176,7 @@ 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==\'停止\')&&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>' +

assets/js/main.js

@@ -622,7 +622,35 @@ app.factory('api_user_data', ['UserRestangular', function (UserRestangular) {
 // };
 // }]);
 
+app.factory('SimpleRestangular', function (Restangular) {
+    return Restangular.withConfig(function (RestangularConfigurer) {
+        RestangularConfigurer.setBaseUrl(serverIp + '/simple');
+    });
+});
+app.factory('api_simple', ['SimpleRestangular', function (SimpleRestangular) {
+    var r_data = SimpleRestangular.all("data");
 
+    return {
+        addListData: function (model, data) {
+            return r_data.customPOST(data, 'addListData/' + model, {});
+        },
+        fetchDataList: function (model, data) {
+            return r_data.customPOST(data, 'fetchDataList/' + model, {});
+        },
+        fetchData: function (model, data) {
+            return r_data.customPOST(data, 'fetchData/' + model, {});
+        },
+        addData: function (model, data) {
+            return r_data.customPOST(data, 'addData/' + model, {});
+        },
+        updData: function (model, data) {
+            return r_data.customPOST(data, 'updData/' + model, {});
+        },
+        rmvData: function (model, data) {
+            return r_data.customPOST(data, 'rmvData/' + model, {});
+        },
+    }
+}]);
 
 app.factory('BpmRestangular', function (Restangular) {
     return Restangular.withConfig(function (RestangularConfigurer) {

assets/js/script/ztree/zTreeStyle.css

@@ -0,0 +1,97 @@
+/*-------------------------------------
+zTree Style
+
+version:	3.5.19
+author:		Hunter.z
+email:		hunter.z@263.net
+website:	http://code.google.com/p/jquerytree/
+
+-------------------------------------*/
+
+.ztree * {padding:0; margin:0; font-size:12px; font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif}
+.ztree {margin:0; padding:5px; color:#333}
+.ztree li{padding:0; margin:0; list-style:none; line-height:14px; text-align:left; white-space:nowrap; outline:0}
+.ztree li ul{ margin:0; padding:0 0 0 18px}
+.ztree li ul.line{ background:url(./img/line_conn.gif) 0 0 repeat-y;}
+
+.ztree li a {padding:1px 3px 0 0; margin:0; cursor:pointer; height:17px; color:#333; background-color: transparent;
+	text-decoration:none; vertical-align:top; display: inline-block}
+.ztree li a:hover {text-decoration:underline}
+.ztree li a.curSelectedNode {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}
+.ztree li a.curSelectedNode_Edit {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}
+.ztree li a.tmpTargetNode_inner {padding-top:0px; background-color:#316AC5; color:white; height:16px; border:1px #316AC5 solid;
+	opacity:0.8; filter:alpha(opacity=80)}
+.ztree li a.tmpTargetNode_prev {}
+.ztree li a.tmpTargetNode_next {}
+.ztree li a input.rename {height:14px; width:80px; padding:0; margin:0;
+	font-size:12px; border:1px #7EC4CC solid; *border:0px}
+.ztree li span {line-height:16px; margin-right:2px}
+.ztree li span.button {line-height:0; margin:0; width:16px; height:16px; display: inline-block; vertical-align:middle;
+	border:0 none; cursor: pointer;outline:none;
+	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
+	background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
+
+.ztree li span.button.chk {width:13px; height:13px; margin:0 3px 0 0; cursor: auto}
+.ztree li span.button.chk.checkbox_false_full {background-position:0 0}
+.ztree li span.button.chk.checkbox_false_full_focus {background-position:0 -14px}
+.ztree li span.button.chk.checkbox_false_part {background-position:0 -28px}
+.ztree li span.button.chk.checkbox_false_part_focus {background-position:0 -42px}
+.ztree li span.button.chk.checkbox_false_disable {background-position:0 -56px}
+.ztree li span.button.chk.checkbox_true_full {background-position:-14px 0}
+.ztree li span.button.chk.checkbox_true_full_focus {background-position:-14px -14px}
+.ztree li span.button.chk.checkbox_true_part {background-position:-14px -28px}
+.ztree li span.button.chk.checkbox_true_part_focus {background-position:-14px -42px}
+.ztree li span.button.chk.checkbox_true_disable {background-position:-14px -56px}
+.ztree li span.button.chk.radio_false_full {background-position:-28px 0}
+.ztree li span.button.chk.radio_false_full_focus {background-position:-28px -14px}
+.ztree li span.button.chk.radio_false_part {background-position:-28px -28px}
+.ztree li span.button.chk.radio_false_part_focus {background-position:-28px -42px}
+.ztree li span.button.chk.radio_false_disable {background-position:-28px -56px}
+.ztree li span.button.chk.radio_true_full {background-position:-42px 0}
+.ztree li span.button.chk.radio_true_full_focus {background-position:-42px -14px}
+.ztree li span.button.chk.radio_true_part {background-position:-42px -28px}
+.ztree li span.button.chk.radio_true_part_focus {background-position:-42px -42px}
+.ztree li span.button.chk.radio_true_disable {background-position:-42px -56px}
+
+.ztree li span.button.seimin-switch {width:18px; height:18px}
+.ztree li span.button.root_open{background-position:-92px -54px}
+.ztree li span.button.root_close{background-position:-74px -54px}
+.ztree li span.button.roots_open{background-position:-92px 0}
+.ztree li span.button.roots_close{background-position:-74px 0}
+.ztree li span.button.center_open{background-position:-92px -18px}
+.ztree li span.button.center_close{background-position:-74px -18px}
+.ztree li span.button.bottom_open{background-position:-92px -36px}
+.ztree li span.button.bottom_close{background-position:-74px -36px}
+.ztree li span.button.noline_open{background-position:-92px -72px}
+.ztree li span.button.noline_close{background-position:-74px -72px}
+.ztree li span.button.root_docu{ background:none;}
+.ztree li span.button.roots_docu{background-position:-56px 0}
+.ztree li span.button.center_docu{background-position:-56px -18px}
+.ztree li span.button.bottom_docu{background-position:-56px -36px}
+.ztree li span.button.noline_docu{ background:none;}
+
+.ztree li span.button.ico_open{margin-right:2px; background-position:-110px -16px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.ico_close{margin-right:2px; background-position:-110px 0; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.ico_docu{margin-right:2px; background-position:-110px -32px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.edit {margin-right:2px; background-position:-110px -48px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.remove {margin-right:2px; background-position:-110px -64px; vertical-align:top; *vertical-align:middle}
+
+.ztree li span.button.ico_loading{margin-right:2px; background:url(./img/loading.gif) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+
+ul.tmpTargetzTree {background-color:#FFE6B0; opacity:0.8; filter:alpha(opacity=80)}
+
+span.tmpzTreeMove_arrow {width:16px; height:16px; display: inline-block; padding:0; margin:2px 0 0 1px; border:0 none; position:absolute;
+	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
+	background-position:-110px -80px; background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
+
+ul.ztree.zTreeDragUL {margin:0; padding:0; position:absolute; width:auto; height:auto;overflow:hidden; background-color:#cfcfcf; border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)}
+.zTreeMask {z-index:10000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute}
+
+/* level style*/
+/*.ztree li span.button.level0 {
+	display:none;
+}
+.ztree li ul.level0 {
+	padding:0;
+	background:none;
+}*/

assets/views/inspect/inspectionScope.html

@@ -8,8 +8,12 @@
        background-color: white;
        padding: 11px;
        margin-top: 7px;
+       min-height: 565px;
        /* height: 565px; */
    }
+   .leftBox.minHeight264{
+        min-height: 264px!important;
+   }
    .leftBox i{
        font-size: 14px;
        color: #007AFF;
@@ -17,7 +21,8 @@
    .leftBox .list{
        height: 30px;
        line-height: 30px;
-       padding: 0 4px
+       padding: 0 4px;
+       cursor: pointer;
    }
    .leftBox .listCliI{
        color:rgb(0,83,149)
@@ -35,6 +40,7 @@
        background-color: white;
        padding: 11px;
        margin-top: 7px;
+       min-height: 565px;
        /* height: 565px; */
    }
    .btn_box{
@@ -156,17 +162,19 @@
         border: 1px solid #eeeeee;
         width: 288px;
         float: left;
+        min-height: 541px;
     }
     
     .mainDivRight {
         margin-left: 302px;
         border-radius: 8px;
         border: 1px solid #eeeeee;
+        min-height: 541px;
     }
     
     .mainDiv-head {
-        height: 47px;
-        line-height: 47px;
+        height: 30px;
+        line-height: 30px;
         background: #f5f5f5;
         font-size: 16px;
         color: #606367;
@@ -221,9 +229,9 @@
         border-radius: 8px;
         border: 1px solid #eeeeee;
         margin: 14px;
-        padding-top: 14px;
+        /* padding-top: 14px; */
         /* height: 402px; */
-        overflow: auto;
+        /* overflow: auto; */
     }
     
     .mainDiv-body-1 {
@@ -248,10 +256,10 @@
         border-bottom: none;
     }
     
-    .fixHeight {
-        /* height: 450px; */
+    /* .fixHeight {
+        height: 450px;
         overflow: auto;
-    }
+    } */
     
     .mainDiv-body-3 {
         height: 50px;
@@ -484,23 +492,21 @@
             <div class="mainDiv-head">
                 <!-- <span>巡检范围设置</span> -->
                 <div class="mainDiv-head-right">
-                    <div class="btn btn_search" ng-click="addType1(output)" ng-show="xinzeng">新增</div>
-                    <div class="btn btn_search" ng-click="addType1(output)" ng-show="xinzeng">修改</div>
-                    <div class="btn btn_remove" ng-class="isMousedown?'btn_removeMousedown':''" ng-mousedown="changeRemoveClass()" ng-click="remove1(output)" ng-show="shanchu">删除</div>
+                    <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>
+                    <div class="btn btn_remove" ng-class="isMousedown?'btn_removeMousedown':''" ng-click="remove1(output)" ng-show="shanchu">删除</div>
                 </div>
             </div>
             <div class="leftBox">
-                <!-- <div class="list" ng-repeat="v in listData" ng-click="leftListCli($index,v)" ng-class="{'listCli':$index==leftListIdx}">
-                    <i class="iconfont icon-liebiao1" ng-class="{'listCliI':$index==leftListIdx}"></i>
-                    <span>{{v.name}}</span>
-                </div> -->
-                <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>
+                <!-- <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"></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>
         <div class="col-xs-6">
             <div class="inspection_name">
-                <div>策略名称<span class="red">*</span>：<input style="width: 220px;" class="form-control" placeholder="策略名称..." /></div>
-                <div class="btn btn_search" ng-click="addType1(output)" ng-show="xinzeng">设置所有范围</div>
+                <div>策略名称<span class="red">*</span>：<input style="width: 220px;" ng-model="modelName" class="form-control" placeholder="策略名称..." /></div>
+                <!-- <div class="btn btn_search" ng-click="addType1(output)" ng-show="xinzeng">设置所有范围</div> -->
             </div>
             <div class="rightBox">
                 <!-- 巡检范围开始 -->
@@ -512,44 +518,28 @@
                                 <span>已选中的巡检范围</span>
                                 <div class="mainDiv-head-right">
                                     <!-- <div class="btn btn_search" ng-click="addType1(output)" ng-show="xinzeng">新增</div> -->
-                                    <div class="btn btn_remove" ng-class="isMousedown?'btn_removeMousedown':''" ng-mousedown="changeRemoveClass()" ng-click="remove1(output)" ng-show="shanchu">删除</div>
+                                    <!-- <div class="btn btn_remove" ng-class="isMousedown?'btn_removeMousedown':''" ng-mousedown="changeRemoveClass()" ng-click="remove1(output)" ng-show="shanchu">删除</div> -->
                                 </div>
                             </div>
-                            <div class="mainDiv-body fixHeight">
+                            <div class="mainDiv-body fixHeight" ng-if="copyInspection.tree.length">
                                 <div class="box-tree">
-                                    <span ng-if="doing_async">...加载中...</span>
-                                    <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>
+                                    <!-- <span ng-if="doing_async">...加载中...</span> -->
+                                    <!-- <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> -->
+                                    <z-tree-copy id="z-tree-copy" class="ztree" copy-inspection-type="copyInspection.tree" changecate="changecateObj.changecate" selectedchangecategory="selectedchangecategory.value"></z-tree-copy>
                                 </div>
                             </div>
                         </div>
                 
-                        <div class="mainDivRight" ng-if="changecate">
+                        <div class="mainDivRight" ng-if="changecateObj.changecate && copyInspection.tree.length">
                             <div class="mainDiv-head">
-                                <span>服务目录修改</span>
+                                <!-- <span>服务目录修改</span> -->
                             </div>
                             <div class="mainDiv-body">
                                 <div class="tab-mainDiv-body-lineDiv-50">
-                                    <div class="tab-mainDiv-body-lable">
-                                        服务目录名称:
-                                    </div>
-                                    <div class="tab-mainDiv-body-content">
-                                        <input class="form-control" ng-model="sub1data.type" placeholder="服务目录名称..." />
-                                    </div>
-                                </div>
-                                <div class="tab-mainDiv-body-lineDiv-50" ng-if="thisParent">
-                                    <div class="tab-mainDiv-body-lable">
-                                        父类:
-                                    </div>
-                                    <div class="tab-mainDiv-body-content">
-                                        <multi-select-tree ng-model="sub1data.parent" data-input-model="tree_1data" data-output-model="sub1data.parent" theme="bootstrap" multi-select="false" data-default-label="{{thisParent.type}}" data-callback="onFilterCallback(item)" data-select-only-leafs="false" data-trans-label="label"
-                                            data-switch-view="false"></multi-select-tree>
-                                    </div>
-                                </div>
-                                <div class="tab-mainDiv-body-lineDiv-50">
                                     <div class="tab-mainDiv-body-lable">线下巡检默认组:</div>
                                     <ui-select class="tab-mainDiv-body-content" ng-model="group_user.offlineGroup"
                                         theme="bootstrap">
-                                        <ui-select-match placeholder="">
+                                        <ui-select-match allow-clear placeholder="">
                                             {{$select.selected.groupName}}
                                         </ui-select-match>
                                         <ui-select-choices repeat="item in groupList | filter: $select.search">
@@ -561,7 +551,7 @@
                                     <div class="tab-mainDiv-body-lable">线上巡检默认人:</div>
                                     <ui-select class="tab-mainDiv-body-content" ng-model="group_user.onlineUser"
                                         theme="bootstrap">
-                                        <ui-select-match placeholder="">
+                                        <ui-select-match allow-clear placeholder="">
                                             {{$select.selected.name}}
                                         </ui-select-match>
                                         <ui-select-choices repeat="item in userList | filter: $select.search">
@@ -571,86 +561,20 @@
                                 </div>
                             </div>
                             <div class="tab-mainDiv-foot">
-                                <div class="btn btn_search" ng-click="submit1change(sub1data)" ng-show="bianji">
-                                    确认
-                                </div>
+                                <!-- <div class="btn btn_search" ng-click="submit1change()" ng-show="bianji">
+                                    保存设置
+                                </div> -->
                             </div>
                         </div>
                 
-                        <div class="mainDivRight" ng-if="add1cate">
-                            <div class="mainDiv-head">
-                                <span>服务目录新增</span>
-                            </div>
-                            <div class="mainDiv-body">
-                                <div class="tab-mainDiv-body-lineDiv-50">
-                                    <div class="tab-mainDiv-body-lable">
-                                        服务目录名称:
-                                    </div>
-                                    <div class="tab-mainDiv-body-content">
-                                        <input class="form-control" ng-model="add1data.type" placeholder="服务目录名称..." />
-                                    </div>
-                                </div>
-                                <div class="tab-mainDiv-body-lineDiv-50">
-                                    <div class="tab-mainDiv-body-lable">
-                                        是否有父类:
-                                    </div>
-                                    <div class="tab-mainDiv-body-content">
-                                        <switch ng-model="addparent" class="green"></switch>
-                                    </div>
-                                </div>
-                                <div class="tab-mainDiv-body-lineDiv-50" ng-if="addparent">
-                                    <div class="tab-mainDiv-body-lable">
-                                        父类:
-                                    </div>
-                                    <div class="tab-mainDiv-body-content">
-                                        <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="服务目录" data-callback="onFilterCallback(item)" data-select-only-leafs="false" data-trans-label="label"
-                                            data-switch-view="false"></multi-select-tree>
-                                    </div>
-                                </div>
-                                <div class="tab-mainDiv-body-lineDiv-50">
-                                    <div class="tab-mainDiv-body-lable">线下巡检默认组:</div>
-                                    <ui-select class="tab-mainDiv-body-content" ng-model="group_user_Add.group"
-                                        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 class="tab-mainDiv-body-lineDiv-50">
-                                    <div class="tab-mainDiv-body-lable">线上巡检默认人:</div>
-                                    <ui-select class="tab-mainDiv-body-content" ng-model="group_user_Add.user"
-                                        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 class="tab-mainDiv-foot">
-                                <div class="btn btn_search" ng-click="submit1add(add1data)">
-                                    确认
-                                </div>
-                                <div class="btn btn_clean" ng-click="closethis(addcategory)">
-                                    取消
-                                </div>
-                            </div>
-                        </div>
-                
-                        <div class="mainDivRight" ng-if="add1cate==''&&changecate==''">
-                            <!-- <div class="mainDivRight"> -->
+                        <div class="mainDivRight" ng-if="!(changecateObj.changecate && copyInspection.tree.length)">
                             <div class="mainDiv-head">
                                 <span>操作提示</span>
                             </div>
                             <div class="mainDiv-body">
                                 <div class="mainDiv-body-noList">
                                     <img src="./assets/images/place/icon_quesheng.png" alt="">
-                                    <p class="handlefont">请选择服务目录</p>
+                                    <p class="handlefont">请选择巡检范围</p>
                                 </div>
                             </div>
                         </div>
@@ -659,23 +583,27 @@
                 <!-- 巡检范围结束 -->
             </div>
             <div class="inspection_btns col-xs-12">
-                <div class="btn btn_search" ng-click="addType1(output)" ng-show="xinzeng">执行巡检计划</div>
-                <div class="btn btn_remove" ng-class="isMousedown?'btn_removeMousedown':''" ng-mousedown="changeRemoveClass()" ng-click="remove1(output)" ng-show="shanchu">关闭</div>
+                <div class="btn btn_search" ng-click="submit1change()" ng-show="xinzeng">执行巡检计划</div>
+                <div class="btn btn_remove" ng-class="isMousedown?'btn_removeMousedown':''" ng-click="closeModel()" ng-show="shanchu">关闭</div>
             </div>
         </div>
         <div class="col-xs-3">
             <div class="mainDiv-head">
                 <span>巡检范围策略模板</span>
-                <!-- <div class="mainDiv-head-right">
-                    <div class="btn btn_search" ng-click="addType1(output)" ng-show="xinzeng">新增</div>
-                    <div class="btn btn_search" ng-click="addType1(output)" ng-show="xinzeng">修改</div>
-                    <div class="btn btn_remove" ng-class="isMousedown?'btn_removeMousedown':''" ng-mousedown="changeRemoveClass()" ng-click="remove1(output)" ng-show="shanchu">删除</div>
-                </div> -->
             </div>
-            <div class="leftBox">
-                <div class="list" ng-repeat="v in listData" ng-click="leftListCli($index,v)" ng-class="{'listCli':$index==leftListIdx}">
+            <div class="leftBox minHeight264">
+                <div class="list" ng-repeat="v in listDataTop" ng-click="leftListCli($index,v)" ng-class="{'listCli':$index==leftListIdx}">
+                    <i class="iconfont icon-liebiao1" ng-class="{'listCliI':$index==leftListIdx}"></i>
+                    <span>{{v.modelName}}</span>
+                </div>
+            </div>
+            <div class="mainDiv-head">
+                <span>往期巡检范围策略</span>
+            </div>
+            <div class="leftBox minHeight264">
+                <div class="list" ng-repeat="v in listDataBottom" ng-click="leftListCli($index,v)" ng-class="{'listCli':$index==leftListIdx}">
                     <i class="iconfont icon-liebiao1" ng-class="{'listCliI':$index==leftListIdx}"></i>
-                    <span>{{v.name}}</span>
+                    <span>{{v.modelName}}</span>
                 </div>
             </div>
         </div>

assets/views/system/tpl/incpectionchange.html

@@ -5,7 +5,7 @@
     <form role="form" class="row">
         <div class="margin-left-30 margin-right-30 margin-top-20">
             <div class="margin-bottom-15 anline">
-                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">巡检范围名称<span class="red">*</span>:</div>
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">名称<span class="red">*</span>:</div>
                 <div class="pull-right openaddinput">
                     <input class="form-control" ng-model="add1data.type" placeholder="巡检范围名称" />
                 </div>
@@ -19,10 +19,10 @@
             <div class="margin-bottom-15 anline" ng-if="addparent">
                 <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">父类:</div>
                 <div class="pull-right openaddinput">
-                    <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-callback="onFilterCallback(item)" data-select-only-leafs="false" data-trans-label="label" data-switch-view="false"></multi-select-tree>
+                    <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="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">
@@ -47,11 +47,11 @@
                         </ui-select-choices>
                     </ui-select>
                 </div>
-            </div>
+            </div> -->
         </div>
     </form>
 </div>
 <div class="modal-footer">
-    <a ng-click="savercode(deptdata)" data-dismiss="modal" class="btn btn-primary">保存</a>
+    <a ng-click="savercode(add1data)" data-dismiss="modal" class="btn btn-primary">保存</a>
     <button class="btn btn-primary btn-o" ng-click="cancel()" translate="modal.button.CANCEL">取消</button>
 </div>

assets/views/system/tpl/inspectionModel.html

@@ -0,0 +1,19 @@
+<div class="modal-header">
+    <div class="modal-title fontcolor-two fontsizes-14">{{title}}<button type="button" class="close pull-right" ng-click="cancel()">×</button></div>
+</div>
+<div class="modal-header">您确认要开始执行巡检计划吗？可勾选多选框将本次巡检范围策略保存为模板；</div>
+<div class="modal-body margin-top-15 margin-left-15 margin-bottom-15 margin-right-15 addrequster">
+    <form role="form" class="row">
+        <div class="margin-left-30 margin-right-30 margin-top-20">
+            <div class="margin-bottom-15 anline">
+                <div class="pull-left">
+                    <label style="cursor: pointer;"><input type="checkbox" ng-model="add1data.model" />同时设置巡检范围策略为模板</label>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <a ng-click="savercode(add1data)" data-dismiss="modal" class="btn btn-primary">保存</a>
+    <button class="btn btn-primary btn-o" ng-click="cancel()" translate="modal.button.CANCEL">取消</button>
+</div>

index.html

@@ -39,6 +39,8 @@
     <!-- <link rel="stylesheet" type="text/css" href="assets/css/svgIconFont/iconfont.css" />
     <link rel="stylesheet" type="text/css" href="assets/css/svgIconFont/demo.css" /> -->
     <link rel="stylesheet" type="text/css" href="assets/css/demo/demo3.css" />
+    <!-- ztree -->
+    <link rel="stylesheet" type="text/css" href="assets/js/script/ztree/zTreeStyle.css" />
     <!-- Clip-Two Theme -->
     <link rel="stylesheet" data-ng-href="assets/css/themes/{{ app.layout.theme }}.css" />
     <script>
@@ -82,6 +84,8 @@
     <script src="assets/js/directives/jquery.js"></script>
     <!-- <script src="../bower_components/jquery/dist/jquery.min.js"></script> -->
     <!--<script src="../bower_components/jquery-ui/jquery-ui.min.js"></script>-->
+    <!-- ztree -->
+    <script src="./assets/js/script/ztree/jquery.ztree.all.js"></script>
     <!-- md5 -->
     <script src="./assets/js/script/md5.min.js"></script>
     <!-- base64 -->