提交 3b1c9a51 编写于 作者: zhaosheng.zhang's avatar zhaosheng.zhang

Merge branch 'release' into feature/task/diagnosis-list

...@@ -122,12 +122,16 @@ ...@@ -122,12 +122,16 @@
v-if="item.showType == 6" v-if="item.showType == 6"
class="audio-box" class="audio-box"
> >
<audio controls> <!-- <audio controls>
<source <source
:src="item.url" :src="item.url"
type="audio/mpeg" type="audio/mpeg"
> >
</audio> </audio> -->
<audio
controls
:src="item.url"
/>
</div> </div>
<!-- 问诊开始与病例模块 --> <!-- 问诊开始与病例模块 -->
<div <div
...@@ -415,7 +419,7 @@ ...@@ -415,7 +419,7 @@
created() { created() {
_this = this; _this = this;
console.log(_this); console.log(_this);
this.picakfAccId = getPicaKFAccid(); this.picakfAccId = getPicaKFAccid();
this.tid = this.$route.query.tid || ''; this.tid = this.$route.query.tid || '';
this.getFiveContentList(); this.getFiveContentList();
autoCompletionIntervalId && clearInterval(autoCompletionIntervalId); autoCompletionIntervalId && clearInterval(autoCompletionIntervalId);
...@@ -744,7 +748,7 @@ ...@@ -744,7 +748,7 @@
canPush && this.messageList.push(item); canPush && this.messageList.push(item);
} }
}); });
if (flag) { if (flag) {
this.$nextTick(() => { this.$nextTick(() => {
var element = document.querySelector('.scroll-box'); var element = document.querySelector('.scroll-box');
...@@ -891,8 +895,8 @@ ...@@ -891,8 +895,8 @@
msg.isShowErrorIcon = false; msg.isShowErrorIcon = false;
msg.isShowErrorMsg = false; // 只有在下次拉取新数据时才有可能是为ture msg.isShowErrorMsg = false; // 只有在下次拉取新数据时才有可能是为ture
msg.extData = Object.assign({}, params); // 再将发送时的数据 msg.extData = Object.assign({}, params); // 再将发送时的数据
msg.sendId = sendId; msg.sendId = sendId;
msg.sendOrReceive = true; msg.sendOrReceive = true;
msg.timestampStr = new Date().format('hh:mm'); msg.timestampStr = new Date().format('hh:mm');
msg.realTimestamp = this.realTimestamp; msg.realTimestamp = this.realTimestamp;
msg.taskLogId = this.currentTaskLogId; msg.taskLogId = this.currentTaskLogId;
...@@ -1001,4 +1005,4 @@ ...@@ -1001,4 +1005,4 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "./im.scss"; @import "./im.scss";
</style> </style>
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册