cnhis-design-vue 2.1.29 → 2.1.30

package/packages/table-filter/src/const/dataOptions.js

@@ -1,43 +1,43 @@
-export const dataOptions = {
-  dateTeam0: [
-    { con: 'TODAY', title: '1.1.4.37', name: '今天' },
-    { con: 'TOMORROW', title: '1.1.4.38', name: '明天' },
-    { con: 'YESTERDAY', title: '1.1.4.39', name: '昨天' },
-    { con: 'THIS_WEEK', title: '1.1.4.40', name: '本周' },
-    { con: 'NEXT_WEEK', title: '1.1.4.41', name: '下周' },
-    { con: 'UP_WEEK', title: '1.1.4.42', name: '上周' },
-    { con: 'THIS_MONTH', title: '1.1.4.43', name: '本月' },
-    { con: 'NEXT_MONTH', title: '1.1.4.44', name: '下月' },
-    { con: 'UP_MONTH', title: '1.1.4.45', name: '上月' },
-    { con: 'THIS_SEASON', title: '1.1.4.46', name: '本季度' },
-    { con: 'NEXT_SEASON', title: '1.1.4.47', name: '下季度' },
-    { con: 'UP_SEASON', title: '1.1.4.48', name: '上季度' },
-    { con: 'THIS_YEAR', title: '1.1.4.49', name: '本年' },
-    { con: 'NEXT_YEAR', title: '1.1.4.50', name: '下年' },
-    { con: 'UP_YEAR', title: '1.1.4.51', name: '上年' }
-  ],
-  dateTeam2: [
-    { con: 'TODAY', title: '1.1.4.37', name: '今天' },
-    { con: 'YESTERDAY', title: '1.1.4.39', name: '昨天' },
-    { con: 'THIS_WEEK', title: '1.1.4.40', name: '本周' },
-    { con: 'UP_WEEK', title: '1.1.4.42', name: '上周' },
-    { con: 'THIS_MONTH', title: '1.1.4.43', name: '本月' },
-    { con: 'UP_MONTH', title: '1.1.4.45', name: '上月' },
-    { con: 'THIS_SEASON', title: '1.1.4.46', name: '本季度' },
-    { con: 'UP_SEASON', title: '1.1.4.48', name: '上季度' },
-    { con: 'THIS_YEAR', title: '1.1.4.49', name: '本年' },
-    { con: 'UP_YEAR', title: '1.1.4.51', name: '上年' }
-  ],
-  dateTeam3: [
-    { con: 'TODAY', title: '1.1.4.37', name: '今天' },
-    { con: 'TOMORROW', title: '1.1.4.38', name: '明天' },
-    { con: 'THIS_WEEK', title: '1.1.4.40', name: '本周' },
-    { con: 'NEXT_WEEK', title: '1.1.4.41', name: '下周' },
-    { con: 'THIS_MONTH', title: '1.1.4.43', name: '本月' },
-    { con: 'NEXT_MONTH', title: '1.1.4.44', name: '下月' },
-    { con: 'THIS_SEASON', title: '1.1.4.46', name: '本季度' },
-    { con: 'NEXT_SEASON', title: '1.1.4.47', name: '下季度' },
-    { con: 'THIS_YEAR', title: '1.1.4.49', name: '本年' },
-    { con: 'NEXT_YEAR', title: '1.1.4.50', name: '下年' }
-  ]
-};
+export const dataOptions = {
+  dateTeam0: [
+    { con: 'TODAY', title: '1.1.4.37', name: '今天' },
+    { con: 'TOMORROW', title: '1.1.4.38', name: '明天' },
+    { con: 'YESTERDAY', title: '1.1.4.39', name: '昨天' },
+    { con: 'THIS_WEEK', title: '1.1.4.40', name: '本周' },
+    { con: 'NEXT_WEEK', title: '1.1.4.41', name: '下周' },
+    { con: 'UP_WEEK', title: '1.1.4.42', name: '上周' },
+    { con: 'THIS_MONTH', title: '1.1.4.43', name: '本月' },
+    { con: 'NEXT_MONTH', title: '1.1.4.44', name: '下月' },
+    { con: 'UP_MONTH', title: '1.1.4.45', name: '上月' },
+    { con: 'THIS_SEASON', title: '1.1.4.46', name: '本季度' },
+    { con: 'NEXT_SEASON', title: '1.1.4.47', name: '下季度' },
+    { con: 'UP_SEASON', title: '1.1.4.48', name: '上季度' },
+    { con: 'THIS_YEAR', title: '1.1.4.49', name: '本年' },
+    { con: 'NEXT_YEAR', title: '1.1.4.50', name: '下年' },
+    { con: 'UP_YEAR', title: '1.1.4.51', name: '上年' }
+  ],
+  dateTeam2: [
+    { con: 'TODAY', title: '1.1.4.37', name: '今天' },
+    { con: 'YESTERDAY', title: '1.1.4.39', name: '昨天' },
+    { con: 'THIS_WEEK', title: '1.1.4.40', name: '本周' },
+    { con: 'UP_WEEK', title: '1.1.4.42', name: '上周' },
+    { con: 'THIS_MONTH', title: '1.1.4.43', name: '本月' },
+    { con: 'UP_MONTH', title: '1.1.4.45', name: '上月' },
+    { con: 'THIS_SEASON', title: '1.1.4.46', name: '本季度' },
+    { con: 'UP_SEASON', title: '1.1.4.48', name: '上季度' },
+    { con: 'THIS_YEAR', title: '1.1.4.49', name: '本年' },
+    { con: 'UP_YEAR', title: '1.1.4.51', name: '上年' }
+  ],
+  dateTeam3: [
+    { con: 'TODAY', title: '1.1.4.37', name: '今天' },
+    { con: 'TOMORROW', title: '1.1.4.38', name: '明天' },
+    { con: 'THIS_WEEK', title: '1.1.4.40', name: '本周' },
+    { con: 'NEXT_WEEK', title: '1.1.4.41', name: '下周' },
+    { con: 'THIS_MONTH', title: '1.1.4.43', name: '本月' },
+    { con: 'NEXT_MONTH', title: '1.1.4.44', name: '下月' },
+    { con: 'THIS_SEASON', title: '1.1.4.46', name: '本季度' },
+    { con: 'NEXT_SEASON', title: '1.1.4.47', name: '下季度' },
+    { con: 'THIS_YEAR', title: '1.1.4.49', name: '本年' },
+    { con: 'NEXT_YEAR', title: '1.1.4.50', name: '下年' }
+  ]
+};

package/src/directive/preventReClick.js

@@ -1,12 +1,12 @@
-export default {
-  inserted(el, binding) {
-    el.addEventListener("click", () => {
-      if (!el.disabled) {
-        el.disabled = true;
-        setTimeout(() => {
-          el.disabled = false;
-        }, binding.value || 1000);
-      }
-    });
-  }
-}
+export default {
+  inserted(el, binding) {
+    el.addEventListener("click", () => {
+      if (!el.disabled) {
+        el.disabled = true;
+        setTimeout(() => {
+          el.disabled = false;
+        }, binding.value || 1000);
+      }
+    });
+  }
+}

package/src/utils/UniRTCv2.js

@@ -1,6 +1,7 @@
 import io from 'socket.io-client';
+import fetch, { qs } from './chatFetch';
 
-function UniRTCObject(appId, tokenProvider) {
+function UniRTCObject(appId, tokenProvider, vueSelf) {
 
 	if (appId == null || appId == '') {
 		console.error('参数appId必填');
@@ -29,6 +30,7 @@ function UniRTCObject(appId, tokenProvider) {
 	this.clientType = '1';
 	this.client = null;
 	this.localStream = null;
+	this.vueSelf = vueSelf;
 	// ***********************API*********************//
 
 	// 我方接听API
@@ -130,6 +132,7 @@ function UniRTCObject(appId, tokenProvider) {
 		msg.targetDeviceToken = targetDeviceToken;
 		msg.brand = brand;
 		msg.message = message;
+		console.log('发送videoHangUp事件');
 		_socket.emit('videoHangUp', JSON.stringify(msg));
 		console.log('进行挂断[' + JSON.stringify(msg) + ']');
 	}
@@ -138,47 +141,51 @@ function UniRTCObject(appId, tokenProvider) {
 
 	// 登录成功callback
 	this.onLogined = function() {
-
 	}
 
 	// 呼入进来callback
 	this.onCallComing = function(incoming) {
-
+		console.log('呼入进来callback', incoming);
 	};
 
 	// 通话就绪callback
 	this.onCallReady = function(incoming) {
-
+		console.log('通话就绪callback', incoming);
 	};
 
 	// 开始呼叫callback
 	this.onCallStarted = function(outing) {
-
+		console.log('开始呼叫callback', outing);
 	};
 
 	// 停止呼叫callback
 	this.onCallStoped = function(outing) {
-
+		console.log('停止呼叫callback', outing);
 	};
 
 	// 呼出反馈callback
 	this.onCallReplied = function(outing) {
-
+		console.log('呼出反馈callback', outing);
 	};
 
 	// 呼出被接callback
 	this.onCallAccepted = function(outing) {
-
+		console.log('呼出被接callback', outing);
+		let videoData = {
+			...outing.guestConfig.videoData,
+			inviteResult: 1
+		}
+		this.vueSelf.subscribeAcceptedJST(videoData)
 	};
 
 	// 呼出被拒callback
 	this.onCallRefused = function(outing) {
-
+		console.log('呼出被拒callback', outing);
 	};
 
 	// 呼出超时callback
 	this.onCallTimeout = function(outing) {
-
+		console.log('呼出超时callback', outing);
 	};
 
 	// 设备状态检查
@@ -210,7 +217,8 @@ function UniRTCObject(appId, tokenProvider) {
 
 	function _connect() {
 		// 创建链接
-		_socket = io.connect('https://video.jsehealth.com:9999');
+		// _socket = io.connect('https://video.jsehealth.com:9999'); // 生产环境
+		_socket = io.connect('https://t.jsehealth.com:9997'); // 测试环境
 		// _socket = io.connect('http://127.0.0.1:9090');
 		// _socket = io.connect("https://dli.xikang.com:9999");
 
@@ -218,7 +226,7 @@ function UniRTCObject(appId, tokenProvider) {
 		_socket.on('connect', function() {
 			_onDeviceConnected();
 			_socket.on('registerReturn', _onDeviceRegistered);
-			_socket.on('deviceLoginReturn', _onDeviceLogined);
+			_socket.on('deviceLoginReturn', _onDeviceLogined); 
 			_socket.on('videoCallNotification', _onCallComing);
 			_socket.on('videoCallReturn', _onCallReplied);
 			_socket.on('videoInfoNotification', _onCallReady);
@@ -303,7 +311,25 @@ function UniRTCObject(appId, tokenProvider) {
 			// alert('设备登录失败\n' + msg);
 		}
 	}
-
+	// 对方拒绝接听回调
+	function customerRefuse(vuePage) {
+		let curScrollParam = vuePage.getRefuseParam();
+		const videoData = vuePage.videoData;
+		const params = {
+			assemblyId: curScrollParam.assemblyId,
+			orgId: curScrollParam.orgId,
+			userId: curScrollParam.userId,
+			sessionId: videoData.sessionId,
+			recordId: videoData.recordId,
+			inviteResult: 0,
+			isExpire: ''
+		};
+		fetch.post('/chat/access/videoInviteEnter', qs.stringify(params)).then(({ data }) => {
+			if (data.result === 'SUCCESS') {
+				vuePage.$message.info('对方拒绝接听');
+			}
+		});
+	}
 	// 呼出反馈handler
 	function _onCallReplied(msg) {
 		console.log('对方反馈[' + msg + ']');
@@ -330,6 +356,13 @@ function UniRTCObject(appId, tokenProvider) {
 		} else if (data.code.substring(0, 1) == '1') {
 			console.error(msg);
 			// alert(data.msg);
+		} else if (data.code === '3001') {
+			console.log('错误号：'+data.code+'====>错误编码:'+data.msg);
+			customerRefuse(_this.vueSelf);
+			target = data.deviceToken;
+			outing = _outing.get(target);
+			_this.stopCall(outing);
+			_this.onCallRefused(outing);
 		} else {
 			console.log('错误号：'+data.code+'====>错误编码:'+data.msg);
 			target = data.deviceToken;