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

pc-master #121

Merged
xiaomeng merged 2 commits from pc-master into portal 2024-03-04 09:38:54 +00:00
Conversation 0 Commits 2 Files Changed 5 +87 -60
1 changed files with 87 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9a7728e494 - Show all commits

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

@ -93,8 +93,10 @@
<div class="table-title"> <div class="table-title">
<img src="../../assets/image/status.png" alt="" /> <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="sunrise"><img src="../../assets/img/sunrise.png" alt="">日出:{{ sunrise }}
<div class="title-text" v-if="sunset"><img src="../../assets/img/sunset.png" alt="">日落:{{ sunset }}</div> </div>
<div class="title-text" v-if="sunset"><img src="../../assets/img/sunset.png" alt="">日落:{{ sunset }}
</div>
</div> </div>
<div class="flex-view border-none"> <div class="flex-view border-none">
<div class="status-view" v-for="item, index in statusList" :key="index"> <div class="status-view" v-for="item, index in statusList" :key="index">
@ -393,7 +395,8 @@
</el-dropdown> </el-dropdown>
</div> </div>
<div class="input-main"> <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> <span></span>
</div> </div>
<div class="input-btn "> <div class="input-btn ">
@ -405,7 +408,8 @@
<div class="title-tips">原有报警规则</div> <div class="title-tips">原有报警规则</div>
<div class="vrcode-table"> <div class="vrcode-table">
<div class="vrcode-table-view table-view"> <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="报警名称"> <el-table-column prop="environmentId" label="报警名称">
<template slot-scope="scope"> <template slot-scope="scope">
@ -415,6 +419,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="environmentId" label="判断条件"> <el-table-column prop="environmentId" label="判断条件">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
{{ typeSelList1[scope.row.unit - 1].name }} {{ typeSelList1[scope.row.unit - 1].name }}
@ -425,6 +430,7 @@
<el-table-column prop="phonenumber" label="手机号1"></el-table-column> <el-table-column prop="phonenumber" label="手机号1"></el-table-column>
<el-table-column prop="phonenumber2" label="手机号2"></el-table-column> <el-table-column prop="phonenumber2" label="手机号2"></el-table-column>
<el-table-column label="操作" width="100"> <el-table-column label="操作" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="vrcode-table-btn"> <div class="vrcode-table-btn">
<div class="vrcode-btn red-btn" @click="delMessage(scope.row)"> <div class="vrcode-btn red-btn" @click="delMessage(scope.row)">
@ -441,6 +447,7 @@
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import EZUIKit from 'ezuikit-js'; import EZUIKit from 'ezuikit-js';
import { getnowtime } from '../../assets/js/nowTime' import { getnowtime } from '../../assets/js/nowTime'
@ -958,13 +965,28 @@ export default {
// name = el.equipmentNumber + '#' + el.environmentDataId // 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.targetValue == 1) {
if (el.equipmentNumber == 0) {
name = '目标' + el.environmentDataId name = '目标' + el.environmentDataId
} else {
name = '目标' + el.equipmentNumber + '#' + el.environmentDataId
}
} else { } else {
if (el.equipmentNumber == 0) { if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId name = '1#平均' + el.environmentDatald
} else if (el.equipmentNumber == 15) { } else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId name = '2#平均' + el.environmentDatald
} else { } else {
name = el.equipmentNumber + '#' + el.environmentDataId name = el.equipmentNumber + '#' + el.environmentDataId
} }
@ -1043,12 +1065,16 @@ export default {
} }
// } // }
if (el.targetValue == 1) { if (el.targetValue == 1) {
if (el.equipmentNumber == 0) {
name = '目标' + el.environmentDataId name = '目标' + el.environmentDataId
} else {
name = '目标' + el.equipmentNumber + '#' + el.environmentDataId
}
} else { } else {
if (el.equipmentNumber == 0) { if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId name = '1#平均' + el.environmentDatald
} else if (el.equipmentNumber == 15) { } else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId name = '2#平均' + el.environmentDatald
} else { } else {
name = el.equipmentNumber + '#' + el.environmentDataId name = el.equipmentNumber + '#' + el.environmentDataId
} }
@ -1432,6 +1458,7 @@ export default {
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.video-js-select-quality-item { .video-js-select-quality-item {
color: rgba(0, 0, 0, 0.85) !important; color: rgba(0, 0, 0, 0.85) !important;