修正导出excel丢失动态颜色的问题

NoneDay · Nov 22, 2023 · 7adba84 · 7adba84
1 parent e22fe02
commit 7adba84
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/front/src/router/axios.js b/front/src/router/axios.js
@@ -64,7 +64,8 @@ axios.interceptors.response.use(async res => {
     //如果在白名单里则自行catch逻辑处理
     if (statusWhiteList.includes(status)) return Promise.reject(res);
     //如果是401则跳转到登录页面
-    if (status === 401){
+
+    if (status === 401 && res.config.url!='/user/login'){
         if(res.headers['token-expired']=='true' || cur_message().indexOf("过期")>=0 ){
              // Create new promise to handle exponential backoff
             await store.dispatch("RefreshToken")

diff --git a/front/src/views/rpt_design/utils/export_excel.js b/front/src/views/rpt_design/utils/export_excel.js
@@ -53,7 +53,7 @@ function find_style(tbl,rowNo,colNo,cur_tbl_class_dict){
         let one=tbl.abs_to_design[idx]
         let cur_ret={}
         if(one.row[0]<=rowNo && rowNo<=one.row[1] && one.col[0]<=colNo && colNo<=one.col[1]){
-            Object.assign(cur_ret,default_css,cur_tbl_class_dict[tbl.loc_style[one.cell+"_S"] ??""],cur_tbl_class_dict[tbl.loc_style[one.cell+"_D"] ??""]
+            Object.assign(cur_ret,default_css,cur_tbl_class_dict[tbl.loc_style[one.cell+"_S"] ??""],cur_tbl_class_dict[tbl.loc_style[`${rowNo}_${colNo}_D`] ??""]
             )
             return cur_ret
         }