From 136f8362fb2af4cf98e5593809769821b5dd2c2f Mon Sep 17 00:00:00 2001
From: guoshipeng <3194674006@qq.com>
Date: Mon, 31 Jul 2023 14:39:36 +0800
Subject: [PATCH] fix:loading框加载，样式修改
---
src/views/UVA/index.vue | 81 +++++++++++++++++++++++++++++-----------
1 files changed, 58 insertions(+), 23 deletions(-)
diff --git a/src/views/UVA/index.vue b/src/views/UVA/index.vue
index b56cd3d..49aeb6b 100644
--- a/src/views/UVA/index.vue
+++ b/src/views/UVA/index.vue
@@ -145,25 +145,6 @@
<el-radio-button label="TVOC"></el-radio-button>
</el-radio-group>
<div class="Duo" v-if="selecttrue === 2">
- <el-select v-model="Duovalue" placeholder="������������" class="slee">
- <el-option
- v-for="item in optionsduo"
- :key="item.code"
- :label="item.name"
- :value="item.name"
- >
- </el-option>
- </el-select>
- <div class="spantu">
- <span>������������(���): </span
- ><el-input
- class="inputtu"
- v-model="uvasize"
- clearable
- placeholder="���������������"
- ref="uvas"
- ></el-input>
- </div>
<div class="spantuu">
<span>���������������������������(���): </span>
<el-input
@@ -178,6 +159,48 @@
ref="uvas"
></el-input>
</div>
+ <!-- <el-select v-model="Duovalue" placeholder="������������" class="slee">
+ <el-option
+ v-for="item in optionsduo"
+ :key="item.code"
+ :label="item.name"
+ :value="item.name"
+ >
+ </el-option>
+ </el-select> -->
+ <div class="spantu">
+ <span>������������(���): </span
+ ><el-input
+ class="inputtu"
+ v-model="uvasize"
+ clearable
+ placeholder="���������������"
+ ref="uvas"
+ ></el-input>
+ </div>
+ <el-select v-model="Duovalue" placeholder="������������" class="slee">
+ <el-option
+ v-for="item in optionsduo"
+ :key="item.code"
+ :label="item.name"
+ :value="item.name"
+ >
+ </el-option>
+ </el-select>
+ <!-- <div class="spantuu">
+ <span>���������������������������(���): </span>
+ <el-input
+ class="inputtu"
+ v-model="tallone"
+ ref="uvas"
+ ></el-input>
+ --
+ <el-input
+ class="inputtu"
+ v-model="talltwo"
+ ref="uvas"
+ ></el-input>
+ </div> -->
</div>
<div v-if="selecttrue === 1" style="margin-left: 10px">
<el-button type="primary" @click="gengD" style="margin-top: 10px"
@@ -726,6 +749,7 @@
},
methods: {
selectDuo() {
+ this.loading1 = true
if (this.chosee === 1) {
this.$message.warning('������������������������������������')
return
@@ -741,8 +765,9 @@
data: {
batch: this.batchs,
uvasize: this.uvasize,
- height: 0,
mac: this.macs,
+ height1: this.tallone,
+ height2: this.talltwo,
// batch: '2023-06-16 16:21:21',
},
}).then((res) => {
@@ -971,6 +996,7 @@
// this.carData.push(this.xie.date[i])
// }
// this.initStart(this.carData)
+ this.loading1 = true
this.asideData.activeKey = index
this.chosee = 2
this.batchs = item.batch
@@ -987,7 +1013,8 @@
data: {
batch: item.batch,
uvasize: this.uvasize,
- height: 0,
+ height1: this.tallone,
+ height2: this.talltwo,
mac: mac,
// batch: '2023-06-16 16:21:21',
},
@@ -1119,6 +1146,8 @@
lat = GPS.gcj_encrypt(lat, lng).lat
lng = GPS.bd_encrypt(lat, lng).lon
lat = GPS.bd_encrypt(lat, lng).lat
+ // lng = GPS.bd_decrypt(lat, lng).lon
+ // lat = GPS.bd_decrypt(lat, lng).lat
var point = new BMapGL.Point(lng, lat)
point.a34004 = parseInt(value.a34004)
point.a34002 = parseInt(value.a34002)
@@ -1178,6 +1207,7 @@
map: that.map,
})
that.firstPlayFlag = false
+ that.loading1 = false
} else {
this.view.removeAllLayers()
this.map.clearOverlays()
@@ -1185,6 +1215,8 @@
that.view = new mapvgl.View({
map: that.map,
})
+ that.loading1 = false
+
// that.map.centerAndZoom(that.centerPoint, 18)
}
}
@@ -1316,6 +1348,7 @@
}
}
points.push(point1)
+ // console.log(points, 'image.png')
// if (flag) {
// points.push(point1)
// console.log(points, 'points')
@@ -2037,9 +2070,10 @@
// background-color: white;
// height: 40px;
display: flex;
- margin-left: 25px;
+ margin-left: 10px;
line-height: 60px;
font-weight: 5px;
+ color: #696b6f;
.inputtu {
width: 40%;
margin-left: 5px;
@@ -2048,11 +2082,12 @@
.slee {
line-height: 60px;
width: 100px;
+ margin-left: 25px;
}
.spantuu {
- margin-left: 25px;
width: 400px;
line-height: 60px;
+ color: #696b6f;
.inputtu {
width: 20%;
}
--
Gitblit v1.8.0