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

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

Reviewed-on: #148
portal
xiaomeng 2024-05-30 03:39:03 +00:00
parent 93e6cb06e3 c65e9cfdda
commit ba07bcd532
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,10 +8,10 @@
<img src="../../assets/image/real-time.png" alt="" /> <img src="../../assets/image/real-time.png" alt="" />
生态气象站<span class="outline" v-if="deviceState == 0">(设备离线)</span> 生态气象站<span class="outline" v-if="deviceState == 0">(设备离线)</span>
</div> </div>
<div class="timeNow" v-if="list.length"> <div class="timeNow" v-if="updateTime">
<!-- {{ time.year.year }}-{{ time.year.month }}-{{ time.year.date }}<span> {{ time.time }}:{{ time.timeS <!-- {{ time.year.year }}-{{ time.year.month }}-{{ time.year.date }}<span> {{ time.time }}:{{ time.timeS
}}</span> --> }}</span> -->
{{ list[0].updateTime ? list[0].updateTime : '' }} {{ updateTime}}
</div> </div>
<div class="flex-list realTime-bottom" :class="deviceName == 30 ? 'weather' : ''"> <div class="flex-list realTime-bottom" :class="deviceName == 30 ? 'weather' : ''">
<div class="left-view-new"> <div class="left-view-new">
@ -50,10 +50,10 @@
<img src="../../assets/image/real-time.png" alt="" /> <img src="../../assets/image/real-time.png" alt="" />
实时数据<span class="outline" v-if="deviceState == 0">(设备离线)</span> 实时数据<span class="outline" v-if="deviceState == 0">(设备离线)</span>
</div> </div>
<div class="timeNow" v-if="list.length"> <div class="timeNow" v-if="updateTime">
<!-- {{ time.year.year }}-{{ time.year.month }}-{{ time.year.date }}<span> {{ time.time }}:{{ time.timeS <!-- {{ time.year.year }}-{{ time.year.month }}-{{ time.year.date }}<span> {{ time.time }}:{{ time.timeS
}}</span> --> }}</span> -->
{{ list[0].updateTime ? list[0].updateTime : '' }} {{ updateTime}}
</div> </div>
<div class="flex-view border-none warning-btn"> <div class="flex-view border-none warning-btn">
<div class="input-btn "> <div class="input-btn ">
@ -491,7 +491,7 @@ export default {
statusList: [], statusList: [],
dataModel: false,//全部实时数据弹窗 dataModel: false,//全部实时数据弹窗
weatherModel: false, weatherModel: false,
updateTime:'',
time: null,//右上角时间 time: null,//右上角时间
list: [], list: [],
inputData: [], inputData: [],
@ -929,6 +929,9 @@ export default {
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.list = [] this.list = []
this.updateTime=res.data.data[0].updateTime
this.inputData.forEach((el, index) => { this.inputData.forEach((el, index) => {
list.forEach((el1, index1) => { list.forEach((el1, index1) => {
if (el.formula == el1.value) { if (el.formula == el1.value) {
@ -1047,6 +1050,8 @@ export default {
if (res.data.code == 200) { if (res.data.code == 200) {
this.inputData = res.data.data; this.inputData = res.data.data;
this.list = [] this.list = []
this.updateTime=res.data.data[0].updateTime
this.inputData.forEach((el, index) => { this.inputData.forEach((el, index) => {
list.forEach((el1, index1) => { list.forEach((el1, index1) => {
if (el.formula == el1.value) { if (el.formula == el1.value) {
@ -1166,6 +1171,7 @@ export default {
this.api.getControlRtDatastation(formData).then(res => { this.api.getControlRtDatastation(formData).then(res => {
this.controlList = [] this.controlList = []
this.list = [] this.list = []
this.updateTime=res.data.data[0].updateTime
if (res.data.code == 200) { if (res.data.code == 200) {
res.data.data.forEach((el, index) => { res.data.data.forEach((el, index) => {
list.forEach((el1, index1) => { list.forEach((el1, index1) => {