积分

assets/js/config.constant.js

@@ -115,6 +115,7 @@ app.constant('JS_REQUIRES', {
         'nxreportCtrl': 'assets/js/controllers/report/nxreportCtrl.js',
         'childpapeCtrl': 'assets/js/controllers/report/childpapeCtrl.js',
         //*** inspect 
+        'integralCtrl': 'assets/js/controllers/inspect/integralCtrl.js',
         'inspectPlanCtrl': 'assets/js/controllers/inspect/inspectPlanCtrl.js',
         'inspectReportCtrl': 'assets/js/controllers/inspect/inspectReportCtrl.js',
         'inspectListCtrl': 'assets/js/controllers/inspect/inspectListCtrl.js',

assets/js/config.router.js

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

assets/js/controllers/customform/customformCtrl.js

@@ -20733,6 +20733,7 @@ appFormly.controller("CustomformCtrl", [
   "api_statistic",
   "up_down_file",
   "fileReader",
+  "api_wechatfile",
   function (
     $rootScope,
     $scope,
@@ -20760,7 +20761,8 @@ appFormly.controller("CustomformCtrl", [
     api_user_data,
     api_statistic,
     up_down_file,
-    fileReader
+    fileReader,
+    api_wechatfile
   ) {
     //console.log($parse('Restangular')($scope));
     //console.log($injector.get('Restangular'));
@@ -21606,6 +21608,7 @@ appFormly.controller("CustomformCtrl", [
               });
             } else {
               console.log($scope.formData.url, "zzzz");
+              var integralMechanism = sessionStorage.getItem('integralMechanism');
               switch ($scope.formData.url) {
                 case "start":
                   vm.model["initUser"] = $rootScope.user.id;
@@ -21675,13 +21678,6 @@ appFormly.controller("CustomformCtrl", [
                   //处理请求数据0327
                   var data0327 = JSON.parse(JSON.stringify(vm.model));
                   delete data0327.repairType;
-                  // 增加地点的请求参数2020年4月24日10:44:36
-                  // console.log($scope.$parent.$parent.$parent.$parent.$parent.$parent.selecthouseNumber,'2020年4月24日20:24:10');
-                  // if($scope.$parent.$parent.$parent.$parent.$parent.$parent.selecthouseNumber){
-                  //     data0327.incident.place = {
-                  //         id:$scope.$parent.$parent.$parent.$parent.$parent.$parent.selecthouseNumber.id
-                  //     }
-                  // }
                   if (data0327.start_code == "close") {
                     data0327.incident.directProcess = 1;
                   }
@@ -21693,10 +21689,94 @@ appFormly.controller("CustomformCtrl", [
                       data0327.incident.callID = paramsModel.model.incident.sockid;
                     }
                   }
-                  api_bpm_domain
+                  // --------------------------- start----------------------------------------
+                  // 积分机制,直接处理
+                  if(vm.model.start_code == "close"&&(integralMechanism == 1 || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
+                    $modal.open({
+                      templateUrl: 'assets/views/incident/tpl/toIntegralMechanism.tpl.html',
+                      controller: function ($scope, $modalInstance, api_bpm_domain, incidentData, currentUserId, Alert, api_user_data,api_wechatfile,scope) {
+                          console.log(incidentData,currentUserId);
+                          $scope.flag = false;
+                          $scope.complexityConfirm = {complexity:null,updateReason:''};
+                          $scope.complexityFn = function(category){
+                            if(category.complexity){
+                              return category.complexity.value;
+                            }else if(category.parent){
+                              return $scope.complexityFn(category.parent);
+                            }else{
+                              return $scope.list[0]?$scope.list[0].value:1;
+                            }
+                          }
+                          $scope.list = [];
+                          api_wechatfile.getDictionary({"key":"incident_complexity","type":"list"}).then(function(res){
+                            $scope.list = res;
+                            $scope.complexity = $scope.complexityFn(incidentData.category);
+                            $scope.complexityConfirm.complexity = $scope.list.find(v=>v.value == $scope.complexity);
+                          })
+                          $scope.onChangeComplexity = function(item){
+                            
+                          }
+                          $scope.ok = function () {
+                              if (!$scope.complexityConfirm.complexity){
+                                  Alert.swal({
+                                      title: "操作失败",
+                                      text: "请选择工时!",
+                                      type: "error"
+                                  });
+                                  return;
+                              }
+                              if ($scope.complexityConfirm.complexity.value != $scope.complexity&&!$scope.complexityConfirm.updateReason.trim()){
+                                  Alert.swal({
+                                      title: "操作失败",
+                                      text: "请填写升级原因!",
+                                      type: "error"
+                                  });
+                                  return;
+                              }
+                              $modalInstance.close('success');
+                              handlerStart();
+                              scope.complexity = $scope.complexity;
+                              scope.complexityConfirm = $scope.complexityConfirm;
+                              // 暂存--后面直接处理后调用积分接口
+                          }
+                          $scope.cancel = function () {
+                              scope.ldloading.expand_right = false;
+                              $modalInstance.dismiss('cancel');
+                          }
+                      },
+                      size: 'sm',
+                      resolve: {
+                          scope: function () {
+                              return $scope;
+                          },
+                          api_bpm: function () {
+                              return api_bpm;
+                          },
+                          incidentData: function () {
+                              return data0327.incident;
+                          },
+                          currentUserId: function () {
+                              return loginUser.id;
+                          },
+                          Alert: function () {
+                              return SweetAlert;
+                          },
+                          api_user_data: function () {
+                              return api_user_data;
+                          },
+                          api_wechatfile: function () {
+                              return api_wechatfile;
+                          }
+                      }
+                    });
+                }else{
+                  handlerStart();
+                }
+                  // -------------------------------end------------------------------------
+                  function handlerStart(){
+                    api_bpm_domain
                     .start(pdKey, data0327)
                     .then(function (response) {
-                      // console.log("response="+JSON.stringify(response));
                       if (response) {
                         var resData = Restangular.stripRestangular(response);
                         if (resData) {
@@ -21729,27 +21809,76 @@ appFormly.controller("CustomformCtrl", [
                             }
                           }
                         }
-
-                        SweetAlert.swal(
-                          {
-                            title: "提交成功!",
-                            type: "success",
-                            confirmButtonColor: "#007AFF",
-                          },
-                          function () {
-                            if (
-                              vm.model.incident &&
-                              vm.model.incident.callID &&
-                              vm.model.incident.callID != ""
-                            ) {
-                              $rootScope.app.layout.isSidebarClosed = false;
-                              if ($scope.login && !$rootScope.busy) {
-                                $rootScope.setidle();
+                        if(vm.model.start_code == "close"&&(integralMechanism == 1 || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
+                          api_wechatfile.getDictionary({"key":"incident_integral_state","type":"list"}).then(function(res){
+                            var auditState = res.find(v=>v.value == 0);
+                            var postData = { 
+                              incidentIntegral: {
+                                incidentId:resData.bussId,
+                                auditState:auditState,
+                                handlerUser:$rootScope.user.id,
+                                handlerUserName:$rootScope.user.name,
+                                sourceScore:$scope.complexity,
+                                currentScore:$scope.complexityConfirm.complexity.value,
+                                updateReason:$scope.complexityConfirm.updateReason.trim() || undefined,
                               }
                             }
-                            $state.go($scope.formData.cancelUrl);
-                          }
-                        );
+                            console.log(postData)
+                            api_bpm_data.addData('incidentIntegral', postData).then(function (response) {
+                                console.log(response)
+                                if (response.status == 200) {
+                                  SweetAlert.swal(
+                                    {
+                                      title: "提交成功!",
+                                      type: "success",
+                                      confirmButtonColor: "#007AFF",
+                                    },
+                                    function () {
+                                      if (
+                                        vm.model.incident &&
+                                        vm.model.incident.callID &&
+                                        vm.model.incident.callID != ""
+                                      ) {
+                                        $rootScope.app.layout.isSidebarClosed = false;
+                                        if ($scope.login && !$rootScope.busy) {
+                                          $rootScope.setidle();
+                                        }
+                                      }
+                                      $state.go($scope.formData.cancelUrl);
+                                    }
+                                  );
+                                } else {
+                                    Alert.swal({
+                                        title: "操作失败",
+                                        text: "操作失败, 请稍后再试!",
+                                        type: "error"
+                                    });
+                                }
+                            });
+                          })
+                        }else{
+                          SweetAlert.swal(
+                            {
+                              title: "提交成功!",
+                              type: "success",
+                              confirmButtonColor: "#007AFF",
+                            },
+                            function () {
+                              if (
+                                vm.model.incident &&
+                                vm.model.incident.callID &&
+                                vm.model.incident.callID != ""
+                              ) {
+                                $rootScope.app.layout.isSidebarClosed = false;
+                                if ($scope.login && !$rootScope.busy) {
+                                  $rootScope.setidle();
+                                }
+                              }
+                              $state.go($scope.formData.cancelUrl);
+                            }
+                          );
+                        }
+                        
                       } else {
                         SweetAlert.swal({
                           title: "系统错误",
@@ -21760,6 +21889,7 @@ appFormly.controller("CustomformCtrl", [
                       }
                       $scope.ldloading[style.replace("-", "_")] = false;
                     });
+                  }
                   break;
                 case "complete":
                   //api_bpm_domain.complete(pdKey, userId, vm.model).then(function(response){
@@ -21778,32 +21908,142 @@ appFormly.controller("CustomformCtrl", [
                     return;
                   }
                   console.log(vm);
-                  //处理日志
-                  // 处理日志不为空并且事件是处理中状态
-                  if (vm.model.handlerLog && vm.model.handlerLog.trim() && vm.model.incident.state.value == 'handler') {
-                    api_bpm_data.addData('operationLog', { operationLog: { opType: 'handlerLog', opValue: vm.model.handlerLog, extra1: vm.model.incident.id } }).then(function (result1) {
-                      baseHandler();
-                    })
-                  } else {
-                    if($stateParams.formUiEdit === 'inspection_LinHu_confirm'){
-                      //巡检计划
-                      if(vm.model.inspectionProcessActual.group&&vm.model.inspectionProcessActual.group.id){
-                        api_bpm.assign({ids:$stateParams.dataId.toString(),userId:$rootScope.user.id}).then(function (response) {
-                            if (response.status == 200) {
-                                baseHandler();
-                            } else {
-                                Alert.swal({
-                                    title: "操作失败",
-                                    text: "操作失败, 请稍后再试!",
-                                    type: "error"
-                                });
+                  // 积分机制,事件状态是“处理中”
+                  if($scope.formData.name === 'handlerform'&&(integralMechanism == 1 || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
+                      $modal.open({
+                        templateUrl: 'assets/views/incident/tpl/toIntegralMechanism.tpl.html',
+                        controller: function ($scope, $modalInstance, api_bpm_domain, incidentData, currentUserId, Alert, api_user_data,api_wechatfile,scope) {
+                            console.log(incidentData,currentUserId);
+                            $scope.flag = true;
+                            $scope.complexityConfirm = {complexity:null,updateReason:''};
+                            $scope.complexityFn = function(category){
+                              if(category.complexity){
+                                return category.complexity.value;
+                              }else if(category.parent){
+                                return $scope.complexityFn(category.parent);
+                              }else{
+                                return $scope.list[0]?$scope.list[0].value:1;
+                              }
                             }
-                        });
+                            $scope.list = [];
+                            api_wechatfile.getDictionary({"key":"incident_complexity","type":"list"}).then(function(res){
+                              $scope.list = res;
+                              $scope.complexity = $scope.complexityFn(incidentData.category);
+                              $scope.complexityConfirm.complexity = $scope.list.find(v=>v.value == $scope.complexity);
+                            })
+                            $scope.onChangeComplexity = function(item){
+                              if($scope.complexityConfirm.complexity.value == $scope.complexity){
+                                $scope.complexityConfirm.updateReason = '';
+                              }
+                            }
+                            $scope.ok = function () {
+                                if (!$scope.complexityConfirm.complexity){
+                                    Alert.swal({
+                                        title: "操作失败",
+                                        text: "请选择工时!",
+                                        type: "error"
+                                    });
+                                    return;
+                                }
+                                if ($scope.complexityConfirm.complexity.value != $scope.complexity&&!$scope.complexityConfirm.updateReason.trim()){
+                                    Alert.swal({
+                                        title: "操作失败",
+                                        text: "请填写升级原因!",
+                                        type: "error"
+                                    });
+                                    return;
+                                }
+                                api_wechatfile.getDictionary({"key":"incident_integral_state","type":"list"}).then(function(res){
+                                  var auditState = $scope.complexityConfirm.complexity.value == $scope.complexity?res.find(v=>v.value == 1):res.find(v=>v.value == 0);
+                                  var postData = { 
+                                    incidentIntegral: {
+                                      incidentId:incidentData.id,
+                                      auditState:auditState,
+                                      handlerUser:$rootScope.user.id,
+                                      handlerUserName:$rootScope.user.name,
+                                      sourceScore:$scope.complexity,
+                                      currentScore:$scope.complexityConfirm.complexity.value,
+                                      updateReason:$scope.complexityConfirm.updateReason.trim() || undefined,
+                                    }
+                                  }
+                                  console.log(postData)
+                                  api_bpm_data.addData('incidentIntegral', postData).then(function (response) {
+                                      console.log(response)
+                                      if (response.status == 200) {
+                                          $modalInstance.close('success');
+                                          handlerLogFn();
+                                      } else {
+                                          Alert.swal({
+                                              title: "操作失败",
+                                              text: "操作失败, 请稍后再试!",
+                                              type: "error"
+                                          });
+                                      }
+                                  });
+                                })
+                            }
+                            $scope.cancel = function () {
+                                scope.ldloading.expand_right = false;
+                                $modalInstance.dismiss('cancel');
+                            }
+                        },
+                        size: 'sm',
+                        resolve: {
+                            scope: function () {
+                                return $scope;
+                            },
+                            api_bpm: function () {
+                                return api_bpm;
+                            },
+                            incidentData: function () {
+                                return $scope.formData.model.incident;
+                            },
+                            currentUserId: function () {
+                                return loginUser.id;
+                            },
+                            Alert: function () {
+                                return SweetAlert;
+                            },
+                            api_user_data: function () {
+                                return api_user_data;
+                            },
+                            api_wechatfile: function () {
+                                return api_wechatfile;
+                            }
+                        }
+                      });
+                  }else{
+                    handlerLogFn();
+                  }
+                  
+                  function handlerLogFn(){
+                    //处理日志
+                    // 处理日志不为空并且事件是处理中状态
+                    if (vm.model.handlerLog && vm.model.handlerLog.trim() && vm.model.incident.state.value == 'handler') {
+                      api_bpm_data.addData('operationLog', { operationLog: { opType: 'handlerLog', opValue: vm.model.handlerLog, extra1: vm.model.incident.id } }).then(function (result1) {
+                        baseHandler();
+                      })
+                    } else {
+                      if($stateParams.formUiEdit === 'inspection_LinHu_confirm'){
+                        //巡检计划
+                        if(vm.model.inspectionProcessActual.group&&vm.model.inspectionProcessActual.group.id){
+                          api_bpm.assign({ids:$stateParams.dataId.toString(),userId:$rootScope.user.id}).then(function (response) {
+                              if (response.status == 200) {
+                                  baseHandler();
+                              } else {
+                                  Alert.swal({
+                                      title: "操作失败",
+                                      text: "操作失败, 请稍后再试!",
+                                      type: "error"
+                                  });
+                              }
+                          });
+                        }else{
+                          baseHandler();
+                        }
                       }else{
                         baseHandler();
                       }
-                    }else{
-                      baseHandler();
                     }
                   }
                   // return;

assets/js/controllers/incident/incidentCtrl.js

@@ -2958,7 +2958,7 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$http', '$scope', '$modal', '
 
     //修改页面显示判断
     $scope.jry_modify = function (item) {
-        console.log(item)
+        // console.log(item)
         // var jry_role = false;
         // for (var i = 0; i < $rootScope.user.role.length; i++) {
         //     if ($rootScope.user.role[i].rolecode == "call center") {

assets/js/controllers/loginCtrl.js

@@ -38,6 +38,9 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
                               case "ifRoom": //是否增加房间号选择
                                 sessionStorage.setItem("ifRoom", v.valueconfig);
                                 break;
+                              case "integralMechanism": //积分机制
+                                sessionStorage.setItem("integralMechanism", v.valueconfig);
+                                break;
                             }
                         });
                     }

assets/js/controllers/system/sysconfigCtrl.js

@@ -28,6 +28,7 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
         arr.systemConfiguration.push(a.incidentWithConsumable);//是否需要绑定耗材
         arr.systemConfiguration.push(a.wxIncidentWithCmdb);//是否需要绑定资产
         arr.systemConfiguration.push(a.ifWorking);//是否开通上下班
+        arr.systemConfiguration.push(a.integralMechanism);//积分机制
         arr.systemConfiguration.push(a.ifRoom);//是否增加房间号选择
         arr.systemConfiguration.push(a.requesterLgoinType);//保修人登录方式
         arr.systemConfiguration.push(a.autoCloseIncidentHour);//自动关单小时
@@ -40,25 +41,25 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
                         if (res.status == 200) {
                             //存储报修主体到缓存
                             var list = res.list;
-                            var repairMain = list.find((v) => v.keyconfig == "repairMain"); //报修主体
-                            var incidentWithConsumable = list.find(
-                            (v) => v.keyconfig == "incidentWithConsumable"
-                            ); //是否绑定耗材
-                            var wxIncidentWithCmdb = list.find(
-                            (v) => v.keyconfig == "wxIncidentWithCmdb"
-                            ); //是否绑定资产
-                            sessionStorage.setItem(
-                            "repair_main",
-                            JSON.stringify(repairMain)
-                            );
-                            sessionStorage.setItem(
-                            "incidentWithConsumable",
-                            incidentWithConsumable.valueconfig
-                            );
-                            sessionStorage.setItem(
-                            "wxIncidentWithCmdb",
-                            wxIncidentWithCmdb.valueconfig
-                            );
+                            list.forEach(v => {
+                                switch (v.keyconfig) {
+                                  case "repairMain": //报修主体
+                                    sessionStorage.setItem("repair_main", JSON.stringify(v));
+                                    break;
+                                  case "incidentWithConsumable": //是否绑定耗材
+                                    sessionStorage.setItem("incidentWithConsumable", v.valueconfig);
+                                    break;
+                                  case "wxIncidentWithCmdb": //是否绑定资产
+                                    sessionStorage.setItem("wxIncidentWithCmdb", v.valueconfig);
+                                    break;
+                                  case "ifRoom": //是否增加房间号选择
+                                    sessionStorage.setItem("ifRoom", v.valueconfig);
+                                    break;
+                                  case "integralMechanism": //积分机制
+                                    sessionStorage.setItem("integralMechanism", v.valueconfig);
+                                    break;
+                                }
+                            });
                             o.swal({
                                 title: "保存成功!",
                                 type: "success",
@@ -116,6 +117,9 @@ app.controller("sysconfigCtrl", ["$rootScope", "$scope", "$state", "$timeout", "
                     if (v.keyconfig == 'ifWorking') {
                         a.ifWorking = v;//是否开通上下班
                     }
+                    if (v.keyconfig == 'integralMechanism') {
+                        a.integralMechanism = v;//积分机制
+                    }
                     if (v.keyconfig == 'ifRoom') {
                         a.ifRoom = v;//是否增加房间号选择
                     }

assets/js/main.js

@@ -653,6 +653,20 @@ app.factory('BpmRestangular', function (Restangular) {
         RestangularConfigurer.setBaseUrl(serverIp + '/bpm');
     });
 });
+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, {});
+        },
+    }
+}]);
 app.factory('api_statistic', ['BpmRestangular', function (BpmRestangular) {
     var statistic = BpmRestangular.all("statistic");
     var table = BpmRestangular.all("data");

assets/views/incident/tpl/toAudit.tpl.html

@@ -0,0 +1,14 @@
+<!-- 转派 -->
+<div class="modal-header">
+    <div class="modal-title fontcolor-two fontsizes-14">审核
+        <button type="button" class="close pull-right" ng-click="cancel()">×</button>
+    </div>
+</div>
+<div class="modal-body center" style="height: 100px;display:flex;justify-content:center;align-items:center;padding:16px;">
+    <div>{{msg}}</div>
+</div>
+<div class="modal-footer modelfooter-hint pointfont">
+    <div class="hintfooterleft pull-left" ng-click="ok()" style="cursor: pointer;width: 33%;">审核通过</div>
+    <div class="hintfooterleft pull-left" ng-click="time()" style="cursor: pointer;width: 33%;">调整工时</div>
+    <div class="hintfooterright pull-right" ng-click="cancel()" style="cursor: pointer;width: 33%;">取消</div>
+</div>

assets/views/incident/tpl/toAuditTime.tpl.html

@@ -0,0 +1,28 @@
+<!-- 转派 -->
+<div class="modal-header">
+    <div class="modal-title fontcolor-two fontsizes-14">指派对象
+        <button type="button" class="close pull-right" ng-click="cancel()">×</button>
+    </div>
+</div>
+<div class="modal-body center">
+    <div class="form-group" style="margin:0 auto;width: 300px;">
+        <div class="input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident">您需要将工时调整为</label>:</div>
+            <div class="pull-right">
+                <ui-select class="pull-left" style="width:150px" ng-model="searchList.time" theme="bootstrap">
+                    <ui-select-match placeholder="">
+                        {{$select.selected.value}}
+                    </ui-select-match>
+                    <ui-select-choices repeat="item in list | filter:{$:$select.search}">
+                        <div ng-bind-html="item.value | highlight: $select.search"></div>
+                    </ui-select-choices>
+                </ui-select>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal-footer modelfooter-hint pointfont">
+    <div class="hintfooterleft pull-left" ng-click="ok()" style="cursor: pointer;">确定</div>
+    <div class="hintfooterright pull-right" ng-click="cancel()" style="cursor: pointer;">取消</div>
+</div>

assets/views/incident/tpl/toIntegralMechanism.tpl.html

@@ -0,0 +1,47 @@
+<!-- 积分机制 -->
+<div class="modal-header">
+    <div class="modal-title fontcolor-two fontsizes-14">提示
+        <button type="button" class="close pull-right" ng-click="cancel()">×</button>
+    </div>
+</div>
+<div class="modal-body center">
+    <div style="margin:8px 0 0;">您本次事件处理获得工时{{complexity}}，如遇问题对工时进行调整</div>
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;">
+        <div class="input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident">工时<span class="red">*</span></label>:</div>
+            <div class="pull-right">
+                <ui-select class="pull-left" style="width:220px" ng-model="complexityConfirm.complexity" theme="bootstrap" ng-change="onChangeComplexity($select.selected)">
+                    <ui-select-match placeholder="">
+                        {{$select.selected.value}}
+                    </ui-select-match>
+                    <ui-select-choices repeat="item in list | filter:{$:$select.search}">
+                        <div ng-bind-html="item.value | highlight: $select.search"></div>
+                    </ui-select-choices>
+                </ui-select>
+            </div>
+        </div>
+    </div>
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;" ng-if="flag && complexityConfirm.complexity.value != complexity">
+        <div class="input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident">升级原因<span class="red">*</span></label>:</div>
+            <div class="pull-right">
+                <textarea placeholder="请输入升级原因" class="pull-left" style="width:220px;height: 100px;resize:none;" ng-model="complexityConfirm.updateReason"></textarea>
+            </div>
+        </div>
+    </div>
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;" ng-if="!flag">
+        <div class="input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident">升级原因<span class="red">*</span></label>:</div>
+            <div class="pull-right">
+                <textarea placeholder="请输入升级原因" class="pull-left" style="width:220px;height: 100px;resize:none;" ng-model="complexityConfirm.updateReason"></textarea>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal-footer modelfooter-hint pointfont">
+    <div class="hintfooterleft pull-left" ng-click="ok()" style="cursor: pointer;">确定</div>
+    <div class="hintfooterright pull-right" ng-click="cancel()" style="cursor: pointer;">取消</div>
+</div>

assets/views/inspect/integral.html

@@ -0,0 +1,290 @@
+<style type="text/css">
+  .incidentsearch {
+    width: 20% !important;
+    margin-right: 16px;
+  }
+  .wt_width5 {
+    width: 160px;
+    border-color: #dedede;
+    float: right;
+    height: 28px;
+    border-radius: 2px !important;
+  }
+
+  .iptSize {
+    width: 60% !important;
+    height: 28px !important;
+  }
+
+  .tree-control .tree-input {
+    min-height: 28px !important;
+  }
+
+  .searchBtnBox > .btn {
+    margin: 0 8px 10px 0;
+  }
+</style>
+<div ng-controller="integralCtrl">
+  <!-- <section id="page-title">
+        <div class="row">
+            <div class="col-sm-8">
+                <h1 class="mainTitle">积分管理</h1><span class="mainDescription">积分管理列表，可对巡检进行修改，新增，删除</span></div>
+        </div>
+    </section> -->
+  <section id="page-title">
+    <div class="row">
+      <!-- <i class="iconfont icon-bianji pull-left"></i> -->
+      <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="col-xs-2 col-md-2 col-sm-2">
+        <h5 class="over-title margin-bottom-15"><i class="fa fa-building-o" /><span class="text-bold">巡检类型</span></h5>
+        <div>
+            <div class="row">
+                <div class="panel panel-white">
+                    <div class="panel-body">
+                        <div class="box-tree">
+                            <span ng-if="doing_async">...加载中...</span>
+                            <abn-tree tree-data="my_data" tree-control="my_tree" on-select="my_tree_handler(branch)" expand-level="2" initial-selection="Granny Smith" icon-leaf="ti-file" icon-expand="ti-plus" icon-collapse="ti-minus"></abn-tree>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div> -->
+  <div class="schuback" id="searchid">
+    <div class="row" style="padding-right: 0px !important">
+      <div class="col-xs-12">
+        <div class="col-xs-10" style="padding-right: 0px !important">
+          <form class="form-inline incidentsearchsize">
+            <!-- <div class="form-group incidentsearch">
+              <div>
+                <div class="control-label pull-left" style="padding-top: 4px">
+                  计划主题:
+                </div>
+                <input
+                  class="form-control pull-right inputcolor iptSize"
+                  style="border-color: #dedede; color: #93989e"
+                  type="text"
+                  ng-model="fileData.inspection.title"
+                  placeholder=""
+                />
+              </div>
+            </div>
+            <div class="form-group incidentsearch">
+              <div class="pull-left" style="padding-top: 4px">巡检范围:</div>
+              <div class="pull-right iptSize" style="display: inline">
+                <div>
+                  <multi-select-tree
+                    ng-model="inspecttype.type"
+                    data-input-model="my_data"
+                    data-output-model="inspectdata.type"
+                    theme="bootstrap"
+                    multi-select="false"
+                    data-default-label=""
+                    data-callback="onFilterCallback(item)"
+                    data-select-only-leafs="true"
+                    reset-search-input="false"
+                    data-trans-label="label"
+                    data-switch-view="false"
+                  ></multi-select-tree>
+                </div>
+              </div>
+            </div>
+            <div class="form-group incidentsearch">
+              <div class="pull-left" style="padding-top: 4px">执行人:</div>
+              <ui-select
+                class="pull-right iptSize"
+                ng-model="fileData.inspection.executeUser"
+                theme="bootstrap"
+              >
+                <ui-select-match placeholder="">
+                  {{$select.selected.name}}
+                </ui-select-match>
+                <ui-select-choices repeat="item in executeUserData">
+                  <div
+                    ng-bind-html="item.name | highlight: $select.search"
+                  ></div>
+                </ui-select-choices>
+              </ui-select>
+            </div> -->
+            <div class="form-group incidentsearch wt_width">
+              <div class="">
+                <div class="control-label pull-left margin-top-5">
+                  登记时间:
+                </div>
+                <input
+                  type="text"
+                  class="incidentsearchsize wt_width5"
+                  datepicker-popuptime="yyyy-MM-dd"
+                  ng-model="fileData.incidentIntegral.startTime"
+                  max-date="fileData.incidentIntegral.endTime"
+                  is-open="startOpened"
+                  hour-time="true"
+                  ng-init="startOpened = false"
+                  close-text="关闭"
+                  ng-click="startOpen($event)"
+                  placeholder=""
+                />
+              </div>
+            </div>
+            <div class="form-group incidentsearch wt_width">
+              <div class="">
+                <div class="control-label pull-left margin-top-5">至</div>
+                <input
+                  type="text"
+                  class="selectzise incidentsearchsize wt_width5"
+                  datepicker-popuptime="yyyy-MM-dd"
+                  ng-model="fileData.incidentIntegral.endTime"
+                  hour-time="true"
+                  min-date="fileData.incidentIntegral.startTime"
+                  is-open="endOpened"
+                  ng-init="endOpened = false"
+                  close-text="关闭"
+                  ng-click="endOpen($event)"
+                  placeholder=""
+                />
+              </div>
+            </div>
+            <div class="form-group incidentsearch">
+              <div class="pull-left" style="padding-top: 4px">审核状态:</div>
+              <ui-select
+                class="pull-right iptSize"
+                ng-model="fileData.incidentIntegral.auditState"
+                theme="bootstrap"
+              >
+                <ui-select-match placeholder="">
+                  {{$select.selected.desc}}
+                </ui-select-match>
+                <ui-select-choices repeat="item in statusData">
+                  <div
+                    ng-bind-html="item.desc | highlight: $select.search"
+                  ></div>
+                </ui-select-choices>
+              </ui-select>
+            </div>
+            <div class="form-group incidentsearch" ng-if="isIncidentManager">
+              <div class="pull-left" style="padding-top: 4px">处理人:</div>
+              <ui-select
+                class="pull-right iptSize"
+                ng-model="fileData.incidentIntegral.handlerUser"
+                theme="bootstrap"
+              >
+                <ui-select-match placeholder="">
+                  {{$select.selected.name}}
+                </ui-select-match>
+                <ui-select-choices repeat="item in createUserData" refresh="getCreateUser($select.search)">
+                  <div
+                    ng-bind-html="item.name | highlight: $select.search"
+                  ></div>
+                </ui-select-choices>
+              </ui-select>
+            </div>
+          </form>
+        </div>
+        <div class="col-xs-2">
+          <div>
+            <!-- <div class="centerdiv-one"></div> -->
+            <div class="pull-left margin-top-10 searchBtnBox">
+              <!-- <div class="form-group"> -->
+              <!-- <a class="btn btn-searchbutton steelbutton" ng-click="searchinspe(inspectdata)" type="button">搜索</a> -->
+              <div class="btn btn_search" ng-click="searchinspe(inspectdata)">
+                <span>搜索</span>
+              </div>
+              <div class="btn btn_search" ng-click="batchReview()" ng-if="selected.items.length">
+                <span>批量审核</span>
+              </div>
+              <!-- </div> -->
+              <!-- <div class="form-group">
+                        <button class="blank btn btn-downbutton downbutton" ng-click="export()" ladda="ldloading.zoom_in" data-style="zoom-in"><span translate="sidebar.nav.configuremanagerdb.LISTButton.EXPORT ">Export Data</span></button>
+                    </div> -->
+              <!-- <button ladda="ldloading.expand_right" type="button" class="btn btn-reashbutton reashbutton" data-style="expand-right" ng-click="reload()">
+                        <span translate="list.button.REFRESH">Refresh Data</span>
+                    </button> -->
+              <!-- <a class="btn btn-searchbutton steelbutton" ng-click="reload()" type="button">重置</a> -->
+              <div class="btn btn_clean" ng-click="reload()">重置</div>
+              <!-- <a class="btn btn-searchbutton steelbutton" ng-click="refresh()" type="button">刷新</a> -->
+              <!-- <button type="button" class="btn btn-addbutton  addbutton" ng-click="addData()">
+                            <span translate="list.button.CREATE">Add Data</span>
+                        </button> -->
+              <!-- <div
+                class="btn btn_search"
+                ng-click="addData()"
+                ng-show="xinzeng"
+              >
+                <span translate="list.button.CREATE">Add Data</span>
+              </div> -->
+              <!--<button type="button" id="removeData" class="btn btn-warning" ng-click="removeData()" ng-disabled="selected.items.length==0">-->
+              <!-- <button type="button" class="btn btn-downbutton downbutton" ng-click="removeData()" ng-disabled="selected.items.length==0">
+                            <span translate=" list.button.REMOVE ">Remove First Row</span>
+                        </button> -->
+              <!-- <div
+                class="btn btn_remove"
+                ng-click="removeData()"
+                ng-class="isMousedown?'btn_removeMousedown':''"
+                ng-mousedown="changeRemoveClass()"
+                ng-show="shanchu"
+                ng-disabled="selected.items.length==0"
+              >
+                <span translate="list.button.REMOVE">Remove First Row</span>
+              </div> -->
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="tableList" ui-i18n="{{lang}}">
+    <!-- <div class="col-xs-2 col-md-2 col-sm-2">
+            <h5 class="over-title margin-bottom-15"><i class="fa fa-building-o" /><span class="text-bold">巡检类型</span></h5>
+            <div>
+                <div class="row">
+                    <div class="panel panel-white">
+                        <div class="panel-body">
+                            <div class="box-tree">
+                                <span ng-if="doing_async">...加载中...</span>
+                                <abn-tree tree-data="my_data" tree-control="my_tree" on-select="my_tree_handler(branch)" expand-level="2" initial-selection="Granny Smith" icon-leaf="ti-file" icon-expand="ti-plus" icon-collapse="ti-minus"></abn-tree>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div> -->
+    <!-- <div class="col-xs-10"> -->
+
+    <!-- <div class="margin-bottom-10">
+            <a ladda="ldloading.expand_right" class="btn btn-primary" data-style="expand-right" ng-click="reload()">
+                <span translate="list.button.REFRESH">Refresh Data</span>
+                <i class="ti-reload" />
+            </a>
+            <button type="button" id="addData" class="btn btn-success" ng-click="addData()">
+                    <span translate="list.button.CREATE">Add Data</span>
+                    <i class="ti-plus"/>
+                </button>
+            <button type="button" id="removeData" class="btn btn-warning" ng-click="removeData()" ng-disabled="selected.items.length==0">
+                    <span translate=" list.button.REMOVE ">Remove First Row</span>
+                    <i class="ti-trash "/>
+                </button>
+        </div> -->
+    <div class=" ">
+      <div
+        id="grid1 "
+        ui-grid="gridOptions "
+        ui-grid-pagination
+        external-scopes="$scope "
+        ui-grid-resize-columns
+        ui-grid-selection
+        ui-grid-auto-resize
+        class="grid"
+      ></div>
+    </div>
+  </div>
+</div>

assets/views/system/sysconfig.html

@@ -237,6 +237,30 @@
                         </ul>
                     </div>
                 </div>
+                <div class="form-group col-sm-6">
+                    <label class="col-sm-4 control-label">
+                        积分机制：
+                    </label>
+                    <div class="col-sm-8">
+                        <ul class="tab_bdItem_tab">
+                            <li class="fl">
+                                <i class="tab_bdItem_tabItem iconfont icon-icon_weizuo" ng-click="integralMechanism.valueconfig = 0;"
+                                    ng-class="integralMechanism.valueconfig == 0?'active':''"></i>
+                                <span>无</span>
+                            </li>
+                            <li class="fl">
+                                <i class="tab_bdItem_tabItem iconfont icon-icon_weizuo" ng-click="integralMechanism.valueconfig = 1;"
+                                    ng-class="integralMechanism.valueconfig == 1?'active':''"></i>
+                                <span>全体人员</span>
+                            </li>
+                            <li class="fl">
+                                <i class="tab_bdItem_tabItem iconfont icon-icon_weizuo" ng-click="integralMechanism.valueconfig = 2;"
+                                    ng-class="integralMechanism.valueconfig == 2?'active':''"></i>
+                                <span>公司人员</span>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
             </div>
             <!-- 保存 -->
             <div class="form-group margin-bottom-0">