Merge branch 'master' of http://47.111.81.118:3000/xf15575941817/admin-fiveFollowing

public/static/config.js

@@ -3,15 +3,15 @@ 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.images = "https://qhome.usky.cn/file/" //线上图片
-// PLATFROM_CONFIG.fileUrl = "https://qhome.usky.cn/file/" //xlsx文件访问路径
-
-PLATFROM_CONFIG.baseUrl = "https://wx.ewoogi.com/api/" //线上
-PLATFROM_CONFIG.images = "https://wx.ewoogi.com/file/" //线上图片
-PLATFROM_CONFIG.fileUrl = "https://wx.ewoogi.com/file/" //xlsx文件访问路径
-
-
+if (window.location.host.indexOf('localhost') != -1 || window.location.host.indexOf('pcdev.ewoogi.com') != -1) {
+    PLATFROM_CONFIG.baseUrl = "https://qhome.usky.cn/fivapi/" //线上--->测试
+    PLATFROM_CONFIG.images = "https://qhome.usky.cn/file/" //线上图片--->测试
+    PLATFROM_CONFIG.fileUrl = "https://qhome.usky.cn/file/" //xlsx文件访问路径--->测试
+} else {
+    PLATFROM_CONFIG.baseUrl = "https://wx.ewoogi.com/api/" //线上--->正式
+    PLATFROM_CONFIG.images = "https://wx.ewoogi.com/file/" //线上图片--->正式
+    PLATFROM_CONFIG.fileUrl = "https://wx.ewoogi.com/file/" //xlsx文件访问路径--->正式
+}
 
 // 本地json文件请求路径
 PLATFROM_CONFIG.Interface = "/vuefiv/InterfaceReturn.json"

src/main.js

@@ -54,7 +54,12 @@ router.beforeEach((to) => {
         store.commit('publicDeviceList')
     }
     if (to.path == '/home') {
-        window.location.href = "https://wx.ewoogi.com/panel/#/home";
-        // window.location.href = "http://localhost:8081/vuefiv#/home";
+        if (window.location.host.indexOf('localhost') != -1) {
+            window.location.href = "http://localhost:8081/vuefiv#/home";
+        } else if (window.location.host.indexOf('pcdev.ewoogi.com') != -1) {
+            window.location.href = "https://pcdev.ewoogi.com/vuefiv#/home";
+        } else {
+            window.location.href = "https://wx.ewoogi.com/panel/#/home";
+        }
     }
 })

src/views/stationManage/dialogComponent.vue

@@ -156,6 +156,7 @@ export default defineComponent({
       formInfo.value.validate((valid) => {
         if (valid) {
           if (props.dialogTitle === '新增') {
+            console.log(form.value)
             api.platformAreaAdd(form.value).then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({