From 82489d726edabed5ea42e88d729a6d775133e38e Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Fri, 16 Aug 2024 17:34:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=B7=AE=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js                    | 14 +++++++++-----
 src/views/away/component/addAway.vue |  4 ++--
 src/views/install/index.vue          |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index 7b25622..8f7efa3 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@ import {
   getToken
 } from '@/utils/auth' // get token from cookie
 import getPageTitle from '@/utils/get-page-title'
-import { loginOssV2 } from "@/api/user"
+import { loginOssV2, loginOss } from "@/api/user"
 import { setToken, removeToken } from "@/utils/auth";
 
 NProgress.configure({
@@ -26,10 +26,10 @@ router.beforeEach(async (to, from, next) => {
   // set page title
   document.title = getPageTitle(to.meta.title)
 
-  if (to.query.code) {
+  if (to.query.token) {
     removeToken()
-    const res = await loginOssV2({
-      code: to.query.code
+    const res = await loginOss({
+      auth_token: to.query.token
     })
     setToken(res.access_token)
     store.commit('user/SET_TOKEN',res.access_token)
@@ -44,7 +44,11 @@ router.beforeEach(async (to, from, next) => {
     // dynamically add accessible routes
     router.addRoutes(accessRoutes)
 
-    next('/old')
+    delete to.query.token
+    next({
+      ...to,
+      replace: true
+    })
     return
   }
   // determine whether the user has logged in
diff --git a/src/views/away/component/addAway.vue b/src/views/away/component/addAway.vue
index 2e0fe2b..953aea0 100644
--- a/src/views/away/component/addAway.vue
+++ b/src/views/away/component/addAway.vue
@@ -156,7 +156,7 @@ export default {
           {
             validator: (rule, value, callback) => {
               if (this.form.end_date && this.form.start_date) {
-                if (this.$moment(this.form.end_date).isAfter(this.form.start_date)) {
+                if (this.$moment(this.form.end_date).isAfter(this.form.start_date) || (this.form.end_date === this.form.start_date)) {
                   callback()
                 } else {
                   callback(new Error('结束时间不能小于开始时间'))
@@ -172,7 +172,7 @@ export default {
           {
             validator: (rule, value, callback) => {
               if (this.form.end_date && this.form.start_date) {
-                if (this.$moment(this.form.end_date).isAfter(this.form.start_date)) {
+                if (this.$moment(this.form.end_date).isAfter(this.form.start_date) || (this.form.end_date === this.form.start_date)) {
                   callback()
                 } else {
                   callback(new Error('结束时间不能小于开始时间'))
diff --git a/src/views/install/index.vue b/src/views/install/index.vue
index ef50e39..616c0b0 100644
--- a/src/views/install/index.vue
+++ b/src/views/install/index.vue
@@ -37,7 +37,7 @@ export default {
         {
           name: "内控管理系统0.0.1",
           support: "wind10+",
-          src: "http://contract-sqhj-test.ali251.langye.net/api/pc/download"
+          src: `${process.env.VUE_APP_DOMIAN}/api/pc/download`
         }
       ]
     }