From 542aee413b7632acab12b23923a843e6a555fb40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 20 Jun 2022 11:01:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/cpd.js                         |  31 +------
 src/components/NoticeMsgBar/index.vue  |  94 +++++---------------
 src/store/modules/noticeMsg.js         |  16 +---
 src/views/myWork/message/index.scss    |  12 ++-
 src/views/myWork/message/index.vue     |  67 ++-------------
 src/views/myWork/message/notifyMsg.vue | 113 +++++++++++++++++++++++++
 6 files changed, 157 insertions(+), 176 deletions(-)
 create mode 100644 src/views/myWork/message/notifyMsg.vue

diff --git a/src/api/cpd.js b/src/api/cpd.js
index 3c1aa098..7038c9b0 100644
--- a/src/api/cpd.js
+++ b/src/api/cpd.js
@@ -2,36 +2,11 @@ import axios from '@/utils/request'
 
 import config from '@/common/config'
 
-let base = config.getMallmBasePath();
+let base = config.getSysBasePath();
 
 
 //export const getNoticeMsg = params => { return axios.get(`${base}/mallm/cpd/index/toHandleOrdersCount`, { params: params }); };
 
-export const getNoticeMsg = params => {
-    if(process.env.CONTEXT=='mallm'){
-      return axios.get(`${base}/mallm/cpd/index/toHandleOrdersCount`, { params: params });
-    }else{
-      return new Promise((resolve, reject) => {
-          var res={
-            data:{
-              tips:{
-                isOk:true,
-                msg:'请求成功'
-              },
-              data:{
-                toPayNum:0,
-                toSendNum:0,
-                toReceNum:0,
-                toApprovaNum:0,
-                hadApprovaNum:0,
-                hadFinishNum:0,
-                hadCloseNum:0,
-                hadCancelNum:0,
-                totalNum:0,
-              }
-            }
-          }
-          resolve(res)
-      })
-    }
+export const getNoticeMsg = params => { 
+      return axios.get(`${base}/sys/notifyMsg/list`, { params: params }); 
  };
diff --git a/src/components/NoticeMsgBar/index.vue b/src/components/NoticeMsgBar/index.vue
index 110d46a0..0d3178a6 100644
--- a/src/components/NoticeMsgBar/index.vue
+++ b/src/components/NoticeMsgBar/index.vue
@@ -17,12 +17,10 @@
       </el-dropdown-menu> 
     </el-dropdown>
     -->
-    <div trigger="hover"  class="avatar-container"  @command="handleNoticeMsgClick">
-      <div class="avatar-wrapper" @click="goToMsgCenter">
-          <i class="el-icon-bell"></i>
-          <span>消息中心</span> 
-      </div> 
-    </div>
+    
+      <div class="notify-box" > 
+          <el-link @click="goToMsgCenter"><el-badge :value="unreadMsgCount"><i class="el-icon-bell"></i>消息中心</el-badge></el-link> 
+      </div>  
 </template>
 
 <script>
@@ -33,41 +31,25 @@ export default {
   computed: {
     noticeMsg() {
       return this.$store.getters.noticeMsg
+    },
+    unreadMsgCount(){
+      var msgs=this.$store.getters.noticeMsg
+      if(!msgs){
+        return 0;
+      }
+      return msgs.filter(k=>k.hadRead!='1').length;
     }
   },
   data(){
     return {
-      load:{list:false},
-      commandLinks:[
-        {command:'toPay',path:'/mallm/OrderCenter/orders/OrdersMng',query:null,params:null},
-        {command:'toSend',path:'/mallm/OrderCenter/orders/OrdersDeliver',query:null,params:null},
-        {command:'toRece',path:'/mallm/OrderCenter/orders/OrdersReceiptConfirm',query:null,params:null},
-        {command:'hadFinish',path:'/mallm/OrderCenter/orders/OrdersMng',query:null,params:null},
-        {command:'hadCancel',path:'/mallm/OrderCenter/orders/OrdersMng',query:null,params:null},
-        {command:'toApprova',path:'/mallm/OrderCenter/orders/OrdersMngBizFlow',query:null,params:null},
-        {command:'hadApprova',path:'/mallm/OrderCenter/orders/OrdersMngBizFlow',query:null,params:null},
-        {command:'hadclose',path:'/mallm/OrderCenter/orders/OrdersMng',query:null,params:null},
-      ]
+      load:{list:false}, 
     }
   },
   methods: {
-    goToMsgCenter(){
-      this.$router.push("/my/work/message");
-    },
-    doGetNoticeMsg(){
-      this.load.list=true;
-       getNoticeMsg({}).then(res=>{
-         this.load.list=false;
-           var tips = res.data.tips;
-           if(tips.isOk){
-             this.$message.success("刷新数据成功")
-             this.$store.dispatch("setNoticeMsg",res.data.data)
-           }else{
-             this.$message.error(tips.msg)
-           }
-         })
-    },
-
+    goToMsgCenter(){ 
+      this.$router.push({path:"/my/work/message"});
+    },  
+     
     doGetNoticeMsgNoTips(){
       this.load.list=true;
        getNoticeMsg({}).then(res=>{
@@ -79,29 +61,7 @@ export default {
              this.$message.error(tips.msg)
            }
          })
-    },
-    handleNoticeMsgClick(command) {
-       if(command=='doGetNoticeMsg'){
-        this.doGetNoticeMsg();
-       }else{
-         if(this.commandLinks.some(c=>c.command==command)){
-          var link=this.commandLinks.find(c=>c.command==command)
-          if(link==null || !link.path){
-            return;
-          }
-          this.$store.dispatch("FindRouter",link.path).then(res=>{
-            if(res==null){
-              this.$message.error("该链接已不存在或者您无权限访问")
-              return
-            }else{
-              this.$router.push({path:res.fullPath,query:res.query,params:res.params});
-            }
-          })
-         }else{
-
-         }
-       }
-    }
+    }, 
   },
   mounted(){
     this.doGetNoticeMsgNoTips()
@@ -110,23 +70,9 @@ export default {
 </script>
 
 <style rel="stylesheet/scss"  lang="scss" scoped>
-.avatar-container {
-  height: 50px;
-  .avatar-wrapper {
-    cursor: pointer;
-    position: relative;
-    font-size: 16px;
-    .user-avatar {
-      height: 30px;
-      border-radius: 10px;
-    }
-    .el-icon-caret-bottom {
-      position: absolute;
-      right: -20px;
-      top: 25px;
-      font-size: 12px;
-    }
-  }
+.notify-box {
+  margin-top:0px;
+  margin-right:10px;
 }
 </style>
 
diff --git a/src/store/modules/noticeMsg.js b/src/store/modules/noticeMsg.js
index 17ec7d7e..6a384e4f 100644
--- a/src/store/modules/noticeMsg.js
+++ b/src/store/modules/noticeMsg.js
@@ -1,16 +1,8 @@
 const noticeMsg = {
   state: { 
-    noticeMsg:{ 
-       toPayNum:0,
-       toSendNum:0,
-       toReceNum:0,
-       toApprovaNum:0,
-       hadApprovaNum:0,
-       hadFinishNum:0,
-       hadCloseNum:0,
-       hadCancelNum:0,
-       totalNum:0,
-    },
+    noticeMsg:[
+      /**{id:'消息编号 主键',sendUserid:'操作人id',sendUsername:'操作人名字',operTime:'操作时间',objType:'对象类型:项目-1/任务-2/产品-3/需求-4/bug-5/迭代-6/团队-7',msg:'备注-完整描述',gloNo:'全局根踪号，用于跟踪日志',branchId:'机构编号',ip:'ip地址',bizId:'业务主键编号',pbizId:'对象上级编号,项目时填项目编号，任务时填项目编号，产品时填产品编号，需求时填产品编号，bug时填产品编号，迭代时填产品编号',bizName:'对象名称',toUserid:'接收用户编号',toUsername:'接收用户名称',hadRead:'是否已读'} */
+    ],
      
   },
 
@@ -36,6 +28,6 @@ const noticeMsg = {
 var noticeMsgLocal=localStorage.getItem("noticeMsg");
 if(noticeMsgLocal){
    
-  noticeMsg.state.noticeMsg=Object.assign( noticeMsg.state.noticeMsg,JSON.parse(noticeMsgLocal))
+  noticeMsg.state.noticeMsg=JSON.parse(noticeMsgLocal)
 }
 export default noticeMsg
\ No newline at end of file
diff --git a/src/views/myWork/message/index.scss b/src/views/myWork/message/index.scss
index fd751905..44c8ddb1 100644
--- a/src/views/myWork/message/index.scss
+++ b/src/views/myWork/message/index.scss
@@ -1,8 +1,8 @@
 .message_card {
-    font-size: 24px;
+    font-size: 18px;
     font-weight: bold;
     color: #303030;
-    line-height: 54px;
+    line-height: 30px;
     .message_type {
         cursor: pointer;
         margin-right: 58px;
@@ -31,8 +31,9 @@
     background: #fff; 
     overflow: auto;
     cursor: pointer;
-    padding: 20px;
+    padding: 10px;
     .message_content_box {
+        padding:10px;
         .title {
             font-size: 18px;
             font-weight: bold;
@@ -41,6 +42,7 @@
             position: relative;
         }
         
+        
         .title::after {
             content: "";
             position: absolute;
@@ -69,4 +71,8 @@
             opacity: 0.43;
         }
     }
+
+    .message_content>.message_content_box:hover{ 
+        background-color: #eee;
+    }
 }
\ No newline at end of file
diff --git a/src/views/myWork/message/index.vue b/src/views/myWork/message/index.vue
index 25413686..dc4b7ddf 100644
--- a/src/views/myWork/message/index.vue
+++ b/src/views/myWork/message/index.vue
@@ -2,10 +2,7 @@
   <div class="m_container">
     <div class="m_content">
       <div class="message_card">  
-        <span :class="{'message_type_active' : currentType == 1}" class="message_type" @click="currentType = 1">聊天消息</span>
-        <span :class="{'message_type_active' : currentType == 2}" class="message_type" @click="currentType = 2">客服消息</span>
-        <span :class="{'message_type_active' : currentType == 3}" class="message_type " @click="currentType = 3">审批流消息</span>
-        <span :class="{'message_type_active' : currentType == 4}" class="message_type " @click="currentType = 4">任务消息</span>
+        <span :class="{'message_type_active' : currentType == 4}" class="message_type " @click="currentType = 4">站内消息</span>
         <span :class="{'message_type_active' : currentType == 5}" class="message_type " @click="currentType = 5">内部公告</span>
         <span :class="{'message_type_active' : currentType == 6}" class="message_type " @click="currentType = 6">平台公告</span>
       </div>
@@ -14,13 +11,10 @@
       </div> 
       <div class="message_content"  v-if="currentType == 2">
          <group-im :msg-class="'CSS'" key="css"></group-im>
-      </div>
-      <div class="message_content"  v-if="currentType == 3">
-         <prichat-im :msg-class="'4'" :key="4"></prichat-im>
-      </div>
+      </div> 
       
       <div class="message_content"  v-if="currentType == 4">
-         <prichat-im :msg-class="'5'" :key="5"></prichat-im>
+         <notify-msg :msg-class="'4'" :key="4"></notify-msg>
       </div>
       
       <div class="message_content" v-if="currentType == 5">
@@ -40,68 +34,23 @@ import {listArchive} from '@/api/mdp/arc/archive'
 import archive from "./archive"
 import prichatIm from "./prichatIm"
 import groupIm from "./groupIm"
+import notifyMsg from "./notifyMsg"
 
 export default {
   
   components:{
-    archive,prichatIm,groupIm
+    archive,prichatIm,groupIm,notifyMsg,
   },
   data() {
     return {
-      currentType: 1,
-      messageData: [
-        {
-          type: '审批消息',
-          time: '2022-04-26 12:00:00',
-          text: '李孝基发起申请领用办公电脑，因工作要求，自己没有电脑所以申请使用公司现有的huaWei办公电脑'
-        },
-        {
-          type: '系统消息',
-          time: '2022-04-26 12:00:00',
-          text: '李孝基发起申请领用办公电脑，因工作要求，自己没有电脑所以申请使用公司现有的huaWei办公电脑'
-        },
-        {
-          type: '审批消息',
-          time: '2022-04-26 12:00:00',
-          text: '李孝基发起申请领用办公电脑，因工作要求，自己没有电脑所以申请使用公司现有的huaWei办公电脑'
-        },
-        {
-          type: '审批消息',
-          time: '2022-04-26 12:00:00',
-          text: '李孝基发起申请领用办公电脑，因工作要求，自己没有电脑所以申请使用公司现有的huaWei办公电脑'
-        },
-        {
-          type: '审批消息',
-          time: '2022-04-26 12:00:00',
-          text: '李孝基发起申请领用办公电脑，因工作要求，自己没有电脑所以申请使用公司现有的huaWei办公电脑'
-        },
-        {
-          type: '审批消息',
-          time: '2022-04-26 12:00:00',
-          text: '李孝基发起申请领用办公电脑，因工作要求，自己没有电脑所以申请使用公司现有的huaWei办公电脑'
-        },
-        
-      ],
-
-      arcArchives:[],
+      currentType: 4,  
     }
   },
 
-  methods:{
-    searcArchives(){
-      var params={archiveType:'3'}
-      listArchive({}).then(res=>{
-        this.arcArchives=res.data.data;
-      })
-    },
-    goToArchive(item){
-      var curlDomain=window.location.protocol+"//"+window.location.host; //   返回https://mp.csdn.net
-      window.open(curlDomain+"/api/"+process.env.VERSION+"/arc/arc/archive/showArchive?id="+item.id)
-    }
+  methods:{ 
   },
 
-  mounted() {
-     this.searcArchives();
+  mounted() { 
   }
 
 }
diff --git a/src/views/myWork/message/notifyMsg.vue b/src/views/myWork/message/notifyMsg.vue
new file mode 100644
index 00000000..4c9709f8
--- /dev/null
+++ b/src/views/myWork/message/notifyMsg.vue
@@ -0,0 +1,113 @@
+<template>
+  <div class="m_container">  
+    <div class="message_content" v-if="notifyMsgs.length>0">
+      <div class="message_content_box" v-for="(item, index) in notifyMsgs" :key="index" @click="goToImPrichatMessage(item)">
+        <p class="title">{{item.sendUsername}}</p>
+        <p class="date">{{item.opTime}}</p>
+        <span class="text">{{item.msg}}</span>
+        <div class="line"></div>
+      </div>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page.sync="pageInfo.pageNum"
+        :page-size="pageInfo.pageSize"
+        layout="total, prev, pager, next"
+        :total="pageInfo.total">
+      </el-pagination>
+    </div> 
+    <div  class="message_content_box" v-else>暂无消息</div>
+  </div>
+</template>
+
+<script>  
+	import {
+		getNoticeMsg
+	} from '@/api/cpd'
+import { mapGetters } from 'vuex'
+export default {
+  props:['msgClass'],
+  computed: {
+      ...mapGetters(['userInfo']),
+
+  },
+  data() {
+    return {  
+      notifyMsgs:[],
+      
+      pageInfo:{//分页数据
+          total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
+          pageSize:10,//每页数据
+          count:false,//是否需要重新计算总记录数
+          pageNum:1,//当前页码、从1开始计算
+          orderFields:['op_time'],//排序列 如 ['sex','student_id']，必须为数据库字段
+          orderDirs:['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
+      },
+    }
+  },
+
+  methods:{
+    
+    handleSizeChange(pageSize) {
+        this.pageInfo.pageSize=pageSize;
+        this.getNoticeMsg();
+    },
+    handleCurrentChange(pageNum) {
+        this.pageInfo.pageNum = pageNum;
+        this.getNoticeMsg();
+    },
+    searchNoticeMsg(){
+      this.pageInfo.count=true;
+      this.getNoticeMsg();
+    },
+    getNoticeMsg(){
+      let params = {
+          pageSize: this.pageInfo.pageSize,
+          pageNum: this.pageInfo.pageNum,
+          total: this.pageInfo.total,
+          count:this.pageInfo.count
+      };
+      if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
+          let orderBys=[];
+          for(var i=0;i<this.pageInfo.orderFields.length;i++){
+              orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
+          }
+          params.orderBy= orderBys.join(",")
+      }  
+      params.toUserid=this.userInfo.userid
+      params.msgClass=this.msgClass||''
+      getNoticeMsg(params).then(res=>{
+        this.notifyMsgs=res.data.data;
+        this.pageInfo.total=res.data.total
+        this.pageInfo.count=false;
+      })
+    },
+    goToImPrichatMessage(item){
+      var curlDomain=window.location.protocol+"//"+window.location.host; //   返回https://mp.csdn.net
+      if(item.msgClass=='0'){
+         window.open(curlDomain+"/im/"+process.env.VERSION+"/#/prichat?groupId="+item.groupId)
+      }else if(item.msgClass=='4'){
+        this.$router.push('/mdp/workflow/ru/task/TaskListAssigneeToMe')
+      }else if(item.msgClass=='5'){
+        if(process.env.CONTEXT=='xm'){
+          this.$router.push('/xm/core/xmTask/XmMyTaskCenter')
+        }else{
+          window.open(curlDomain+"/xm/"+process.env.VERSION+"/#/xm/core/xmTask/XmMyTaskCenter")
+        } 
+      }
+      
+     
+    }
+  },
+
+  mounted() {
+     this.searchNoticeMsg();
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+@import '../common.scss';
+@import './index.scss';
+</style>
\ No newline at end of file