Merge branch 'dev'

src/views/operation/exceptionMessage.vue

@@ -148,8 +148,22 @@ export default {
           key: 'statusStr'
           key: 'statusStr'
         },
         },
         {
         {
-          label: '异常信息',
-          key: 'errorMsg'
+          label: '异常信息2',
+          key: 'errorMsg',
+          minWidth: 200,
+          render: (row) => (
+            <el-tooltip
+              placement="top"
+              effect="dark"
+              open-delay={300}>
+              <div
+                slot="content"
+                style="max-width: 500px; word-break: break-all; white-space: normal;">
+                {row.errorMsg || '-'}
+              </div>
+              <div class="cell-ellipsis">{row.errorMsg || '-'}</div>
+            </el-tooltip>
+          )
         },
         },
         {
         {
           label: '创建时间',
           label: '创建时间',
@@ -348,6 +362,13 @@ export default {
       background-color: #f8f8f9;
       background-color: #f8f8f9;
     }
     }
 
 
+    .cell-ellipsis {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      width: 100%;
+    }
+
     .el-input-group__append {
     .el-input-group__append {
       padding-left: 0;
       padding-left: 0;
     }
     }