‘1’

Reviewed-on: #1

src/api/user.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2020-12-14 09:07:03
- * @LastEditors: guo
+ * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-01-11 09:40:09
+ * @LastEditTime: 2021-12-06 15:14:46
  * @FilePath: \basic-admin\src\api\user.js
  * @Description: 用户管理 & 登录用户的相关api接口定义
  */
@@ -13,7 +13,8 @@ export function login(data) {
     userType: 1
   })
   return request({
-    url: '/passport/login',
+    url: '/api/passport/login',
+    // url: '/passport/login',
     method: 'post',
     data: dto
   })
@@ -26,13 +27,13 @@ export function logout() {
   })
 }
 // 获取当前登录的用户信息
-export function getUserInfo(data) {
+// export function getUserInfo(data) {
-  return request({
+//   return request({
-    url: '/passport/getLoginUser',
+//     url: '/passport/getLoginUser',
-    method: 'post',
+//     method: 'post',
-    data
+//     data
-  })
+//   })
-}
+// }
 
 // 修改当前用户密码
 export function editUserPW(data) {

src/lang/i18n.js

@@ -1,7 +1,7 @@
 export default {
   title: {
-    en: 'ARI MES',
+    en: 'ARI WMS',
-    zh: '中建材自动化智能制造执行系统'
+    zh: '中建材自动化智能仓库管理系统'
   },
   btn: {
     start: {

src/settings.js

@@ -1,13 +1,13 @@
 /*
  * @Date: 2020-12-14 09:07:03
- * @LastEditors: gtz
+ * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-03-08 11:52:17
+ * @LastEditTime: 2021-12-06 14:24:30
  * @FilePath: \basic-admin\src\settings.js
  * @Description:
  */
 
 module.exports = {
-  title: 'ARI MES',
+  title: 'ARI WMS',
 
   /**
    * @type {boolean} true | false

src/store/modules/user.js

@@ -42,7 +42,7 @@ const actions = {
   login({ commit }, userInfo) {
     const { username, password } = userInfo
     return new Promise((resolve, reject) => {
-      login({ mobile: username.trim(), password: password }).then(res => {
+      login({ mobile: String(username).trim(), password }).then(res => {
         console.log(res)
         if (res.code === 0) {
           const { token, name } = res.data

src/views/login/index.vue

@@ -102,8 +102,13 @@ export default {
     }
     return {
       loginForm: {
-        username: '13588441519',
+        username: 13588441519,
-        password: '123abc.'
+        password: 123456,
+        // password: '123abc.'
+        mobile: 13588441519,
+        oauthCode: 13588441519,
+        openId: 13588441519,
+        wechatAppId: 13588441519
       },
       loginRules: {
         username: [{ required: true, trigger: 'blur', validator: validateUsername }],
@@ -133,6 +138,7 @@ export default {
     // window.addEventListener('storage', this.afterQRScan)
   },
   mounted() {
+    // 自动获取焦点
     if (this.loginForm.username === '') {
       this.$refs.username.focus()
     } else if (this.loginForm.password === '') {
@@ -146,6 +152,7 @@ export default {
     // window.removeEventListener('storage', this.afterQRScan)
   },
   methods: {
+    // 监听用户键盘输入
     checkCapslock(e) {
       const { key } = e
       this.capsTooltip = key && key.length === 1 && (key >= 'A' && key <= 'Z')
@@ -162,12 +169,24 @@ export default {
     },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
+        // 自定义登陆验证，如符合验证console.log输出true
         console.log(valid)
         console.log(this.redirect, this.$route)
         if (valid) {
           this.loading = true
+          // this.$store.dispatch('user/login', this.loginForm)
+          //   .then(() => {
+          //     console.log(this.redirect, this.otherQuery)
+          //     this.$router.push({ path: this.redirect || '/', query: this.otherQuery })
+          //     this.loading = false
+          //   })
+          //   .catch(() => {
+          //     this.loading = false
+          //   })
+
           this.$store.dispatch('user/login', this.loginForm)
-            .then(() => {
+            .then(res => {
+              console.log(res)
               console.log(this.redirect, this.otherQuery)
               this.$router.push({ path: this.redirect || '/', query: this.otherQuery })
               this.loading = false

vue.config.js

@@ -0,0 +1,190 @@
+'use strict'
+const path = require('path')
+const defaultSettings = require('./src/settings.js')
+
+function resolve(dir) {
+  return path.join(__dirname, dir)
+}
+
+const name = defaultSettings.title || 'vue Element Admin' // page title
+
+// If your port is set to 80,
+// use administrator privileges to execute the command line.
+// For example, Mac: sudo npm run
+// You can change the port by the following method:
+// port = 9527 npm run dev OR npm run dev --port = 9527
+const port = process.env.port || process.env.npm_config_port || 9527 // dev port
+// All configuration item explanations can be find in https://cli.vuejs.org/config/
+module.exports = {
+  /**
+   * You will need to set publicPath if you plan to deploy your site under a sub path,
+   * for example GitHub Pages. If you plan to deploy your site to https://foo.github.io/bar/,
+   * then publicPath should be set to "/bar/".
+   * In most cases please use '/' !!!
+   * Detail: https://cli.vuejs.org/config/#publicpath
+   */
+  publicPath: '',
+  outputDir: 'dist',
+  assetsDir: 'static',
+  lintOnSave: process.env.NODE_ENV === 'development',
+  productionSourceMap: false,
+  devServer: {
+    port: port,
+    open: false,
+    overlay: {
+      warnings: false,
+      errors: true
+    },
+    // allowedHosts: ['192.168.0.104:8080', '192.168.0.104:8081'],
+    // headers: {
+    //   'Access-Control-Allow-Origin': '192.168.0.104:8080, 192.168.0.104:8081',
+    //   'Access-Control-Allow-Headers': '*',
+    //   'Access-Control-Allow-Methods': '*',
+    //   'Access-Control-Allow-Credentials': 'true'
+    // },
+    // before: require('./mock/mock-server.js'),
+    // 这里写入需要代理的api和对应的目标地址
+    proxy: {
+      '/api': {
+        target: 'http://localhost:8080',
+        // target: 'http://192.168.0.198:8080',
+        // target: 'http://192.168.0.127:8080',
+        // target: 'http://192.168.0.165:8080',
+        // target: 'http://192.168.43.105:8080',
+        // target: 'http://127.0.0.1:8080',
+        // target: 'http://192.168.0.70:8080',
+        // target: 'http://192.168.0.199:8080',
+
+        ws: true,
+        changeOrigin: true,
+        pathRewrite: {
+          '^/portapi': ''
+        }
+        // 使用了proxy 就需要开启下面的选项 (http-proxy-middleware会将post请求给parse了 所以需要再次进行string化)
+        // onProxyReq: (proxyReq, req, res, options) => {
+        //   if (req.body) {
+        //     const bodyData = JSON.stringify(req.body)
+        //     // incase if content-type is application/x-www-form-urlencoded -> we need to change to application/json
+        //     proxyReq.setHeader('Content-Type', 'application/json')
+        //     proxyReq.setHeader('Content-Length', Buffer.byteLength(bodyData))
+        //     // stream the content
+        //     proxyReq.write(bodyData)
+        //   }
+        // }
+      },
+      '/spc': {
+        // target: 'http://192.168.0.180:8080',
+        target: 'http://58.210.206.230:8000',
+        // target: 'http://192.168.0.187:8080',
+        // target: 'http://192.168.43.105:8080',
+        // target: 'http://127.0.0.1:8080',
+        ws: true,
+        changeOrigin: true,
+        pathRewrite: {
+          '^/spc': ''
+        }
+        // 使用了proxy 就需要开启下面的选项 (http-proxy-middleware会将post请求给parse了 所以需要再次进行string化)
+        // onProxyReq: (proxyReq, req, res, options) => {
+        //   if (req.body) {
+        //     const bodyData = JSON.stringify(req.body)
+        //     // incase if content-type is application/x-www-form-urlencoded -> we need to change to application/json
+        //     proxyReq.setHeader('Content-Type', 'application/json')
+        //     proxyReq.setHeader('Content-Length', Buffer.byteLength(bodyData))
+        //     // stream the content
+        //     proxyReq.write(bodyData)
+        //   }
+        // }
+      }
+    }
+  },
+  configureWebpack: {
+    // provide the app's title in webpack's name field, so that
+    // it can be accessed in index.html to inject the correct title.
+    name: name,
+    resolve: {
+      alias: {
+        '@': resolve('src')
+      }
+    }
+  },
+  css: {
+    loaderOptions: {
+      // vue cli默认使用node-sass作为sass预处理器，使用下面的选项可以使用sass包作为预处理器
+      // 用于解决node-sass需要从外网下载依赖的卡顿问题
+      sass: {
+        implementation: require('sass')
+      }
+    }
+  },
+  chainWebpack(config) {
+    config.plugins.delete('preload') // TODO: need test
+    config.plugins.delete('prefetch') // TODO: need test
+
+    // set svg-sprite-loader
+    config.module
+      .rule('svg')
+      .exclude.add(resolve('src/icons'))
+      .end()
+    config.module
+      .rule('icons')
+      .test(/\.svg$/)
+      .include.add(resolve('src/icons'))
+      .end()
+      .use('svg-sprite-loader')
+      .loader('svg-sprite-loader')
+      .options({
+        symbolId: 'icon-[name]'
+      })
+      .end()
+
+    // set preserveWhitespace
+    config.module
+      .rule('vue')
+      .use('vue-loader')
+      .loader('vue-loader')
+      .tap(options => {
+        options.compilerOptions.preserveWhitespace = true
+        return options
+      })
+      .end()
+
+    config
+      .when(process.env.NODE_ENV !== 'development',
+        config => {
+          config
+            .plugin('ScriptExtHtmlWebpackPlugin')
+            .after('html')
+            .use('script-ext-html-webpack-plugin', [{
+              // `runtime` must same as runtimeChunk name. default is `runtime`
+              inline: /runtime\..*\.js$/
+            }])
+            .end()
+          config
+            .optimization.splitChunks({
+              chunks: 'all',
+              cacheGroups: {
+                libs: {
+                  name: 'chunk-libs',
+                  test: /[\\/]node_modules[\\/]/,
+                  priority: 10,
+                  chunks: 'initial' // only package third parties that are initially dependent
+                },
+                elementUI: {
+                  name: 'chunk-elementUI', // split elementUI into a single package
+                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+                },
+                commons: {
+                  name: 'chunk-commons',
+                  test: resolve('src/components'), // can customize your rules
+                  minChunks: 3, //  minimum common number
+                  priority: 5,
+                  reuseExistingChunk: true
+                }
+              }
+            })
+          config.optimization.runtimeChunk('single')
+        }
+      )
+  }
+}