diff --git a/src/api/api.js b/src/api/api.js index bb1911e..933faa5 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -36,6 +36,7 @@ export const getHomePageInfo = (params) => { params }) }; +// 环境信息 export const getEnvironmentInfo = (params) => { return axios.get('api/gk/info/getEnvironmentInfo', { params }) @@ -46,25 +47,26 @@ export const getSiteInfo = (params) => { }) }; export const getSwitchInfo = (params) => { - return axios.get('api/gk/info/getSwitchInfo', { + return axios.get('/gk/info/getSwitchInfo', { 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 }) }; diff --git a/src/views/land/child/index.vue b/src/views/land/child/index.vue index 6dfc24e..26986c8 100644 --- a/src/views/land/child/index.vue +++ b/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") { diff --git a/vue.config.js b/vue.config.js index c2fe0a2..08a51b3 100644 --- a/vue.config.js +++ b/vue.config.js @@ -17,8 +17,7 @@ module.exports = { proxy: { '/api': { //代理的名字 // target: 'https://309k63x452.oicp.vip', - target: 'http://221.226.19.85:10123/', - + target: 'http://221.226.19.85:10123/', ws: true, changeOrigin: true, pathRewrite:{