sunyanqiang 3 سال پیش
والد
کامیت
1ca05ef46c
3فایلهای تغییر یافته به همراه38 افزوده شده و 24 حذف شده
  1. 2 2
      src/assets/styles/global.css
  2. 18 16
      src/views/PrintsLog/printlog/index.vue
  3. 18 6
      src/views/PrintsManage/manage/index.vue

+ 2 - 2
src/assets/styles/global.css

@@ -927,12 +927,12 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
   display: none;
 }
 
-/* .el-tooltip__popper {
+.el-tooltip__popper {
   width: 300px !important;
   height: auto !important;
   letter-spacing: .2em;
   text-indent: 2em;
-} */
+}
 
 /* 主页左侧导航栏 */
 .nest-menu li {

+ 18 - 16
src/views/PrintsLog/printlog/index.vue

@@ -105,12 +105,24 @@
       <el-table-column label="序号" align="center" type="index" />
       <!-- <el-table-column label="现文件路径" align="center" prop="id" />
       <el-table-column label="打印id" align="center" prop="printId" />-->
-      <el-table-column
-        label="打印文件名称"
-        align="center"
-        prop="printName"
-        show-overflow-tooltip
-      />
+      <el-table-column label="打印文件名称" align="center" prop="printName">
+        <template slot-scope="scope">
+          <el-tooltip :content="scope.row.printName" placement="top">
+            <div
+              style="
+                overflow: hidden;
+                display: -webkit-box;
+                text-overflow: ellipsis;
+                -webkit-line-clamp: 2;
+                -webkit-box-orient: vertical;
+                white-space: normal;
+              "
+            >
+              {{ scope.row.printName }}
+            </div>
+          </el-tooltip>
+        </template>
+      </el-table-column>
       <el-table-column label="打印份数" align="center" prop="printNumber" />
       <!-- <el-table-column
         label="是否需要归还(0否1是)"
@@ -896,14 +908,4 @@ export default {
 ::v-deep .el-form-item__content {
   width: 200px;
 }
-::v-deep .el-tooltip__popper {
-  width: 600px;
-  word-break: break-all;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2; /* 这里是超出几行省略 */
-  overflow: hidden;
-  background: red !important;
-}
 </style>

+ 18 - 6
src/views/PrintsManage/manage/index.vue

@@ -93,12 +93,24 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="打印回复信息" align="center" prop="id" /> -->
       <el-table-column label="序号" align="center" type="index" />
-      <el-table-column
-        label="文件名称"
-        align="center"
-        prop="name"
-        show-overflow-tooltip
-      />
+      <el-table-column label="文件名称" align="center" prop="name">
+        <template slot-scope="scope">
+          <el-tooltip :content="scope.row.name" placement="top">
+            <div
+              style="
+                overflow: hidden;
+                display: -webkit-box;
+                text-overflow: ellipsis;
+                -webkit-line-clamp: 2;
+                -webkit-box-orient: vertical;
+                white-space: normal;
+              "
+            >
+              {{ scope.row.name }}
+            </div>
+          </el-tooltip>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="路径" align="center" prop="file" /> -->
       <el-table-column label="类型" align="center" prop="type" />
       <el-table-column label="是否彩打" align="center" prop="isPrintColor">