Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
zhutianqi
2021-12-24 10:06:42 +08:00
@@ -9,10 +9,14 @@
</div>
<ul>
<li v-for="item in toDoTaskList" :key="item.id" class="time-title">
<div style="height: 30px">
<span @click="dealWith(item)" v-if="item.prcName.length<25" style="line-height: 30px; font-size: 13px;">{{ item.prcName }}</span>
<span @click="dealWith(item)" v-else style="line-height: 30px; font-size: 13px;">{{ item.prcName.substring(0,25)+'...' }}</span>
</div>
<div style="height: 30px">
<span @click="dealWith(item)" v-if="item.prcName.length<24"
style="line-height: 30px; font-size: 13px;">{{ item.prcName }}</span>
<el-tooltip class="item" effect="dark" :content="item.prcName" placement="left" v-else>
<span @click="dealWith(item)"
style="line-height: 30px; font-size: 13px;">{{ item.prcName.substring(0, 24) + '...' }}</span>
</el-tooltip>
</div>
</li>
</ul>
</div>