Prechádzať zdrojové kódy

Merge branch 'master' of http://39.106.8.246:3003/sagacloud/sagacloud-sagadaping

anxiaoxia 3 rokov pred
rodič
commit
35c6b5b480
3 zmenil súbory, kde vykonal 14 pridanie a 20 odobranie
  1. 4 4
      src/api/fistpage.ts
  2. 7 7
      src/api/second.ts
  3. 3 9
      vue.config.js

+ 4 - 4
src/api/fistpage.ts

@@ -1,10 +1,10 @@
 export default {
     queryConditionerStatus:
-        "/daping/duoduo-service/setup-service/environment/queryConditionerStatus", //空调状态
+        "/sgshow/duoduo-service/setup-service/environment/queryConditionerStatus", //空调状态
     queryEnvHistory:
-        "/daping/duoduo-service/setup-service/environment/queryEnvHistory", //上月温度
+        "/sgshow/duoduo-service/setup-service/environment/queryEnvHistory", //上月温度
     queryEnvCurrent:
-        "/daping/duoduo-service/setup-service/environment/queryEnvCurrent", //实时数据
+        "/sgshow/duoduo-service/setup-service/environment/queryEnvCurrent", //实时数据
     queryIndoorTempList:
-        "/daping/duoduo-service/setup-service/environment/queryIndoorTempList", //实时温度
+        "/sgshow/duoduo-service/setup-service/environment/queryIndoorTempList", //实时温度
 };

+ 7 - 7
src/api/second.ts

@@ -1,13 +1,13 @@
 export default {
-    queryBuilding: "/daping/duoduo-service/object-service/object/building/query", //获取楼层
-    queryFs: "/daping/duoduo-service/object-service/object/floor/queryFs", //获取楼层
-    queryParam: "/daping/duoduo-service/object-service/object/floor/queryParam", //获取楼层详情
+    queryBuilding: "/sgshow/duoduo-service/object-service/object/building/query", //获取楼层
+    queryFs: "/sgshow/duoduo-service/object-service/object/floor/queryFs", //获取楼层
+    queryParam: "/sgshow/duoduo-service/object-service/object/floor/queryParam", //获取楼层详情
     getWeatherCurrent:
-        "/daping/duoduo-service/object-service/weather/getCurrent", //天气
+        "/sgshow/duoduo-service/object-service/weather/getCurrent", //天气
     queryLastDayEnergy:
-        "/daping/duoduo-service/review-service/energy/week/day/query", //上月每日能耗
+        "/sgshow/duoduo-service/review-service/energy/week/day/query", //上月每日能耗
     queryLastAllEnergy:
-        "/daping/duoduo-service/review-service/sceneValue/query", //上月所有能耗
-    saveMapInfo:"/daping/duoduo-service/setup-service/map/saveMapInfo"//保存地图
+        "/sgshow/duoduo-service/review-service/sceneValue/query", //上月所有能耗
+    saveMapInfo:"/sgshow/duoduo-service/setup-service/map/saveMapInfo"//保存地图
         
 };

+ 3 - 9
vue.config.js

@@ -17,17 +17,11 @@ module.exports = {
         //https: false,
         //hotOnly: false,
         proxy: {
-            "/daping": {
-                // http://api.sagacloud.cn/duoduo-service/object-service/object/floor/queryFs
-                //target: 'http://192.168.0.14:52021', // 接 口环境
+            "/sgshow/duoduo-service": {
                 'target': 'http://duoduoenv.sagacloud.cn/', // 开发环境
-                // target: 'http://test.persagy.com', // 测试环境
                 changeOrigin: true,
-                //logLevel: "debug",
                 pathRewrite: {
-                    '^/daping': '', // 接口环境
-                    // '^/daping': 'http://192.168.0.14:52015', // 开发环境
-
+                    '^/sgshow/duoduo-service': '/duoduo-service', // 接口环境
                 },
             },
 
@@ -40,7 +34,7 @@ module.exports = {
             //     changeOrigin: true,
             //     //logLevel: "debug",
             //     pathRewrite: {
-            //         // '^/daping': 'http://192.168.0.14:52010', // 接口环境
+          
             //         '^/weather': '', // 开发环境
 
             //     },