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

Reviewed-on: #29
pull/34/head^2
xiaomeng 2023-11-11 02:01:20 +00:00
commit e8b736299a
4 changed files with 17 additions and 5 deletions

View File

@ -1494,7 +1494,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
overflow: hidden; overflow: hidden;
max-width: 500px; max-width: 806px;
} }
.realTime .page-content .control-view .control-list > div { .realTime .page-content .control-view .control-list > div {

File diff suppressed because one or more lines are too long

View File

@ -1575,7 +1575,7 @@
align-items: center; align-items: center;
overflow: hidden; overflow: hidden;
max-width: 500px; max-width: 806px;
>div { >div {
// width: 100%!important; // width: 100%!important;
display: flex; display: flex;

View File

@ -6,9 +6,9 @@
}}</span> --> }}</span> -->
{{ list[0].updateTime ? list[0].updateTime : '' }} {{ list[0].updateTime ? list[0].updateTime : '' }}
</div> </div>
<div class="control-view"> <div class="control-view" v-if="deviceName == 10">
<div class="title">气象站:</div> <div class="title">气象站:</div>
<vue-seamless class="control-list" v-if="deviceName == 10" :data="controlList" :class-option="defaultOption"> <vue-seamless class="control-list" :data="controlList" :class-option="defaultOption1">
<div class="list-view" v-for="item, index in controlList " :key="index"> <div class="list-view" v-for="item, index in controlList " :key="index">
<img class="icon" :src="item.img" alt=""> <img class="icon" :src="item.img" alt="">
{{ item.environmentDataId {{ item.environmentDataId
@ -79,6 +79,18 @@ export default {
singleWidth: 0, // (0) direction => 2/3 singleWidth: 0, // (0) direction => 2/3
waitTime: 1000 // (1000ms) waitTime: 1000 // (1000ms)
} }
},
defaultOption1() {
return {
step: 0.3, //
limitMoveNum: 6, // this.dataList.length
hoverStop: true, // stop
direction: 2, // 0 1 2 3
openWatch: true, // dom
singleHeight: 0, // (0) direction => 0/1
singleWidth: 0, // (0) direction => 2/3
waitTime: 1000 // (1000ms)
}
} }
}, },
data() { data() {