代码提交

src/api/api.js

@@ -27,14 +27,14 @@ axios.interceptors.request.use(function (config) {
 export const doLogin = (data) =>{
     return axios.post('/login/doLogin',data)
 }
-export const getHomePageInfo = (params) => {
-    return axios.post('/gk/homePage/getHomePageInfo?cityId='+params)
-};
+// export const getHomePageInfo = (params) => {
+//     return axios.post('/gk/homePage/getHomePageInfo?cityId='+params)
+// };
 // 环境信息
-export const getEnvironmentInfo = (params) => {
-    return axios.post('/gk/info/getEnvironmentInfo?siteId='+params
-    )
-};
+// export const getEnvironmentInfo = (params) => {
+//     return axios.post('/gk/info/getEnvironmentInfo?siteId='+params
+//     )
+// };
 // 获取城市列表
 export const getCityList = (params)=>{
     return axios.post('/gk/homePage/getCityList')
@@ -43,31 +43,69 @@ export const getCityList = (params)=>{
 export const getCityDetail = (params)=>{
     return axios.post('/gk/homePage/getCityDetail?cityId='+params)
 }
-export const getSiteInfo = (params) => {
-    return axios.get('api/gk/info/getSiteInfo', {
+// export const getSiteInfo = (params) => {
+//     return axios.get('api/gk/info/getSiteInfo', {
+//         params
+//     })
+// };
+// export const getSwitchInfo = (params) => {
+//     return axios.get('api/gk/info/getSwitchInfo', {
+//         params
+//     })
+// };
+//查询实时事件
+// export const getDeviceRecord = (params) => {
+//     return axios.get('api/gk/info/getDeviceRecord', {
+//         params
+//     })
+// };
+//查询实时记录下拉框
+// export const getDeviceNum = (params) => {
+//     return axios.get('api/gk/info/getDeviceNum', {
+//         params
+//     })
+// };
+// 修改提交
+// export const updateDeviceRecord = (params) => {
+//     return axios.get('api/gk/info/updateDeviceRecord', {
+//         params
+//     })
+// };
+export const getHomePageInfo = (params) => {
+    return axios.get('/gk/homePage/getHomePageInfo', {
         params
     })
 };
 export const getSwitchInfo = (params) => {
-    return axios.get('api/gk/info/getSwitchInfo', {
+    return axios.get('/gk/info/getSwitchInfo', {
+        params
+    })
+};
+// 环境信息
+export const getEnvironmentInfo = (params) => {
+    return axios.get('/gk/info/getEnvironmentInfo', { params
+    })
+};
+export const getSiteInfo = (params) => {
+    return axios.get('/gk/info/getSiteInfo', {
         params
     })
 };
 //查询实时事件
 export const getDeviceRecord = (params) => {
-    return axios.get('api/gk/info/getDeviceRecord', {
+    return axios.get('/gk/info/getDeviceRecord', {
         params
     })
 };
 //查询实时记录下拉框
 export const getDeviceNum = (params) => {
-    return axios.get('api/gk/info/getDeviceNum', {
+    return axios.get('/gk/info/getDeviceNum', {
         params
     })
 };
 // 修改提交
 export const updateDeviceRecord = (params) => {
-    return axios.get('api/gk/info/updateDeviceRecord', {
+    return axios.get('/gk/info/updateDeviceRecord', {
         params
     })
 };

src/views/land/child/index.vue

@@ -1776,7 +1776,7 @@ export default {
             var url =
               "http://" +
               that.locanionIp +
-              ":5500/demo/demo_window_simple_previewNew.html";
+              ":5501/demo/demo_window_simple_previewNew.html";
             window.open(url, "baidu", "top=200,left=450,width=1000,height=600");
             console.log("bbb");
           }, 1000 * 1.5);
@@ -1787,7 +1787,7 @@ export default {
             var url =
               "http://" +
               that.locanionIp +
-              ":5500/demo/demo_window_simple_preview.html";
+              ":5501/demo/demo_window_simple_preview.html";
             window.open(url, "baidu", "top=200,left=450,width=1000,height=600");
           }, 1000 * 1.5);
         } else if (res.val == "Human") {

vue.config.js

@@ -16,7 +16,8 @@ module.exports = {
       // port: 8989, // 开发服务器运行端口号
       proxy: {
           '/api': { //代理的名字
-              target: 'https://309k63x452.oicp.vip',
+            //   target: 'https://309k63x452.oicp.vip',
+              target: 'http://221.226.19.85:10123/',
               ws: true,
               changeOrigin: true,
               pathRewrite:{