Browse Source

日志表格不固定高度

zhongxiaoyu 3 years ago
parent
commit
e4860d030c
2 changed files with 7 additions and 4 deletions
  1. 4 1
      src/utils/request.js
  2. 3 3
      src/views/dashboard/components/journal.vue

+ 4 - 1
src/utils/request.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-06 09:45:17
- * @LastEditTime: 2022-04-21 16:06:47
+ * @LastEditTime: 2022-04-21 17:36:42
  * @LastEditors: your name
  * @Description: axios封装
  */
@@ -108,6 +108,9 @@ service.interceptors.response.use(
           config.data.OperatorId = (res.returnData.UserId ?? '').toString()
           config.data.LogId = (res.returnData.LogId ?? '').toString()
           config.data.UserName = (res.returnData.UserName ?? '').toString()
+        } else {
+          const loginData = typeof data === 'string' ? JSON.parse(data) : data
+          config.data.UserName = loginData.LoginName.toString()
         }
       } else {
         config.data.OperatorId = getUserId()

+ 3 - 3
src/views/dashboard/components/journal.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-25 10:42:02
- * @LastEditTime: 2021-11-25 17:19:06
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-04-21 17:53:49
+ * @LastEditors: your name
  * @Description: 个人日志
  * @FilePath: \Foshan4A2.0\src\views\dashboard\components\journal.vue
 -->
@@ -19,7 +19,7 @@
       </div>
     </div>
     <div class="journal-content">
-      <el-table :data="tableData" :row-class-name="tableRowClassName" class="table scrollbar" height="450" style="width: 100%">
+      <el-table :data="tableData" :row-class-name="tableRowClassName" class="table" style="width: 100%">
         <el-table-column label="用户名">
           <template slot-scope="scope">
             <div :class="scope.row.isSocket ? 'red' : ''">{{ scope.row.UserName ? scope.row.UserName : "暂无数据" }}</div>