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

Merge pull request 'pc-master' (#90) from pc-master into portal 

Reviewed-on: #90
portal
xiaomeng 2024-01-11 07:31:06 +00:00
parent bd8c1656ce f838dd1587
commit 61ecce740c
10 changed files with 168 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1783,6 +1783,10 @@
justify-content: center;
}
.realTime .page-content .realTime-list .seamless-warp .list-view .number.red {
color: #fc7d6a;
}
.realTime .page-content .flex-list {
display: flex;
align-items: center;

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

File diff suppressed because one or more lines are too long

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

@ -1880,6 +1880,9 @@
display: flex;
align-items: center;
justify-content: center;
&.red{
color: rgba(252, 125, 106, 1);
}
}
}
}

BIN
src/assets/img/LED-off.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
src/assets/img/LED-on.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

6
src/components/setParamsControl.vue
View File

@ -236,12 +236,6 @@ export default {
list: [],
isRouter: true
},
{
name: "通道报警设置",
router: "exitSettings",
list: [],
isRouter: true
},
);
}

32
src/views/page/alarmSettings.vue
View File

@ -51,7 +51,9 @@
<span>选项三:温度高于</span>
<input @blur="blurChangeCount('20083', $event)" v-model="inputData['20083']"
@input="changeCountData('20083', $event)" type="text" value="60" placeholder="60" />
<span>℃，高温报警。</span>
<span>℃，高温报警。报警通道</span>
<input @blur="blurChange(20104, $event)" v-model="inputData[20104]" @input="change(20104, $event)"
type="text" placeholder="0">
</div>
</div>
<div class="flex-view">
@ -63,7 +65,9 @@
<span>选项四:温度低于</span>
<input @blur="blurChangeCount('20084', $event)" v-model="inputData['20084']"
@input="changeCountData('20084', $event)" type="text" value="60" placeholder="60" />
<span>℃，低温报警。</span>
<span>℃，低温报警。报警通道</span>
<input @blur="blurChange(20105, $event)" v-model="inputData[20105]" @input="change(20105, $event)"
type="text" placeholder="0">
</div>
</div>
<div class="flex-view shrink-none border-none">
@ -114,7 +118,9 @@
<span>选项三:温度高于</span>
<input @blur="blurChangeCount('20089', $event)" v-model="inputData['20089']"
@input="changeCountData('20089', $event)" type="text" value="60" placeholder="60" />
<span>℃，高温报警。</span>
<span>℃，高温报警。报警通道</span>
<input @blur="blurChange(20106, $event)" v-model="inputData[20106]" @input="change(20106, $event)"
type="text" placeholder="0">
</div>
</div>
<div class="flex-view">
@ -126,7 +132,9 @@
<span>选项四:温度低于</span>
<input @blur="blurChangeCount('20090', $event)" v-model="inputData['20090']"
@input="changeCountData('20090', $event)" type="text" value="60" placeholder="60" />
<span>℃，低温报警。</span>
<span>℃，低温报警。报警通道</span>
<input @blur="blurChange(20107, $event)" v-model="inputData[20107]" @input="change(20107, $event)"
type="text" placeholder="0">
</div>
</div>
<div class="flex-view shrink-none border-none">
@ -178,7 +186,9 @@
<span>选项三:湿度高于</span>
<input @blur="blurChange10('20096', $event)" v-model="inputData['20096']"
@input="changeCount10('20096', $event)" type="text" value="60" placeholder="60" />
<span>%RH，高湿报警。</span>
<span>%RH，高湿报警。报警通道</span>
<input @blur="blurChange(20108, $event)" v-model="inputData[20108]" @input="change(20108, $event)"
type="text" placeholder="0">
</div>
</div>
<div class="flex-view">
@ -190,7 +200,9 @@
<span>选项四:湿度低于</span>
<input @blur="blurChange10('20097', $event)" v-model="inputData['20097']"
@input="changeCount10('20097', $event)" type="text" value="60" placeholder="60" />
<span>%RH，低湿报警。</span>
<span>%RH，低湿报警。报警通道</span>
<input @blur="blurChange(20109, $event)" v-model="inputData[20109]" @input="change(20109, $event)"
type="text" placeholder="0">
</div>
</div>
<div class="flex-view shrink-none border-none">
@ -241,7 +253,9 @@
<span>选项三:湿度高于</span>
<input @blur="blurChange10('20102', $event)" v-model="inputData['20102']"
@input="changeCount10('20102', $event)" type="text" value="60" placeholder="60" />
<span>%RH，高湿报警。</span>
<span>%RH，高湿报警。报警通道</span>
<input @blur="blurChange(20110, $event)" v-model="inputData[20110]" @input="change(20110, $event)"
type="text" placeholder="0">
</div>
</div>
<div class="flex-view border-none">
@ -253,7 +267,9 @@
<span>选项四:湿度低于</span>
<input @blur="blurChange10('20103', $event)" v-model="inputData['20103']"
@input="changeCount10('20103', $event)" type="text" value="60" placeholder="60" />
<span>%RH，低湿报警。</span>
<span>%RH，低湿报警。报警通道</span>
<input @blur="blurChange(20111, $event)" v-model="inputData[20111]" @input="change(20111, $event)"
type="text" placeholder="0">
</div>
</div>
</div>

29
src/views/page/largeScreen.vue
View File

@ -38,7 +38,7 @@
</div>
</div>
<div class="content">
<div class="left">
<div class="left" v-show="limitUserId != 5">
<div class="weatherStation"></div>
<div class="weather">
@ -104,6 +104,26 @@
></div>
</div>
</div>
<div class="left" v-show="limitUserId == 5" style="height: calc(100% - 0.9rem);">
<div class="environmentData" style="height: 100%;overflow: hidden;">
<div class="e_title">温室环境数据</div>
<div class="detail" style="height: 100%;">
<vue-seamless
class="e_content"
:data="list"
:class-option="defaultOption"
>
<div class="item" v-for="(el, index) in list" :key="index">
<img :src="el.img" alt="" />
<div class="item_child">
<span>{{ el.name }}</span>
<span>{{ el.num }}</span>
</div>
</div>
</vue-seamless>
</div>
</div>
</div>
<div class="middle">
<div class="map">
<div class="map1">
@ -933,8 +953,11 @@ export default {
],
};
},
mounted() {
beforeMount(){
this.login();
},
mounted() {
// this.login();
this.getTime();
@ -1900,7 +1923,7 @@ export default {
.e_content {
width: 100%;
height: 2.53rem;
//height: 2.53rem;
display: flex;
flex-wrap: wrap;

4
src/views/page/outsizeSunshade.vue
View File

@ -65,11 +65,11 @@
</div>
</div>
<div class="flex-view border-none shrink-none padding-none">
<div class="input-btn">
<!-- <div class="input-btn">
<div class="btn btn-w80" @click="changeIndexOpen(1)" :class="actList1[1] == '1' ? 'blue' : 'off'">
{{ actList1[1] == '1' ? '有效' : '无效' }}
</div>
</div>
</div> -->
<div class="input-main-80">
<span>室外光照大于</span>
<input @blur="blurChange10(startList[indexs-1]+7, $event)" v-model="inputData[startList[indexs-1]+7]" @input="changeCount10(startList[indexs-1]+7, $event)"

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

@ -21,7 +21,7 @@
</div> -->
<div class="table-title">
<img src="../../assets/image/real-time.png" alt="" />
实时数据<span class="outline" v-if="deviceState==0">(设备离线)</span>
实时数据<span class="outline" v-if="deviceState == 0">(设备离线)</span>
</div>
<div class="timeNow" v-if="list.length">
<!-- {{ time.year.year }}-{{ time.year.month }}-{{ time.year.date }}<span> {{ time.time }}:{{ time.timeS
@ -44,7 +44,7 @@
<img :src="item.img" alt="">
<div>
<div class="text">{{ item.name }}</div>
<div class="number">{{ item.num }}</div>
<div class="number" :class="item.num=='无效'?'red':''">{{ item.num }}</div>
</div>
</div>
</vue-seamless>
@ -142,52 +142,52 @@
</div>
<div class="status-fan">
<div class="btn" :class="item.status[0] == 1 ? 'blue' : 'off'">
<img class="light-img" v-if="item.status[0] == 1" src="../../assets/img/light-on.png"
<img class="light-img" v-if="item.status[0] == 1" src="../../assets/img/LED-on.png"
alt="">
<img v-else src="../../assets/img/light-off.png" alt="">
<img v-else src="../../assets/img/fan-off.png" alt="">
<span>1#补光灯</span>
</div>
<div class="btn" :class="item.status[1] == 1 ? 'blue' : 'off'">
<img class="light-img" v-if="item.status[1] == 1" src="../../assets/img/light-on.png"
<img class="light-img" v-if="item.status[1] == 1" src="../../assets/img/LED-on.png"
alt="">
<img v-else src="../../assets/img/light-off.png" alt="">
<span>2#补光灯</span>
<img v-else src="../../assets/img/fan-off.png" alt="">
<span>2#补光灯</span>
</div>
<div class="btn" :class="item.status[2] == 1 ? 'blue' : 'off'">
<img class="light-img" v-if="item.status[2] == 1" src="../../assets/img/light-on.png"
<img class="light-img" v-if="item.status[2] == 1" src="../../assets/img/LED-on.png"
alt="">
<img v-else src="../../assets/img/light-off.png" alt="">
<span>3#补光灯</span>
<img v-else src="../../assets/img/fan-off.png" alt="">
<span>3#补光灯</span>
</div>
<div class="btn" :class="item.status[3] == 1 ? 'blue' : 'off'">
<img class="light-img" v-if="item.status[3] == 1" src="../../assets/img/light-on.png"
<img class="light-img" v-if="item.status[3] == 1" src="../../assets/img/LED-on.png"
alt="">
<img v-else src="../../assets/img/light-off.png" alt="">
<span>4#补光灯</span>
<img v-else src="../../assets/img/fan-off.png" alt="">
<span>4#补光灯</span>
</div>
<div class="btn" :class="item.status[4] == 1 ? 'blue' : 'off'">
<img class="light-img" v-if="item.status[4] == 1" src="../../assets/img/light-on.png"
<img class="light-img" v-if="item.status[4] == 1" src="../../assets/img/LED-on.png"
alt="">
<img v-else src="../../assets/img/light-off.png" alt="">
<span>5#补光灯</span>
<img v-else src="../../assets/img/fan-off.png" alt="">
<span>5#补光灯</span>
</div>
<div class="btn" :class="item.status[5] == 1 ? 'blue' : 'off'">
<img class="light-img" v-if="item.status[5] == 1" src="../../assets/img/light-on.png"
<img class="light-img" v-if="item.status[5] == 1" src="../../assets/img/LED-on.png"
alt="">
<img v-else src="../../assets/img/light-off.png" alt="">
<span>6#补光灯</span>
<img v-else src="../../assets/img/fan-off.png" alt="">
<span>6#补光灯</span>
</div>
<div class="btn" :class="item.status[6] == 1 ? 'blue' : 'off'">
<img class="light-img" v-if="item.status[6] == 1" src="../../assets/img/light-on.png"
<img class="light-img" v-if="item.status[6] == 1" src="../../assets/img/LED-on.png"
alt="">
<img v-else src="../../assets/img/light-off.png" alt="">
<span>7#补光灯</span>
<img v-else src="../../assets/img/fan-off.png" alt="">
<span>7#补光灯</span>
</div>
<div class="btn" :class="item.status[7] == 1 ? 'blue' : 'off'">
<img class="light-img" v-if="item.status[7] == 1" src="../../assets/img/light-on.png"
<img class="light-img" v-if="item.status[7] == 1" src="../../assets/img/LED-on.png"
alt="">
<img v-else src="../../assets/img/light-off.png" alt="">
<span>8#补光灯</span>
<img v-else src="../../assets/img/fan-off.png" alt="">
<span>8#补光灯</span>
</div>
</div>
</div>
@ -211,7 +211,8 @@
手机控制
</div>
</div>
<div class="status-true-charts" v-if="item.type == 6 || item.type == 5 || item.type == 2|| item.type == 15|| item.type == 14|| item.type == 13|| item.type == 12">
<div class="status-true-charts"
v-if="item.type == 6 || item.type == 5 || item.type == 2 || item.type == 15 || item.type == 14 || item.type == 13 || item.type == 12">
<img src="../../assets/img/status-true-charts-icon.png" alt="">
<div :id="'statusCharts' + index"></div>
</div>
@ -221,7 +222,8 @@
<div class="status-true-text">
<div class="status-true-text-left">{{ getNumberStatus(item) }}</div>
<div class="status-true-text-right"
v-if="item.type == 6 || item.type == 5 || item.type == 2|| item.type == 15|| item.type == 14|| item.type == 13|| item.type == 12">{{
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>
@ -327,14 +329,14 @@
<el-table-column prop="environmentId" label="报警名称">
<template slot-scope="scope">
<div>
{{ typeSelList[scope.row.environmentId-1].name }}
{{ typeSelList[scope.row.environmentId - 1].name }}
</div>
</template>
</el-table-column>
<el-table-column prop="environmentId" label="判断条件">
<template slot-scope="scope">
<div>
{{ typeSelList1[scope.row.unit-1].name }}
{{ typeSelList1[scope.row.unit - 1].name }}
</div>
</template>
</el-table-column>
@ -408,7 +410,7 @@ export default {
url: '',
timer: null,
deviceName: 1,
deviceState:1,
deviceState: 1,
controlList: [],
statusInterval: null,//status状态的Interval
statusTime: 2,//status状态的秒数
@ -505,11 +507,11 @@ export default {
}
return '';
},
delMessage(item){
var data={
messageId:item.id
delMessage(item) {
var data = {
messageId: item.id
}
this.api.delMessage(data).then(res=>{
this.api.delMessage(data).then(res => {
if (res.data.code == 200) {
this.$message({
message: '删除成功',
@ -527,7 +529,7 @@ export default {
}
this.api.messageList(data).then(res => {
if (res.data.code == 200) {
this.tableData=res.data.data
this.tableData = res.data.data
} else {
this.$message.error(res.data.msg);
}
@ -549,8 +551,8 @@ export default {
"phonenumber": '',
"phonenumber2": ''
}
this.warnModelSel1= ''
this.warnModelSel2=''
this.warnModelSel1 = ''
this.warnModelSel2 = ''
this.getMessageList()
} else {
this.$message.error(res.data.msg);
@ -627,8 +629,8 @@ export default {
},
getNumberStatus(item) {
var index = item.index
if (item.type == 2 || item.type == 5 || item.type == 6|| item.type == 12
|| item.type == 13|| item.type == 14|| item.type == 15) {
if (item.type == 2 || item.type == 5 || item.type == 6 || item.type == 12
|| item.type == 13 || item.type == 14 || item.type == 15) {
//顶卷膜
if (index == 0) {
return '静止状态'
@ -675,7 +677,7 @@ export default {
} else {
return ''
}
}else if (item.type == 10) {
} else if (item.type == 10) {
//地热风机
if (index == 0) {
return '环流风扇关闭'
@ -684,7 +686,7 @@ export default {
} else {
return ''
}
}else if (item.type == 11) {
} else if (item.type == 11) {
//地热风机
if (index == 0) {
return '湿帘泵关闭'
@ -693,7 +695,7 @@ export default {
} else {
return ''
}
}else{
} else {
//初始化
if (index == 0) {
return '关闭'
@ -807,7 +809,11 @@ export default {
// }else if(el1.countType==3){
// num=this.countType3(el.environmentData)+el1.unit
// }else{
num = el.environmentData + el1.unit
if(el.equipmentStart==0){
num='无效'
}else{
num = el.environmentData + el1.unit
}
// }
// if (el.equipmentNumber == 0) {
// if (el.targetValue == 1) {
@ -824,20 +830,20 @@ export default {
// } else {
// name = el.equipmentNumber + '#' + el.environmentDataId
// }
if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId
if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId
} else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId
name = '2#平均' + el.environmentDataId
} else {
if (el.targetValue == 1) {
if (el.targetValue == 1) {
name = el.equipmentNumber + '#目标' + el.environmentDataId
} else{
name = el.equipmentNumber + '#' + el.environmentDataId
}
} else {
name = el.equipmentNumber + '#' + el.environmentDataId
}
}
this.list.push({
@ -902,22 +908,27 @@ export default {
// }else if(el1.countType==3){
// num=this.countType3(el.environmentData)+el1.unit
// }else{
num = el.environmentData + el1.unit
if(el.equipmentStart==0){
num='无效'
}else{
num = el.environmentData + el1.unit
}
// }
if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId
if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId
} else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId
name = '2#平均' + el.environmentDataId
} else {
if (el.targetValue == 1) {
if (el.targetValue == 1) {
name = el.equipmentNumber + '#目标' + el.environmentDataId
} else{
name = el.equipmentNumber + '#' + el.environmentDataId
}
} else {
name = el.equipmentNumber + '#' + el.environmentDataId
}
}
this.list.push({
...el,
@ -941,7 +952,12 @@ export default {
list.forEach((el1, index1) => {
if (el.formula == el1.value) {
// console.log(el1);
var num = el.environmentData + el1.unit
var num=0
if(el.equipmentStart==0){
num='无效'
}else{
num = el.environmentData + el1.unit
}
this.controlList.push({
...el,
num: num,
@ -1000,7 +1016,12 @@ export default {
list.forEach((el1, index1) => {
if (el.formula == el1.value) {
// console.log(el1);
var num = el.environmentData + el1.unit
var num=0
if(el.equipmentStart==0){
num='无效'
}else{
num = el.environmentData + el1.unit
}
this.list.push({
...el,
name: el.environmentDataId,
@ -1085,7 +1106,7 @@ export default {
type: "success",
});
this.getPermissionStatus()
}else{
} else {
this.$message({
message: res.data.msg,
type: "warning",
@ -1142,7 +1163,7 @@ export default {
openListNew = num1.split("")
fandata.status = openListNew.reverse()
statusList.push(fandata)
}else if (el.id == 17) {
} else if (el.id == 17) {
//风机
var fandata = {}
fandata.open = res.data.data['1078']
@ -1156,7 +1177,7 @@ export default {
openListNew = num1.split("")
fandata.status = openListNew.reverse()
statusList.push(fandata)
}else if (el.id == 12) {
} else if (el.id == 12) {
//补光灯
var fandata = {}
fandata.open = res.data.data['1068']
@ -1198,42 +1219,42 @@ export default {
//除雪
var statusData = { name: el.name, type: 7, id: el.id, open: res.data.data['1013'], progress: 0, index: res.data.data['1014'] }
statusList.push(statusData)
}else if (el.id == 13||el.id == 14) {
} 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))] }
statusList.push(statusData)
}else if (el.id == 15||el.id == 16) {
} 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))] }
statusList.push(statusData)
}else if (el.id == 18||el.id == 19) {
} 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))] }
statusList.push(statusData)
}else if (el.id == 20||el.id == 21) {
} 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))] }
statusList.push(statusData)
}else if (el.id == 22||el.id == 23) {
} 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))] }
statusList.push(statusData)
}else if (el.id == 24||el.id == 25) {
} 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))] }
statusList.push(statusData)
}else if (el.id == 26||el.id == 27||el.id == 28||el.id == 29) {
} 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)*2))], progress: res.data.data[(1104 + ((el.id - 26)*2))], index: res.data.data[(1103 + ((el.id - 26)*2))] }
var statusData = { name: el.name, type: 15, id: el.id, open: res.data.data[(1102 + ((el.id - 26) * 2))], progress: res.data.data[(1104 + ((el.id - 26) * 2))], index: res.data.data[(1103 + ((el.id - 26) * 2))] }
statusList.push(statusData)
}
})
this.statusList = statusList
this.$forceUpdate();
setTimeout(() => {
this.statusList.forEach((el, index) => {
if (el.open != 0 && (el.type == 6 || el.type == 5 || el.type == 2|| el.type == 15|| el.type == 14|| el.type == 13|| el.type == 12)) {
if (el.open != 0 && (el.type == 6 || el.type == 5 || el.type == 2 || el.type == 15 || el.type == 14 || el.type == 13 || el.type == 12)) {
statusCharts(`statusCharts${index}`, el.progress)
}
})