pc-master #121

Merged
xiaomeng merged 2 commits from pc-master into portal 2024-03-04 09:38:54 +00:00
5 changed files with 121 additions and 66 deletions

View File

@ -546,6 +546,10 @@
width: 180px;
}
.input-sel.input-sel-w140 .el-dropdown-link {
width: 140px;
}
.input-sel .el-dropdown-link {
width: 300px;
height: 44px;

File diff suppressed because one or more lines are too long

View File

@ -582,7 +582,11 @@
width: 180px;
}
}
&.input-sel-w140 {
.el-dropdown-link {
width: 140px;
}
}
.el-dropdown-link {
width: 300px;
height: 44px;

View File

@ -273,7 +273,7 @@
<input @blur="blurChange(20670, $event)" v-model="inputData[20670]" @input="change(20670, $event)"
type="text" placeholder="0">
</div>
<div class="input-sel input-sel-w180">
<div class="input-sel input-sel-w140">
<span>通风窗朝向</span>
<el-dropdown @command="handleCommand2($event,20668)">
<div class="el-dropdown-link">
@ -286,6 +286,11 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="input-main-80">
<span>开度基础值</span>
<input @blur="blurChange(20892, $event)" v-model="inputData[20892]" @input="change(20892, $event)"
type="text" placeholder="0">
</div>
</div>
<div class="flex-view border-none shrink-none padding-none">
<div class="input-main-80">
@ -299,7 +304,7 @@
<input @blur="blurChange(20674, $event)" v-model="inputData[20674]" @input="change(20674, $event)"
type="text" placeholder="0">
</div>
<div class="input-sel input-sel-w180">
<div class="input-sel input-sel-w140">
<span>通风窗朝向</span>
<el-dropdown @command="handleCommand2($event,20672)">
<div class="el-dropdown-link">
@ -312,6 +317,11 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="input-main-80">
<span>开度基础值</span>
<input @blur="blurChange(20893, $event)" v-model="inputData[20893]" @input="change(20893, $event)"
type="text" placeholder="0">
</div>
</div>
<div class="flex-view border-none shrink-none padding-none">
<div class="input-main-80">
@ -325,7 +335,7 @@
<input @blur="blurChange(20678, $event)" v-model="inputData[20678]" @input="change(20678, $event)"
type="text" placeholder="0">
</div>
<div class="input-sel input-sel-w180">
<div class="input-sel input-sel-w140">
<span>通风窗朝向</span>
<el-dropdown @command="handleCommand2($event,20676)">
<div class="el-dropdown-link">
@ -338,6 +348,11 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="input-main-80">
<span>开度基础值</span>
<input @blur="blurChange(20894, $event)" v-model="inputData[20894]" @input="change(20894, $event)"
type="text" placeholder="0">
</div>
</div>
<div class="flex-view shrink-none padding-none">
<div class="input-main-80">
@ -351,7 +366,7 @@
<input @blur="blurChange(20682, $event)" v-model="inputData[20682]" @input="change(20682, $event)"
type="text" placeholder="0">
</div>
<div class="input-sel input-sel-w180">
<div class="input-sel input-sel-w140">
<span>通风窗朝向</span>
<el-dropdown @command="handleCommand2($event,20680)">
<div class="el-dropdown-link">
@ -364,6 +379,11 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="input-main-80">
<span>开度基础值</span>
<input @blur="blurChange(20895, $event)" v-model="inputData[20895]" @input="change(20895, $event)"
type="text" placeholder="0">
</div>
</div>
<div class="flex-view shrink-none padding-none">
<div class="input-main-80">

View File

@ -30,7 +30,7 @@
<div class="page-content new-data" v-else :class="deviceName == 10 || deviceName == 30 ? 'control-page' : ''">
<div class="control-view" v-if="deviceName == 10 || deviceName == 30">
<div class="title" @click='weatherModel=true'>气象站:</div>
<div class="title" @click='weatherModel = true'>气象站:</div>
<vue-seamless class="control-list" :data="controlList" :class-option="defaultOption1">
<div class="list-view" v-for="item, index in controlList " :key="index">
<img class="icon" :src="item.img" alt="">
@ -93,8 +93,10 @@
<div class="table-title">
<img src="../../assets/image/status.png" alt="" />
设备运行状态
<div class="title-text" v-if="sunrise"><img src="../../assets/img/sunrise.png" alt="">日出:{{ sunrise }}</div>
<div class="title-text" v-if="sunset"><img src="../../assets/img/sunset.png" alt="">日落:{{ sunset }}</div>
<div class="title-text" v-if="sunrise"><img src="../../assets/img/sunrise.png" alt="">日出:{{ sunrise }}
</div>
<div class="title-text" v-if="sunset"><img src="../../assets/img/sunset.png" alt="">日落:{{ sunset }}
</div>
</div>
<div class="flex-view border-none">
<div class="status-view" v-for="item, index in statusList" :key="index">
@ -267,7 +269,7 @@
<span>{{ item.index == 1 ? '开启' : '关闭' }}</span>
</div>
</div>
<div class="status-true-text" v-if=" item.type == 15 ">
<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>
@ -294,15 +296,15 @@
</div>
</div>
<el-dialog title="气象站" class="vrcode-model" :append-to-body="true" :visible.sync="weatherModel" width="1030px">
<el-button class="model-return-btn" type="primary" @click="weatherModel=false"> </el-button>
<el-button class="model-return-btn" type="primary" @click="weatherModel = false"> </el-button>
<div class="vrcode-model-title vrcode-model-title-282">气象站</div>
<div class="dataModel">
<div class="view-new">
<div class="list-view" v-for="item, index in controlList " :key="index">
<img class="icon" :src="item.img" alt="">
<div>
<div class="text">{{ item.environmentDataId}}</div>
<div class="number" > {{ getControlData(item) }}</div>
<div class="text">{{ item.environmentDataId }}</div>
<div class="number"> {{ getControlData(item) }}</div>
</div>
</div>
@ -311,7 +313,7 @@
</el-dialog>
<el-dialog title="实时数据" class="vrcode-model" :append-to-body="true" :visible.sync="dataModel" width="1030px">
<el-button class="model-return-btn" type="primary" @click="dataModel=false"> </el-button>
<el-button class="model-return-btn" type="primary" @click="dataModel = false"> </el-button>
<div class="vrcode-model-title vrcode-model-title-282">实时数据</div>
<div class="dataModel">
<div class="view-new">
@ -393,7 +395,8 @@
</el-dropdown>
</div>
<div class="input-main">
<input type="text" v-model="warnForm.environmentData" style="width: 200px;" placeholder="请输入设定值">
<input type="text" v-model="warnForm.environmentData" style="width: 200px;"
placeholder="请输入设定值">
<span></span>
</div>
<div class="input-btn ">
@ -405,7 +408,8 @@
<div class="title-tips">原有报警规则</div>
<div class="vrcode-table">
<div class="vrcode-table-view table-view">
<el-table :data="tableData" :row-class-name="tableRowClassName" height="520" style="width: 100%">
<el-table :data="tableData" :row-class-name="tableRowClassName" height="520"
style="width: 100%">
<el-table-column prop="environmentId" label="报警名称">
<template slot-scope="scope">
@ -415,6 +419,7 @@
</template>
</el-table-column>
<el-table-column prop="environmentId" label="判断条件">
<template slot-scope="scope">
<div>
{{ typeSelList1[scope.row.unit - 1].name }}
@ -425,6 +430,7 @@
<el-table-column prop="phonenumber" label="手机号1"></el-table-column>
<el-table-column prop="phonenumber2" label="手机号2"></el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<div class="vrcode-table-btn">
<div class="vrcode-btn red-btn" @click="delMessage(scope.row)">
@ -441,6 +447,7 @@
</el-dialog>
</div>
</template>
<script>
import EZUIKit from 'ezuikit-js';
import { getnowtime } from '../../assets/js/nowTime'
@ -482,8 +489,8 @@ export default {
sunrise: "00:00",
sunset: "00:00",
statusList: [],
dataModel:false,//
weatherModel:false,
dataModel: false,//
weatherModel: false,
time: null,//
list: [],
@ -491,7 +498,7 @@ export default {
indexs: 1,
player: null,
url: '',
imgUrl:'',
imgUrl: '',
timer: null,
deviceName: 1,
deviceState: 1,
@ -583,8 +590,8 @@ export default {
this.$bus.$off('refreshTime')
},
methods: {
openDataModel(){
this.dataModel=true
openDataModel() {
this.dataModel = true
},
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) {
@ -958,13 +965,28 @@ export default {
// name = el.equipmentNumber + '#' + el.environmentDataId
// }
// }
// if (el.targetValue == 1) {
// name = '' + 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
// }
// }
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
name = '1#平均' + el.environmentDatald
} else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId
name = '2#平均' + el.environmentDatald
} else {
name = el.equipmentNumber + '#' + el.environmentDataId
}
@ -1012,8 +1034,8 @@ export default {
if (res.data.code == 200) {
this.url = res.data.data.ezopen
this.createVideoNew(res.data.data.accesstoken)
}else{
this.imgUrl=nowDevice.hls
} else {
this.imgUrl = nowDevice.hls
}
})
}
@ -1043,12 +1065,16 @@ export default {
}
// }
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
name = '1#平均' + el.environmentDatald
} else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId
name = '2#平均' + el.environmentDatald
} else {
name = el.equipmentNumber + '#' + el.environmentDataId
}
@ -1128,8 +1154,8 @@ export default {
if (res.data.code == 200) {
this.url = res.data.data.ezopen
this.createVideoNew(res.data.data.accesstoken)
}else{
this.imgUrl=nowDevice.hls
} else {
this.imgUrl = nowDevice.hls
}
})
}
@ -1336,63 +1362,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))],count:0 }
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'],count:0 }
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'],count:0 }
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'],count:0 }
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'],count:0 }
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'],count:0 }
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'],count:0 }
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))],count:0 }
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))],count:0 }
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))],count:0 }
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))],count:0 }
var statusData = { name: el.name, type: 12, id: el.id, open: res.data.data[(1084 + ((el.id - 20) * 3))], progress: res.data.data[(1086 + ((el.id - 20) * 3))], index: res.data.data[(1085 + ((el.id - 20) * 3))], 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))],count:0 }
var statusData = { name: el.name, type: 13, id: el.id, open: res.data.data[(1090 + ((el.id - 22) * 3))], progress: res.data.data[(1092 + ((el.id - 22) * 3))], index: res.data.data[(1091 + ((el.id - 22) * 3))], 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))],count:0 }
var statusData = { name: el.name, 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) {
//
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)] }
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))],count:0 }
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)
}
@ -1432,6 +1458,7 @@ export default {
}
</script>
<style lang="scss">
.video-js-select-quality-item {
color: rgba(0, 0, 0, 0.85) !important;