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

Reviewed-on: #148

src/views/page/realTime.vue

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