cnhis-design-vue 2.1.29 → 2.1.30

package/packages/multi-chat/chat/chatHeader.vue

@@ -452,11 +452,14 @@ export default {
       color: #2d7aff;
       border: 1px solid #2d7aff;
     }
-    /deep/ .avatar-logo {
+    /deep/ .avatar-wrap {
       font-size: 12px;
       position: absolute;
       left: 0;
       top: 50%;
+    }
+    /deep/ .avatar-logo {
+      font-size: 12px;
       margin-top: -15px;
     }
   }

package/packages/multi-chat/chat/chatHistory.vue

@@ -92,7 +92,7 @@ import MsgDescribe from '../components/msg-describe';
 import MsgPicture from '../components/msg-picture';
 import MsgPrescription from '../components/msg-prescription';
 import viewerOptions from './mixins/viewerOptions';
-import InfiniteScroll from 'vue-infinite-scroll';
+import InfiniteScroll from '@/directive/scroll';
 import vexutils from '@/utils/vexutils';
 import fetch from '@/utils/chatFetch';
 import { Icon, Spin } from 'ant-design-vue';
@@ -108,6 +108,7 @@ export default {
     MsgDescribe
   },
   data() {
+    this.handleInfiniteOnLoad = vexutils.debounce(this.handleInfiniteOnLoad, 200)
     return {
       msgList: [],
       historySessionId: '',
@@ -116,7 +117,8 @@ export default {
       visible: false,
       images: [],
       curAudioUrl: '',
-      lastAudioItem: null
+      lastAudioItem: null,
+      loadFinished: false
     };
   },
   props: ['params', 'i18nText'],
@@ -146,6 +148,11 @@ export default {
     },
     /* 向上滚动刷新 */
     handleInfiniteOnLoad() {
+      console.log('加载记录');
+      if (this.loadFinished) {
+        console.log('loadFinished')
+        return
+      }
       this.loading = true;
       let id = this.msgList[0] && this.msgList[0].id;
       // let params = {
@@ -169,6 +176,7 @@ export default {
           if (data.result === 'SUCCESS') {
             this.loading = false;
             if (id && data.list.length === 0) {
+              this.loadFinished = true
               return '没有更多消息了';
             }
             this.msgList = [...data.list, ...this.msgList];

package/packages/multi-chat/chat/chatMain.vue

@@ -640,6 +640,11 @@ export default {
           return;
         }
         if (openMode === 'EJECT') {
+          // 打开云his页面需要从cookie内获取最新的jsessionids
+          if (address.includes('jsessionidsFlag=1')) {
+            let jsessionids = vexutils.cookie.get('jsessionids')
+            address = address + `&jsessionids=${jsessionids}`
+          }
           this.modalShow = true;
           this.modalData = Object.assign({}, data, {
             address

package/packages/multi-chat/chat/index.vue

@@ -849,6 +849,7 @@ export default {
           this.subscribeVideoRecord();
           this.subscribeOfflineSessionStatistic();
           this.subscribeMessageRecord();
+          this.subscribeUserStatus();
         },
         errorCb: (_err, count) => {
           this.reConnention = count;
@@ -864,6 +865,16 @@ export default {
       });
     },
 
+    /* 订阅客服状态更新 */
+    subscribeUserStatus() {
+      this.stompClient.subscribe(`/topic/updateStatus/${this.serviceId}`, response => {
+        // let res = JSON.parse(response.body);
+        console.log('客服状态改变');
+        let refDom = this.$refs['scrollList-session'][0];
+        refDom?.getSessionList();
+      });
+    },
+
     /* 订阅排队列表人数及未读消息数 */
     subscribeQueueStatistic() {
       this.stompClient.subscribe(`/topic/queueStatistic/${this.queueKey}`, response => {
@@ -1089,6 +1100,15 @@ export default {
         // });
       });
     },
+    // 江苏通app接通
+    subscribeAcceptedJST(res) {
+      this.setShowVideo(true);
+      this.setShowAudio(false);
+      this.setVideoData(res);
+      this.$nextTick(() => {
+        this.setRecordId(res.recordId);
+      });
+    },
     /**
      * 视频通话记录变更
      */
@@ -1280,6 +1300,14 @@ export default {
           }
         });
     },
+    getRefuseParam() {
+      const curScrollItemParams = JSON.parse(this.curScrollItem?.params)
+      return {
+        userId: curScrollItemParams.vaa01,
+        orgId: curScrollItemParams.orgId,
+        assemblyId: this.assemblyId
+      }
+    },
     // 获取视频sdk
     getSdkAppId() {
       fetch
@@ -1296,6 +1324,7 @@ export default {
             if (vendor == 3) {
               this.initUniRTC({
                 ...data.obj,
+                vueSelf: this,
                 params: {
                   assemblyId: this.assemblyId
                 }

package/packages/multi-chat/chat/mixins/uniRTCAPI.js

@@ -2,7 +2,7 @@ import { mapGetters, mapMutations, mapActions } from '../../store/helper';
 
 export default {
   computed: {
-    ...mapGetters(['uniRTC', 'incoming', 'outing']),
+    ...mapGetters(['uniRTC', 'incoming', 'outing', 'sdkAppId']),
   },
   data() {
     return {
@@ -26,17 +26,19 @@ export default {
         let outings = [];
         for (let i = 0; i < targetList.length; i++) {
           const item = targetList[i];
-          const outing = this.uniRTC.startCall(item.deviceToken, '腾讯', 'tencent', {
-            sdkAppId: this.uniRTC.appId,
-            userId: this.userId,
+          const outing = this.uniRTC.startCall(item.deviceToken, '腾讯视频', 'tencent', {
+            sdkAppId: Number(this.sdkAppId),
+            userId: this.isServer ? this.serviceId : this.clientId,
             userSig: this.videoData.token,
-            roomId: this.videoData.roomId,
+            roomId: Number(this.videoData.roomId),
+            videoData: this.videoData
             // privateMapKey
           }, {
-            sdkAppId: this.uniRTC.appId,
+            sdkAppId: Number(this.sdkAppId),
             userId: item.username,
             userSig: item.token,
-            roomId: this.videoData.roomId,
+            roomId: Number(this.videoData.roomId),
+            videoData: this.videoData
             // privateMapKey
           });
           outings.push(outing);
@@ -47,6 +49,7 @@ export default {
     stopCall() {
       for (let i = 0; i < this.outing.length; i++) {
         const item = this.outing[i];
+        console.log('江苏省主动挂断', item);
         // 江苏省主动挂断
         this.uniRTC.stopCall(item);
       }

package/packages/multi-chat/chat/multiVideo.vue

@@ -185,6 +185,7 @@ import fetch, { qs } from '@/utils/chatFetch';
 import { Button, Modal, Popover, Tooltip } from 'ant-design-vue';
 import SvgIcon from '@/component/svg/index.vue';
 import uniRTCAPI from './mixins/uniRTCAPI';
+import { getClientDeviceToken } from '../utils/index';
 
 const videoStatus = {
   1: '未接听',
@@ -249,7 +250,10 @@ export default {
       'sessionId',
       'videoListChange',
       'videoData',
-      'videoMode'
+      'videoMode',
+      'curScrollItem',
+      'clientId',
+      'isServer'
     ]),
     serviceName() {
       return this.userInfo?.sysParams?.userName;
@@ -472,9 +476,17 @@ export default {
           // this.appendVideoMessage();
           // 江苏省
           if (this.uniRTC) {
-            const targetList = data.map?.targetList || [];
-            this.checkStatus(targetList);
-            this.startCall(targetList);
+            console.log('this.curScrollItem', this.curScrollItem);
+            const curScrollItemParams = JSON.parse(this.curScrollItem?.params)
+            getClientDeviceToken(curScrollItemParams.customerId).then(tokenRes => {
+              const targetInfo = data.map?.targetList || [];
+              if (!tokenRes) {
+                return
+              }
+              const targetList = [{deviceToken: tokenRes.deviceToken, username: targetInfo[0].username, token: targetInfo[0].token}]
+              this.checkStatus(targetList);
+              this.startCall(targetList);
+            })
           }
         } else {
           data.resultMsg && this.$message.warning(data.resultMsg);