diff --git a/sample-form-manager-ui/admin/.env.development b/sample-form-manager-ui/admin/.env.development
index 3dfee2490f9fd7d9a2b5016975b2bd530ede9350..b974ab357d8409266b7c211661934d964ede8cc4 100644
--- a/sample-form-manager-ui/admin/.env.development
+++ b/sample-form-manager-ui/admin/.env.development
@@ -1,6 +1,6 @@
#寮€鍙戠幆澧�
NODE_ENV = "development"
-VUE_APP_API_BASE_URL=http://127.0.0.1:17215
+VUE_APP_API_BASE_URL=http://192.168.0.98:17008
#VUE_APP_API_BASE_URL=http://192.168.0.98:11071/zwfw
#VUE_APP_API_BASE_URL=http://192.168.0.98:11023
#VUE_APP_API_BASE_URL=http://192.168.0.217:17311
\ No newline at end of file
diff --git a/sample-form-manager-ui/admin/.env.production b/sample-form-manager-ui/admin/.env.production
index eb62b59806477a209b995042b672ef6c3266c88f..5295fdefaf5351e4afec11bd80f71763d3c304a2 100644
--- a/sample-form-manager-ui/admin/.env.production
+++ b/sample-form-manager-ui/admin/.env.production
@@ -1,3 +1,7 @@
#鐢熶骇鐜
NODE_ENV = "production"
+<<<<<<< HEAD
+VUE_APP_API_BASE_URL=http://192.168.0.98:17008
+=======
VUE_APP_API_BASE_URL=http://192.168.0.251:11099
+>>>>>>> 261f9fabe9cdcb5ca4e16170db6b02e66a2d29c8
diff --git a/sample-form-manager-ui/admin/src/pages/login/login.vue b/sample-form-manager-ui/admin/src/pages/login/login.vue
index 74134587e9a2310e22e35ca180ee90f4ef2e076b..e48145202874ce7638a2265abd4cdb33121dbcff 100644
--- a/sample-form-manager-ui/admin/src/pages/login/login.vue
+++ b/sample-form-manager-ui/admin/src/pages/login/login.vue
@@ -3,61 +3,68 @@
<template>
<div class="page page-login flex flex-v">
<div class="form-wrap flex flex-1">
- <el-form @submit.prevent='onSubmit' ref="form" :model="form" label-width="80px" size="small">
+ <el-form
+ @submit.prevent="onSubmit"
+ ref="form"
+ :model="form"
+ label-width="80px"
+ size="small"
+ >
<h1>鏍疯〃绠＄悊骞冲彴</h1>
- <el-form-item label="鐢ㄦ埛鍚�">
+ <el-form-item label="鐢ㄦ埛鍚�" prop="loginName">
<el-input v-model="form.loginName"></el-input>
</el-form-item>
- <el-form-item label="瀵嗙爜">
- <el-input v-model="form.password" type='password'></el-input>
+ <el-form-item label="瀵嗙爜" prop="password">
+ <el-input v-model="form.password" type="password"></el-input>
</el-form-item>
<el-form-item size="large">
- <el-button type="primary" native-type='submit' :loading='loading' @click='onSubmit'>鐧诲綍</el-button>
+ <el-button
+ type="primary"
+ native-type="submit"
+ :loading="loading"
+ @click="onSubmit"
+ >鐧诲綍</el-button
+ >
</el-form-item>
</el-form>
</div>
-
<div class="footer">
鐧婚檰 © <a href="">淇″畯缈旂綉缁滅鎶€鏈夐檺鍏徃</a> 鍑哄搧
</div>
-
</div>
</template>
<script>
-
import { login } from "@/api/login";
import local from "@/utils/local";
-
export default {
name: "login",
- created() {
-
+ data() {
+ return {
+ originData: [],
+ loading: false,
+ redirect: this.$route.query.redirect || "/",
+ form: {
+ loginName: "",
+ password: "",
+ },
+ };
},
+ created() {},
methods: {
async login() {
let res = await login(this.form);
let { data, code } = res.data;
if (code === 1) {
if (data.token) {
- let token = data.token
+ let token = data.token;
let siteIds = data.user.siteIds;
- let siteid = siteIds.split(",")[0]
+ let siteid = siteIds.split(",")[0];
if (token) {
- local.setLocal("writeToken", token);
-
- local.setLocal("writeSiteId", siteid);
+ local.setLocal("sampleToken", token);
+ local.setLocal("sampleSiteId", siteid);
this.$router.push("/basicsset");
- } else {
- // this.$message.warning("璺宠浆澶辫触锛岃閲嶆柊鐧诲綍");
- // setTimeout(() => {
- // location.href = this.portal;
- // }, 2000);
}
-
-
- } else {
-
}
}
},
@@ -67,7 +74,6 @@ export default {
this.$router.replace({
path: this.redirect,
});
-
},
loginFail(error) {
this.loading = false;
@@ -77,7 +83,6 @@ export default {
onSubmit(e) {
e.preventDefault();
-
if (!this.form.loginName.length) {
return this.$message.warning("璇疯緭鍏ョ敤鎴峰悕");
}
@@ -88,17 +93,6 @@ export default {
this.login();
},
},
- data() {
- return {
- originData: [],
- loading: false,
- redirect: this.$route.query.redirect || "/",
- form: {
- loginName: "",
- password: "",
- },
- };
- },
};
</script>
diff --git a/sample-form-manager-ui/admin/src/router/index.js b/sample-form-manager-ui/admin/src/router/index.js
index c655047d973a53bcd821de0c8cb1943d7f0dd23b..b2341ede42a1b05e5b20fef2ae2853685db8d8e4 100644
--- a/sample-form-manager-ui/admin/src/router/index.js
+++ b/sample-form-manager-ui/admin/src/router/index.js
@@ -16,10 +16,10 @@ const routes = [
name: '璺宠浆椤�',
component: () => import('@/pages/jump/jump')
},
- // {
- // path: '/',
- // redirect: '/basicsset',
- // },
+ {
+ path: '/',
+ redirect: '/login',
+ },
{
path: '/login',
name: '鐧诲綍椤�',
diff --git a/sample-form-manager-ui/admin/src/utils/request.js b/sample-form-manager-ui/admin/src/utils/request.js
index c14dcd674648ecb029c259e6eabba0903e0c2a03..23818d60225efc0fe952aecd1476ec1e2c436659 100644
--- a/sample-form-manager-ui/admin/src/utils/request.js
+++ b/sample-form-manager-ui/admin/src/utils/request.js
@@ -12,7 +12,7 @@ axios.defaults.timeout = 10 * 1000
axios.defaults.baseURL = process.env.VUE_APP_API_BASE_URL
// 璇锋眰鎷︽埅
axios.interceptors.request.use(config => {
- let token = local.getLocal('writeToken')
+ let token = local.getLocal('sampleToken')
if (token) {
config.headers.Authorization = token
config.headers.Authtoken = token
diff --git a/sample-form-manager-ui/admin/src/utils/validate.js b/sample-form-manager-ui/admin/src/utils/validate.js
index bb180f7651ed9c56eb74dbf4c917ab2db0eb0971..2b650fb02d89859c2f17db35b4fc29fa2573a668 100644
--- a/sample-form-manager-ui/admin/src/utils/validate.js
+++ b/sample-form-manager-ui/admin/src/utils/validate.js
@@ -32,7 +32,7 @@ export const changeAccount = (rule, value, callback) => {
if (!value) {
callback(new Error("璇疯緭鍏ョ敤鎴峰悕"));
} else if (!/^[a-zA-Z0-9_-]{4,16}$/.test(value)) {
- callback(new Error("4鍒�12浣�(a-z,A-Z,0-9,涓嬪垝绾�,涓í绾�)"));
+ callback(new Error("4鍒�16浣�(a-z,A-Z,0-9,涓嬪垝绾�,涓í绾�)"));
} else {
callback();
}
@@ -43,7 +43,7 @@ export const changePassWord = (rule, value, callback) => {
if (!value) {
callback(new Error("璇疯緭鍏ュ瘑鐮�"));
} else if (!/^[a-zA-Z0-9_-]{5,18}$/.test(value)) {
- callback(new Error("5鍒�9浣�(a-z,A-Z,0-9,涓嬪垝绾�,涓í绾�)"));
+ callback(new Error("5鍒�18浣�(a-z,A-Z,0-9,涓嬪垝绾�,涓í绾�)"));
} else {
callback();
}