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

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

Reviewed-on: #113
portal
xiaomeng 2024-02-21 09:29:41 +00:00
parent adce6b924b 1397aa586a
commit 14395e63d5
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/page/historyData.vue
View File

@ -51,7 +51,7 @@
</el-table> </el-table>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="pageSize" :current-page="currentPage" :page-sizes="[10, 20, 50, 100, 200, 500, 1000,1500]" :page-size="pageSize"
layout="->,total, sizes, prev, pager, next, jumper" :total="total"> layout="->,total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination> </el-pagination>
</div> </div>

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

@ -30,7 +30,7 @@
<div class="page-content new-data" v-else :class="deviceName == 10 || deviceName == 30 ? 'control-page' : ''"> <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="control-view" v-if="deviceName == 10 || deviceName == 30">
<div class="title">气象站:</div> <div class="title" @click='weatherModel=true'>气象站:</div>
<vue-seamless class="control-list" :data="controlList" :class-option="defaultOption1"> <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="">
@ -285,9 +285,25 @@
</div> </div>
</div> </div>
</div> </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>
<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> </div>
<el-dialog title="实时数据" class="vrcode-model" :append-to-body="true" :visible.sync="dataModel" width="70%"> </div>
</div>
</div>
</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="vrcode-model-title vrcode-model-title-282">实时数据</div>
<div class="dataModel"> <div class="dataModel">
@ -460,6 +476,7 @@ export default {
sunset: "00:00", sunset: "00:00",
statusList: [], statusList: [],
dataModel:false,//全部实时数据弹窗 dataModel:false,//全部实时数据弹窗
weatherModel:false,
time: null,//右上角时间 time: null,//右上角时间
list: [], list: [],