From f3a8b27eb23c940dcd67bd459b76b0457fcb8b46 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Thu, 13 Jun 2024 13:29:49 +0800
Subject: [PATCH] fix: 样式修改
---
src/components/Wind/Map.vue | 77 ++++++++++++++++++++++++++------------
1 files changed, 53 insertions(+), 24 deletions(-)
diff --git a/src/components/Wind/Map.vue b/src/components/Wind/Map.vue
index 1c38cb7..f66f6b1 100644
--- a/src/components/Wind/Map.vue
+++ b/src/components/Wind/Map.vue
@@ -28,7 +28,19 @@
alt=""
@click="turnState"
>
- <span class="text_Time">{{ dateFormat }}</span>
+ <span class="text_Time">
+ <el-date-picker
+ v-model="selectData"
+ popper-class="tpc"
+ value-format="yyyy-MM-dd HH"
+ format="yyyy-MM-dd HH"
+ :clearable="false"
+ :editable="false"
+ type="datetime"
+ placeholder="������������������"
+ @change="changeData"
+ />
+ </span>
<img
class="drop-icon"
:src="turnImg"
@@ -432,7 +444,7 @@
// ������������������������������������������(���������������������������)
totalCount: 0,
// ������������������������������
- pageSizes: [10, 20, 30, 40],
+ pageSizes: [10, 50, 100, 200],
// ������������������������������������������
PageSize: 20,
factorOptions: [
@@ -507,6 +519,7 @@
turnImg: require('@/assets/images/regionalOverview/dropDown.png'),
showOrHidden: true,
dateFormat: '',
+ selectData: new Date(),
alarmTableVisible: false,
chooseTimeInfo: false, // ������������������������
chooseTime: false,
@@ -554,6 +567,9 @@
window.deviceDetail = this.deviceDetail
},
created () {
+ if (this.$store.state.orgId === 72) {
+ this.changeColor = 1
+ }
const newLL = this.bd09togcj02(this.jingduNew, this.weiduNew) // ���������������������������������
this.jingduNew = newLL[1]
this.weiduNew = newLL[0]
@@ -1546,32 +1562,15 @@
console.log('level', level)
if (deviceDetails.a01008) {
var windDirs = dushu === '-' ? 0 : Number(dushu)
- console.log('windDirs', windDirs)
+ WWindUtil.windValueFormat(windDirs)
+ console.log('windDirs', WWindUtil.windValueFormat(windDirs))
windDeg = windDirs
windTip = 'inline'
if (windDirs === 0 || windDirs === '-') {
windDir = '-'
windTip = 'none'
- } else if (windDirs > 0 && windDirs < 90) {
- windDir = '���������'
- windTip = 'inline'
- } else if (windDirs === 90) {
- windDir = '������'
- windTip = 'inline'
- } else if (windDirs > 90 && windDirs < 180) {
- windDir = '���������'
- windTip = 'inline'
- } else if (windDirs === 180) {
- windDir = '������'
- windTip = 'inline'
- } else if (windDirs > 180 && windDirs < 270) {
- windDir = '���������'
- windTip = 'inline'
- } else if (windDirs === 270) {
- windDir = '������'
- windTip = 'inline'
- } else if (windDirs > 270 && windDirs < 360) {
- windDir = '���������'
+ } else {
+ windDir = WWindUtil.windValueFormat(windDirs)
windTip = 'inline'
}
}
@@ -1981,6 +1980,11 @@
// that.canvasWind(this.windJsonData)
// })
window.map = map
+ },
+ changeData (val) {
+ this.nyr = val + ':00'
+ this.chooseTime = true
+ this.initData()
},
// ������������������������
change (index) {
@@ -2451,11 +2455,36 @@
margin-top: 9px;
margin-left: 10px;
}
-
.text_Time {
float: left;
margin-left: 37px;
+ .el-date-editor{
+ width: 145px!important;
+ .el-input__prefix{
+ display: none!important;
+ }
+ .el-input__inner{
+ cursor: pointer;
+ font-size: 18px;
+ color: #fff;
+ padding: 0px!important;
+ border: none;
+ background: inherit;
+
+ }
+ }
}
+.tpc{
+ left: unset!important;
+ right: 60px;
+}
+.tpc .el-time-spinner__wrapper {
+ width:100% !important;
+}
+.tpc .el-scrollbar:nth-of-type(2) {
+ display: none !important;
+}
+
.my-div-icon {
font-size: 14px;
text-align: center;
--
Gitblit v1.8.0