FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-09-29 17:19:48 +08:00
parent d9ff2f9cca b5be4a9b92
commit 16d2a9ab9e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/mechanismManage/index.vue
+2 -2
View File
@@ -101,7 +101,7 @@
<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 ==null || 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>
@@ -116,7 +116,7 @@
<el-popover trigger="hover" placement="top"> <el-popover trigger="hover" placement="top">
{{scope.row.NameList}} {{scope.row.NameList}}
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<p v-if="scope.row.institutionName ==null ||scope.row.NameList.length<15"> <p v-if="!scope.row.institutionName ||scope.row.NameList.length<15">
{{scope.row.NameList}} {{scope.row.NameList}}
</p> </p>
<p v-else> {{scope.row.NameList.substring(0,15)}}...</p> <p v-else> {{scope.row.NameList.substring(0,15)}}...</p>