cnhis-design-vue 2.1.34 → 2.1.36

package/packages/table-filter/src/base-search-com/BaseSearch.vue

@@ -134,6 +134,9 @@
                 </a-button>
               </a-input-search>
             </li>
+            <a-button v-if="showRelatedSetting"  type="primary"  style="margin-right: 8px; margin-bottom: 8px" @click="relatedSetting" >
+              <a-icon type="setting" />
+            </a-button>
             <template v-if="rowTileBtnListTree && rowTileBtnListTree.length === 1">
               <a-button type="primary" style="margin-right: 8px; margin-bottom: 8px" @click="handleAddType(rowTileBtnListTree[0])">
                 {{ rowTileBtnListTree[0].alias || rowTileBtnListTree[0].name }}
@@ -786,6 +789,9 @@ export default create({
     },
     showBaseTabs() {
       return this.conditionType === 'keyword' && this.tabConditionList?.length && !this.visibleInlineOperateBtn && !this.isRowEditing;
+    },
+    showRelatedSetting() {
+      return !!this.relatedBaseInfo?.showSetting;
     }
   },
   data() {
@@ -1642,6 +1648,9 @@ export default create({
         console.log(error);
       }
     },
+    relatedSetting() {
+      this.$emit('relatedSetting')
+    },
     handleAddType(btn) {
       const btnObj = utils.getRowOperatorIdSetting({}, btn);
       let setData = JSON.parse(btnObj.setting);

package/src/utils/UniRTCv2.js

@@ -1,5 +1,6 @@
 import io from 'socket.io-client';
 import fetch, { qs } from './chatFetch';
+import vexutils from '../utils/vexutils';
 
 function UniRTCObject(appId, tokenProvider, vueSelf) {
 
@@ -120,6 +121,7 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 			obj.deviceToken = deviceTokens[i];
 			msg.deviceArray.push(obj);
 		}
+		console.log('设备参数', msg);
 		_socket.emit('onlineStatusQuery', JSON.stringify(msg));
 		console.log('检查设备状态[' + JSON.stringify(msg) + ']');
 	}
@@ -171,11 +173,11 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 	// 呼出被接callback
 	this.onCallAccepted = function(outing) {
 		console.log('呼出被接callback', outing);
-		let videoData = {
-			...outing.guestConfig.videoData,
-			inviteResult: 1
-		}
-		this.vueSelf.subscribeAcceptedJST(videoData)
+		// let videoData = {
+		// 	...outing.guestConfig.videoData,
+		// 	inviteResult: 1
+		// }
+		// this.vueSelf.subscribeAcceptedJST(videoData)
 	};
 
 	// 呼出被拒callback
@@ -191,10 +193,34 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 	// 设备状态检查
 	this.onStatusChecked = function(stat) {
 		console.log('设备状态检查', stat);
-		if (stat[0].status == '0') {
+		let index = stat.findIndex(item => item.status == '0')
+		let outtings =[]
+		outtings.push(...stat)
+		let targetInfo = _this.vueSelf.targetInfo
+		if (index != -1) {
+			if (_this.vueSelf.callTimer) {
+				clearInterval(_this.vueSelf.callTimer)
+				_this.vueSelf.setCallTimer(null)
+			}
 			_this.vueSelf.setCallerStatus('在线')
+			_this.startCall(stat[index].deviceToken, '腾讯视频', 'tencent', {
+				sdkAppId: Number(_this.vueSelf.sdkInfo.sdkAppId),
+				userId: _this.vueSelf.isServer ? _this.vueSelf.serviceId : _this.vueSelf.clientId,
+				userSig: _this.vueSelf.videoData.token,
+				roomId: Number(_this.vueSelf.roomId),
+				videoData: _this.vueSelf.videoData
+			}, {
+				sdkAppId: Number(_this.vueSelf.sdkInfo.sdkAppId),
+				userId: targetInfo.username,
+				userSig: targetInfo.token,
+				roomId: Number(_this.vueSelf.videoData.roomId),
+				videoData: _this.vueSelf.videoData
+				// privateMapKey
+			})
+			_this.vueSelf.setOuting( outtings)
 		} else {
 			_this.vueSelf.setCallerStatus('离线')
+			_this.vueSelf.sendVideoCall()
 		}
 	}
 
@@ -226,7 +252,6 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 		_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");
-
 		// 注册事件处理函数
 		_socket.on('connect', function() {
 			_onDeviceConnected();
@@ -316,8 +341,9 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 			// alert('设备登录失败\n' + msg);
 		}
 	}
-	// 对方拒绝接听回调
-	function customerRefuse(vuePage) {
+	const customerConfirmDebounce = vexutils.debounce(customerConfirm, 2000);
+	// 对方接听/拒绝接听回调
+	function customerConfirm(vuePage, accept) {
 		let curScrollParam = vuePage.getRefuseParam();
 		const videoData = vuePage.videoData;
 		const params = {
@@ -326,12 +352,12 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 			userId: curScrollParam.userId,
 			sessionId: videoData.sessionId,
 			recordId: videoData.recordId,
-			inviteResult: 0,
+			inviteResult: accept ? 1 : 0,
 			isExpire: ''
 		};
 		fetch.post('/chat/access/videoInviteEnter', qs.stringify(params)).then(({ data }) => {
 			if (data.result === 'SUCCESS') {
-				vuePage.$message.info('对方拒绝接听');
+				vuePage.$message.info(accept ? '接入成功' : '对方拒绝接听');
 			}
 		});
 	}
@@ -343,6 +369,8 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 
 		// 如果对方接听，就向对方发送视频配置
 		if (data.code == '0') {
+			// 接听调用接口
+			customerConfirmDebounce(_this.vueSelf, true)
 			target = data.deviceToken;
 			outing = _outing.get(target);
 			if (outing == null) {
@@ -363,7 +391,7 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 			// alert(data.msg);
 		} else if (data.code === '3001') {
 			console.log('错误号：'+data.code+'====>错误编码:'+data.msg);
-			customerRefuse(_this.vueSelf);
+			customerConfirmDebounce(_this.vueSelf, false);
 			target = data.deviceToken;
 			outing = _outing.get(target);
 			_this.stopCall(outing);

package/packages/fabric-chart/src/fabric-chart2/FabricBottom.vue

@@ -1,108 +0,0 @@
-<script>
-import fabricCommon from '../mixins/fabricCommon';
-import draw from '../mixins/draw';
-import defaultVaule from '../const/defaultVaule';
-
-export default {
-  name: 'fabric-bottom2',
-  mixins: [fabricCommon, draw],
-  props: {
-    templateData: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {};
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.init();
-    });
-  },
-  computed: {
-    girdLineStyle() {
-      return Object.assign({}, defaultVaule.borderStyle, this.templateData.borderStyle || {});
-    }
-  },
-  methods: {
-    init() {
-      this.drawBottom(this.templateData.bottom || null);
-      this.canvas.renderAll();
-    },
-    drawBottom(bottom) {
-      const { xScaleList, xScaleCell, originX, endX, endY, xCellWidth, canvasHeight } = this.propItems;
-      if (!bottom) {
-        this.canvas.add(new this.fabric.Line([0, canvasHeight - 1, endX, canvasHeight - 1], defaultVaule.borderStyle));
-        return false;
-      }
-      const height = canvasHeight - endY;
-      const list = [];
-      let flag = true; // 定义呼吸数值显示为靠上还是靠下
-      // 数据列表
-      xScaleList.forEach((item, index) => {
-        const left = originX + index * xCellWidth;
-        let text = '';
-        bottom.list.forEach((v, i) => {
-          const time = new Date(v.time).getTime();
-          if (time >= item && time < item + xScaleCell) text = v.value;
-        });
-        const style = flag
-          ? {
-              top: -(height / 2 - 10)
-            }
-          : {
-              top: height / 2 - 10
-            };
-        if (text) flag = !flag;
-        const group = this.drawTextGroup(
-          {
-            width: xCellWidth,
-            height,
-            ...defaultVaule.rectStyle
-          },
-          Object.assign(
-            {},
-            {
-              text: String(text),
-              ...defaultVaule.textStyle,
-              ...top.textGroupStyle
-            },
-            text ? style : {}
-          ),
-          {
-            left,
-            top: endY
-          }
-        );
-        list.push(group);
-      });
-      // 底部外框和标题名称
-      const titleGroup = this.drawTextGroup(
-        {
-          width: endX,
-          height: height - 1,
-          ...defaultVaule.rectStyle
-        },
-        {
-          text: String(bottom.name + bottom.unit),
-          ...defaultVaule.textStyle,
-          ...top.textGroupStyle,
-          left: -((endX - originX) / 2)
-        },
-        {
-          left: 0,
-          top: endY
-        }
-      );
-      list.push(titleGroup);
-      const group = list.length > 0 ? new this.fabric.Group([...list], { ...defaultVaule.style }) : null;
-      group && group.sendToBack(); // 向下跳底层
-      group && this.canvas.add(group);
-    }
-  },
-  render(h) {
-    return this.$slots.default ? h('div', this.$slots.default) : undefined;
-  }
-};
-</script>

package/packages/fabric-chart/src/fabric-chart2/FabricCanvas.vue

@@ -1,181 +0,0 @@
-<template>
-  <div>
-    <canvas :id="id"></canvas>
-    <slot></slot>
-  </div>
-</template>
-
-<script>
-import { fabric } from 'fabric';
-
-export default {
-  name: 'FabricCanvas2',
-  props: {
-    id: {
-      type: String,
-      required: true
-    },
-    templateData: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-      canvas: null,
-      type: 'canvas',
-      canvasAttr: {
-        selectable: false,
-        evented: false,
-        selection: false,
-        containerClass: 'c-fabric-canvas-container',
-        fireRightClick: true
-      },
-      fabric: fabric
-    };
-  },
-  provide() {
-    return {
-      $canvas: () => this.canvas,
-      $group: () => null,
-      $fabric: () => fabric,
-      $propItems: () => {
-        return {
-          type: this.templateData.type,
-          endX: this.endX,
-          endY: this.endY,
-          originX: this.originX,
-          originY: this.originY,
-          gridYNumber: this.gridYNumber,
-          gridXNumber: this.gridXNumber,
-          canvasWidth: this.canvasWidth,
-          canvasHeight: this.canvasHeight,
-          xCellWidth: this.xCellWidth,
-          yCellHeight: this.yCellHeight,
-          table: { ...this.templateData.table },
-          xScaleList: this.xScaleList,
-          xScaleCell: this.xScaleCell,
-          breatheYCell: this.breatheYCell,
-          pulseYCell: this.pulseYCell,
-          centigradeYCell: this.centigradeYCell,
-          eventStyle: this.eventStyle
-        };
-      }
-    };
-  },
-  computed: {
-    canvasWidth() {
-      // 画布宽度
-      return this.templateData.canvasWidth;
-    },
-    canvasHeight() {
-      // 画布高度
-      return this.templateData.canvasHeight;
-    },
-    gridXNumber() {
-      // 网格水平方向总数    如果设置了默认值就直接取用
-      return this.templateData.table.mainXCell * this.templateData.table.subXCell;
-    },
-    gridYNumber() {
-      // 网格垂直方向总数
-      return this.templateData.table.mainYCell * this.templateData.table.subYCell;
-    },
-    originX() {
-      const originX = this.templateData.top.titleWidth;
-      const residue = (this.endX - originX) % this.gridXNumber;
-      return originX + residue;
-    },
-    originY() {
-      // 顶部列表高度 网格不需要的高度放到顶部始终存在的时间那一行，因为底部不一定存在列表
-      const { top } = this.templateData;
-      const dateHeight = top.date?.height || 0;
-      const dayHeight = top.dayHeight || 0;
-      const xScaleHeight = top.xScalevalue.height || 15;
-      const topHeight = dateHeight + dayHeight + xScaleHeight;
-      const residue = (this.endY - topHeight) % this.gridYNumber;
-      return topHeight + residue;
-    },
-    endX() {
-      // 网格区域水平方向最大坐标值, 也是整个画布右侧列表坐标起始值，网格右下角x轴坐标值
-      if (!this.templateData.right) return this.templateData.canvasWidth;
-      const endWidth = this.templateData.right.width || 50;
-      return this.templateData.canvasWidth - endWidth;
-    },
-    endY() {
-      // 画布高度 - 底部列表高度 ，网格右下角y轴坐标值
-      if (!this.templateData.bottom) return this.templateData.canvasHeight;
-      const endHeight = this.templateData.bottom.height || 30;
-      return this.canvasHeight - endHeight;
-    },
-    xCellWidth() {
-      // 水平方向网格宽度
-      return (this.endX - this.originX) / this.gridXNumber;
-    },
-    yCellHeight() {
-      // 垂直方向网格宽度
-      return (this.endY - this.originY) / this.gridYNumber;
-    },
-    // 转换为时间戳的x轴刻度list
-    xScaleList() {
-      const dateList = this.templateData.top.date.list;
-      const dayList = this.templateData.top.xScalevalue.list;
-      const timeList = dateList.map(item => {
-        return dayList.map(v => {
-          return new Date(`${item} ${v}:00`).getTime();
-        })
-      })
-      return timeList.flat();
-    },
-    // x轴每格的时间，比如4小时，不能刻度list长度值除以总格子数计算，因为有可能刻度比较短，不能满足所有的格子
-    xScaleCell() {
-      return this.xScaleList[1] - this.xScaleList[0]; // 返回时间戳
-    },
-    // y轴每一次的呼吸的高度值
-    breatheYCell() {
-      const leftYScalevalue = this.templateData.left.leftYScalevalue;
-      const list = leftYScalevalue.find(v => v.type === 'breathe').list;
-      return list ? this.yCellHeight / ((parseInt(list[1]) - parseInt(list[0])) / this.templateData.left.spaceGridNumber) : 0;
-    },
-    // y轴每mmHg的脉搏/心率的高度值
-    pulseYCell() {
-      const leftYScalevalue = this.templateData.left.leftYScalevalue;
-      const list = leftYScalevalue.find(v => v.type === 'pulse').list;
-      return this.yCellHeight / ((parseInt(list[1]) - parseInt(list[0])) / this.templateData.left.spaceGridNumber);
-    },
-    // y轴每摄氏度的高度值
-    centigradeYCell() {
-      const { leftYScalevalue, spaceGridNumber } = this.templateData.left;
-      const list = leftYScalevalue.find(v => v.type === 'centigrade').list;
-      return this.yCellHeight / ((parseInt(list[1]) - parseInt(list[0])) / spaceGridNumber);
-    },
-    eventStyle() {
-      return this.templateData.table?.eventStyle || { selectable: true, evented: true };
-    }
-  },
-  mounted() {
-    this.init();
-  },
-  methods: {
-    init() {
-      this.canvas = new this.fabric.Canvas('c-fabric-canvas', {
-        width: this.templateData.canvasWidth,
-        height: this.templateData.canvasHeight,
-        //   margin: [this.templateData.margin.top, this.templateData.margin.right, this.templateData.margin.bottom, this.templateData.margin.left],
-        ...this.canvasAttr
-      });
-    },
-    toDataURL(option) {
-      return this.canvas.toDataURL(option);
-    },
-    renderCanvas() {
-      this.canvas.clear();
-      // this.canvas.renderCanvas();
-    }
-  },
-  beforeDestroy() {
-    this.canvas.dispose();
-  }
-};
-</script>
-
-<style></style>