文档大量修改

assets/css/styles.css

@@ -705,7 +705,7 @@
     margin-top: 1px;
     margin-bottom: 8px;
     /* padding: 10px 0px 0px 10px !important; */
-    padding-bottom: 10px;
+    padding-bottom: 8px;
     padding-top: 8px;
     background-color: #f9f9f9 !important;
     /* border-radius: 8px !important; */
@@ -796,8 +796,8 @@
 
 .incidentsearch {
     width: 260px;
-    padding-top: 10px;
-    padding-bottom: 5px;
+    /* padding-top: 10px; */
+    /* padding-bottom: 5px; */
 }
 
 
@@ -1839,8 +1839,8 @@ fieldset[disabled] .btn-statebutton.btn-o.active {
 
 .incidentsearch {
     width: 200px;
-    padding-top: 10px;
-    padding-bottom: 5px;
+    /* padding-top: 10px; */
+    /* padding-bottom: 5px; */
 }
 
 .incidentsearchsize {
@@ -19850,7 +19850,7 @@ td.ng-scope.data {
     padding-right: 0;
     padding-bottom: 12px;
     padding-left: 0px;
-    margin-bottom: 15px;
+    margin-bottom: 5px;
 }
 
 @media (max-width: 767px) {
@@ -20549,4 +20549,9 @@ selectList.selected {
     background-color: #fc4c58 !important;
     border-color: #0055b3 !important;
     color: #0055b3 !important;
+}
+
+/* 富文本框高度 */
+#cke_1_contents {
+    height: 80px!important;
 }

assets/js/controllers/customform/customformCtrl.js

@@ -9117,7 +9117,8 @@ appFormly.config(function config(formlyConfigProvider) {
         //认证计费数据获取
         $scope.sumInfo = {};
         function getSumInfo() {
-          $scope.isHk = $rootScope.isHk;
+          // $scope.isHk = $rootScope.isHk;
+          $scope.isHk = true;
           if($rootScope.isHk){
             //用户信息
             api_webservice1.fetchDataList("queryUser", { "userId": $scope.model.incident.account }).then(function(response) {
@@ -14683,7 +14684,7 @@ appFormly.config(function config(formlyConfigProvider) {
             api_bpm_data.fetchData("place", model.place.id)
                   .then(function (response) {
                     if (response.status == 200) {
-                      text = `姓名：${model.requester?model.requester.name:''}\r\n工号：${model.requester?model.requester.account:''}\r\n来电电话：${model.contactsInformation||''}\r\n地点：${response.data.place||''}\r\n详细地址：${model.houseNumber||''}\r\n事件描述：${model.description||''}`;
+                      text = `姓名：${model.requester?(model.requester.name||''):''}\r\n工号：${model.requester?(model.requester.account||''):''}\r\n来电电话：${model.requester?(model.requester.telephone||''):''}\r\n地点：${response.data.place||''}\r\n详细地址：${model.houseNumber||''}\r\n事件描述：${model.description||''}`;
                       var textarea = document.createElement('textarea');
                       document.body.appendChild(textarea);
                       // 隐藏此输入框
@@ -14701,7 +14702,7 @@ appFormly.config(function config(formlyConfigProvider) {
                     }
                   });
           }else{
-            text = `姓名：${model.contacts||''}\r\n工号：${model.account||''}\r\n来电电话：${model.contactsInformation||''}\r\n地点：${''}\r\n详细地址：${model.houseNumber||''}\r\n事件描述：${model.description||''}`;
+            text = `姓名：${model.requester?(model.requester.name||''):''}\r\n工号：${model.requester?(model.requester.account||''):''}\r\n来电电话：${model.requester?(model.requester.telephone||''):''}\r\n地点：${''}\r\n详细地址：${model.houseNumber||''}\r\n事件描述：${model.description||''}`;
             var textarea = document.createElement('textarea');
             document.body.appendChild(textarea);
             // 隐藏此输入框
@@ -15085,7 +15086,8 @@ appFormly.config(function config(formlyConfigProvider) {
         SweetAlert,
         moment
       ) {
-        $scope.isHk = $rootScope.isHk;
+        // $scope.isHk = $rootScope.isHk;
+        $scope.isHk = true;
         $scope.roleidcode = true;
         // $scope.options.initialValue = undefined;
         if ($rootScope.user && $rootScope.user.role) {

assets/js/controllers/desk/chartCtrl.js

@@ -648,6 +648,9 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
     //   $state.go('app.detail', { formKey:'statusform', pdKey:'incident', dataId: data.id,processInstanceId: data.processInstanceId});
 
     // };
+    $scope.onDblClick = function(row) {
+        $scope.lookFunction(row.entity);
+    }
     // $scope.onDblClick = function (row) {
     //     var data = row.entity;
     //     var formdata = {

assets/js/controllers/incident/incidentCtrl.js

@@ -1412,7 +1412,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             $scope.memoryfilterData = defaultFilterData = {
                 "assignee": loginUser.id,
                 "candidateGroups": loginuserGroup,
-                "searchType": "todo",
+                "searchType": "all",
                 "idx": 0,
                 "sum": mun
             };
@@ -1420,7 +1420,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
     } else {
         $scope.memoryfilterData = defaultFilterData = {
             "assignee": loginUser.id,
-            "searchType": "todo",
+            "searchType": "all",
             "idx": 0,
             "sum": mun
         };
@@ -2612,10 +2612,10 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         if (JSON.parse($stateParams.model).searchType && JSON.parse($stateParams.model).searchType != null) {
             $scope.searchType = JSON.parse($stateParams.model).searchType;
         } else {
-            $scope.searchType = "todo";
+            $scope.searchType = "all";
         }
     } else {
-        $scope.searchType = "todo";
+        $scope.searchType = "all";
     }
     // if (JSON.parse($stateParams.model).searchType) {
     //     if ($rootScope.user.group) {
@@ -2639,14 +2639,14 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         var defaultFilterData = {
             "assignee": loginUser.id,
             "candidateGroups": loginuserGroup,
-            "searchType": "todo",
+            "searchType": "all",
             "idx": 0,
             "sum": mun
         };
     } else {
         var defaultFilterData = {
             "assignee": $rootScope.user.id,
-            "searchType": "todo",
+            "searchType": "all",
             "idx": 0,
             "sum": mun
         };
@@ -2683,7 +2683,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
     if($state.params.tab){
         $scope.searchstate = $state.params.tab;
     }else{
-        $scope.searchstate = 'todo';//baba
+        $scope.searchstate = 'all';
     }
     $scope.onChange = function (searchType) {
         if(searchType === 'all_del'){

assets/js/controllers/mainCtrl.js

@@ -7,6 +7,21 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
     if(localStorage.getItem('version_qd')){
       $rootScope[localStorage.getItem('version_qd')] = true;
     }
+    //判断项目归属 start
+      //因项目众多，前端为了加以区分，所以用域名加以判断，后期有更好的方式可以自行修改
+      // 中南财大
+      // $rootScope.isZncd = document.domain === 'itsm.zuel.edu.cn';
+      $rootScope.isZncd = false;
+      // 华科
+      // $rootScope.isHk = document.domain === '192.168.3.110' || document.domain === '192.168.3.69' || document.domain === '172.16.7.91' || document.domain === '192.168.3.105' || document.domain === 'localhost' || document.domain === '192.168.77.59';
+      $rootScope.isHk = true;
+      if($rootScope.isZncd){
+          localStorage.setItem('version_qd','isZncd');
+      }
+      if($rootScope.isHk){
+          localStorage.setItem('version_qd','isHk');
+      }
+      //判断项目归属 end
     // 未读消息数量seimin
     $rootScope.getMsgNum = function (id) {
       api_msg.msgDataList({ idx: 0, sum: 1, messageStation: { readStatus: 0, userId: id } }).then(function (data) {
@@ -52,6 +67,21 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
       if(localStorage.getItem('version_qd')){
         $rootScope[localStorage.getItem('version_qd')] = true;
       }
+      //判断项目归属 start
+      //因项目众多，前端为了加以区分，所以用域名加以判断，后期有更好的方式可以自行修改
+      // 中南财大
+      // $rootScope.isZncd = document.domain === 'itsm.zuel.edu.cn';
+      $rootScope.isZncd = false;
+      // 华科
+      // $rootScope.isHk = document.domain === '192.168.3.110' || document.domain === '192.168.3.69' || document.domain === '172.16.7.91' || document.domain === '192.168.3.105' || document.domain === 'localhost' || document.domain === '192.168.77.59';
+      $rootScope.isHk = true;
+      if($rootScope.isZncd){
+          localStorage.setItem('version_qd','isZncd');
+      }
+      if($rootScope.isHk){
+          localStorage.setItem('version_qd','isHk');
+      }
+      //判断项目归属 end
       if($rootScope.isZncd){
         // 中南财大
         if ((toState.name == 'app.incident.chart' || toState.name == 'app.incident.editor') &&
@@ -1216,7 +1246,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                                                                                   contactsInformation: response.data.telephone,
                                                                                   contacts:response.data.name,
                                                                                   callID: cdrid,
-                                                                                  source: { id: 1 },
+                                                                                  source: { id: 1547 },
                                                                                 },
                                                                               },
                                                                             };
@@ -1241,7 +1271,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                                                                   houseNumber: myData.list[0].houseNumber,
                                                                   contacts:myData.list[0].name,
                                                                   callID: cdrid,
-                                                                  source: { id: 1 },
+                                                                  source: { id: 1547 },
                                                                 },
                                                               },
                                                             };
@@ -1268,7 +1298,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                                                                               contactsInformation: requester.telephone,
                                                                               contacts:requester.name,
                                                                               callID: cdrid,
-                                                                              source: { id: 1 },
+                                                                              source: { id: 1547 },
                                                                             },
                                                                           },
                                                                         };

assets/js/controllers/system/user/schedulingplan.js

@@ -142,6 +142,7 @@ app.controller("calendarCtrl", function($scope,$rootScope, $filter, $q, $timeout
                 });
             }
             for (var i = 0; i < $scope.selectedDate.length; i++) {
+                console.log(moment(date).format('YYYY-MM-DD HH:mm:ss'), moment($scope.selectedDate[i]).format('YYYY-MM-DD HH:mm:ss'));
                 if (angular.equals(date, $scope.selectedDate[i]) == true) {
                     ischeck = false
                     break
@@ -186,10 +187,12 @@ app.controller("calendarCtrl", function($scope,$rootScope, $filter, $q, $timeout
     };
 
     $scope.prevMonth = function(data) {
+        workdays = data;
         $scope.refreshData(data);
     };
 
     $scope.nextMonth = function(data) {
+        workdays = data;
         $scope.refreshData(data);
     };
 

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

@@ -3,7 +3,7 @@
 </div> -->
 <div class="jry_tit">事件描述<span class="important_red">*</span>:<span ng-if="!options.templateOptions.isHidden" class="knowledge" tooltip="点击查看可以引用的知识库" tooltip-placement="right" ng-click="openSolution(model[options.key], options, this, $event ,model)">引用知识库</span></div>
 <div>
-	<textarea class="form-control autosize msd-elastic: \n;" maxlength="{{to.maxlength}}" data-ng-model="model[options.key]" ng-change="to['onChange'](model[options.key], options, this, $event ,model);" ng-disabled="{{to.readOnly}}" rows="{{options.templateOptions.rows||0}}"></textarea>
+	<textarea style="height: 50px;" class="form-control autosize msd-elastic: \n;" maxlength="{{to.maxlength}}" data-ng-model="model[options.key]" ng-change="to['onChange'](model[options.key], options, this, $event ,model);" ng-disabled="{{to.readOnly}}" rows="{{options.templateOptions.rows||0}}"></textarea>
 </div>
 <!-- <div ng-if="dlideboxslide" data-ng-include=" 'assets/views/customform/tpl/searchknowledge.html' " toggleable default=active class="seachknowledge panel panel-default hidden-xs hidden-sm " id="seachknowledge"></div> -->
 <!-- <div class="col-md-12" style="z-indx:1px;" >

assets/views/desk/chart.html

@@ -13,10 +13,10 @@
         padding: 6px 10px;
         border-radius: 2px;
     } */
-  .incidentsearch {
+  /* .incidentsearch {
     width: 30% !important;
     margin-right: 16px;
-  }
+  } */
 
   .iptSize {
     width: 60% !important;

assets/views/incident/list.html

@@ -39,7 +39,7 @@
         <div style="background: #F9F9F9 !important;padding-left: 16px;padding-right: 0px;">
             <div class="row wt_searchlistback" id="searchid">
 
-                <div class="col-xs-10" style="padding-right: 0px !important;padding-bottom: 10px;">
+                <div class="col-xs-10" style="padding-right: 0px !important;">
 
                     <form class="form-inline incidentsearchsize" style='padding-top: 8px'>
                         <!-- <div class="form-group incidentsearch">