Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -9,10 +9,14 @@
|
|||||||
</div>
|
</div>
|
||||||
<ul>
|
<ul>
|
||||||
<li v-for="item in toDoTaskList" :key="item.id" class="time-title">
|
<li v-for="item in toDoTaskList" :key="item.id" class="time-title">
|
||||||
<div style="height: 30px">
|
<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-if="item.prcName.length<24"
|
||||||
<span @click="dealWith(item)" v-else style="line-height: 30px; font-size: 13px;">{{ item.prcName.substring(0,25)+'...' }}</span>
|
style="line-height: 30px; font-size: 13px;">{{ item.prcName }}</span>
|
||||||
</div>
|
<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>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user