Merge branch 'fix_foton_20240408' into 'master'

国内标准详情页 过程稿件改为两行显示文件名

See merge request laws-foton-slrs/foton-laws-system-front!175
This commit is contained in:
王晓勇
2024-04-12 09:50:38 +00:00
2 changed files with 8 additions and 8 deletions
@@ -133,10 +133,11 @@
<el-popover trigger="hover" placement="top"> <el-popover trigger="hover" placement="top">
{{ scope.row.institutionName }} {{ scope.row.institutionName }}
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<p v-if="!scope.row.institutionName || scope.row.institutionName.length<15"> <!-- <p v-if="!scope.row.institutionName || scope.row.institutionName.length<15">
{{ scope.row.institutionName }} {{ scope.row.institutionName }}
</p> </p>
<p v-else> {{ scope.row.institutionName.substring(0, 15) }}...</p> <p v-else> {{ scope.row.institutionName.substring(0, 15) }}...</p>-->
<p> {{ scope.row.institutionName }}</p>
</div> </div>
</el-popover> </el-popover>
</template> </template>
@@ -1844,9 +1844,6 @@ export default {
filters: { filters: {
ellipsis(value) { ellipsis(value) {
if (!value) return '' if (!value) return ''
if (value.length > 12) {
return value.slice(0, 12) + '...'
}
return value return value
}, },
ellipsis50(value) { ellipsis50(value) {
@@ -4227,9 +4224,11 @@ export default {
a { a {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
width: calc(~'100% - 40px'); width: calc(~'100% - 40px');
white-space: nowrap; white-space: break-spaces;
display: block;
} }
} }
@@ -4623,7 +4622,7 @@ export default {
width: calc(~'100% - 225px'); width: calc(~'100% - 225px');
& > .files-title { & > .files-title {
width: calc(~'100% - 120px'); width: calc(~'100% - 10px');
//报批稿撑开 //报批稿撑开
//min-height: 50px; //min-height: 50px;
//line-height: 50px; //line-height: 50px;