diff --git a/src/api/index.js b/src/api/index.js index 82a2e93..6f28851 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -14,7 +14,7 @@ function sendGetRequest(url, data) { params: data }) .then(function (res) { //请求成功，response接收返回参数 - if (res.data.code == 401) { + if (res.data.code == 403) { localStorage.removeItem('token') router.push({ name: 'login' @@ -41,7 +41,7 @@ function sendUploadRequest(url, data) { } }).then( (res) => { - if (res.data.code == 401) { + if (res.data.code == 403) { localStorage.removeItem('token') router.push({ name: 'login' @@ -631,4 +631,45 @@ getIccid(data){ controlReadValuedownload(data) { return sendPostRequest(`/control/read/value?devicecode=${data}`,'') }, + + // 智能灌注 + //主页查看智能灌溉控制器 + getFi_rtdata(data) { + return sendGetRequest(`/getFi/rtdata`, data) + }, + //当天折线图 + chart_fidata(data) { + return sendPostRequest(`/chart/fidata?equipmentId=${data}`,'') + }, + //智能灌溉1 + readFi_irrigate(url,data) { + return sendGetRequest(url, data) + }, + //智能灌溉写入 + postwriteFi_write(data) { + return sendPostRequest("/writeFi/write", data); + }, + //智能灌溉状态值 + getFI_getState(data) { + return sendGetRequest("/getFI/getState", data); + }, + + //智能灌溉系统参数 + readControl_getFIIccid(data) { + return sendGetRequest("/readControl/getFIIccid", data); +}, + + //智能灌溉系统导入txt的 + upLoadFIwritevalue(data) { + return sendUploadRequest(`/FI/write/value`, data) + }, + //智能灌溉系统导出下载txt + FIreadvaluedownload(data) { + return sendPostRequest(`/FI/read/value?devicecode=${data}`,'') + }, + //智能灌溉系统数据上传 + readFi_datauploadfi(data) { + return sendGetRequest("/readFi/datauploadfi", data); + }, + }; diff --git a/src/components/setParamsSoil.vue b/src/components/setParamsSoil.vue new file mode 100644 index 0000000..02f08b0 --- /dev/null +++ b/src/components/setParamsSoil.vue @@ -0,0 +1,222 @@ + + + + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index d3f0e78..1b42765 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4,6 +4,7 @@ import HomeView from '../views/HomeView.vue' import index from '../views/index.vue' import login from '../views/login.vue' import control from '../views/control.vue' +import soil from '../views/soil.vue' Vue.use(VueRouter) const routes = [ @@ -132,7 +133,8 @@ const routes = [ name: 'videoManage', component: () => import('../views/manage/videoManage.vue') },] - }, { + }, + { path: '/control', name: 'control', component: control, @@ -257,6 +259,33 @@ const routes = [ name: 'facadeInsulation', component: () => import('../views/page/facadeInsulation.vue') },] + }, + { + path: '/soil', + name: 'soil', + component: soil, + redirect: '/irrigateSet-soil', + children: [{ + path: '/irrigateSet-soil', + name: 'irrigateSet-soil', + component: () => import('../views/page/irrigateSet-soil.vue') + },{ + path: '/intrinsicParameter-soil', + name: 'intrinsicParameter-soil', + component: () => import('../views/page/intrinsicParameter-soil.vue') + },{ + path: '/systemSet-soil', + name: 'systemSet-soil', + component: () => import('../views/page/systemSet-soil.vue') + },{ + path: '/upload-soil', + name: 'upload-soil', + component: () => import('../views/page/upload-soil.vue') + },{ + path: '/sensorSet-soil', + name: 'sensorSet-soil', + component: () => import('../views/page/sensorSet-soil.vue') + },] },] }, diff --git a/src/views/control.vue b/src/views/control.vue index 71b4eed..05a300a 100644 --- a/src/views/control.vue +++ b/src/views/control.vue @@ -25,10 +25,4 @@ export default { }; - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/index.vue b/src/views/index.vue index 96dc9bf..fb17d56 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -30,7 +30,7 @@ - + + + + \ No newline at end of file diff --git a/src/views/page/irrigateSet-soil.vue b/src/views/page/irrigateSet-soil.vue new file mode 100644 index 0000000..7d605fb --- /dev/null +++ b/src/views/page/irrigateSet-soil.vue @@ -0,0 +1,908 @@ + + + \ No newline at end of file diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index 89ce596..0f714a0 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -1170,7 +1170,7 @@ export default { } else if (this.deviceName == 30) { this.api.getControlRtDatastation(formData).then(res => { this.controlList = [] - this.list = [] + this.list = [] this.updateTime=res.data.data[0].updateTime if (res.data.code == 200) { res.data.data.forEach((el, index) => { @@ -1211,6 +1211,72 @@ export default { } }) + }else if(this.deviceName==20){ + this.api.getFi_rtdata(formData).then(res=>{ + if (res.data.code == 200) { + this.inputData = res.data.data; + this.list = [] + + this.updateTime=res.data.data[0].updateTime + + this.inputData.forEach((el, index) => { + list.forEach((el1, index1) => { + if (el.formula == el1.value) { + var num = 0 + var name = '' + if (el.equipmentStart == 0) { + num = '故障' + } else { + num = el.environmentData + el1.unit + } + + if (el.targetValue == 1) { + if (el.equipmentNumber == 0) { + name = '目标' + el.environmentDataId + } else { + name = '目标' + el.equipmentNumber + '#' + el.environmentDataId + } + } else { + if (el.equipmentNumber == 0) { + name = '1#平均' + el.environmentDataId + } else if (el.equipmentNumber == 15) { + name = '2#平均' + el.environmentDataId + } else { + name = el.equipmentNumber + '#' + el.environmentDataId + } + } + + + this.list.push({ + ...el, + name: name, + num: num, + img: require(`../../assets/image/real-time-${el.formula}.png`) + + }) + + } + }) + }) + } else { + // this.$message.error(res.data.msg); + } + }) + var nowDevice = store.equipmentList[this.indexs - 1] + // var data2 = { + // cameraid: nowDevice.cameraSerialNumber, + // channelid: nowDevice.cameraChannelNumber + // } + this.imgUrl = nowDevice.hls + + this.api.chart_fidata(equipmentId).then(res=>{ + if (res.data.code == 200) { + var chartsData = res.data.data + realTimeLine('realTime-line', chartsData, data1) + } else { + // this.$message.error(res.data.msg); + } + }) } }, diff --git a/src/views/page/sensorSet-soil.vue b/src/views/page/sensorSet-soil.vue new file mode 100644 index 0000000..d438916 --- /dev/null +++ b/src/views/page/sensorSet-soil.vue @@ -0,0 +1,451 @@ + + + + \ No newline at end of file diff --git a/src/views/page/systemSet-soil.vue b/src/views/page/systemSet-soil.vue new file mode 100644 index 0000000..a902187 --- /dev/null +++ b/src/views/page/systemSet-soil.vue @@ -0,0 +1,308 @@ + + + + \ No newline at end of file diff --git a/src/views/page/upload-soil.vue b/src/views/page/upload-soil.vue new file mode 100644 index 0000000..b5ef0f7 --- /dev/null +++ b/src/views/page/upload-soil.vue @@ -0,0 +1,288 @@ + + + + \ No newline at end of file diff --git a/src/views/soil.vue b/src/views/soil.vue new file mode 100644 index 0000000..89d8c31 --- /dev/null +++ b/src/views/soil.vue @@ -0,0 +1,27 @@ + + + \ No newline at end of file