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

实时数据时间位置修改

Browse Source
This commit is contained in:
孙萌 2023-11-11 11:12:19 +08:00
parent 90cd66efe4
commit c3f0d872e0
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/assets/css/main.css
View File

@ -1522,10 +1522,7 @@
.realTime .page-content .timeNow { .realTime .page-content .timeNow {
text-align: center; text-align: center;
position: absolute; padding-left: 75px;
right: 30px;
top: 42px;
width: 240px;
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 24px; font-size: 24px;

2
src/assets/css/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

9
src/assets/css/main.scss
View File

@ -1602,10 +1602,11 @@
.timeNow { .timeNow {
text-align: center; text-align: center;
position: absolute; // position: absolute;
right: 30px; // right: 30px;
top: 42px; // top: 42px;
width: 240px; padding-left: 75px;
// width: 240px;
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 24px; font-size: 24px;

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

@ -1,11 +1,7 @@
<template> <template>
<div class="formula realTime"> <div class="formula realTime">
<div class="page-content"> <div class="page-content">
<div class="timeNow" v-if="list.length">
<!-- {{ time.year.year }}-{{ time.year.month }}-{{ time.year.date }}<span> {{ time.time }}:{{ time.timeS
}}</span> -->
{{ list[0].updateTime ? list[0].updateTime : '' }}
</div>
<div class="control-view" v-if="deviceName == 10"> <div class="control-view" v-if="deviceName == 10">
<div class="title">气象站:</div> <div class="title">气象站:</div>
<vue-seamless class="control-list" :data="controlList" :class-option="defaultOption1"> <vue-seamless class="control-list" :data="controlList" :class-option="defaultOption1">
@ -27,6 +23,12 @@
<img src="../../assets/image/real-time.png" alt="" /> <img src="../../assets/image/real-time.png" alt="" />
实时数据 实时数据
<!-- <div class="tips">种植作物1</div> --> <!-- <div class="tips">种植作物1</div> -->
</div>
<div class="timeNow" v-if="list.length">
<!-- {{ time.year.year }}-{{ time.year.month }}-{{ time.year.date }}<span> {{ time.time }}:{{ time.timeS
}}</span> -->
{{ list[0].updateTime ? list[0].updateTime : '' }}
</div> </div>
<div class="flex-view border-none"> <div class="flex-view border-none">
<!-- <div class="input-btn"> <!-- <div class="input-btn">
@ -354,7 +356,7 @@ export default {
res.data.data.forEach((el, index) => { res.data.data.forEach((el, index) => {
list.forEach((el1, index1) => { list.forEach((el1, index1) => {
if (el.formula == el1.value) { if (el.formula == el1.value) {
console.log(el1); // console.log(el1);
var num = el.environmentData + el1.unit var num = el.environmentData + el1.unit
this.controlList.push({ this.controlList.push({
...el, ...el,
@ -364,7 +366,7 @@ export default {
} }
}) })
}) })
console.log(this.controlList); // console.log(this.controlList);
}) })
var data1 = store.equipmentList[this.indexs - 1].deviceId var data1 = store.equipmentList[this.indexs - 1].deviceId
@ -389,7 +391,7 @@ export default {
// channelid: '1' // channelid: '1'
// } // }
this.api.getGethls(data2).then(res => { this.api.getGethls(data2).then(res => {
console.log(res.data, 11); // console.log(res.data, 11);
if (res.data.code == 200) { if (res.data.code == 200) {
this.url = res.data.msg this.url = res.data.msg
this.createVideo() this.createVideo()