hw1

src/axios/index.js

@@ -16,13 +16,17 @@ config = {
 instance.interceptors.request.use(
   function (config) {
     const token = localStorage.getItem('token')
+    const site = JSON.parse(localStorage.getItem('site'))
     // let proxy_url = 'http://121.37.173.82:82'; //打包上线时请改用此处
-    const proxyUrl = process.env.VUE_APP_BASE_URL //打包上线时请改用此处
+    const proxyUrl = process.env.VUE_APP_BASE_URL // 打包上线时请改用此处
     // let proxy_url = '/proxy'//打包上线时此处请注释掉
     config.url = proxyUrl + config.url
-    console.log(config)
-    // 在发送请求之前做些什么，例如加入token
-    config.headers.Authorization = token
+    if (config.data.url === 'http://121.36.142.167:7774/jbl/api/mes/login' || config.data.url === 'http://121.36.142.167:7774/jbl/api/site/all/ignore-action?_allow_anonymous=true') {
+      config.data.header = ['Content-Type:application/json']
+    } else {
+      config.data.header = [`Authorization:Bearer ${token}`, 'Content-Type:application/json', `Site:${site.site}`]
+    }
+    // config.data = JSON.stringify(data)
     return config
   },
   function (error) {

src/views/Login.vue

@@ -61,6 +61,32 @@
           required
           placeholder="请输入密码"
         ></b-form-input>
+        <b-form-group
+            label="所属站点"
+            label-for="input-3"
+            style="margin: 1rem 0"
+            label-cols="3"
+        >
+          <b-form-select
+              id="input-3"
+              v-model="form.site"
+              :options="siteList"
+              class="inp"
+              style="height: 3rem;
+              width:100%;
+             padding: 0 0 0 0.5rem;
+            font-size: 1.1rem;
+            font-weight: 500;
+            background: #f2f2f2;
+            border-radius: 1.2rem;
+            letter-spacing: 0.1rem;
+            border: none;
+            box-shadow: 0.2rem 0.18rem 0.1rem 0.1rem rgba(0, 0, 0, 0.3);"
+              required
+              placeholder="请选择站点"
+              @change="handleChangeSite"
+          ></b-form-select>
+        </b-form-group>
       </b-form-group>
       <b-button
         type="submit"
@@ -84,12 +110,27 @@ export default {
     return {
       form: {
         account: '',
-        password: ''
-      }
+        password: '',
+        site: '',
+        site_show: ''
+      },
+      siteList: []
     }
   },
-
+  mounted () {
+    const data = { url: 'http://121.36.142.167:7774/jbl/api/site/all/ignore-action?_allow_anonymous=true'}
+    this.axios.post('/api/testdwyget', data).then(res => {
+      res.data.forEach(v => {
+        v.text = v.name
+        v.value = v.code
+      })
+      this.siteList = res.data
+    })
+  },
   methods: {
+    handleChangeSite (e) {
+      this.form.site_show = this.siteList.find(v => v.code === e).name
+    },
     onSubmit () {
       const data = {
         post: {
@@ -101,6 +142,7 @@ export default {
       this.axios.post('/api/testdwy', data).then(res => {
         if (res.code === 200) {
           this.$Message.success(res.msg)
+          localStorage.setItem('site', JSON.stringify({ site: this.form.site, site_show : this.form.site_show}))
           localStorage.setItem('token', res.data.token)
           localStorage.setItem('userDto', JSON.stringify(res.data.userDto))
           this.$router.push('/cms/home')

src/views/page/Finish/detailed.vue

@@ -363,7 +363,10 @@ export default {
           header: ['Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxIiwiYXV0aCI6IlJPTEVfSU5ORVJfVVNFUixST0xFX0FETUlOLFJPTEVfSU5URVJGQUNFIiwidG9rZW5JZCI6IjM1IiwiZXhwIjoxNjk0Njc0MTE0fQ.L3Di3K_cpF0rWSgvzbcLufLm8bkCxd3Y-xudfKzSm4F-qdpDr0hYWWQP5K5BYTNuZnu4tWpGmSW2KRHU0pjt-A', 'Content-Type:application/json']
         }
         this.axios.post('/api/testdwy', { ...data3 }).then(res => {
-
+          if (res.code == 200) {
+            this.$Message.success(res.msg)
+            this.$router.push('/cms/home')
+          }
         })
       })
     }