xiaomeng
/
wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc-master #120

Merged
xiaomeng merged 2 commits from pc-master into portal 2024-03-04 01:17:18 +00:00
Conversation 0 Commits 2 Files Changed 6
6 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/css/main.css
View File

@ -438,6 +438,7 @@
.index .header .header-right > img {
width: 40px;
height: 40px;
flex-shrink: 0;
}
.index .header .header-right .user-data {
@ -445,7 +446,7 @@
display: flex;
flex-direction: column;
justify-content: center;
padding: 0 20px 0 10px;
padding: 0 5px 0 10px;
margin-right: 20px;
border-right: 1px solid rgba(255, 255, 255, 0.2);
}
@ -470,6 +471,7 @@
background: url(../image/login-out.png) no-repeat center;
background-size: 100% 100%;
cursor: pointer;
flex-shrink: 0;
}
.index .header .header-right .login-out:hover {

2
src/assets/css/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

5
src/assets/css/main.scss
View File

@ -466,6 +466,7 @@
>img {
width: 40px;
height: 40px;
flex-shrink: 0;
}
.user-data {
@ -473,7 +474,7 @@
display: flex;
flex-direction: column;
justify-content: center;
padding: 0 20px 0 10px;
padding: 0 5px 0 10px;
margin-right: 20px;
border-right: 1px solid rgba(255, 255, 255, 0.2);
@ -498,7 +499,7 @@
background: url(../image/login-out.png) no-repeat center;
background-size: 100% 100%;
cursor: pointer;
flex-shrink: 0;
&:hover {
background: url(../image/login-out-hover.png) no-repeat center;
background-size: 100% 100%;

6
src/views/page/irrigateSet.vue
View File

@ -773,6 +773,12 @@ export default {
};
},
watch: {
'$store.state.equipmentIndex': function(newValue, oldValue) {
const that = this;
setTimeout(() => {
that.dataInit();
}, 0);
},
$route(newVal, oldVal) {
const that = this;
this.indexs = this.$route.query.id ? this.$route.query.id : 1;

36
src/views/page/realTime.vue
View File

@ -259,6 +259,7 @@
v-if="item.type == 6 || item.type == 5 || item.type == 2 || item.type == 15 || item.type == 14 || item.type == 13 || item.type == 12">
{{ item.progress }}%</div>
</div>
<div class="status-fan status-btn" v-else>
<div class="btn" :class="item.index == 1 ? 'blue' : 'off'">
<img class="light-img" :src="getIcon(item)" alt="">
@ -266,6 +267,11 @@
<span>{{ item.index == 1 ? '开启' : '关闭' }}</span>
</div>
</div>
<div class="status-true-text" v-if=" item.type == 15 ">
<div class="status-true-text-left">计算结果</div>
<div class="status-true-text-right">
{{ item.count }}</div>
</div>
</div>
<div v-else class="status-noTrue">
<img src="../../assets/img/status-no.png" alt="">
@ -1330,63 +1336,63 @@ export default {
statusList.push(fandata)
} else if (el.id == 2 || el.id == 3 || el.id == 4 || el.id == 5) {
//顶卷膜
var statusData = { name: el.name, type: 2, id: el.id, open: res.data.data[(1025 + ((el.id - 2) * 3))], progress: res.data.data[(1027 + ((el.id - 2) * 3))], index: res.data.data[(1026 + ((el.id - 2) * 3))] }
var statusData = { name: el.name, type: 2, id: el.id, open: res.data.data[(1025 + ((el.id - 2) * 3))], progress: res.data.data[(1027 + ((el.id - 2) * 3))], index: res.data.data[(1026 + ((el.id - 2) * 3))],count:0 }
statusList.push(statusData)
} else if (el.id == 6) {
//加温水泵
var statusData = { name: el.name, type: 3, id: el.id, open: res.data.data['1000'], progress: 0, index: res.data.data['1001'] }
var statusData = { name: el.name, type: 3, id: el.id, open: res.data.data['1000'], progress: 0, index: res.data.data['1001'],count:0 }
statusList.push(statusData)
} else if (el.id == 7) {
//地热风机
var statusData = { name: el.name, type: 4, id: el.id, open: res.data.data['1002'], progress: 0, index: res.data.data['1003'] }
var statusData = { name: el.name, type: 4, id: el.id, open: res.data.data['1002'], progress: 0, index: res.data.data['1003'],count:0 }
statusList.push(statusData)
} else if (el.id == 8) {
//上风口
var statusData = { name: el.name, type: 5, id: el.id, open: res.data.data['1004'], progress: res.data.data['1006'], index: res.data.data['1005'] }
var statusData = { name: el.name, type: 5, id: el.id, open: res.data.data['1004'], progress: res.data.data['1006'], index: res.data.data['1005'],count:0 }
statusList.push(statusData)
} else if (el.id == 9) {
//下风口
var statusData = { name: el.name, type: 5, id: el.id, open: res.data.data['1007'], progress: res.data.data['1009'], index: res.data.data['1008'] }
var statusData = { name: el.name, type: 5, id: el.id, open: res.data.data['1007'], progress: res.data.data['1009'], index: res.data.data['1008'],count:0 }
statusList.push(statusData)
} else if (el.id == 10) {
//卷被
var statusData = { name: el.name, type: 6, id: el.id, open: res.data.data['1010'], progress: res.data.data['1012'], index: res.data.data['1011'] }
var statusData = { name: el.name, type: 6, id: el.id, open: res.data.data['1010'], progress: res.data.data['1012'], index: res.data.data['1011'],count:0 }
statusList.push(statusData)
} else if (el.id == 11) {
//除雪
var statusData = { name: el.name, type: 7, id: el.id, open: res.data.data['1013'], progress: 0, index: res.data.data['1014'] }
var statusData = { name: el.name, type: 7, id: el.id, open: res.data.data['1013'], progress: 0, index: res.data.data['1014'],count:0 }
statusList.push(statusData)
} else if (el.id == 13 || el.id == 14) {
//高压微雾
var statusData = { name: el.name, type: 9, id: el.id, open: res.data.data[(1070 + ((el.id - 13) * 2))], progress: 0, index: res.data.data[(1071 + ((el.id - 13) * 2))] }
var statusData = { name: el.name, type: 9, id: el.id, open: res.data.data[(1070 + ((el.id - 13) * 2))], progress: 0, index: res.data.data[(1071 + ((el.id - 13) * 2))],count:0 }
statusList.push(statusData)
} else if (el.id == 15 || el.id == 16) {
//环流风扇
var statusData = { name: el.name, type: 10, id: el.id, open: res.data.data[(1074 + ((el.id - 15) * 2))], progress: 0, index: res.data.data[(1075 + ((el.id - 15) * 2))] }
var statusData = { name: el.name, type: 10, id: el.id, open: res.data.data[(1074 + ((el.id - 15) * 2))], progress: 0, index: res.data.data[(1075 + ((el.id - 15) * 2))],count:0 }
statusList.push(statusData)
} else if (el.id == 18 || el.id == 19) {
//湿帘泵
var statusData = { name: el.name, type: 11, id: el.id, open: res.data.data[(1080 + ((el.id - 18) * 2))], progress: 0, index: res.data.data[(1081 + ((el.id - 18) * 2))] }
var statusData = { name: el.name, type: 11, id: el.id, open: res.data.data[(1080 + ((el.id - 18) * 2))], progress: 0, index: res.data.data[(1081 + ((el.id - 18) * 2))],count:0 }
statusList.push(statusData)
} else if (el.id == 20 || el.id == 21) {
//湿帘外翻窗
var statusData = { name: el.name, type: 12, id: el.id, open: res.data.data[(1084 + ((el.id - 20) * 2))], progress: res.data.data[(1086 + ((el.id - 20) * 2))], index: res.data.data[(1085 + ((el.id - 20) * 2))] }
var statusData = { name: el.name, type: 12, id: el.id, open: res.data.data[(1084 + ((el.id - 20) * 2))], progress: res.data.data[(1086 + ((el.id - 20) * 2))], index: res.data.data[(1085 + ((el.id - 20) * 2))],count:0 }
statusList.push(statusData)
} else if (el.id == 22 || el.id == 23) {
//内遮阳
var statusData = { name: el.name, type: 13, id: el.id, open: res.data.data[(1090 + ((el.id - 22) * 2))], progress: res.data.data[(1092 + ((el.id - 22) * 2))], index: res.data.data[(1091 + ((el.id - 22) * 2))] }
var statusData = { name: el.name, type: 13, id: el.id, open: res.data.data[(1090 + ((el.id - 22) * 2))], progress: res.data.data[(1092 + ((el.id - 22) * 2))], index: res.data.data[(1091 + ((el.id - 22) * 2))],count:0 }
statusList.push(statusData)
} else if (el.id == 24 || el.id == 25) {
//外遮阳
var statusData = { name: el.name, type: 14, id: el.id, open: res.data.data[(1096 + ((el.id - 24) * 2))], progress: res.data.data[(1098 + ((el.id - 24) * 2))], index: res.data.data[(1097 + ((el.id - 24) * 2))] }
var statusData = { name: el.name, type: 14, id: el.id, open: res.data.data[(1096 + ((el.id - 24) * 2))], progress: res.data.data[(1098 + ((el.id - 24) * 2))], index: res.data.data[(1097 + ((el.id - 24) * 2))],count:0 }
statusList.push(statusData)
} else if (el.id == 26 || el.id == 27 || el.id == 28 || el.id == 29) {
//通风窗
var statusData = { name: el.name, 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))] }
var statusData = { name: el.name, 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.name, 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))] }
var statusData = { name: el.name, 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)
}

6
src/views/page/wetFan.vue
View File

@ -271,6 +271,9 @@
<span>湿帘外翻窗1模式:</span>
</div>
<div class="input-btn ">
<div class="btn" @click="changeOpen(0,21974)" :class="inputData[21974] == 0 ? 'blue' : 'green'">
无效
</div>
<div class="btn" @click="changeOpen(1,21974)" :class="inputData[21974] == 1 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet2.png" alt="" />自动运行
</div>
@ -318,6 +321,9 @@
<span>湿帘外翻窗2模式:</span>
</div>
<div class="input-btn ">
<div class="btn" @click="changeOpen(0,21979)" :class="inputData[21979] == 0 ? 'blue' : 'green'">
无效
</div>
<div class="btn" @click="changeOpen(1,21979)" :class="inputData[21979] == 1 ? 'blue' : 'green'">
<img src="../../assets/image/irrigateSet2.png" alt="" />自动运行
</div>