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

Merge pull request '修改左边模块滚动间隙问题' (#91) from pc-master into portal 

Reviewed-on: #91
portal
xiaomeng 2024-01-12 06:54:05 +00:00
parent 61ecce740c 36a2253445
commit 319b90f8c9
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,7 @@
<div class="e_title">温室环境数据</div> <div class="e_title">温室环境数据</div>
<div class="detail" style="height: 100%;"> <div class="detail" style="height: 100%;">
<vue-seamless <vue-seamless
class="e_content" class="e_content e_content1"
:data="list" :data="list"
:class-option="defaultOption" :class-option="defaultOption"
> >
@ -475,7 +475,7 @@ export default {
defaultOption() { defaultOption() {
return { return {
step: 0.3, // 数值越大速度滚动越快 step: 0.3, // 数值越大速度滚动越快
limitMoveNum: 8, // 开始无缝滚动的数据量 this.dataList.length limitMoveNum: this.limitUserId != 5 ? 8 : 18, // 开始无缝滚动的数据量 this.dataList.length
hoverStop: true, // 是否开启鼠标悬停stop hoverStop: true, // 是否开启鼠标悬停stop
direction: 1, // 0向下 1向上 2向左 3向右 direction: 1, // 0向下 1向上 2向左 3向右
openWatch: true, // 开启数据实时监控刷新dom openWatch: true, // 开启数据实时监控刷新dom
@ -1012,11 +1012,11 @@ export default {
this.getWeatherData(2023112911050004); this.getWeatherData(2023112911050004);
}else if (limitUserId == 5) { }else if (limitUserId == 5) {
// 石门 // 石门
this.get_weather_echart_data(2023042214250070); // this.get_weather_echart_data(2023042214250070);
this.get_thisWeekTemperature_echart_data(2023042214250070); // this.get_thisWeekTemperature_echart_data(2023042214250070);
this.get_environmentData(2023042214250070); this.get_environmentData(2023042214250070);
this.get_readControl_getState(2023042214250070); this.get_readControl_getState(2023042214250070);
this.getWeatherData(2023042214250070); // this.getWeatherData(2023042214250070);
} }
} }
}); });
@ -1273,7 +1273,6 @@ export default {
// id == 1 丽水; // id == 1 丽水;
// id == 5 石门; // id == 5 石门;
this.limitUserId = (res.data.data.filter(el=>el.id == 2 || el.id == 1 || el.id == 5))[0].id; this.limitUserId = (res.data.data.filter(el=>el.id == 2 || el.id == 1 || el.id == 5))[0].id;
if (this.limitUserId == 1) { if (this.limitUserId == 1) {
this.drag_boxHandler(); this.drag_boxHandler();
this.dataInit(userId, this.limitUserId); this.dataInit(userId, this.limitUserId);
@ -1572,11 +1571,29 @@ export default {
<style lang="scss"> <style lang="scss">
.environmentData { .environmentData {
.e_content { .e_content {
> div { > div {
width: 100% !important; width: 100% !important;
> div { > div {
width: 100% !important; width: 100% !important;
display: flex;
flex-wrap: wrap;
}
}
}
.e_content1{
height: 100%;
> div {
width: 100% !important;
height: 100%;
> div {
width: 100% !important;
height: 100%;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }