From db582914c36d92de14098fff2274811a2696114d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 九月 2023 10:54:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.218.113:9001/r/lims-before
---
.env.development | 2 +-
src/permission.js | 18 +++++++++---------
src/main.js | 2 +-
src/views/login/index.vue | 1 +
.env.production | 2 +-
src/router/index.js | 7 +------
postcss.config.js | 3 ++-
src/views/inspectionManagement/commissionInspection/index.vue | 6 +++---
8 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/.env.development b/.env.development
index 6c8cdfe..dc51ced 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = 'http://192.168.218.96:1234/'
+VUE_APP_BASE_API = 'http://114.132.189.42:1234/'
diff --git a/.env.production b/.env.production
index dd72fa5..0306dbf 100644
--- a/.env.production
+++ b/.env.production
@@ -3,5 +3,5 @@
# base api
# VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = 'http://localhost:1234/'
+VUE_APP_BASE_API = 'http://114.132.189.42:1234/'
diff --git a/postcss.config.js b/postcss.config.js
index 2926a37..8f99bd1 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,5 +1,6 @@
-// https://github.com/michael-ciniawsky/postcss-load-config
+// https://github.com/michael-ciniawsky/postcss-load-config
+const path = require('path');
module.exports = {
'plugins': {
// to edit target browsers: use "browserslist" field in package.json
diff --git a/src/main.js b/src/main.js
index 08ded1c..c029a5a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -43,7 +43,7 @@
return JSON.parse(JSON.stringify(val))
}
-Vue.prototype.vueIp = "http://localhost:8080/"
+Vue.prototype.vueIp = "http://114.132.189.42:8080"
// set ElementUI lang to EN
Vue.use(ElementUI, { locale })
diff --git a/src/permission.js b/src/permission.js
index dafb844..beba60f 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,21 +5,21 @@
// import 'nprogress/nprogress.css' // progress bar style
// import { getToken } from '@/utils/auth' // get token from cookie
// import getPageTitle from '@/utils/get-page-title'
-
+//
// NProgress.configure({ showSpinner: false }) // NProgress Configuration
-
+//
// const whiteList = ['/login'] // no redirect whitelist
-
+//
// router.beforeEach(async(to, from, next) => {
// // start progress bar
// NProgress.start()
-
+//
// // set page title
// document.title = getPageTitle(to.meta.title)
-
+//
// // determine whether the user has logged in
// const hasToken = getToken()
-
+//
// if (hasToken) {
// if (to.path === '/login') {
// // if is logged in, redirect to the home page
@@ -33,7 +33,7 @@
// try {
// // get user info
// await store.dispatch('user/getInfo')
-
+//
// next()
// } catch (error) {
// // remove token and go to login page to re-login
@@ -47,7 +47,7 @@
// }
// } else {
// /* has no token*/
-
+//
// if (whiteList.indexOf(to.path) !== -1) {
// // in the free login whitelist, go directly
// next()
@@ -58,7 +58,7 @@
// }
// }
// })
-
+//
// router.afterEach(() => {
// // finish progress bar
// NProgress.done()
diff --git a/src/router/index.js b/src/router/index.js
index 0c8e1b0..18015f1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -323,11 +323,6 @@
hidden: true
},
{
- path: '/addCommision',
- component: () => import('@/views/inspectionManagement/commissionInspection/addCommision'),
- hidden: true
-},
-{
path: '/',
component: Layout,
redirect: '/home',
@@ -423,7 +418,7 @@
Routees = baseRouter
}
return new Router({
- mode: 'history', // require service support
+ // mode: 'history', // require service support
scrollBehavior: () => ({ y: 0 }),
routes: Routees
})
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index 36860a8..707c3b1 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -24,7 +24,7 @@
</el-form-item>
</el-form>
<el-form>
- <el-popover placement="left" width="400" trigger="click">
+ <el-popover placement="left" width="410" trigger="click">
<div class="vue_qr_div">
<el-row>
<el-col>
@@ -474,7 +474,7 @@
selectViewUUID({
day: this.day
}).then(res => {
- this.view = `${this.vueIp}addCommision/${res.data.id}`
+ this.view = `${this.vueIp}/#/addCommision/${res.data.id}`
this.viewId = res.data.id
this.viewTime2 = res.data.time
})
@@ -484,7 +484,7 @@
day: this.viewTime == null ? 1 : this.viewTime
}).then(res => {
this.viewId = res.data
- this.view = `${this.vueIp}addCommision/${res.data.id}`
+ this.view = `${this.vueIp}/#/addCommision/${res.data.id}`
this.viewDia = false
this.$message.success('閾炬帴宸茬敓鎴愶紝鐐瑰嚮澶嶅埗鎸夐挳杩涜澶嶅埗')
})
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3076e66..8e904c8 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -218,6 +218,7 @@
this.$message.success("鐧诲綍鎴愬姛")
this.btnload = false
this.$router.push({ path: this.redirect || '/' })
+ // this.$router.push('/')
}).catch((error) => {
this.$message.error(error.message)
this.btnload = false
--
Gitblit v1.9.3