Merge branch 'v1.1' into pr@v1.1@refactor_token过期提示弹框

frontend/src/api/dataset/dataset.js

@@ -103,7 +103,7 @@ export function batchEdit(data) {
   })
 }
 
-export function post(url, data, showLoading = true, timeout = 10000) {
+export function post(url, data, showLoading = true, timeout = 20000) {
   return request({
     url: url,
     method: 'post',

frontend/src/lang/en.js

@@ -127,7 +127,11 @@ export default {
     tokenError: 'Token error, please login again',
     username_error: 'Please enter the correct ID',
     password_error: 'The password can not be less than 8 digits',
-    login_again: 'Login again'
+
+    login_again: 'Login again',
+
+    re_login: 'Login again'
+
   },
   commons: {
     no_target_permission: 'No permission',

frontend/src/lang/tw.js

@@ -127,7 +127,11 @@ export default {
     tokenError: '信息錯誤，請重新登錄',
     username_error: '請輸入正確的 ID',
     password_error: '密碼不小於 8 位',
-    login_again: '重新登錄'
+
+    login_again: '重新登錄',
+
+    re_login: '重新登陸'
+
   },
   commons: {
     no_target_permission: '沒有權限',

frontend/src/lang/zh.js

@@ -127,7 +127,11 @@ export default {
     tokenError: '登陆信息错误，请重新登录',
     username_error: '请输入正确的 ID',
     password_error: '密码不小于 8 位',
-    login_again: '重新登录'
+
+    login_again: '重新登录',
+
+    re_login: '重新登录'
+
   },
   commons: {
     no_target_permission: '没有权限',

frontend/src/utils/request.js

@@ -52,6 +52,10 @@ service.interceptors.request.use(
   }
 )
 
+const defaultOptions = {
+  confirmButtonText: i18n.t('login.re_login')
+}
+
 const checkAuth = response => {
   // 请根据实际需求修改
 
@@ -62,6 +66,7 @@ const checkAuth = response => {
       store.dispatch('user/logout').then(() => {
         location.reload()
       })
+
     }, {
       confirmButtonText: i18n.t('login.login_again'),
       showClose: false

frontend/src/views/system/task/TaskRecord.vue

@@ -56,6 +56,7 @@ import ComplexTable from '@/components/business/complex-table'
 import { formatCondition, formatQuickCondition, addOrder, formatOrders } from '@/utils/index'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { post } from '@/api/dataset/dataset'
+import {loadMenus} from "@/permission";
 
 export default {
   name: 'TaskRecord',
@@ -116,7 +117,8 @@ export default {
       last_condition: null,
       show_error_massage: false,
       error_massage: '',
-      matchLogId: null
+      matchLogId: null,
+      lastRequestComplete: true
     }
   },
   computed: {
@@ -139,7 +141,7 @@ export default {
       if (!this.timer) {
         this.timer = setInterval(() => {
           this.search(this.last_condition, false)
-        }, 10000)
+        }, 1000)
       }
     },
     destroyTimer() {
@@ -167,6 +169,12 @@ export default {
     select(selection) {
     },
     search(condition, showLoading = true) {
+      if(!this.lastRequestComplete){
+        return;
+      }else {
+        this.lastRequestComplete = false;
+      }
+
       this.last_condition = condition
       condition = formatQuickCondition(condition, 'dataset_table_task.name')
       const temp = formatCondition(condition)
@@ -175,6 +183,9 @@ export default {
       post('/dataset/taskLog/list/notexcel/' + this.paginationConfig.currentPage + '/' + this.paginationConfig.pageSize, param, showLoading).then(response => {
         this.data = response.data.listObject
         this.paginationConfig.total = response.data.itemCount
+        this.lastRequestComplete = true;
+      }).catch(() => {
+        this.lastRequestComplete = true;
       })
     },
     showErrorMassage(massage) {