diff --git a/src/api/index.js b/src/api/index.js index a3bf7ea..00be56c 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -421,6 +421,10 @@ readfilllight(data) { interiorthermalinsulation(data) { return sendGetRequest(`/readControl/interiorthermalinsulation`, data) }, +//立面保温 +facadeinsulation(data) { + return sendGetRequest(`/readControl/facadeinsulation`, data) +}, //环流风扇 readcirculationfan(data) { return sendGetRequest(`/readControl/readcirculationfan`, data) diff --git a/src/components/setParamsControl.vue b/src/components/setParamsControl.vue index f4e3b10..55bfa0f 100644 --- a/src/components/setParamsControl.vue +++ b/src/components/setParamsControl.vue @@ -125,6 +125,8 @@ export default { { name: '通风窗2', status: -1, router: 'sunroofControl', index: 2 }, { name: '通风窗3', status: -1, router: 'sunroofControl', index: 3 }, { name: '通风窗4', status: -1, router: 'sunroofControl', index: 4 }, + { name: '通风窗5', status: -1, router: 'sunroofControl', index: 5 }, + { name: '通风窗6', status: -1, router: 'sunroofControl', index: 6 }, ], router: "sunroofControl", }); } else if (el.id == 25) { @@ -151,7 +153,17 @@ export default { { name: '内保温2', status: -1, router: 'internalInsulation', index: 2 }, ], router: "internalInsulation", }); - } else if (el.id == 26) { + } else if (el.id == 29) { + this.routerList.push({ + id: el.id, sort: el.sort, + name: el.nickName, list: [ + { name: '立面保温1', status: -1, router: 'facadeInsulation', index: 1 }, + { name: '立面保温2', status: -1, router: 'facadeInsulation', index: 2 }, + { name: '立面保温3', status: -1, router: 'facadeInsulation', index: 3 }, + { name: '立面保温4', status: -1, router: 'facadeInsulation', index: 4 }, + ], router: "facadeInsulation", + }); + } else if (el.id == 26) { this.routerList.push({ id: el.id, sort: el.sort, name: el.nickName, list: [ { name: '风机', status: -1, router: 'wetFan', index: 1 }, diff --git a/src/router/index.js b/src/router/index.js index 85dc09d..d3f0e78 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -252,6 +252,10 @@ const routes = [ path: '/systemSet-con', name: 'systemSet-con', component: () => import('../views/page/systemSet-con.vue') + },{ + path: '/facadeInsulation', + name: 'facadeInsulation', + component: () => import('../views/page/facadeInsulation.vue') },] },] }, diff --git a/src/views/page/facadeInsulation.vue b/src/views/page/facadeInsulation.vue new file mode 100644 index 0000000..2fc5388 --- /dev/null +++ b/src/views/page/facadeInsulation.vue @@ -0,0 +1,340 @@ + + + \ No newline at end of file diff --git a/src/views/page/intrinsicParameter.vue b/src/views/page/intrinsicParameter.vue index 37a3802..4085fd6 100644 --- a/src/views/page/intrinsicParameter.vue +++ b/src/views/page/intrinsicParameter.vue @@ -357,7 +357,7 @@ -
+
4#通风窗全程运行时间
+
+
+
+ 5#通风窗全程运行时间 + + 打开输出通道: + + 关闭输出通道: + +
+
+ 通风窗朝向 + + + + {{ + item.label }} + + +
+
+ 开度基础值: + + +
+
+
+
+ 6#通风窗全程运行时间 + + 打开输出通道: + + 关闭输出通道: + +
+
+ 通风窗朝向 + + + + {{ + item.label }} + + +
+
+ 开度基础值: + + +
@@ -558,7 +622,7 @@ export default { { label: '东北', value: 6 }, { label: '西南', value: 7 }, { label: '西北', value: 8 },], - list2:[20668,20672,20676,20680], + list2:[20668,20672,20676,20680,20734,20738], typeList3: [ { label: '加热模式', value: 1 }, { label: '制冷模式', value: 2 },], diff --git a/src/views/page/parameterSet.vue b/src/views/page/parameterSet.vue index add23b7..4091dcf 100644 --- a/src/views/page/parameterSet.vue +++ b/src/views/page/parameterSet.vue @@ -335,7 +335,7 @@
-
+
4#通风窗: 目标温度选择 @@ -389,6 +389,114 @@
+
+
+ 5#通风窗: 目标温度选择 + + + + {{ + item.label }} + + +
+
+ 环境温度选择 + + + + {{ + item.label }} + + +
+
+ 目标湿度选择 + + + + {{ + item.label }} + + +
+
+ 环境湿度选择 + + + + {{ + item.label }} + + +
+
+
+
+ 6#通风窗: 目标温度选择 + + + + {{ + item.label }} + + +
+
+ 环境温度选择 + + + + {{ + item.label }} + + +
+
+ 目标湿度选择 + + + + {{ + item.label }} + + +
+
+ 环境湿度选择 + + + + {{ + item.label }} + + +
+
@@ -660,7 +768,7 @@ export default { { label: '6#空气温度', value: 8 }, { label: '7#空气温度', value: 7 }, { label: '8#空气温度', value: 8 },], - list1: [21732, 21736, 21740, 21742, 21743, 21744, 21746, 21748, 21752, 21756, 21760, 21764, 21768,21772,21774], + list1: [21732, 21736, 21740, 21742, 21743, 21744, 21746, 21748, 21752, 21756, 21760, 21764, 21768,21772,21774,21776,21780],//温度数组 typeList2: [ { label: '1#平均空气湿度', value: 1 }, { label: '2#平均空气湿度', value: 2 }, @@ -672,15 +780,15 @@ export default { { label: '6#空气湿度', value: 8 }, { label: '7#空气湿度', value: 7 }, { label: '8#空气湿度', value: 8 },], - list2: [21730, 21731, 21734, 21738, 21750, 21754, 21758, 21762, 21766, 21770], + list2: [21730, 21731, 21734, 21738, 21750, 21754, 21758, 21762, 21766, 21770,21778,21782],//湿度数组 typeList3: [ { label: '目标温度1', value: 1 }, { label: '目标温度2', value: 2 },], - list3: [21733, 21737, 21741, 21745, 21747, 21749, 21753, 21757, 21761, 21765, 21769,21773,21775], + list3: [21733, 21737, 21741, 21745, 21747, 21749, 21753, 21757, 21761, 21765, 21769,21773,21775,21777,21781],//目标温度 typeList4: [ { label: '目标湿度1', value: 1 }, { label: '目标湿度2', value: 2 },], - list4: [21735, 21739, 21751, 21755, 21759, 21763, 21767, 21771], + list4: [21735, 21739, 21751, 21755, 21759, 21763, 21767, 21771,21779,21783],//目标湿度 inputData: [], inputDataNew: [], loading:null, diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index 7e91771..17b3ba3 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -1422,14 +1422,22 @@ export default { var statusData = { name: el.nickName, type: 14, id: el.id, open: res.data.data[(1096 + ((el.id - 24) * 3))], progress: res.data.data[(1098 + ((el.id - 24) * 3))], index: res.data.data[(1097 + ((el.id - 24) * 3))], count: 0 } statusList.push(statusData) } else if (el.id == 26 || el.id == 27 || el.id == 28 || el.id == 29) { - //通风窗 + //通风窗1234 var statusData = { name: el.nickName, type: 15, id: el.id, open: res.data.data[(1102 + ((el.id - 26) * 3))], progress: res.data.data[(1104 + ((el.id - 26) * 3))], index: res.data.data[(1103 + ((el.id - 26) * 3))], count: res.data.data[1115 + (el.id - 26)] } statusList.push(statusData) } else if (el.id == 30 || el.id == 31) { //内保温 var statusData = { name: el.nickName, type: 16, id: el.id, open: res.data.data[(1182 + ((el.id - 30) * 3))], progress: res.data.data[(1184 + ((el.id - 30) * 3))], index: res.data.data[(1183 + ((el.id - 30) * 3))], count: 0 } statusList.push(statusData) - } + } else if (el.id == 32 || el.id == 33) { + //通风窗56 + var statusData = { name: el.nickName, type: 15, id: el.id, open: res.data.data[(1188 + ((el.id - 32) * 3))], progress: res.data.data[(1190 + ((el.id - 32) * 3))], index: res.data.data[(1189 + ((el.id - 32) * 3))], count: res.data.data[1194 + (el.id - 32)] } + statusList.push(statusData) + } else if (el.id == 34 || el.id == 35|| el.id == 36|| el.id == 37) { + //立面保温1234 + var statusData = { name: el.nickName, type: 16, id: el.id, open: res.data.data[(1196 + ((el.id - 34) * 3))], progress: res.data.data[(1198 + ((el.id - 34) * 3))], index: res.data.data[(1197 + ((el.id - 34) * 3))], count: 0 } + statusList.push(statusData) + } }) diff --git a/src/views/page/sunroofControl.vue b/src/views/page/sunroofControl.vue index 7686cbb..f01875f 100644 --- a/src/views/page/sunroofControl.vue +++ b/src/views/page/sunroofControl.vue @@ -200,7 +200,7 @@ export default { return { inputData: [], statusData:[], - startList: [21250, 21273, 21296, 21319],//每个阀门的起始参数 + startList: [21250, 21273, 21296, 21319,21342,21365],//每个阀门的起始参数 indexs: 1, actList1: [], loading:null, diff --git a/src/views/page/upload-con.vue b/src/views/page/upload-con.vue index bd59ef6..6eaefc6 100644 --- a/src/views/page/upload-con.vue +++ b/src/views/page/upload-con.vue @@ -107,7 +107,10 @@ export default { '室外平均露点温度', '室外平均C02传感器', '室外平均土温传感器', - '室外平均土湿传感器'], + '室外平均土湿传感器', + '室外平均大气压传感器', + "室外平均太阳总辐射传感器", + ], //平均值数据 actList2: [], @@ -215,7 +218,7 @@ export default { getAct1() { this.actList1=[] var num = this.inputData['21501'] - var num2 = this.padString(num.toString(2), 14) + var num2 = this.padString(num.toString(2), 16) this.actList1New=num2.split("") this.actList1New.forEach((el,index)=>{ if(el=='1'){ @@ -411,7 +414,7 @@ export default { } else { this.actList1.splice(this.actList1.indexOf(index), 1) } - this.actList1New=['0','0','0','0','0','0','0','0','0','0','0','0','0','0',] + this.actList1New=['0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'] this.actList1.forEach((el, index) => { this.actList1New[this.actList1New.length-el-1] = '1' }) diff --git a/src/views/page/upload.vue b/src/views/page/upload.vue index 6bdc457..facde1b 100644 --- a/src/views/page/upload.vue +++ b/src/views/page/upload.vue @@ -65,7 +65,9 @@ export default { '室外平均露点温度', '室外平均C02传感器', '室外平均土温传感器', - '室外平均土湿传感器'], + '室外平均土湿传感器', + '室外平均大气压传感器', + "室外平均太阳总辐射传感器",], actList2: [], actList2New: [], list2: ['目标水肥PH数据', @@ -81,7 +83,10 @@ export default { '3#通道传感器数据', '4#通道传感器数据', '5#通道传感器数据', - '6#通道传感器数据'], + '6#通道传感器数据', + "1#水温传感器数据", + "2#水温传感器数据", + ], inputData: [], loading:null, @@ -109,7 +114,7 @@ export default { getAct1() { this.actList1=[] var num = this.inputData['500'] - var num2 = this.padString(num.toString(2), 14) + var num2 = this.padString(num.toString(2), 16) this.actList1New=num2.split("") this.actList1New.forEach((el,index)=>{ if(el=='1'){ @@ -120,7 +125,7 @@ export default { getAct2() { this.actList2=[] var num = this.inputData['501'] - var num2 = this.padString(num.toString(2), 14) + var num2 = this.padString(num.toString(2), 16) this.actList2New=num2.split("") this.actList2New.forEach((el,index)=>{ if(el=='1'){ @@ -251,7 +256,7 @@ export default { } else { this.actList1.splice(this.actList1.indexOf(index), 1) } - this.actList1New=['0','0','0','0','0','0','0','0','0','0','0','0','0','0',] + this.actList1New=['0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0',] this.actList1.forEach((el, index) => { this.actList1New[this.actList1New.length-el-1] = '1' }) @@ -270,7 +275,7 @@ export default { } else { this.actList2.splice(this.actList2.indexOf(index), 1) } - this.actList2New=['0','0','0','0','0','0','0','0','0','0','0','0','0','0',] + this.actList2New=['0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0',] this.actList2.forEach((el, index) => { this.actList2New[this.actList2New.length-el-1] = '1' })