Leo 2 年之前
父节点
当前提交
dcf1ea3640
共有 3 个文件被更改,包括 15 次插入4 次删除
  1. 2 2
      src/module/layout/Main.jsx
  2. 8 0
      src/module/tasklog/component/LogTable.jsx
  3. 5 2
      src/utils/request.js

+ 2 - 2
src/module/layout/Main.jsx

@@ -195,11 +195,11 @@ const Main = () => {
   }
 
   const changeProject = async (val, option) => {
+    sessionStorage.setItem('project_id', option.key)
     const { data } = await getUserRole()
     if (data.code === 200) {
       sessionStorage.setItem('role', data.data.role_id)
       sessionStorage.setItem('project_token', val)
-      sessionStorage.setItem('project_id', option.key)
       setCurrentProject(val)
     } else {
       message.error(data.msg)
@@ -593,7 +593,7 @@ const Main = () => {
           <Select
             bordered={false}
             className="projects"
-            placeholder="新建项目"
+            placeholder="选择项目"
             optionLabelProp="label"
             value={currentProject}
             onChange={changeProject}

+ 8 - 0
src/module/tasklog/component/LogTable.jsx

@@ -96,6 +96,14 @@ const LogTable = () => {
 
   const fetchJoblog = async (page = 1, pageSize = 10) => {
     setDataLoading(true)
+    console.log(
+      '111',
+      await getLogList({
+        page: page,
+        size: pageSize,
+        id: state?.id,
+      })
+    )
     const { data } = await getLogList({
       page: page,
       size: pageSize,

+ 5 - 2
src/utils/request.js

@@ -30,13 +30,16 @@ axiosInstance.interceptors.response.use(
     if (error.response.status) {
       switch (error.response.status) {
         case 401:
-          message.error('登录过期')
           window.location.pathname = "/login"
           break
         default:
+          error.response.data = {
+            code: 404,
+            msg: '请选择项目'
+          }
           break
       }
-      return Promise.reject(error.response);
+      return Promise.resolve(error.response);
     }
   }
 )