From 723e2db9c585cd4b54ac3c8d14fd457d4699b51a Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 6 Feb 2023 12:22:39 +0800
Subject: [PATCH] shouyedaibanyangshitioazheng

---
 src/utils/request.js                          |  2 +-
 .../home/widgets/components/eventlist.vue     | 21 ++++++++++++++++---
 src/views/login/components/passwordForm.vue   |  2 ++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 4ad14f80..be2f1380 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -15,7 +15,7 @@ let requests = [];
 // HTTP request 拦截器
 axios.interceptors.request.use(
 	(config) => {
-		let token = tool.cookie.get("TOKEN");
+		let token = tool.cookie.get("TOKEN")?tool.cookie.get("TOKEN"):tool.data.get("TOKEN");
 		if(token){
 			config.headers[sysConfig.TOKEN_NAME] = sysConfig.TOKEN_PREFIX + token
 		}
diff --git a/src/views/home/widgets/components/eventlist.vue b/src/views/home/widgets/components/eventlist.vue
index 4b15dd27..b5d8c1da 100644
--- a/src/views/home/widgets/components/eventlist.vue
+++ b/src/views/home/widgets/components/eventlist.vue
@@ -8,11 +8,11 @@
           </div>
         </template>
         <div class="card-body">
-          <div v-for="item in dutyAgg" :key="item.workflow">
-            <el-badge :value="item.count" class="item">
+          <div v-for="item in dutyAgg" :key="item.workflow" style="    margin-bottom: 10px;">
+            <el-badge :value="item.count" class="item workItemImg">
               <el-button icon="el-icon-promotion" type="primary" size="small" @click="toTicket"></el-button>
             </el-badge>
-            <div style="font-size:12px">{{ item.workflow__name }}</div>
+            <div class="workItemText">{{ item.workflow__name }}</div>
           </div>
         </div>
       </el-card>
@@ -243,5 +243,20 @@ export default {
   flex-wrap: wrap;
   justify-content: space-around;
   height: 340px;
+  overflow-y: scroll;
+  padding-top: 10px;
+}
+
+.workItemImg{
+  left: 50%;
+  transform: translateX(-50%);
+}
+
+.workItemText{
+  width: 70px;
+  font-size: 12px;
+  word-wrap: break-word;
+  word-break: break-all;
+  text-align: center;
 }
 </style>
diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index d055b930..a406a194 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -157,6 +157,8 @@ export default {
         that.$TOOL.cookie.set("TOKEN", res.access, {
           expires: that.form.autologin ? 24 * 60 * 60 : 0,
         });
+        that.$TOOL.data.set("TOKEN", res.access);
+        that.$TOOL.data.set("TOKEN_REFRESH", res.refresh);
         that.$TOOL.cookie.set("TOKEN_REFRESH", res.refresh);
         that.$TOOL.data.set("TOKEN_TIME", new Date().getTime());
         try {