feat:修改请求地址

sample-form-manager-ui/admin/.env.development

 #开发环境
 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

sample-form-manager-ui/admin/.env.production

 #生产环境
 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

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">
       登陆 &copy; <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>
 

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: '登录页',

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

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();
     }