提交 b20ec1ab 编写于 作者: guangjun.yang's avatar guangjun.yang

高度有问题

上级 1b02407b
......@@ -3,7 +3,7 @@ const vueFilter = {
if (!value) return '';
return new Date(value).format("yyyy-MM-dd hh:mm:ss");
},
continueTimesFilter: (value) => {
continueTimesFilter: (value, flag) => {
if (!value) return '';
var duration = value / 1000;
var s = Math.floor(duration % 60).toString();
......@@ -18,11 +18,15 @@ const vueFilter = {
if (h.length < 2) {
h = '0' + h;
}
if (flag) {
return h + ':' + m + ':' + s;
} else {
if (parseInt(h) >= 1) {
return h + '时' + m + '分' + s + '秒';
} else {
return m + '分' + s + '秒';
}
}
},
liveFilter: (value) => {
if (value.liveStatus == 1) {
......
......@@ -8,7 +8,8 @@
<span @click="fetchOneTask">再来一个</span>
</div>
<p class="c-num">当前等待会话:{{this.sessionListData.waitingTaskCount}}</p>
<ul id="sessionListId" class="session-list" :style="{'height': containerHeight + 'px'}">
<!-- <ul id="sessionListId" class="session-list" :style="{'height': containerHeight + 'px'}"> -->
<ul id="sessionListId" class="session-list">
<li
class="item"
:class="{'current': currentTaskLogId == session.taskLogId}"
......@@ -51,10 +52,14 @@
<!-- <span class="close-btn">结束会话</span> -->
</section>
<p class="refreshText"></p>
<section
<!-- <section
id="msgContentId"
class="msg-content scroll-box"
:style="{'height': (containerHeight - 35) + 'px'}"
> -->
<section
id="msgContentId"
class="msg-content scroll-box"
>
<article
v-for="(item, index) in messageList"
......@@ -310,8 +315,8 @@ export default {
_this.p_getElm('screenSet').style.height =
_this.containerHeight - 152 + "px";
console.log('_this.containerHeight', _this.containerHeight);
_this.p_getElm("sessionListId").style.height = "1000px";
_this.p_getElm("msgContentId").style.height = "965px";
_this.p_getElm("sessionListId").style.height = _this.containerHeight + 'px';
_this.p_getElm("msgContentId").style.height = _this.containerHeight - 35 + 'px';
});
},
......
......@@ -10,7 +10,7 @@
<el-table-column prop="userName" label="用户名" min-width="50" align="center"></el-table-column>
<el-table-column prop="waitTime" label="等待时间" min-width="100" align="center">
<template slot-scope="scope">
<span>{{scope.row.waitTime * 1000 | continueTimesFilter}}</span>
<span>{{scope.row.waitTime * 1000 | continueTimesFilter(true)}}</span>
</template>
</el-table-column>
<el-table-column prop="idType" label="用户类型" min-width="50" align="center">
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册