巡检

assets/css/styles.css

@@ -6279,7 +6279,7 @@ ul.sub-menu li ul.sub-menu li ul.sub-menu li a {
     font-size: 12px;
     -webkit-transform: translate3d(0, 0, 0);
     transform: translate3d(0, 0, 0);
-    z-index: 1088;
+    z-index: 99;
 }
 
 #app>footer .footer-inner {

assets/js/app.js

@@ -1,2 +1,2 @@
 "use strict";
-angular.module("itsm-dep", ["ngAnimate", "ngCookies", "ngStorage", "ngSanitize", "ngTouch", "ui.router", "ui.bootstrap", "oc.lazyLoad", "cfp.loadingBar", "ncy-angular-breadcrumb", "duScroll", "pascalprecht.translate", "restangular", "ng-token-auth", "angular-dayparts","angular-nicescroll","ui2.bootstrap"]);
+angular.module("itsm-dep", ["ngAnimate", "ngCookies", "ngStorage", "ngSanitize", "ngTouch", "ui.router", "ui.bootstrap", "oc.lazyLoad", "cfp.loadingBar", "ncy-angular-breadcrumb", "duScroll", "pascalprecht.translate", "restangular", "ng-token-auth", "angular-dayparts","angular-nicescroll","ui2.bootstrap",'isteven-multi-select']);

assets/js/config.constant.js

@@ -110,6 +110,7 @@ app.constant('JS_REQUIRES', {
         'childpapeCtrl': 'assets/js/controllers/report/childpapeCtrl.js',
         //*** inspect 
         'inspectPlanCtrl': 'assets/js/controllers/inspect/inspectPlanCtrl.js',
+        'inspectReportCtrl': 'assets/js/controllers/inspect/inspectReportCtrl.js',
         'inspectListCtrl': 'assets/js/controllers/inspect/inspectListCtrl.js',
         'inspectForm': 'assets/js/controllers/inspect/inspectForm.js',
         'calllogCtrl': 'assets/js/controllers/desk/calllogCtrl.js',

assets/js/config.router.js

@@ -1363,6 +1363,18 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
                 }
             })
 
+            //巡检管理>巡检报告
+            .state('app.inspection.inspectReport', {
+                url: '/inspectReport',
+                templateUrl: "assets/views/inspect/inspectReport.html",
+                resolve: loadSequence('jquery-nestable-plugin', 'ng-nestable', 'ui.select', 'angularBootstrapNavTree', 'multi.select.tree', 'ckeditor-plugin', 'ckeditor', 'angularFileUpload', 'spin', 'ladda', 'angular-ladda', 'ui.grid', 'inspectReportCtrl'),
+                title: 'inspection.LIST',
+                icon: 'ti-list',
+                ncyBreadcrumb: {
+                    label: 'inspection list'
+                }
+            })
+
             //巡检管理>巡检列表
             .state('app.inspection.inspectList', {
                 url: '/inspectList',

assets/js/controllers/customform/customformCtrl.js

@@ -11243,6 +11243,53 @@ appFormly.config(function config(formlyConfigProvider) {
       };
     },
   });
+  //下拉框组件(巡检计划-查看)
+  formlyConfigProvider.setType({
+    name: "ui-select-xj",
+    extends: "select",
+    templateUrl: "assets/views/customform/tpl/ui-select-xj.html",
+    defaultOptions: function (options, scope) {
+      return {
+        templateOptions: {
+          getScope: function () {
+            return scope;
+          },
+          refreshDelay: 0,
+          validators: {
+            required: {
+              expression: function (viewValue, modelValue) {
+                var value = modelValue || viewValue;
+                return value != null;
+              },
+            },
+          },
+        },
+        controller: [
+          "$scope",
+          "$rootScope",
+          "api_bpm_domain",
+          "$stateParams",
+          function ($scope, $rootScope, api_bpm_domain, $stateParams) {
+            $scope.model[$scope.options.key] = '全部';//默认全部
+            var arr = $scope.model.inspection.batchNos.map(v=>({value:v,name:v}));
+            arr.unshift({value:'全部',name:'全部'});
+            $scope.options.templateOptions.options = arr;
+            console.log($scope)
+            // ts.$parent.fields.forEach(v=>{
+            //   if(v.templateOptions.onlyKey === "batchNos"){
+            //     //巡检计划-批次号
+            //     var batchNos = $scope.model.batchNos === "0"?"":$scope.model.batchNos;
+            //     v.templateOptions.getScope().refreshData(batchNos)
+            //   }
+            // })
+            // ts.$parent.fields.forEach(v=>{if(v.templateOptions.onlyKey === "batchNos"){var batchNos = item == "0"?"":item;v.templateOptions.getScope().refreshData(batchNos);}})
+            // console.log($scope.options)
+            // console.log($scope.model)
+          },
+        ],
+      };
+    },
+  });
 
   //下拉多选框组件
   formlyConfigProvider.setType({
@@ -11265,6 +11312,169 @@ appFormly.config(function config(formlyConfigProvider) {
     ],
   });
 
+  //下拉多选全选组件
+  formlyConfigProvider.setType({
+    name: "ui-isteven",
+    extends: "select",
+    templateUrl: "assets/views/customform/tpl/ui-isteven.html",
+    defaultOptions: function (options,$scope) {
+      return {
+        templateOptions: {
+          refresh: function () {
+            console.log(options)
+            options.templateOptions
+                .refreshData(options.templateOptions.APIService)
+                .then(function (result) {
+                  if(result.status == 200){
+                    console.log(result.list)
+                    //树形结构转换
+                    function formatDataTree2(json){
+                      var _json = JSON.parse(JSON.stringify(json));
+                      return _json.filter(p=>{
+                        var _arr = _json.filter(c=>(c.parent?c.parent.id === p.id:false));
+                        _arr.length && (p.children = _arr);
+                        return !p.parent;
+                      })
+                    }
+                    var list = formatDataTree2(result.list);
+                    // $scope.treeList = angular.copy(list);
+                    var resultList = [];
+                    //转换数据
+                    function trasData(list,obj){
+                      if(obj){
+                        //有父级
+                        list.forEach(v=>{
+                          var type = "<strong>"+ v.parent.type +"</strong>";//父级type
+                          var i = resultList.findIndex(c=>c.type == type);
+                          if(v.children){
+                            resultList.splice(i+1,0,{
+                              type: "<strong>"+ v.type +"</strong>",
+                              msId: v.id,
+                              msGroup: true,
+                            },{msGroup: false})
+                            trasData(v.children,v);
+                          }else{
+                            resultList.splice(i+1,0,{...v,...{ticked:false}});
+                          }
+                        })
+                      }else{
+                        //顶级
+                        list.forEach(v=>{
+                          if(v.children){
+                            resultList.push({
+                              type: "<strong>"+ v.type +"</strong>",
+                              msId: v.id,
+                              msGroup: true,
+                            },{msGroup: false})
+                            trasData(v.children,v);
+                          }else{
+                            resultList.push(...v,...{ticked:false});
+                          }
+                        })
+                      }
+                      return resultList;
+                    }
+                    var __arr = trasData(list,null);
+                    if(options.model.inspectionType){
+                      //有巡检类型，则需要回显
+                      __arr.forEach(w=>{
+                        w.ticked = w.id == options.model.inspectionType.id;
+                      })
+                    }
+                    $scope.webBrowsersGrouped = __arr;
+                    console.log($scope.webBrowsersGrouped);
+                  }
+                })
+          },
+          refreshDelay: 1000,
+        },
+      };
+    },
+    controller: [
+      "$scope",
+      function ($scope) {
+        console.log($scope)
+        $scope.to.refresh();//获取列表数据
+        // $scope.model[$scope.options.key] = [];
+        //单项点击或菜单
+        $scope.fClick = function(data){
+          console.log($scope.outputBrowsers)
+          $scope.$parent.$parent.$parent.model.inspection.typeIds = $scope.outputBrowsers.map(v=>v.id).join();
+          console.log($scope.$parent.$parent.$parent.model.inspection.typeIds)
+          // if(data.id){
+          //   //单项点击
+          //   if($scope.$parent.$parent.$parent.model.inspection.typeIds){
+          //     //有巡检类型
+          //     var arr = $scope.$parent.$parent.$parent.model.inspection.typeIds.split(',');
+          //     if(data.ticked){
+          //       arr.push(data.id);
+          //     }else{
+          //       arr = arr.filter(v=>v != data.id);
+          //     }
+          //     $scope.$parent.$parent.$parent.model.inspection.typeIds = arr.join();
+          //   }else{
+          //     //无巡检类型
+          //     $scope.$parent.$parent.$parent.model.inspection.typeIds = 1;
+          //     if(data.ticked){
+          //       $scope.$parent.$parent.$parent.model.inspection.typeIds = data.id + '';
+          //     }else{
+          //       $scope.$parent.$parent.$parent.model.inspection.typeIds = '';
+          //     }
+          //   }
+          // }else{
+          //   // 菜单点击
+          //   console.log($scope.webBrowsersGrouped,data.msId);
+          //   var treeResultArr = $scope.webBrowsersGrouped.filter(v=>{
+          //     return v.parent?v.parent.id == data.msId:false;
+          //   })
+          //   if(treeResultArr.every(v=>v.ticked)){
+          //     //全部都是true的情况下，需要移除，否则增加
+          //   }
+          //   console.log(treeResultArr)
+          //   // --------------------------------------
+          //   // var treeArr = [];
+          //   // function findParent(treeList){
+          //   //   treeList.forEach(v=>{
+          //   //     if(v.id == data.msId){
+          //   //       treeArr = v.children;
+          //   //     }else{
+          //   //       if(v.children){
+          //   //         findParent(v.children);
+          //   //       }
+          //   //     }
+          //   //   })
+          //   //   return treeArr;
+          //   // }
+          //   // var treeResultArr = findParent($scope.treeList);
+          //   // console.log(treeResultArr)
+          //   // -----------------------------------
+          // }
+        }
+        // 全选
+        $scope.fSelectAll = function(){
+          // console.log($scope.webBrowsersGrouped)
+          var arr = $scope.webBrowsersGrouped.filter(v=>v.id).map(v=>v.id);
+          // console.log(arr);
+          $scope.$parent.$parent.$parent.model.inspection.typeIds = arr.join();
+          console.log($scope.$parent.$parent.$parent.model.inspection.typeIds)
+        }
+        // 全不选
+        $scope.fSelectNone = function(){
+          $scope.$parent.$parent.$parent.model.inspection.typeIds = '';
+          console.log($scope.$parent.$parent.$parent.model.inspection.typeIds)
+        }
+
+        // 配置信息
+        $scope.outputBrowsers = [];
+        $scope.localLang = {
+          selectAll: "全选",
+          selectNone: "全不选",
+          nothingSelected: "请选择"
+        }
+      },
+    ],
+  });
+
   //下拉多选框灵活组件
   formlyConfigProvider.setType({
     name: "ui-multiselectplus",
@@ -12197,6 +12407,11 @@ appFormly.config(function config(formlyConfigProvider) {
     controller: [
       "$scope",
       function ($scope) {
+        console.log($scope)
+        if($scope.options.templateOptions.isTrue){
+          //是否默认打开
+          $scope.model[$scope.options.key] = true;
+        }
         // 巡检生成事件，默认派单
         if ($scope.model.isInspection) {
           $scope.model[$scope.options.key] = true;
@@ -12210,6 +12425,27 @@ appFormly.config(function config(formlyConfigProvider) {
       },
     ],
   });
+  //勾选组件(禁用)--yeye
+  formlyConfigProvider.setType({
+    name: "ui-checkbox-disabled",
+    extends: "checkbox",
+    templateUrl: "assets/views/customform/tpl/ui-checkbox-disabled.html",
+    controller: [
+      "$scope",
+      function ($scope) {
+        // 巡检生成事件，默认派单
+        // if ($scope.model.isInspection) {
+        //   $scope.model[$scope.options.key] = true;
+        // }
+        // if ($scope.model[$scope.options.key] == "true") {
+        //   $scope.model[$scope.options.key] = true;
+        // }
+        // if ($scope.model[$scope.options.key] == "false") {
+        //   $scope.model[$scope.options.key] = false;
+        // }
+      },
+    ],
+  });
 
   //换行组件
   formlyConfigProvider.setType({
@@ -12717,10 +12953,13 @@ appFormly.config(function config(formlyConfigProvider) {
     name: "ui-grid-show",
     extends: "multiCheckbox",
     templateUrl: "assets/views/customform/tpl/ui-grid-show.html",
-    defaultOptions: function (options) {
+    defaultOptions: function (options,scope) {
       return {
         templateOptions: {
           linkage: function () { },
+          getScope: function () {
+            return scope;
+          },
         },
       };
     },
@@ -12747,7 +12986,7 @@ appFormly.config(function config(formlyConfigProvider) {
       $scope.gridOptions.fastWatch = true;
       $scope.gridOptions.useExternalFiltering = true;
       $scope.gridOptions.useExternalPagination = true;
-      $scope.gridOptions.paginationPageSizes = [10, 20, 50, 100];
+      $scope.gridOptions.paginationPageSizes = [10];
       $scope.gridOptions.paginationPageSize = 10;
       $scope.gridOptions.multiSelect = true;
 
@@ -12796,6 +13035,12 @@ appFormly.config(function config(formlyConfigProvider) {
           width: 160,
           enableFiltering: false,
         },
+        {
+          name: "batchNo",
+          displayName: "批次号",
+          width: 160,
+          enableFiltering: false,
+        },
       ];
 
       var defaultFilterData = {
@@ -12823,15 +13068,28 @@ appFormly.config(function config(formlyConfigProvider) {
       //页面获取数据
       $scope.refreshData = function (style, filterData) {
         // $scope.ldloading[style.replace('-', '_')] = true;
+        console.log(angular.isUndefined(filterData))
         if (angular.isUndefined(filterData)) {
           filterData = defaultFilterData;
         }
         $scope.myData = [];
-        angular.extend(filterData, {
-          inspectionProcessActual: {
+        console.log(filterData)
+        if(filterData.inspectionProcessActual && filterData.inspectionProcessActual.batchNo){
+          filterData.inspectionProcessActual = {
             inspectionid: $scope.model.id,
-          },
-        });
+            batchNo:filterData.inspectionProcessActual.batchNo
+          }
+        }else{
+          filterData.inspectionProcessActual = {
+            inspectionid: $scope.model.id
+          }
+        }
+        // angular.extend(filterData, {
+        //   inspectionProcessActual: {
+        //     inspectionid: $scope.model.id,
+        //   },
+        // });
+        console.log(filterData)
         api_bpm_data.fetchDataList("inspectionProcessActual", filterData).then(
           function (data) {
             var myData = Restangular.stripRestangular(data);

assets/js/controllers/inspect/inspectForm.js

@@ -386,7 +386,8 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
             // console.log("data="+JSON.stringify(data));
             // if($stateParams.formKey=="system_edit"){
             // console.log("roleid="+$scope.roleid);
-            if (vm.form.$valid) {
+            console.log(vm);
+            if (vm.form.$valid && vm.model.inspection.typeIds) {
                 if (data.inspection.planStrategy && data.inspection.planStrategy.id == 1) {
                     if (Date.parse(data.inspection.planStartTime) > (new Date().setMinutes(new Date().getMinutes() + 1))) {
                         vm.options.updateInitialValue();

assets/js/controllers/inspect/inspectListCtrl.js

@@ -105,7 +105,7 @@ app.controller('inspectListCtrl', ["$rootScope", "$scope", "$state", "$timeout",
             enableFiltering: false
         },
         {
-            name: 'inspection.inspectionType.type',
+            name: 'inspectionType.type',
             displayName: '巡检分类',
             width: '12%',
             minWidth: 120,
@@ -199,7 +199,7 @@ app.controller('inspectListCtrl', ["$rootScope", "$scope", "$state", "$timeout",
             'dataId': data.id,
             "processInstanceId": data.processInstanceId,
             "pdKey": data.processKey,
-            "formUiEdit": data.inspection.inspectionType.formUiEdit,
+            "formUiEdit": data.inspectionType.formUiEdit,
             // "formUiName": data.inspection.inspectionTypeDTO.formUiName,
             "model": JSON.stringify(filedata)
         });
@@ -213,13 +213,13 @@ app.controller('inspectListCtrl', ["$rootScope", "$scope", "$state", "$timeout",
             // model:data
         }
         $state.go('app.inspection.inspectListdetail', {
-            "formKey": data.inspection.inspectionType.formUiName,
+            "formKey": data.inspectionType.formUiName,
             "dataId": data.id,
             "taskId": data.taskId,
             "processInstanceId": data.processInstanceId,
             "pdKey": data.processKey,
             // "formUiEdit": data.inspection.inspectionTypeDTO.formUiEdit,
-            "formUiName": data.inspection.inspectionType.formUiName,
+            "formUiName": data.inspectionType.formUiName,
             "model": JSON.stringify(filedata)
         });
     };

assets/js/controllers/inspect/inspectPlanCtrl.js

@@ -100,12 +100,12 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
             width: '10%',
             enableFiltering: true
         },
-        {
-            name: 'inspectionType.type',
-            displayName: '巡检类型',
-            width: '109',
-            enableFiltering: false
-        },
+        // {
+        //     name: 'inspectionType.type',
+        //     displayName: '巡检类型',
+        //     width: '109',
+        //     enableFiltering: false
+        // },
         {
             name: 'status.name',
             displayName: '状态',
@@ -123,7 +123,7 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
         {
             name: 'planStrategy.name',
             displayName: '执行策略',
-            width: '8%',
+            width: '10%',
             enableFiltering: false
         },
         {
@@ -136,11 +136,25 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
         {
             name: 'executionTime',
             displayName: '执行时长',
-            width: '8%',
+            width: '10%',
             enableFiltering: false,
             cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.executionTime + "分钟"}}</div>'
         },
         {
+            name: 'executionTime1',
+            displayName: '当前批次进度',
+            width: '12%',
+            enableFiltering: false,
+            cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.completed + "/" + row.entity.doing}}</div>'
+        },
+        {
+            name: 'executionTime2',
+            displayName: '最新批次号',
+            width: '15%',
+            enableFiltering: false,
+            cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.batchNos?row.entity.batchNos.join():""}}</div>'
+        },
+        {
             name: 'createUser.name',
             displayName: '创建人',
             width: '8%',

assets/js/controllers/mainCtrl.js

@@ -46,7 +46,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
     // }
     // 监听路由
     $rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) {
-      console.log(event, toState, toParams, fromState, fromParams, 'cao')
+      console.log(event, toState, toParams, fromState, fromParams)
       if ((toState.name == 'app.incident.chart' || toState.name == 'app.incident.editor') &&
         fromState.name) {
         console.log($rootScope.jry_state);

assets/js/main.js

@@ -657,8 +657,13 @@ app.factory('api_statistic', ['BpmRestangular', function (BpmRestangular) {
 app.factory('api_bpm', ['BpmRestangular', function (BpmRestangular) {
     var process = BpmRestangular.all("process");
     var postfix = BpmRestangular.all("bpm");
-    var getData = BpmRestangular.all('data')
+    var getData = BpmRestangular.all('data');
+    var InspectionProcessActual = BpmRestangular.all('InspectionProcessActual');
     return {
+        //获取巡检报告
+        report: function (data) {
+            return InspectionProcessActual.customPOST(data, 'report', {});
+        },
         deploy: function (data) {
             return process.customPOST(data, 're/model/deploy', {});
         },

assets/js/script/isteven-multi-select.css

@@ -0,0 +1,300 @@
+/* 
+ * Don't modify things marked with ! - unless you know what you're doing
+ */
+
+/* ! vertical layout */
+.multiSelect .vertical {
+    float: none;        
+}
+
+/* ! horizontal layout */
+.multiSelect .horizontal:not(.multiSelectGroup) {
+    float: left;
+}
+
+/* ! create a "row" */
+.multiSelect .line {
+    padding:  2px 0px 4px 0px;
+    max-height: 30px;   
+    overflow: hidden;
+    box-sizing: content-box;
+}
+
+/* ! create a "column" */
+.multiSelect .acol {
+    display: inline-block;    
+    min-width: 12px;
+}
+
+/* ! */
+.multiSelect .inlineBlock {
+    display: inline-block;
+}
+
+/* the multiselect button */
+.multiSelect > button {
+    width: 100%;
+    display: inline-block;
+    position: relative;
+    text-align: center;    
+    cursor: pointer;
+    border: 1px solid #c6c6c6;    
+    padding: 1px 8px 1px 8px;    
+    font-size: 14px;
+    min-height : 38px !important;
+    border-radius: 4px;
+    color: #555;   
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    -o-user-select: none;
+    user-select: none; 
+    white-space:normal;
+    background-color: #fff;
+    background-image: linear-gradient(#fff, #f7f7f7);      
+}
+
+/* button: hover */
+.multiSelect > button:hover {    
+    background-image: linear-gradient(#fff, #e9e9e9);    
+}
+
+/* button: disabled */
+.multiSelect > button:disabled {
+    background-image: linear-gradient(#fff, #fff);      
+    border: 1px solid #ddd;    
+    color: #999;
+}
+
+/* button: clicked */
+.multiSelect .buttonClicked {
+    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.15) inset, 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+/* labels on the button */
+.multiSelect .buttonLabel {
+    display: inline-block;
+    padding: 5px 0px 5px 0px; 
+}
+
+/* downward pointing arrow */
+.multiSelect .caret {
+    display: inline-block;
+    width: 0;
+    height: 0;
+    margin: 0px 0px 1px 12px  !important;    
+    vertical-align: middle;
+    border-top: 4px solid #333;
+    border-right: 4px solid transparent;
+    border-left: 4px solid transparent;
+    border-bottom: 0 dotted; 
+}
+
+/* the main checkboxes and helper layer */
+.multiSelect .checkboxLayer {
+    background-color: #fff;
+    position: absolute;
+    z-index: 999;
+    border: 1px solid rgba(0, 0, 0, 0.15);
+    border-radius: 4px;
+    -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);    
+    min-width:278px;
+    display: none !important;    
+}
+
+/* container of helper elements */
+.multiSelect .helperContainer {
+    border-bottom: 1px solid #ddd;
+    padding: 8px 8px 0px 8px;    
+}
+
+/* helper buttons (select all, none, reset); */
+.multiSelect .helperButton {
+    display: inline;
+    text-align: center;
+    cursor: pointer;
+    border: 1px solid #ccc;
+    height: 26px;
+    font-size: 13px;
+    border-radius: 2px;
+    color: #666;    
+    background-color: #f1f1f1;
+    line-height: 1.6;
+    margin: 0px 0px 8px 0px;
+}
+
+.multiSelect .helperButton.reset{
+    float: right;
+}
+
+.multiSelect .helperButton:not( .reset ) {
+    margin-right: 4px;    
+}
+
+/* clear button */
+.multiSelect .clearButton {
+    position: absolute;
+    display: inline;
+    text-align: center;
+    cursor: pointer;
+    border: 1px solid #ccc;
+    height: 22px;
+    width: 22px;
+    font-size: 13px;
+    border-radius: 2px;
+    color: #666;    
+    background-color: #f1f1f1;
+    line-height: 1.4;
+    right : 2px;
+    top: 4px;
+}
+
+/* filter */
+.multiSelect .inputFilter {
+    border-radius: 2px; 
+    border: 1px solid #ccc;
+    height: 26px;
+    font-size: 14px;
+    width:100%;    
+    padding-left:7px;
+    -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
+    -moz-box-sizing: border-box;    /* Firefox, other Gecko */
+    box-sizing: border-box;         /* Opera/IE 8+ */    
+    color: #888;
+    margin: 0px 0px 8px 0px;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+            box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+}
+
+/* helper elements on hover & focus */
+.multiSelect .clearButton:hover,
+.multiSelect .helperButton:hover {
+    border: 1px solid #ccc;
+    color: #999;    
+    background-color: #f4f4f4;    
+}
+.multiSelect .helperButton:disabled {
+    color: #ccc;    
+    border: 1px solid #ddd;
+}
+
+.multiSelect .clearButton:focus,
+.multiSelect .helperButton:focus,
+.multiSelect .inputFilter:focus {
+    border: 1px solid #66AFE9 !important;
+    outline: 0;
+    -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,.065), 0 0 5px rgba(102, 175, 233, .6) !important;
+            box-shadow: inset 0 0 1px rgba(0,0,0,.065), 0 0 5px rgba(102, 175, 233, .6) !important;
+}
+
+/* container of multi select items */
+.multiSelect .checkBoxContainer {
+    display: block;
+    padding: 8px;   
+    overflow: hidden;
+}
+
+/* ! to show / hide the checkbox layer above */
+.multiSelect .show {
+    display: block !important;
+}
+
+/* item labels */
+.multiSelect .multiSelectItem {
+    display: block;
+    padding: 3px;
+    color: #444;       
+    white-space: nowrap;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    -o-user-select: none;
+    user-select: none;      
+    border: 1px solid transparent;
+    position: relative;
+    min-width:278px;    
+    min-height: 32px;    
+}
+
+/* Styling on selected items */
+.multiSelect .multiSelectItem:not(.multiSelectGroup).selected
+{
+    background-image: linear-gradient( #e9e9e9, #f1f1f1 );    
+    color: #555;        
+    cursor: pointer;        
+    border-top: 1px solid #e4e4e4;
+    border-left: 1px solid #e4e4e4;    
+    border-right: 1px solid #d9d9d9;            
+}
+
+.multiSelect .multiSelectItem .acol label {
+    display: inline-block;
+    padding-right: 30px;    
+    margin: 0px;
+    font-weight: normal;    
+    line-height: normal;
+}
+
+/* item labels focus on mouse hover */
+.multiSelect .multiSelectItem:hover, 
+.multiSelect .multiSelectGroup:hover {
+    background-image: linear-gradient( #c1c1c1, #999 ) !important;    
+    color: #fff !important;    
+    cursor: pointer;        
+    border: 1px solid #ccc !important;
+}
+
+/* item labels focus using keyboard */
+.multiSelect .multiSelectFocus { 
+    background-image: linear-gradient( #c1c1c1, #999 ) !important;    
+    color: #fff !important;    
+    cursor: pointer;        
+    border: 1px solid #ccc !important;
+}
+
+/* change mouse pointer into the pointing finger */
+.multiSelect .multiSelectItem span:hover, 
+.multiSelect .multiSelectGroup span:hover
+{    
+    cursor: pointer;  
+}
+
+/* ! group labels */
+.multiSelect .multiSelectGroup {    
+    display: block;
+    clear: both;
+}
+
+/* right-align the tick mark (✔) */
+.multiSelect .tickMark {
+    display:inline-block; 
+    position: absolute; 
+    right: 10px; 
+    top: 7px;
+    font-size: 10px;          
+}
+
+/* hide the original HTML checkbox away */
+.multiSelect .checkbox {    
+    color: #ddd !important;    
+    position: absolute;
+    left: -9999px;
+    cursor: pointer;    
+}
+
+/* checkboxes currently disabled */
+.multiSelect .disabled, 
+.multiSelect .disabled:hover,
+.multiSelect .disabled label input:hover ~ span {
+    color: #c4c4c4 !important;
+    cursor: not-allowed !important;
+}
+
+/* If you use images in button / checkbox label, you might want to change the image style here. */
+.multiSelect img {
+    vertical-align: middle;
+    margin-bottom:0px;
+    max-height: 22px;
+    max-width:22px;
+}

assets/views/customform/tpl/ui-checkbox-disabled.html

@@ -0,0 +1,20 @@
+<!--<div>-->
+<!--{{to.label}}-->
+<!--</div>-->
+<!--<div class="checkbox">-->
+<!--<label>-->
+<!--<input type="checkbox"-->
+<!--class="formly-field-checkbox"-->
+<!--ng-model="model[options.key]">-->
+<!--{{to.label}}-->
+<!--{{to.required ? '*' : ''}}-->
+<!--</label>-->
+<!--</div>-->
+<div class="padding-top-5">
+    <label>{{to.label}}<span ng-if="to.required" style="color:red">*</span>:</label>
+    <div class="setting-box clearfix" style="padding-top:2px;padding-bottom:2px">
+        <span class="setting-switch pull-left">
+        <switch ng-model="model[options.key]"  class="green" disabled></switch>
+    </span>
+    </div>
+</div>

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

@@ -0,0 +1,24 @@
+<div
+  isteven-multi-select
+  input-model="webBrowsersGrouped"
+  output-model="outputBrowsers"
+  button-label="type"
+  item-label="type"
+  tick-property="ticked"
+  group-property="msGroup"
+  output-properties="type ticked id" 
+  helper-elements="all none" 
+  translation="localLang" 
+  max-height="250px"
+  on-close="fClose()"
+  on-item-click="fClick(data)"
+  on-select-all="fSelectAll()"
+  on-select-none="fSelectNone()" 
+  style="height: 30px;"
+></div>
+<style>
+    .multiSelect > button{
+        max-height: 38px!important;
+        overflow: auto;
+    }
+</style>

assets/views/customform/tpl/ui-select-xj.html

@@ -0,0 +1,10 @@
+<div formly-custom-validation="options.validators">
+    <ui-select ng-model="model[options.key]" theme="bootstrap" ng-required="{{to.required}}" ng-change="to['onChange'](model[options.key], options, this, $event ,model,$select.selected);" ng-disabled={{to.readOnly}} reset-search-input="false">
+        <ui-select-match placeholder="{{to.placeholder}}">
+            {{$select.selected[to.labelProp || 'name']}}
+        </ui-select-match>
+        <ui-select-choices uiDisableChoice="option.disabled" repeat="option[to.valueProp || 'value'] as option in to.options| filter:{$:$select.search}" refresh="to.refresh($select.search, options,myFilter)" refresh-delay="{{to.refreshDelay}}">
+            <div ng-bind-html="option[to.labelProp || 'name'] | highlight: $select.search"></div>
+        </ui-select-choices>
+    </ui-select>
+</div>

assets/views/inspect/inspectReport.html

@@ -0,0 +1,119 @@
+<style type="text/css">
+  .inspectReportCtrl .incidentsearch {
+    width: 30% !important;
+    margin-right: 16px;
+  }
+
+  .inspectReportCtrl .iptSize {
+    width: 60% !important;
+    height: 28px !important;
+  }
+
+  .inspectReportCtrl .tree-control .tree-input {
+    min-height: 28px !important;
+  }
+
+  .inspectReportCtrl .searchBtnBox > .btn {
+    margin: 0 8px 10px 0;
+  }
+  .inspectReportCtrl .inspectMask {
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    margin: auto;
+    background-color: rgba(0, 0, 0, 0.5);
+    z-index: 99999;
+  }
+  .inspectReportCtrl .inspectMask .inspectMain {
+    width: 400px;
+    height: 200px;
+    background-color: #fff;
+    margin: 100px auto 0;
+    border-radius: 5px;
+    padding: 16px;
+  }
+  .inspectReportCtrl .inspectMask .inspectMain .inspectMain_header {
+    height: 30px;
+    line-height: 30px;
+    text-align: center;
+    font-weight: bold;
+  }
+  .inspectReportCtrl .inspectMask .inspectMain .inspectMain_footer {
+    margin-top: 8px;
+    text-align: center;
+  }
+  .inspectReportCtrl .xj_img {
+    width: 50px;
+    height: 100px;
+    object-fit: cover;
+    margin: 0 2px;
+    cursor: pointer;
+  }
+  .inspectReportCtrl .gridInspectReport {
+    height: 100vh;
+  }
+</style>
+<div ng-controller="inspectReportCtrl" class="inspectReportCtrl">
+  <div class="inspectMask" ng-if="isMask">
+    <div class="inspectMain">
+      <div class="inspectMain_header">请选择计划主题和批次号</div>
+      <div>
+        计划主题<span style="color:red" class="ng-scope">*</span>：
+        <ui-select ng-model="queryList.title" ng-change="changeTitle(e)">
+          <ui-select-match placeholder="请选择计划主题">
+            <span ng-bind="$select.selected.title"> </span>
+          </ui-select-match>
+          <ui-select-choices
+            repeat="item in (titles | filter:$select.search) track by item.id"
+          >
+            <span ng-bind="item.title"> </span>
+          </ui-select-choices>
+        </ui-select>
+      </div>
+      <div>
+        批次号<span style="color:red" class="ng-scope">*</span>：
+        <ui-select ng-model="queryList.batchNo">
+          <ui-select-match placeholder="请选择批次号">
+            <span ng-bind="$select.selected.name"> </span>
+          </ui-select-match>
+          <ui-select-choices
+            repeat="item in (batchNos | filter:$select.search) track by item.id"
+          >
+            <span ng-bind="item.name"> </span>
+          </ui-select-choices>
+        </ui-select>
+      </div>
+      <div class="inspectMain_footer">
+        <div class="btn btn_search" ng-click="onClick()"><span>确定</span></div>
+      </div>
+    </div>
+  </div>
+  <section id="page-title">
+    <div class="row">
+      <div class="col-sm-8">
+        <h1 class="mainTitle">
+          巡检计划<i
+            tooltip="巡检计划列表，可对巡检进行修改，新增，删除"
+            tooltip-placement="right"
+            class="fa ti-help-alt margin-left-10 fontcolor-five pointfont"
+          ></i>
+        </h1>
+      </div>
+    </div>
+  </section>
+  <div class="tableList" ui-i18n="{{lang}}">
+    <div class=" ">
+      <div
+        id="grid1 "
+        ui-grid="gridOptions "
+        external-scopes="$scope "
+        ui-grid-resize-columns
+        ui-grid-selection
+        ui-grid-auto-resize
+        class="grid gridInspectReport"
+      ></div>
+    </div>
+  </div>
+</div>

assets/views/report/event_form.html

@@ -147,9 +147,9 @@
             </div>
             <!-- 事件总数 -->
             <div class="deck_cont_body" ng-if="tap=='SJZS'">
-                <div class="deck_cont_body_TB1" ng-if="isArrays(sjzs_list)&&sjzs_list.length>0">
+                <div class="deck_cont_body_TB1">
                     <div class="TB">
-                        <div class="TB_head">
+                        <div class="TB_head" ng-if="isArrays(sjzs_list)&&sjzs_list.length>0">
                             <div class="TB_head_L">
                                 <div class="TB_LDZH fl" tooltip='事件状态已关单，并且有处理人的单子' tooltip-placement="top">
                                     <p>事件总数</p>
@@ -281,9 +281,9 @@
             </div>
             <!-- 事件类型 -->
             <div class="deck_cont_body" ng-if="tap=='SJLX'">
-                <div class="deck_cont_body_TB1" ng-if="isArrays(sjlx_list)&&sjlx_list.length>0">
+                <div class="deck_cont_body_TB1">
                     <div class="TB">
-                        <div class="TB_head">
+                        <div class="TB_head" ng-if="isArrays(sjlx_list)&&sjlx_list.length>0">
                             <div class="TB_head_L">
                                 <div class="TB_LDZH fl" tooltip='事件状态已关单，并且有处理人的单子' tooltip-placement="top">
                                     <p>事件总数</p>
@@ -390,7 +390,7 @@
             </div>
             <!-- 处理人/组 -->
             <div class="deck_cont_body" ng-if="tap=='CLRZ'">
-                <div class="deck_cont_body_TB1" ng-if="isArrays(clrz_list)&&clrz_list.length>0">
+                <div class="deck_cont_body_TB1">
                     <div class="TB">
                         <div class="TB_head">
                             <div class="TB_head_L">
@@ -414,7 +414,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="TB_cont">
+                        <div class="TB_cont" ng-if="isArrays(clrz_list)&&clrz_list.length>0">
                             <table class="jry_table jry_table_head" cellspacing="0" cellpadding="16"
                                 style="font-weight:normal !important;table-layout:fixed">
                                 <thead>
@@ -533,7 +533,7 @@
             </div>
             <!-- 三方公司 -->
             <div class="deck_cont_body" ng-if="tap=='SFGS'">
-                <div class="deck_cont_body_TB1" ng-if="isArrays(sfgs_list)&&sfgs_list.length>0">
+                <div class="deck_cont_body_TB1">
                     <div class="TB">
                         <div class="TB_head">
                             <div class="TB_head_L">
@@ -557,7 +557,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="TB_cont">
+                        <div class="TB_cont" ng-if="isArrays(sfgs_list)&&sfgs_list.length>0">
                             <table class="jry_table jry_table_head" cellspacing="0" cellpadding="16"
                                 style="font-weight:normal !important;table-layout:fixed">
                                 <thead>
@@ -577,7 +577,7 @@
                                                 </em>
                                             </strong>
                                         </th>
-                                        <th style="width:18%" ng-click="tableSort('i_total')" tooltip='此人员处理的工单数量' tooltip-placement="top">
+                                        <th style="width:18%" ng-click="tableSort('i_total')" tooltip='此公司处理的工单数量' tooltip-placement="top">
                                             <strong>
                                                 事件数量
                                                 <em class="sort-wrap">
@@ -643,7 +643,7 @@
             </div>
             <!-- 区域地点 -->
             <div class="deck_cont_body" ng-if="tap=='QYDD'">
-                <div class="deck_cont_body_TB1" ng-if="isArrays(qydd_list)&&qydd_list.length>0">
+                <div class="deck_cont_body_TB1">
                     <div class="TB">
                         <div class="TB_head">
                             <div class="TB_head_L">
@@ -653,7 +653,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="TB_cont">
+                        <div class="TB_cont" ng-if="isArrays(qydd_list)&&qydd_list.length>0">
                             <table class="jry_table jry_table_head" cellspacing="0" cellpadding="16"
                                 style="font-weight:normal !important;table-layout:fixed">
                                 <thead>
@@ -709,7 +709,7 @@
             </div>
             <!-- 事件来源 -->
             <div class="deck_cont_body" ng-if="tap=='SJLY'">
-                <div class="deck_cont_body_TB1" ng-if="isArrays(sjly_list)&&sjly_list.length>0">
+                <div class="deck_cont_body_TB1">
                     <div class="TB">
                         <div class="TB_head">
                             <div class="TB_head_L">
@@ -719,7 +719,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="TB_cont">
+                        <div class="TB_cont" ng-if="isArrays(sjly_list)&&sjly_list.length>0">
                             <table class="jry_table jry_table_head" cellspacing="0" cellpadding="16"
                                 style="font-weight:normal !important;table-layout:fixed">
                                 <thead>

assets/views/report/service_form.html

@@ -500,32 +500,32 @@
                             <div class="TB_head_L">
                                 <div class="TB_LDZH fl" tooltip='电话留言总数（含未处理，已处理，不受理）' tooltip-placement="top">
                                     <p>电话留言总数</p>
-                                    <span>{{web_req_total}}</span>
+                                    <span>{{dhlytj_req_total}}</span>
                                 </div>
                                 <div class="TB_ITEMS fl">
                                     <div class="TB_ITEM" tooltip='建单的数量' tooltip-placement="top">
                                         <p>建单总数</p>
-                                        <span>{{web_req_trans}}</span>
+                                        <span>{{dhlytj_req_trans}}</span>
                                     </div>
                                     <div class="TB_ITEM" tooltip='不受理的数量' tooltip-placement="top">
                                         <p>不受理总数</p>
-                                        <span>{{web_req_reject}}</span>
+                                        <span>{{dhlytj_req_reject}}</span>
                                     </div>
                                 </div>
                             </div>
                             <div class="TB_head_L">
                                 <div class="TB_LDZH fl" tooltip='直接解决数 + 派单数' tooltip-placement="top">
                                     <p>电话留言转换总数</p>
-                                    <span>{{web_trans_total}}</span>
+                                    <span>{{dhlytj_trans_total}}</span>
                                 </div>
                                 <div class="TB_ITEMS fl">
                                     <div class="TB_ITEM" tooltip='转换后。直接处理工单数' tooltip-placement="top">
                                         <p>直接解决总数</p>
-                                        <span>{{web_p_total}}</span>
+                                        <span>{{dhlytj_p_total}}</span>
                                     </div>
                                     <div class="TB_ITEM" tooltip='转换后。派单工单数' tooltip-placement="top">
                                         <p>派单总数</p>
-                                        <span>{{web_unp_total}}</span>
+                                        <span>{{dhlytj_unp_total}}</span>
                                     </div>
                                 </div>
                             </div>

bower_components/angular-ui-switch/angular-ui-switch copy.js

@@ -0,0 +1,28 @@
+angular.module('uiSwitch', [])
+
+.directive('switch', function() {
+    return {
+        restrict: 'AE',
+        replace: true,
+        transclude: true,
+        template: function(element, attrs) {
+            var html = '';
+            html += '<span';
+            html += ' class="switch' + (attrs.class ? ' ' + attrs.class : '') + '"';
+            html += attrs.ngModel ? ' ng-click="' + attrs.ngModel + '=!' + attrs.ngModel + (attrs.ngChange ? '; ' + attrs.ngChange + '()"' : '"') : '';
+            html += ' ng-class="{ checked:' + attrs.ngModel + ' }"';
+            html += '>';
+            html += '<small></small>';
+            html += '<input type="checkbox"';
+            html += attrs.id ? ' id="' + attrs.id + '"' : '';
+            html += attrs.name ? ' name="' + attrs.name + '"' : '';
+            html += attrs.ngModel ? ' ng-model="' + attrs.ngModel + '"' : '';
+            html += ' style="display:none" />';
+            html += '<span class="switch-text">'; /*adding new container for switch text*/
+            html += attrs.on ? '<span class="on">' + attrs.on + '</span>' : ''; /*switch text on value set by user in directive html markup*/
+            html += attrs.off ? '<span class="off">' + attrs.off + '</span>' : ' '; /*switch text off value set by user in directive html markup*/
+            html += '</span>';
+            return html;
+        }
+    }
+});

bower_components/angular-ui-switch/angular-ui-switch.js

@@ -1,28 +1,28 @@
 angular.module('uiSwitch', [])
 
-.directive('switch', function() {
-    return {
-        restrict: 'AE',
-        replace: true,
-        transclude: true,
-        template: function(element, attrs) {
-            var html = '';
-            html += '<span';
-            html += ' class="switch' + (attrs.class ? ' ' + attrs.class : '') + '"';
-            html += attrs.ngModel ? ' ng-click="' + attrs.ngModel + '=!' + attrs.ngModel + (attrs.ngChange ? '; ' + attrs.ngChange + '()"' : '"') : '';
-            html += ' ng-class="{ checked:' + attrs.ngModel + ' }"';
-            html += '>';
-            html += '<small></small>';
-            html += '<input type="checkbox"';
-            html += attrs.id ? ' id="' + attrs.id + '"' : '';
-            html += attrs.name ? ' name="' + attrs.name + '"' : '';
-            html += attrs.ngModel ? ' ng-model="' + attrs.ngModel + '"' : '';
-            html += ' style="display:none" />';
-            html += '<span class="switch-text">'; /*adding new container for switch text*/
-            html += attrs.on ? '<span class="on">' + attrs.on + '</span>' : ''; /*switch text on value set by user in directive html markup*/
-            html += attrs.off ? '<span class="off">' + attrs.off + '</span>' : ' '; /*switch text off value set by user in directive html markup*/
-            html += '</span>';
-            return html;
-        }
+.directive('switch', function(){
+  return {
+    restrict: 'AE'
+  , replace: true
+  , transclude: true
+  , template: function(element, attrs) {
+      var html = '';
+      html += '<span';
+      html +=   ' class="switch' + (attrs.class ? ' ' + attrs.class : '') + '"';
+      html +=   attrs.ngModel ? ' ng-click="' + attrs.disabled + ' ? ' + attrs.ngModel + ' : ' + attrs.ngModel + '=!' + attrs.ngModel + (attrs.ngChange ? '; ' + attrs.ngChange + '()"' : '"') : '';
+      html +=   ' ng-class="{ checked:' + attrs.ngModel + ', disabled:' + attrs.disabled + ' }"';
+      html +=   '>';
+      html +=   '<small></small>';
+      html +=   '<input type="checkbox"';
+      html +=     attrs.id ? ' id="' + attrs.id + '"' : '';
+      html +=     attrs.name ? ' name="' + attrs.name + '"' : '';
+      html +=     attrs.ngModel ? ' ng-model="' + attrs.ngModel + '"' : '';
+      html +=     ' style="display:none" />';
+      html +=     '<span class="switch-text">'; /*adding new container for switch text*/
+      html +=     attrs.on ? '<span class="on">'+attrs.on+'</span>' : ''; /*switch text on value set by user in directive html markup*/
+      html +=     attrs.off ? '<span class="off">'+attrs.off + '</span>' : ' ';  /*switch text off value set by user in directive html markup*/
+      html += '</span>';
+      return html;
     }
+  }
 });

index.html

@@ -46,7 +46,29 @@
             window.console.log = function(){};//财大
         }
     </script>
-    <style>.slf{text-align: left!important;}</style>
+    <style>
+    .slf{text-align: left!important;}
+    .inspectReportCtrl [ui-grid-cell] .ui-grid-cell-contents {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        white-space:normal;
+    }
+    .inspectReportCtrl [ui-grid-cell] .ui-grid-cell-contents .inspectPar {
+        overflow: auto;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        white-space:normal;
+        flex-wrap: wrap;
+        height: 100%;
+    }
+    .inspectReportCtrl [ui-grid-cell] .ui-grid-cell-contents .inspectPar p{
+        text-align: justify;
+        width: 100%;
+        margin: 0;
+    }
+    </style>
 </head>
 
 <body ng-controller="AppCtrl">
@@ -119,6 +141,9 @@
     <script src="assets/js/script/TLWebSocketAgent.js"></script>
     <!-- <script src="assets/js/script/TLWSADemo.js"></script> -->
     <script ng-src="{{'assets/js/directives/ola_api'+seiminHj+'.js'}}"></script>
+    <!-- 多选全选下拉框 -->
+    <link rel="stylesheet" href="assets/js/script/isteven-multi-select.css">
+    <script src="assets/js/script/isteven-multi-select.js"></script>
     <!-- Clip-Two Directives -->
     <script src="assets/js/directives/toggle.js"></script>
     <script src="assets/js/directives/perfect-scrollbar.js"></script>