消息通知

assets/js/controllers/system/notificationCtrl.js

@@ -9,18 +9,18 @@ app.controller('notificationCtr', ["$rootScope", "$scope", "$state", "$timeout",
     $scope.tableName = "消息通知设置";
     //侧边栏名称
     $scope.listData = [
-        { "name": "报修流程" },
+        // { "name": "报修流程" },
         { "name": "事件流程" }
         // { "name": "上下班管理" }
     ];
     //转换通知规则
-    $scope.computedRule = function (data, id) {
-        if (data === undefined) {
+    $scope.computedRule = function (noticeRule, noticeCode) {
+        if (noticeRule === undefined) {
             return '进入本步骤时';
-        } else if (id == 13 || id == 14 || id == 12) {
-            return '【逾期响应时间】' + data + '分钟';
-        } else if (id == 18 || id == 19) {
-            return '【解决时间】剩余 ' + data + '%';
+        } else if (noticeCode == 'user_receive_overresp' || noticeCode == 'manager_receive_overresp') {
+            return '【逾期响应时间】' + noticeRule + '分钟';
+        } else if (noticeCode == 'user_doing_overresp' || noticeCode == 'manager_doing_overresp') {
+            return '【解决时间】剩余 ' + noticeRule + '%';
         }
     };
     /**
@@ -56,38 +56,39 @@ app.controller('notificationCtr', ["$rootScope", "$scope", "$state", "$timeout",
             }
         })
     }
-    $scope.getBxList();
+    // $scope.getBxList();
     //请求获取事件流程列表
     //process: '通知流程',processNode:'流程节点',processStatus:'状态',notifiedPerson:'被通知人'
     $scope.sjList = [
-        { processName: '事件流程', processNode: '接单', processStatus: '待接单', notifiedPerson: '运维工程师', noticeCode:'user_receive' },
-        { processName: '事件流程', processNode: '接单', processStatus: '待接单', notifiedPerson: '运维工程师', noticeCode:'user_receive_overresp' },
-        { processName: '事件流程', processNode: '接单', processStatus: '待接单', notifiedPerson: '分类管理员', noticeCode:'cm_receive_overresp' },
-        { processName: '事件流程', processNode: '接单', processStatus: '待接单', notifiedPerson: '事件经理', noticeCode:'manager_receive_overresp' },
-        { processName: '事件流程', processNode: '重新指派', processStatus: '重新指派', notifiedPerson: '服务台人员', noticeCode:'service_reassign' },
-        { processName: '事件流程', processNode: '重新指派', processStatus: '重新指派', notifiedPerson: '运维工程师', noticeCode:'user_reassign' },
-        { processName: '事件流程', processNode: '处理', processStatus: '处理中', notifiedPerson: '报修人', noticeCode:'req_doing' },
-        { processName: '事件流程', processNode: '处理', processStatus: '处理中', notifiedPerson: '运维工程师', noticeCode:'user_doing' },
-        { processName: '事件流程', processNode: '处理', processStatus: '处理中', notifiedPerson: '分类管理员', noticeCode:'cm_doing' },
-        { processName: '事件流程', processNode: '处理', processStatus: '指派', notifiedPerson: '运维工程师', noticeCode:'user_doing_assign' },
-        { processName: '事件流程', processNode: '处理', processStatus: '转派', notifiedPerson: '运维工程师', noticeCode:'user_doing_redeploy' },
-        { processName: '事件流程', processNode: '处理', processStatus: '升级', notifiedPerson: '运维工程师', noticeCode:'user_doing_upgrade' },
-        { processName: '事件流程', processNode: '评价', processStatus: '已解决', notifiedPerson: '报修人', noticeCode:'req_resolve' },
-        { processName: '事件流程', processNode: '关单', processStatus: '已解决', notifiedPerson: '服务台人员', noticeCode:'service_resolve' },
-        { processName: '事件流程', processNode: '完成', processStatus: '已关闭', notifiedPerson: '报修人', noticeCode:'req_close' }
+        // { processName: '事件流程', processNode: '接单', processStatus: '待接单', notifiedPerson: '运维工程师', noticeCode:'user_receive' },
+        // { processName: '事件流程', processNode: '接单', processStatus: '待接单', notifiedPerson: '运维工程师', noticeCode:'user_receive_overresp' },
+        // { processName: '事件流程', processNode: '接单', processStatus: '待接单', notifiedPerson: '分类管理员', noticeCode:'cm_receive_overresp' },
+        // { processName: '事件流程', processNode: '接单', processStatus: '待接单', notifiedPerson: '事件经理', noticeCode:'manager_receive_overresp' },
+        // { processName: '事件流程', processNode: '重新指派', processStatus: '重新指派', notifiedPerson: '服务台人员', noticeCode:'service_reassign' },
+        // { processName: '事件流程', processNode: '重新指派', processStatus: '重新指派', notifiedPerson: '运维工程师', noticeCode:'user_reassign' },
+        // { processName: '事件流程', processNode: '处理', processStatus: '处理中', notifiedPerson: '报修人', noticeCode:'req_doing' },
+        // { processName: '事件流程', processNode: '处理', processStatus: '处理中', notifiedPerson: '运维工程师', noticeCode:'user_doing' },
+        // { processName: '事件流程', processNode: '处理', processStatus: '处理中', notifiedPerson: '分类管理员', noticeCode:'cm_doing' },
+        // { processName: '事件流程', processNode: '处理', processStatus: '指派', notifiedPerson: '运维工程师', noticeCode:'user_doing_assign' },
+        // { processName: '事件流程', processNode: '处理', processStatus: '转派', notifiedPerson: '运维工程师', noticeCode:'user_doing_redeploy' },
+        // { processName: '事件流程', processNode: '处理', processStatus: '升级', notifiedPerson: '运维工程师', noticeCode:'user_doing_upgrade' },
+        // { processName: '事件流程', processNode: '评价', processStatus: '已解决', notifiedPerson: '报修人', noticeCode:'req_resolve' },
+        // { processName: '事件流程', processNode: '关单', processStatus: '已解决', notifiedPerson: '服务台人员', noticeCode:'service_resolve' },
+        // { processName: '事件流程', processNode: '完成', processStatus: '已关闭', notifiedPerson: '报修人', noticeCode:'req_close' }
     ];
     $scope.getSjList = function () {
         api_notification_data.fetchDataList({
             "idx": 0,
             "sum": 20,
             "messageManager": {
-                "noticeProcess": 2
+                "noticeProcess": 1
             }
         }).then(function (res) {
             if (res.status == 200) {
-                angular.forEach($scope.sjList, function (v, i) {
-                    angular.extend(v, res.list[i]);//合并对象
-                })
+                // angular.forEach($scope.sjList, function (v, i) {
+                //     angular.extend(v, res.list[i]);//合并对象
+                // })
+                $scope.sjList = res.list.map(v => ({...v, ...{processName: '事件流程'}}));
                 console.log($scope.sjList)
             }
         })
@@ -102,10 +103,10 @@ app.controller('notificationCtr', ["$rootScope", "$scope", "$state", "$timeout",
                     id: data.id,//id
                     noticeCode: data.noticeCode,
                     noticeRule: data.noticeRule === undefined ? 'no' : data.noticeRule,//通知规则,数字
-                    processNode: data.processNode,//流程节点
+                    noticeNode: data.noticeNode,//流程节点
                     processName: data.processName,//报修流程或者事件流程
-                    processStatus: data.processStatus,//状态
-                    notifiedPerson: data.notifiedPerson,//被通知人
+                    noticeState: data.noticeState,//状态
+                    noticeDetails: data.noticeDetails,//被通知人
                     noticeProcess: data.noticeProcess,//1为报修流程、2为事件流程
                     messageStationContent: data.messageStationContent,//站内消息通知内容
                     shortMessageContent: data.shortMessageContent,//短信通知内容
@@ -360,7 +361,7 @@ app.controller('notificationCtr', ["$rootScope", "$scope", "$state", "$timeout",
                         type: "success",
                         confirmButtonColor: "#007AFF"
                     }, function () {
-                        $scope.getBxList();
+                        // $scope.getBxList();
                         $scope.getSjList();
                     });
                 }

assets/views/system/notification.html

@@ -113,7 +113,7 @@
       <div class="fonsize">消息通知设置</div>
       <div class="rightBox">
         <!-- 报修流程 -->
-        <table class="jry_table" ng-if="leftListIdx==0" cellspacing="0" cellpadding="20"
+        <!-- <table class="jry_table" ng-if="leftListIdx==0" cellspacing="0" cellpadding="20"
           style="font-weight:normal !important;margin-bottom: 15px;table-layout:fixed">
           <thread>
             <tr>
@@ -180,9 +180,9 @@
               </td>
             </tr>
           </tbody>
-        </table>
+        </table> -->
         <!-- 事件流程 -->
-        <table class="jry_table" ng-if="leftListIdx==1" cellspacing="0" cellpadding="20"
+        <table class="jry_table" ng-if="leftListIdx==0" cellspacing="0" cellpadding="20"
           style="font-weight:normal !important;margin-bottom: 15px;table-layout:fixed">
           <thread>
             <tr>
@@ -224,16 +224,16 @@
                 {{rowData.processName}}
               </td>
               <td style="width:10%">
-                {{rowData.processNode}}
+                {{rowData.noticeNode}}
               </td>
               <td style="width:10%">
-                {{rowData.processStatus}}
+                {{rowData.noticeState}}
               </td>
               <td style="width:12%">
-                {{rowData.notifiedPerson}}
+                {{rowData.noticeDetails}}
               </td>
               <td style="width:18%">
-                {{computedRule(rowData.noticeRule,rowData.id)}}
+                {{computedRule(rowData.noticeRule,rowData.noticeCode)}}
               </td>
               <td style="width:18%">
                 {{rowData.messageStationFlag ==1?'站内消息':''}}

assets/views/system/tpl/notificationBj.html

@@ -38,13 +38,13 @@
         outline: none;
     }
 
-    .modal-body-common .processNode {
+    .modal-body-common .noticeNode {
         margin-top: 16px;
         font-size: 14px;
         color: #333;
     }
 
-    .modal-body-common .processNode span {
+    .modal-body-common .noticeNode span {
         color: #666;
     }
 
@@ -63,7 +63,7 @@
         color: #666;
     }
 
-    .modal-body-common .notifiedPerson {
+    .modal-body-common .noticeDetails {
         margin-left: 192px;
     }
 
@@ -224,10 +224,10 @@
                 ng-model="editData.noticeRule">分钟</h2>
             <h2 ng-if="editData.noticeRule !== 'no'&&(editData.id == 18||editData.id == 19)">{{editData.processName}}-【解决时长】剩余<input
                     class="noticeRule" type="number" ng-model="editData.noticeRule">%</h2>
-            <div class="processNode">流程节点：<span>{{editData.processNode}}</span></div>
+            <div class="noticeNode">流程节点：<span>{{editData.noticeNode}}</span></div>
             <div class="infoParent">
-                <div class="processStatus infoCommon">状态：<span>{{editData.processStatus}}</span></div>
-                <div class="notifiedPerson infoCommon">被通知人：<span>{{editData.notifiedPerson}}</span></div>
+                <div class="noticeState infoCommon">状态：<span>{{editData.noticeState}}</span></div>
+                <div class="noticeDetails infoCommon">被通知人：<span>{{editData.noticeDetails}}</span></div>
             </div>
         </div>
     </div>