From 5ebc500a3e8c519a3e3388c4176e51bf2e5fe38e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 25 九月 2024 10:33:11 +0800
Subject: [PATCH] 地图倾斜
---
src/views/system/work-order/threshold/index.vue | 17 ++++----
src/views/system/data-manage/data-detail/index.vue | 1
src/views/screen/components/map3.vue | 69 +++++++++++++++++-----------------
src/views/system/work-order/index.vue | 18 +++++++-
4 files changed, 59 insertions(+), 46 deletions(-)
diff --git a/src/views/screen/components/map3.vue b/src/views/screen/components/map3.vue
index 72efd83..29513dd 100644
--- a/src/views/screen/components/map3.vue
+++ b/src/views/screen/components/map3.vue
@@ -26,37 +26,37 @@
dotData: [
{
name: '鑷祦浜曞尯',
- value: [104.665471408, 29.23008885, 300],
+ value: [104.645471408, 29.150000, 300],
platformOnline: true
},
{
name: '楂樻柊鍖�',
- value: [104.805193, 29.3, 300],
+ value: [104.780000, 29.22, 300],
platformOnline: true
},
{
name: '澶у畨鍖�',
- value: [104.90805, 29.345946, 300],
+ value: [104.90805, 29.275946, 300],
platformOnline: true
},
{
name: '娌挎哗鍖�',
- value: [104.80804, 29.200594, 300],
+ value: [104.78804, 29.130594, 300],
platformOnline: true
},
{
name: '璐′簳鍖�',
- value: [104.579106, 29.241427, 300],
+ value: [104.559106, 29.161427, 300],
platformOnline: true
},
{
name: '鑽ｅ幙',
- value: [104.3534, 29.3538, 300],
+ value: [104.3234, 29.2838, 300],
platformOnline: true
},
{
name: '瀵岄『鍘�',
- value: [104.96, 29.08, 300],
+ value: [104.950000, 29.04, 300],
platformOnline: true
}
],
@@ -64,37 +64,37 @@
{
name: '鑷祦浜曞尯',
number: '0',
- value: [104.616237686031, 29.081, 300]
+ value: [104.490471408, 28.960000, 300]
},
{
name: '楂樻柊鍖�',
number: '0',
- value: [104.84, 29.405, 300]
+ value: [104.86, 29.405, 300]
},
{
name: '澶у畨鍖�',
number: '0',
- value: [105.136, 29.30548885792289, 300]
+ value: [105.236, 29.30548885792289, 300]
},
{
name: '娌挎哗鍖�',
number: '0',
- value: [104.956237686031, 29.2, 300]
+ value: [104.760237686031, 28.8500000, 300]
},
{
name: '璐′簳鍖�',
number: '0',
- value: [104.436237686031, 29.16048885792289, 300]
+ value: [104.322237686031, 29.00048885792289, 300]
},
{
name: '鑽ｅ幙',
number: '0',
- value: [104.480237686031, 29.40048885792289, 300]
+ value: [104.466237686031, 29.44048885792289, 300]
},
{
name: '瀵岄『鍘�',
number: '0',
- value: [105.12, 29.076, 300]
+ value: [105.18, 29.000000, 300]
}
],
}
@@ -122,7 +122,6 @@
}
if (this.platformData) {
this.dotData.forEach(item => {
- console.log('鏇存柊鏁版嵁', this.platformData)
if (this.platformData[item.name]) {
item.platformOnline = this.platformData[item.name].platformOnline
}
@@ -161,8 +160,8 @@
map: name,
left: '-5%',
top: '5%',
- boxWidth: 100,
- regionHeight: 2,
+ boxWidth: 90,
+ regionHeight: 1,
zlevel: 5,
tooltip: {
@@ -178,7 +177,7 @@
},
label: {
- show: true, // (鍦板浘涓婄殑鍩庡競鍚嶇О)鏄惁鏄剧ず鏍囩
+ show: false, // (鍦板浘涓婄殑鍩庡競鍚嶇О)鏄惁鏄剧ず鏍囩
distance: 5,
formatter: function (params) {
return params.name ? params.name : ' '
@@ -191,7 +190,7 @@
emphasis: {
label: {
- show: true,
+ show: false,
textStyle: {
color: '#ffffff' // 楂樹寒鏂囧瓧涓轰寒钃濊壊
}
@@ -219,7 +218,7 @@
zoomSensitivity: 0, // 缂╂斁
panSensitivity: 0, // 骞崇Щ
center: [0, 0, 0],
- alpha: 70, // 鍊炬枩瑙掑害
+ alpha: 40, // 鍊炬枩瑙掑害
animationDurationUpdate: 1000, // 杩囨浮鍔ㄧ敾鐨勬椂闀�
animationEasingUpdate: 'cubicInOut' // 杩囨浮鍔ㄧ敾鐨勭紦鍔ㄦ晥鏋�
},
@@ -252,8 +251,8 @@
name: name,
type: 'map3D',
map: name,
- boxWidth: 100,
- regionHeight: 2,
+ boxWidth: 90,
+ regionHeight: 1,
left: '-5%',
top: '5%',
zlevel: 10,
@@ -293,7 +292,7 @@
zoomSensitivity: 0, // 缂╂斁
panSensitivity: 0, // 骞崇Щ
center: [0, 0, 0],
- alpha: 70 // 鍊炬枩瑙掑害
+ alpha: 40 // 鍊炬枩瑙掑害
}
},
{
@@ -330,44 +329,44 @@
data: [
{
coords: [
- [104.665471408, 29.23008885, 300],
- [104.6, 29.125, 430]
+ [104.645471408, 29.150000, 300],
+ [104.525471408, 28.960000, 430]
]
},
{
coords: [
- [104.805193, 29.30148885792289, 300],
+ [104.779193, 29.22148885792289, 300],
[104.780237686031, 29.39548885792289, 430]
]
},
{
coords: [
- [104.90805, 29.345946, 300],
- [105.056237686031, 29.33548885792289, 430]
+ [104.90805, 29.275946, 300],
+ [105.106237686031, 29.22948885792289, 430]
]
},
{
coords: [
- [104.80804, 29.200594, 300],
- [104.906237686031, 29.20048885792289, 430]
+ [104.78804, 29.130594, 300],
+ [104.776237686031, 28.85048885792289, 430]
]
},
{
coords: [
- [104.579106, 29.241427, 300],
- [104.486237686031, 29.19048885792289, 430]
+ [104.559106, 29.161427, 300],
+ [104.356237686031, 29.00048885792289, 430]
]
},
{
coords: [
- [104.3534, 29.3538, 300],
+ [104.3234, 29.2838, 300],
[104.456237686031, 29.39048885792289, 430]
]
},
{
coords: [
- [104.96, 29.08, 300],
- [105.05, 29.083, 430]
+ [104.950000, 29.04, 300],
+ [105.05, 28.983, 430]
]
}
],
diff --git a/src/views/system/data-manage/data-detail/index.vue b/src/views/system/data-manage/data-detail/index.vue
index bf183d7..f288951 100644
--- a/src/views/system/data-manage/data-detail/index.vue
+++ b/src/views/system/data-manage/data-detail/index.vue
@@ -84,6 +84,7 @@
v-model="queryParams.timeRange"
type="daterange"
range-separator="鑷�"
+ value-format="yyyy-MM-dd"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index 593c822..d27bd64 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -24,6 +24,16 @@
<el-option label="瀹℃牳鏈�氳繃" value="AUDITING_FAIL"></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鏃堕棿鑼冨洿" prop="timeRange">
+ <el-date-picker
+ v-model="queryParams.timeRange"
+ type="daterange"
+ range-separator="鑷�"
+ value-format="yyyy-MM-dd"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
@@ -88,7 +98,7 @@
<el-col :span="24" class="time">鏁呴殰鏃堕棿锛歿{ item.createTime }}</el-col>
</el-row>
<el-row class="work-order-item">
- <el-col class="time" :span="24"><div>鏁呴殰鐐逛綅锛�</div><div>{{ item.source }}</div></el-col>
+ <el-col class="time" :span="24"><div>鍥芥爣鐮侊細{{ item.serialNumber }}</div><div>{{ item.source }}</div></el-col>
</el-row>
<el-row style="position: absolute;bottom: 10px">
<el-button
@@ -769,8 +779,10 @@
this.empty = false;
this.loading = true
this.queryParams.params = {}
- this.queryParams['start'] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[0] : null
- this.queryParams['end'] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[1] : null
+ if (this.queryParams.timeRange && this.queryParams.timeRange.length > 0) {
+ this.queryParams.start = this.queryParams.timeRange[0]
+ this.queryParams.end = this.queryParams.timeRange[1]
+ }
listWorkOrder(this.queryParams).then(response => {
response.data.forEach(item => {
diff --git a/src/views/system/work-order/threshold/index.vue b/src/views/system/work-order/threshold/index.vue
index 412791e..feb4b44 100644
--- a/src/views/system/work-order/threshold/index.vue
+++ b/src/views/system/work-order/threshold/index.vue
@@ -13,8 +13,8 @@
<!-- </el-button>-->
<!-- </el-col>-->
<!-- </el-row>-->
- <div style="display: flex;overflow-x: auto;" >
- <div>
+ <el-row>
+ <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
<el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
<div style="display: flex; justify-content: space-between">
<div class="header鈥攖ext">瑙嗛</div>
@@ -102,8 +102,8 @@
</div>
</div>
</el-card>
- </div>
- <div>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
<el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
<div style="display: flex; justify-content: space-between">
<div class="header鈥攖ext">浜鸿劯</div>
@@ -191,9 +191,9 @@
</div>
</div>
</div>
- </el-card></div
+ </el-card></el-col
>
- <div>
+ <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
<el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
<div style="display: flex; justify-content: space-between">
<div class="header鈥攖ext">杞﹁締</div>
@@ -280,8 +280,9 @@
</div>
</div>
</div>
- </el-card></div>
- </div>
+ </el-card></el-col
+ >
+ </el-row>
</div>
</template>
--
Gitblit v1.8.0