Compare commits

..

No commits in common. "6922280fa860950b537b596c6825e92dcf0535e1" and "b14a5434b9416eadb38d9db22ccb6572de27a725" have entirely different histories.

2 changed files with 10 additions and 12 deletions

View File

@ -25,7 +25,7 @@ axios.interceptors.request.use(function (config) {
}) })
// 登录的请求 // 登录的请求
export const doLogin = (data) =>{ export const doLogin = (data) =>{
return axios.post('api/login/doLogin',data) return axios.post('/login/doLogin',data)
} }
// export const getHomePageInfo = (params) => { // export const getHomePageInfo = (params) => {
// return axios.post('/gk/homePage/getHomePageInfo?cityId='+params) // return axios.post('/gk/homePage/getHomePageInfo?cityId='+params)
@ -47,26 +47,26 @@ export const getSiteInfo = (params) => {
}) })
}; };
export const getSwitchInfo = (params) => { export const getSwitchInfo = (params) => {
return axios.get('api/gk/info/getSwitchInfo', { return axios.get('/gk/info/getSwitchInfo', {
params params
}) })
}; };
//查询实时事件 //查询实时事件
export const getDeviceRecord = (params) => { export const getDeviceRecord = (params) => {
return axios.get('api/gk/info/getDeviceRecord', { return axios.get('/gk/info/getDeviceRecord', {
params params
}) })
}; };
//查询实时记录下拉框 //查询实时记录下拉框
export const getDeviceNum = (params) => { export const getDeviceNum = (params) => {
return axios.get('api/gk/info/getDeviceNum', { return axios.get('/gk/info/getDeviceNum', {
params params
}) })
}; };
// 修改提交 // 修改提交
export const updateDeviceRecord = (params) => { export const updateDeviceRecord = (params) => {
return axios.get('api/gk/info/updateDeviceRecord', { return axios.get('/gk/info/updateDeviceRecord', {
params params
}) })
}; };

View File

@ -863,7 +863,7 @@
<div class="select"> <div class="select">
<div class="seSearch">查询</div> <div class="seSearch">查询</div>
<div class="changeselect"> <div class="changeselect">
<el-select v-model="chaValue" placeholder="请选择" @change="searchChange" clearable > <el-select v-model="chaValue" placeholder="请选择" @change="searchChange">
<el-option v-for="item in optionsOpen" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in optionsOpen" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
@ -1811,8 +1811,7 @@ export default {
this.init(); this.init();
// // // //
window.setInterval(() => { window.setInterval(() => {
if (that.unityChange == 3 || that.unityChange == 0) { if (this.unityChange == 0) {
// getEnvironmentInfo( "2" ).then((res) => {
getEnvironmentInfo( {siteId:"2"} ).then((res) => { getEnvironmentInfo( {siteId:"2"} ).then((res) => {
// this.eniorArr // this.eniorArr
console.log(res,'实时记录'); console.log(res,'实时记录');
@ -1889,8 +1888,7 @@ export default {
} }
}); });
} else { } else {
// getEnvironmentInfo("96445C7C4AD6F0C5" ).then((res) => { getEnvironmentInfo({siteId:"96445C7C4AD6F0C5"} ).then((res) => {
getEnvironmentInfo({ siteId: "1" } ).then((res) => {
// this.eniorArr // this.eniorArr
for (const key in res.data.data) { for (const key in res.data.data) {
if (key == "doorState") { if (key == "doorState") {
@ -2127,7 +2125,7 @@ export default {
}, },
getTableData() { getTableData() {
// this.tableData = []; // this.tableData = [];
if (this.unityChange == 0 ||this.unityChange == 3) { if (this.unityChange == 0) {
getSwitchInfo({ siteId: "2" }).then((res) => { getSwitchInfo({ siteId: "2" }).then((res) => {
this.tableData = res.data.data.items; this.tableData = res.data.data.items;
for (let i = 0; i < this.tableData.length; i++) { for (let i = 0; i < this.tableData.length; i++) {