Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -65,9 +65,9 @@
|
||||
<template v-slot:oldTextDetail="{text, record}">
|
||||
<a-tooltip overlay-class-name="tooltip-style">
|
||||
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
||||
<div class="table-text can-click-table-text" v-if="text || text === 0" @click="toDetailPage('old', record)">{{
|
||||
text
|
||||
}}
|
||||
<!-- can-click-table-text @click="toDetailPage('old', record)"-->
|
||||
<div class="table-text" v-if="text || text === 0">
|
||||
{{ text }}
|
||||
</div>
|
||||
<div v-else class="table-text">{{ global.emptyLine }}</div>
|
||||
</a-tooltip>
|
||||
@@ -77,9 +77,9 @@
|
||||
<template v-slot:newTextDetail="{text, record}">
|
||||
<a-tooltip overlay-class-name="tooltip-style">
|
||||
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
||||
<div class="table-text can-click-table-text" v-if="text || text === 0" @click="toDetailPage('new', record)">{{
|
||||
text
|
||||
}}
|
||||
<!-- can-click-table-text @click="toDetailPage('new', record)"-->
|
||||
<div class="table-text" v-if="text || text === 0">
|
||||
{{ text }}
|
||||
</div>
|
||||
<div v-else class="table-text">{{ global.emptyLine }}</div>
|
||||
</a-tooltip>
|
||||
|
||||
@@ -848,6 +848,6 @@ export default {
|
||||
/*z-index: 10;*/
|
||||
}
|
||||
.iconClass{
|
||||
font-size: 18px;
|
||||
font-size: 19px;
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user