大屏接入仓储系统菜单

sgzb-screen/config/dev.env.js

@@ -5,12 +5,12 @@ var prodEnv = require('./prod.env')
 // var testUrl = '172.16.2.82:8802'
 // var testUrl = '14.29.196.32:8802'
 // var testUrl = '10.14.16.165:8802'
-// var testUrl = '112.29.103.165:21624'    //线上
-var testUrl = '192.168.0.14:21624'    //线上
+var testUrl = '112.29.103.165:21624'    //线上
+// var testUrl = '192.168.0.14:21624'    //线上
 // var testUrl = '192.168.0.166:8080'
 // var testUrl = '223.243.184.53:8480'
 // var testUrl = 'www.lingyangplat.com'
-
+// var testUrl = ''
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   //API调用地址

sgzb-screen/config/index.js

@@ -2,6 +2,8 @@
 
 const path = require('path')
 
+var proxyUrl = 
+
 module.exports = {
   dev: {
     // Paths
@@ -15,7 +17,17 @@ module.exports = {
     poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
     devtool: 'cheap-module-eval-source-map',
     cacheBusting: true,
-    cssSourceMap: true
+    cssSourceMap: true,
+    proxyTable: {
+        '/screen': {
+          target: 'http://112.29.103.165:21624',
+          changeOrigin: true,
+          // secure: true, //如果是https接口，需要配置这个参数
+          pathRewrite: {
+          '^/screen': '/'
+          }
+        },
+    }
   },
   build: {
     index: path.resolve(__dirname, '../dist/index01.html'),

sgzb-screen/src/App.vue

@@ -7,11 +7,14 @@
 export default {
   name: 'app',
   created() {
+    // console.log(this.$route)
+    // localStorage.setItem('token', this.$route.query.token)
     var link = document.querySelector("link[rel*='icon']") || document.createElement("link");
     link.type = "image/x-icon";
     link.rel = "shortcut icon";
     link.href = require('./assets/img/myImage/logo.png');
     document.getElementsByTagName("head")[0].appendChild(link);
+    
   },
 }
 </script>

sgzb-screen/src/api/screen.js

@@ -1,25 +1,25 @@
 import { POST, GET } from './index'
 
 // 领料数据
-export const getMaterialReqDataApi = params => POST(`/base/largeScreen/home/getMaterialReqData`,)
+export const getMaterialReqDataApi = params => POST(`/screen/base/largeScreen/home/getMaterialReqData`,)
 // 退料数据
-export const getMaterialReturnDataApi = params => POST(`/base/largeScreen/home/getMaterialReturnData`)
+export const getMaterialReturnDataApi = params => POST(`/screen/base/largeScreen/home/getMaterialReturnData`)
 //当月报废分析
-export const getScrapAnalysisByMonthApi = params => POST(`/base/largeScreen/home/getScrapAnalysisByMonth?maType=${params.maType}`)
+export const getScrapAnalysisByMonthApi = params => POST(`/screen/base/largeScreen/home/getScrapAnalysisByMonth?maType=${params.maType}`)
 //新购验收入库分析
-export const getAcceptanceStorageApi = params => POST(`/base/largeScreen/home/getAcceptanceStorage?maType=${params.maType}`,)
+export const getAcceptanceStorageApi = params => POST(`/screen/base/largeScreen/home/getAcceptanceStorage?maType=${params.maType}`,)
 //当月领料分析
-export const getPickingAnalysisByMonthApi = params => POST(`/base/largeScreen/home/getPickingAnalysisByMonth?maType=${params.maType}`,)
+export const getPickingAnalysisByMonthApi = params => POST(`/screen/base/largeScreen/home/getPickingAnalysisByMonth?maType=${params.maType}`,)
 //当月退料分析
-export const getMaterialReturnByMonthApi = params => POST(`/base/largeScreen/home/getMaterialReturnByMonth?maType=${params.maType}`,)
+export const getMaterialReturnByMonthApi = params => POST(`/screen/base/largeScreen/home/getMaterialReturnByMonth?maType=${params.maType}`,)
 //当月维修分析
-export const getMaintenanceByMonthApi = params => POST(`/base/largeScreen/home/getMaintenanceByMonth?maType=${params.maType}`,)
+export const getMaintenanceByMonthApi = params => POST(`/screen/base/largeScreen/home/getMaintenanceByMonth?maType=${params.maType}`,)
 //设备分布图
-export const getEquipmentDisByMapApi = params => POST(`/base/largeScreen/home/getEquipmentDisByMap`,)
+export const getEquipmentDisByMapApi = params => POST(`/screen/base/largeScreen/home/getEquipmentDisByMap`,)
 //施工机具/
-export const getTotalOwnershipApi = params => POST(`/base/largeScreen/home/getTotalOwnership`,)
+export const getTotalOwnershipApi = params => POST(`/screen/base/largeScreen/home/getTotalOwnership`,)
 // 当月使用车辆
-export const getCarUseByMonthApi = params => POST(`/base/largeScreen/home/getCarUseByMonth?maType=${params.maType}`,)
+export const getCarUseByMonthApi = params => POST(`/screen/base/largeScreen/home/getCarUseByMonth?maType=${params.maType}`,)
 // 当月使用车辆
-export const getMaintenanceWarningApi = params => POST(`/base/largeScreen/home/getMaintenanceWarning`,)
+export const getMaintenanceWarningApi = params => POST(`/screen/base/largeScreen/home/getMaintenanceWarning`,)
 

sgzb-screen/src/api/userLogin.js

@@ -2,7 +2,7 @@ import { POST, GET } from './index'
 // 获取短信验证码
 export const getSendIphoneCodeApi = params => POST(`/system/sms/codeLogin?phone=${params.phone}`,)
 // 账号密码登录
-export const authLoginApi = params => POST(`/auth/login`, params)
+export const authLoginApi = params => POST(`/screen/auth/loginApp`, params)
 // 手机号登录
 export const loginCodeApi = params => POST(`/auth/loginCode`, params)
 // export const getImageCode = params => GET(`/iot/gywlw/publishVersion/page`, params)

sgzb-screen/src/common/index.js

@@ -15,7 +15,8 @@ axios.interceptors.request.use(
     config.data = JSON.stringify(config.data)
     config.headers = {
       'Content-Type': 'application/json',
-      token: localStorage.getItem('token')
+      token: localStorage.getItem('token'),
+      'Istoken':false
     }
     if ('get' == config.method) {
       config.headers = {

sgzb-screen/src/main.js

@@ -12,7 +12,8 @@ Vue.prototype.$eventBus = new Vue()
 Vue.config.productionTip = false;
 Vue.use(ElementUI);
 Vue.prototype.$message = Message;
-
+console.log(this.$route)
+// localStorage.setItem('token', this.$route.query.token)
 
 new Vue({
   el: '#app',

sgzb-screen/src/views/layout.vue

@@ -16,6 +16,10 @@ export default {
 
     }
   },
+  mounted() {
+    // console.log(this.$route)
+    localStorage.setItem('token', this.$route.query.token)
+  },
   methods: {
 
   }

sgzb-screen/src/views/login/index.vue

@@ -155,7 +155,10 @@ export default {
     }
   },
   mounted() {
-    localStorage.removeItem('token')
+    console.log(this.$route)
+    if(localStorage.getItem('token')!=''){
+      this.$router.push('./Home/index')
+    }
   },
 
   methods: {