Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

ele-admin-template/.eslintignore

@@ -2,3 +2,5 @@ public
 src/assets
 node_modules
 dist
+src/api 
+src/views 

ele-admin-template/src/views/login/index.vue

@@ -14,20 +14,20 @@
       @keyup.enter.native="submit"
     >
       <h4>{{ $t('login.title') }}</h4>
-      <el-form-item prop="username">
+      <el-form-item prop="loginName">
         <el-input
           clearable
           v-model="form.loginName"
           prefix-icon="el-icon-user"
-          :placeholder="$t('login.username')"
+          :placeholder="$t('login.loginName')"
         />
       </el-form-item>
-      <el-form-item prop="password">
+      <el-form-item prop="loginPwd">
         <el-input
           show-password
           v-model="form.loginPwd"
           prefix-icon="el-icon-lock"
-          :placeholder="$t('login.password')"
+          :placeholder="$t('login.loginPwd')"
         />
       </el-form-item>
       <!-- <el-form-item prop="code">
@@ -140,7 +140,7 @@
           loginName: [
             {
               required: true,
-              message: this.$t('login.username'),
+              message: this.$t('login.loginName'),
               type: 'string',
               trigger: 'blur'
             }
@@ -148,7 +148,7 @@
           loginPwd: [
             {
               required: true,
-              message: this.$t('login.password'),
+              message: this.$t('login.loginPwd'),
               type: 'string',
               trigger: 'blur'
             }
@@ -168,7 +168,6 @@
           if (!valid) {
             return false;
           }
-
           this.loading = true;
           login(this.form)
             .then((msg) => {

ele-admin-template/vue.config.js

@@ -44,5 +44,21 @@ module.exports = {
         }
       }
     }
-  }
+  },
+  devServer: { //liu 
+   
+    proxy: {
+        
+        '/kingdom': {
+            target: 'http://192.168.3.51:18086',
+            //target: 'http://192.168.3.35:8080', // kang杨威
+            changeOrigin: true,
+            pathRewrite: {
+                "^/kingdom": '',
+            }
+        },
+       
+    },
+    
+},
 };