Merge branch 'master' of 47.111.81.118:xf15575941817/PC_FiveFollowing

public/static/config.js

@@ -3,14 +3,14 @@ var PLATFROM_CONFIG = {};
 // PLATFROM_CONFIG.baseUrl = "http://172.16.120.104:8010/" //杨强本地
 // PLATFROM_CONFIG.baseUrl = "http://172.16.1.196:8010/"  //超博本地
 
-
-// PLATFROM_CONFIG.baseUrl = "https://qhome.usky.cn/fivapi/" //线上
-// PLATFROM_CONFIG.fileUrl = "https://qhome.usky.cn/file/" //xlsx文件访问路径
-
-
-PLATFROM_CONFIG.baseUrl = "https://wx.ewoogi.com/api/" //线上
-PLATFROM_CONFIG.fileUrl = "https://wx.ewoogi.com/file/" //xlsx文件访问路径
-
+console.log(window.location.host)
+if (window.location.host.indexOf("localhost") != -1) {
+    PLATFROM_CONFIG.baseUrl = "https://qhome.usky.cn/fivapi/" //线上
+    PLATFROM_CONFIG.fileUrl = "https://qhome.usky.cn/file/" //xlsx文件访问路径
+} else {
+    PLATFROM_CONFIG.baseUrl = "https://wx.ewoogi.com/api/" //线上
+    PLATFROM_CONFIG.fileUrl = "https://wx.ewoogi.com/file/" //xlsx文件访问路径
+}
 
 
 // 本地json文件请求路径

src/main.js

@@ -51,10 +51,11 @@ router.beforeEach((to, from, next) => {
             // 本地存储的accessToken不存在时，跳转至后台登录页
             // alert('本地存储的accessToken不存在')
 
-            console.log(window.location)
-            if (window.location.host === 'localhost:8080') {
+            // console.log(window.location.host.indexOf("localhost") != -1)
+            if (window.location.host.indexOf("localhost") != -1) {
                 next({ path: '/' })
             } else {
+                //https://wx.ewoogi.com/adminfiv/#/login
                 window.location.href = 'https://wx.ewoogi.com/manage/#/login'
             }
 

src/views/site/components/Overview/histTrendChart.vue

@@ -44,9 +44,9 @@ export default {
     electricIco() {
       this.$store.commit("TimeAll_function", [this.hisDefaultTime]);
       var time = this.$store.state.Time_Data;
-       console.log('time[0]')
-      console.log(time[0])
-      console.log(time[1])
+      //  console.log('time[0]')
+      // console.log(time[0])
+      // console.log(time[1])
 
       api
         .electricIco({
@@ -97,7 +97,7 @@ export default {
         }
       });
 
-      console.log(JSON.stringify(data),JSON.stringify(dataAll));
+      // console.log(JSON.stringify(data),JSON.stringify(dataAll));
 
       option = {
         color: ["#FEB70D", "#50F335", "#0DC8FE"],

vue.config.js

@@ -6,8 +6,8 @@ function resolve(dir) {
 // 基本结构
 module.exports = {
     // 打包后路径错误导致的空白页面问题。
-    // publicPath: '/vuefiv/',
-    publicPath: '/panel/',
+    publicPath: '/vuefiv/',
+    // publicPath: '/panel/',
     outputDir: process.env.outputDir,
     // assetsPublicPath: '/vuefiv/',
     // assetsDir: 'vuefiv',