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

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

Reviewed-on: #121
portal
xiaomeng 2024-03-04 09:38:53 +00:00
parent 7f69240cfb 9a7728e494
commit 2a81c2cf28
5 changed files with 121 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

File diff suppressed because one or more lines are too long

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

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

28
src/views/page/intrinsicParameter.vue
View File

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

49
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
} }
@ -1376,15 +1402,15 @@ export default {
statusList.push(statusData) 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))],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) 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))],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) 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))],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) 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) {
//通风窗 //通风窗
@ -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;