diff --git a/src/api/index.js b/src/api/index.js index b4b83ee..1cf0687 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -14,11 +14,17 @@ function sendGetRequest(url, data) { params: data }) .then(function (res) { //请求成功，response接收返回参数 + if (res.data.code == 401) { localStorage.removeItem('token') - router.push({ - name: 'login' - }) + if(router.currentRoute.name!='login'){ + router.push({ + name: 'login' + }) + } + // router.push({ + // name: 'login' + // }) } resolve(res); @@ -43,9 +49,11 @@ function sendUploadRequest(url, data) { (res) => { if (res.data.code == 401) { localStorage.removeItem('token') - router.push({ - name: 'login' - }) + if(router.currentRoute.name!='login'){ + router.push({ + name: 'login' + }) + } } resolve(res); }, @@ -70,9 +78,11 @@ function sendPostRequest(url, data) { (res) => { if (res.data.code == 401) { localStorage.removeItem('token') - router.push({ - name: 'login' - }) + if(router.currentRoute.name!='login'){ + router.push({ + name: 'login' + }) + } } resolve(res); }, @@ -100,9 +110,11 @@ function sendDelRequest(url, data) { (res) => { if (res.data.code == 401) { localStorage.removeItem('token') - router.push({ - name: 'login' - }) + if(router.currentRoute.name!='login'){ + router.push({ + name: 'login' + }) + } } resolve(res); }, @@ -126,9 +138,11 @@ function sendPutRequest(url, data) { (res) => { if (res.data.code == 401) { localStorage.removeItem('token') - router.push({ - name: 'login' - }) + if(router.currentRoute.name!='login'){ + router.push({ + name: 'login' + }) + } } resolve(res); }, diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 33e2af8..1986862 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -782,6 +782,11 @@ textarea { padding: 0 10px; } +.input-main-80 span.tips { + color: rgba(255, 255, 255, 0.7); + font-size: 16px; +} + .input-main-80 input { width: 80px; height: 44px; @@ -2228,6 +2233,7 @@ textarea { background-size: 100% 100%; position: relative; overflow: hidden; + flex-shrink: 0; } .realTime .page-content .realTime-bottom .left-view > div .video-control .video-btn-big > div { diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index b2b5bce..c5c6a5d 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -817,6 +817,10 @@ textarea{ span { padding: 0 10px; + &.tips{ + color: rgba(255, 255, 255, 0.7); + font-size: 16px; + } } input { @@ -2344,6 +2348,7 @@ textarea{ background-size: 100% 100%; position: relative; overflow: hidden; + flex-shrink: 0; >div { width: 230px; diff --git a/src/views/index.vue b/src/views/index.vue index 9f95bc6..26e6e27 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -112,7 +112,7 @@ export default { activeNames: [3], leftList: [ { name: '首页', img: require('../assets/image/index-icon.png'), list: [], router: 'realTime', isRouter: true, }, - { name: '温室', routerList: ['realTime', 'dataAnalysis', 'historyData', 'exitSettings', 'videoMonitoring','imageData', 'skylight', 'control', 'systemSet-con', 'fan', 'upload-con', 'sensorSet-con', 'synthesis-con', 'alarmSettings', 'waterPump', 'geothermalFan', 'uptake', 'downtake', 'rollByRoll', 'snowRemoval', "targetTemperature", "targetHumidity", "targetCo2", "sunroofControl", "outsizeSunshade", "insizeSunshade", "wetFan", "LED", 'electromagneticControl', "coercionMist", "circulationCan", "internalInsulation", "forceOutput", "intrinsicParameter", "parameterSet"], img: require('../assets/image/left-img0.png'), list: [] }, + { name: '温室', routerList: ['realTime', 'dataAnalysis', 'historyData','air-conditioning', 'exitSettings', 'videoMonitoring','imageData', 'skylight', 'control', 'systemSet-con', 'fan', 'upload-con', 'sensorSet-con', 'synthesis-con', 'alarmSettings', 'waterPump', 'geothermalFan', 'uptake', 'downtake', 'rollByRoll', 'snowRemoval', "targetTemperature", "targetHumidity", "targetCo2", "sunroofControl", "outsizeSunshade", "insizeSunshade", "wetFan", "LED", 'electromagneticControl', "coercionMist", "circulationCan", "internalInsulation", "forceOutput", "intrinsicParameter", "parameterSet"], img: require('../assets/image/left-img0.png'), list: [] }, // { name: '二号温室', img: require('../assets/image/left-img1.png'), list: [] }, { name: '施肥机', routerList: ['status-soil','formula', 'dataAnalysis', 'historyData', 'irrigateSet', 'videoMonitoring','imageData', 'PIDSet', 'systemSet', 'upload', 'sensorSet', 'realTime', 'history', 'dataAnalysis'], img: require('../assets/image/left-img2.png'), list: [] }, { name: '智能灌溉', routerList: ['realTime', 'dataAnalysis', 'historyData','irrigateSet-soil', 'videoMonitoring','imageData','PIDSet-soil', 'systemSet-soil', 'upload-soil', 'sensorSet-soil', 'realTime', 'history', 'dataAnalysis'], img: require('../assets/image/irrigateSet-icon1-act.png'), list: [] }, @@ -288,8 +288,19 @@ export default { return value1 - value2; }; }, + // 根据deviceName获取router + deviceNameRouter(deviceName){ + if(deviceName==1){ + return 'formula' + }else if(deviceName==10){ + return 'control' + }else if(deviceName==20){ + return 'soil' + } + }, //获取设备 getEqbyid(selTrue) { + const that = this var userInfo = localStorage.getItem('userInfo') ? JSON.parse(localStorage.getItem('userInfo')) : { userid: -1 } var store = this.$store.state this.api.getEqbyid(userInfo.userid).then((res) => { @@ -297,7 +308,7 @@ export default { this.$store.state.equipmentList = res.data.data.map((item, index) => { return { ...item, - router: 'formula', + router: that.deviceNameRouter(item.deviceName), index: index + 1, }; }); @@ -350,7 +361,7 @@ export default { userId: item.userId, deviceTypeName: item.deviceName, index: list[list.length - 1].index + index + 1, - router: 'formula', + router: that.deviceNameRouter(item.deviceName), deviceName: '30' }; })) @@ -496,23 +507,17 @@ export default { if (item.router) { if (item.http) { window.location.href = item.http; - } else if (item.router == 'formula' && this.$route.query.index != item.index) { - if (this.routerNow == 'realTime') { + }else if(item.isRouter){ + this.$router.push({ path: item.router }) + } else if ( this.$route.query.index != item.index) { + if (this.routerNow == 'realTime'||item.router=='realTime') { this.$store.state.equipmentIndex = item.index - this.$router.push({ path: `/realTime?index=${item.index ? item.index : 1}&name=${item.deviceName}` }) - } else if (this.routerNow == 'history') { + this.$router.push({ path: `/realTime?index=${item.index ? item.index : 1}&name=${item.deviceName? item.deviceName : 1}` }) + } else if (this.routerNow == 'history'||this.routerNow == 'dataAnalysis'||this.routerNow == 'historyData'||this.routerNow == 'imageData') { this.$store.state.equipmentIndex = item.index - this.$router.push({ path: `/history?index=${item.index ? item.index : 1}` }) - } else if (this.routerNow == 'dataAnalysis') { - this.$store.state.equipmentIndex = item.index - this.$router.push({ path: `/dataAnalysis?index=${item.index ? item.index : 1}` }) - } else if (this.routerNow == 'historyData') { - this.$store.state.equipmentIndex = item.index - this.$router.push({ path: `/historyData?index=${item.index ? item.index : 1}` }) - } else if (this.routerNow == 'imageData') { - this.$store.state.equipmentIndex = item.index - this.$router.push({ path: `/imageData?index=${item.index ? item.index : 1}` }) - } else if (this.routerNow == 'videoMonitoring') { + this.$router.push({ path: `/${this.routerNow}?index=${item.index ? item.index : 1}` }) + } + else if (this.routerNow == 'videoMonitoring') { this.$store.state.equipmentIndex = item.index this.routerIndex = item.index // this.$router.push({ path: `/videoMonitoring?index=${item.index ? item.index : 1}` }) @@ -538,8 +543,7 @@ export default { this.$router.push({ path: `/irrigateSet?change=${item.index}` }) } } else if (item.deviceName == 20 ) { - // 智能灌溉 - + // 智能灌溉s if(this.routerNow == 'irrigateSet-soil'){ this.$store.state.equipmentIndex = item.index this.routerIndex = item.index @@ -553,7 +557,7 @@ export default { this.$message('气象站无该页面'); } } - } else if (item.router == 'formula' && this.$route.query.index == item.index) { + } else if ( this.$route.query.index == item.index) { return } else if (item.router != this.routerNow && !item.http) { this.$router.push({ name: item.router }) diff --git a/src/views/page/air-conditioning.vue b/src/views/page/air-conditioning.vue index 3ea2551..e32ae83 100644 --- a/src/views/page/air-conditioning.vue +++ b/src/views/page/air-conditioning.vue @@ -40,15 +40,37 @@ -
手动开启设置
-
+
手动设置
+
- 1.手动开启时空调设置的温度追踪目标温度。 + 手动开启空调的温度 + + ℃
+
+
+ 手动开启空调的湿度 + + %RH +
+
+
手自动设置
- 2.空调设置风速 + 空调的风速
- // (0是空调自动调整风速)。 + // (0是空调自动调整风速)。
- 3.空调设置冷暖模式 + 空调的模式
自动设置
+
+
+ {{ actList1[0] == "1" ? "有效" : "无效" }} +
+
- 目标值控制精度 - - PID采样时间 + 制热时段启用 +
+
+
+
+ + 工作时段 - 分钟 -
-
-
-
- 空调制冷 加暖模式切换时间 - - 分钟 ， - 比例系数(P) + : -
-
-
-
- 空调设置风速 - -
- -
- -
-
- - {{ item.label }} - - - // (0是空调自动调整风速)。 -
-
- 积分系数(I) + - -
-
-
-
- 空调调整间隔时间 - - 微分系数(D) + :
+
+
+ {{ actList1[1] == "1" ? "有效" : "无效" }} +
+
- 空调设置最高温度值 - - ℃ - 积分限制 + 制冷时段启用 +
+
+
+
+ + 工作时段 + : + + - + + : +
- 空调设置最低温度值 + + 空调PID采样时间 - ℃ + 分钟 +
+
+
+
+ + 比例调节系数 + + (比例需求=【实时温度-目标温度】*10*比例调节系数) +
+
+
+
+ + 积分调节系数 + + (积分需求=累计积分*10*积分调节系数) +
+
+
+
+ + 微分调节系数 + + (微分需求=(这次差值-上次差值)*10*微分调节系数) +
+
+
+
+ + 总PID输出=比例需求+积分需求+微分需求。(>=10000开始调节) +
+
+
+
+ + 空调停机温度差值 + + ℃ +
+
+
+
+ + 加热时，实时温度>目标温度+空调停机温度差值，空调停机 +
+
+
+
+ + 制冷时，实时温度<目标温度-空调停止温度差值，空调停机 +
+
+
+
+ + 空调停机湿度差值 + + %RH +
+
+
+
+ + 实时温度<目标温度-空调停机温度差值，空调停机 +
+
+
+
+
+ {{ actList1[2] == "1" ? "有效" : "无效" }} +
+
+
+ 优先冷暖风机启动 +
+
+
+
+ + 冷暖风机达到最大输出能力后，仍然达不到目标值 +
+
+
+
+ + + 分钟后启动空调
@@ -240,8 +374,9 @@ export default { data() { return { inputData: [], - inputDataNew:[], + inputDataNew: [], indexs: 1, + actList1: [], loading: null, pageName: "空调", typeList1: [ @@ -257,6 +392,8 @@ export default { { label: "空调自动调整", value: 0 }, { label: "制冷模式", value: 1 }, { label: "制热模式", value: 2 }, + { label: "除湿模式", value: 3 }, + { label: "送风模式", value: 4 }, ], }; }, @@ -366,7 +503,7 @@ export default { this.inputDataNew[code] = el.label; } }); - this.inputData[code] = command; + this.inputData[code] = command; var dataNum = { target: { value: command, @@ -374,7 +511,7 @@ export default { }; this.changeBtn(code, dataNum); }, - //制冷制热类型选择 + //制冷制热类型选择 handleCommand2(command, code) { this.typeList2.forEach((el, index) => { if (el.value == command) { @@ -417,6 +554,33 @@ export default { }); return name; }, + // 空调时段限制 + changeIndexOpen(active) { + if (this.actList1[active] == "1") { + this.actList1[active] = "0"; + } else { + this.actList1[active] = "1"; + } + this.$forceUpdate(); + var revList = this.actList1.slice().reverse(); + var num = revList.join(""); + var dataNum = { + target: { + value: parseInt(num, 2), + }, + }; + this.inputData[22057] = parseInt(num, 2); + this.changeBtn(22057, dataNum); + }, + getActive1() { + this.actList1 = []; + var num = this.inputData[22057]; + + var num1 = this.padString(num.toString(2), 3); + var openListNew = []; + openListNew = num1.split(""); + this.actList1 = openListNew.reverse(); + }, dataInit() { this.loading = this.$loading({ lock: true, @@ -433,12 +597,15 @@ export default { if (res.data.code == 200) { this.inputData = JSON.parse(JSON.stringify(res.data.data)); this.inputDataNew = JSON.parse(JSON.stringify(res.data.data)); - this.inputData[22047] = this.countData10(this.inputData[22047]); - this.inputData[22043] = this.countData10(this.inputData[22043]); - this.inputData[22048] = this.countData10(this.inputData[22048]); + // this.inputData[22047] = this.countData10(this.inputData[22047]); + this.inputData[22043] = this.countData(this.inputData[22043]); + this.inputData[22044] = this.countData10(this.inputData[22044]); + this.inputData[22059] = this.countData10(this.inputData[22059]); + this.inputData[22060] = this.countData10(this.inputData[22060]); this.inputDataNew[22041] = this.getData1(this.inputData[22041]); this.inputDataNew[22042] = this.getData2(this.inputData[22042]); - this.inputDataNew[22045] = this.getData1(this.inputData[22045]); + this.getActive1(); + // this.inputDataNew[22045] = this.getData1(this.inputData[22045]); } }); }, diff --git a/src/views/page/heatFan.vue b/src/views/page/heatFan.vue index f443333..7e1d74c 100644 --- a/src/views/page/heatFan.vue +++ b/src/views/page/heatFan.vue @@ -43,13 +43,13 @@
- 工作时段限制 + 工作时段 : - + - : diff --git a/src/views/page/intrinsicParameter.vue b/src/views/page/intrinsicParameter.vue index c4709a1..60bcd23 100644 --- a/src/views/page/intrinsicParameter.vue +++ b/src/views/page/intrinsicParameter.vue @@ -203,7 +203,7 @@
-
+
-
+
diff --git a/src/views/page/wetFan.vue b/src/views/page/wetFan.vue index 3137a23..c509164 100644 --- a/src/views/page/wetFan.vue +++ b/src/views/page/wetFan.vue @@ -45,7 +45,7 @@
-
工作时段限制
+
工作时段
- 温度大于 + 温度大于( - 时，启动1#风机。 + +控温精度滞回带)时，启动1#风机。
@@ -180,10 +180,10 @@
- 温度大于 + 温度大于( - 时，启动2#风机。 + +控温精度滞回带)时，启动2#风机。
@@ -193,10 +193,10 @@
- 温度大于 + 温度大于( - 时，启动3#风机。 + +控温精度滞回带)时，启动3#风机。
@@ -204,10 +204,10 @@
- 温度大于 + 温度大于( - 时，启动4#风机。 + +控温精度滞回带)时，启动4#风机。
@@ -217,10 +217,10 @@
- 温度大于 + 温度大于( - 时，启动5#风机。 + +控温精度滞回带)时，启动5#风机。