From 05631bcdcce230b3ffdccb5f299938e57fd2761d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 20 三月 2024 13:48:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/data-manage/index.vue | 112 ++++++++++++++++++++--
src/views/screen/components/screen-map/index.vue | 134 ++++++++++++++++++++++----
src/views/screen/components/screen-map/test.vue | 0
3 files changed, 215 insertions(+), 31 deletions(-)
diff --git a/src/views/screen/components/screen-map/index.vue b/src/views/screen/components/screen-map/index.vue
index 8a263a0..e1b84bc 100644
--- a/src/views/screen/components/screen-map/index.vue
+++ b/src/views/screen/components/screen-map/index.vue
@@ -15,18 +15,18 @@
import WrapperTitle from '../wrapper-title/index';
echarts.registerMap('zigong', mapData);
-console.log(mapData);
let mapChart = null;
let tempName = '';
let observer = null;
const mapConfig = {
- series: [{
- map: "zigong", //娉ㄥ唽鍦板浘鐨勫悕瀛�
- type: "map3D",
+ geo3D: {
+ map: 'zigong',
+ show: true,
bottom: 0,
left: 0,
top: 0,
right: 0,
+ zlevel: 1,
itemStyle: {
color: "#4189f2", // 鑳屾櫙
opacity: 1, //閫忔槑搴�
@@ -44,28 +44,112 @@
// 鎺у埗鍣�
viewControl: {
beta: -30,
- alpha: 90,
- distance: 100,
+ alpha: 50,
+ distance: 105,
maxBeta: 180,
- panSensitivity: 0
+ panSensitivity: 0,
+ zoomSensitivity: 1,
+ rotateSensitivity: 0,
},
// 榧犳爣绉诲叆鏃舵牱寮�
emphasis: {
itemStyle: {
- color: "#F63545"
+ color: "#F63545",
}
},
+ // regions: mapData.features.map((item) => {
+ // return {
+ // name: item.properties.name,
+ // itemStyle: {
+ // color: "#4189f2"
+ // }
+ // }
+ // })
+ },
+ series: [
+ {
+ map: "zigong", //娉ㄥ唽鍦板浘鐨勫悕瀛�
+ type: "map3D",
+ bottom: 0,
+ left: 0,
+ top: 0,
+ right: 0,
+ zlevel: 2,
+ itemStyle: {
+ color: "#4189f2", // 鑳屾櫙
+ opacity: 0, //閫忔槑搴�
+ borderWidth: 0, // 杈规瀹藉害
+ borderColor: "#fff", // 杈规棰滆壊
+ fontSize: 18, //
+ },
- // 鏁版嵁
- data: mapData.features.map((item) => {
- return {
- name: item.properties.name,
- itemStyle: {
- color: "#4189f2"
+ // 鏍囩
+ label: {
+ show: false,
+ color: "#fff", //鍦板浘鍒濆鍖栧尯鍩熷瓧浣撻鑹�
+ fontSize: 18,
+ },
+ // 鎺у埗鍣�
+ viewControl: {
+ beta: -30,
+ alpha: 50,
+ distance: 105,
+ maxBeta: 180,
+ panSensitivity: 0,
+ zoomSensitivity: 1,
+ rotateSensitivity: 0,
+ },
+
+ // 鏁版嵁
+ data: mapData.features.map((item) => {
+ return {
+ name: item.properties.name,
+ itemStyle: {
+ color: "#4189f2"
+ }
}
- }
- }),
- }
+ }),
+
+ },
+ {
+ type: 'lines3D',
+ coordinateSystem: 'geo3D',
+ zlevel: 15,
+
+ effect: {
+ show: true,
+ period: 5,
+ trailLength: 0.2,
+ color: '#01AAED',
+ },
+ lineStyle: {
+ width: 3,
+ opacity: 0.6,
+ color: '#FFB800'
+ },
+ data: [
+ [
+ [104.343914,29.470778],
+ [104.766432,29.328016]
+ ],
+ [
+ [104.603116,29.347364],
+ [104.766432,29.328016]
+ ],
+ [
+ [104.873139,29.30861],
+ [104.766432,29.328016]
+ ],
+ [
+ [105.058792,29.1521],
+ [104.766432,29.328016]
+ ],
+ [
+ [104.848535,29.410526],
+ [104.766432,29.328016]
+ ],
+ ]
+ }
]
};
@@ -82,13 +166,21 @@
methods: {
filterData(name) {
this.initConfig();
- let temp = mapConfig.series[0].data.find(item => item.name === name);
+ let temp = mapConfig.geo3D.regions.find(item => item.name === name);
+
+ // mapConfig.geo3D.regions.push({
+ // name: name,
+ // itemStyle: {
+ // color: '#F63545'
+ // }
+ // });
temp.itemStyle.color = '#F63545';
mapChart.setOption(mapConfig, true);
this.$emit('filterData', name);
},
initConfig() {
- mapConfig.series[0].data.forEach(item => {
+ // mapConfig.geo3D.regions = [];
+ mapConfig.geo3D.regions.forEach(item => {
item.itemStyle.color = '#4189f2';
});
},
@@ -112,6 +204,7 @@
mapChart = echarts.init(this.$refs.map);
mapChart.setOption(mapConfig, true);
mapChart.on('click', (params) => {
+ return;
if (tempName === params.name) {
tempName = '';
this.initConfig();
@@ -144,8 +237,9 @@
.map-content {
flex: 1;
background: rgba(67, 102, 155, 0.3);
- border: 1px solid rgba(47, 91, 157, 0.8);
+ border: 1px solid rgba(47, 91, 157, 0.8);
}
+
.map-style {
width: 100%;
height: 100%;
diff --git a/src/views/screen/components/screen-map/test.vue b/src/views/screen/components/screen-map/test.vue
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/views/screen/components/screen-map/test.vue
diff --git a/src/views/system/data-manage/index.vue b/src/views/system/data-manage/index.vue
index eef8562..f0228ea 100644
--- a/src/views/system/data-manage/index.vue
+++ b/src/views/system/data-manage/index.vue
@@ -3,13 +3,24 @@
<div class="container">
<el-row type="flex" justify="center">
<el-col :span="24">
- <h3 style="color: rgb(104,104,103);padding-top: 20px;padding-bottom: 20px;">浜鸿劯鏁版嵁寮傚父妫�娴�</h3>
+ <h3 style="color: rgb(104,104,103);padding-top: 20px;padding-bottom: 20px;">瑙嗛杩愯鐩戞帶</h3>
</el-col>
</el-row>
<el-row type="flex" justify="center">
- <el-col :span="6" v-for="(item, index) in faceData" :key="index">
+ <el-col :span="6" v-for="(item, index) in videoData" :key="index">
<el-link @click="handleDetail(item)">
+ <el-card style="width:150px;height: 150px;text-align: center;">
+ <i style="font-size: 40px;padding: 15px;" :class="item.icon"></i>
+ <div>{{ item.name }}</div>
+ </el-card>
+ </el-link>
+ </el-col>
+ </el-row>
+ <br/>
+ <el-row type="flex" justify="center">
+ <el-col :span="6" v-for="(item, index) in videoData2" :key="index">
+ <el-link @click="handleDetail(item)" :style="item.name == '' ? 'display:none' : ''">
<el-card style="width:150px;height: 150px;text-align: center;">
<i style="font-size: 40px;padding: 15px;" :class="item.icon"></i>
<div>{{ item.name }}</div>
@@ -22,7 +33,7 @@
<div class="container">
<el-row type="flex" justify="center">
<el-col :span="24">
- <h3 style="color: rgb(104,104,103);padding-top: 20px;padding-bottom: 20px;">杞︿咯鏁版嵁寮傚父妫�娴�</h3>
+ <h3 style="color: rgb(104,104,103);padding-top: 20px;padding-bottom: 20px;">杞﹁締杩愯鐩戞帶</h3>
</el-col>
</el-row>
@@ -36,7 +47,49 @@
</el-link>
</el-col>
</el-row>
+ <br/>
+ <el-row type="flex" justify="center">
+ <el-col :span="6" v-for="(item, index) in carData2" :key="index">
+ <el-link @click="handleDetail(item)" :style="item.name == '' ? 'display:none' : ''">
+ <el-card style="width:150px;height: 150px;text-align: center;">
+ <i style="font-size: 40px;padding: 15px;" :class="item.icon"></i>
+ <div>{{ item.name }}</div>
+ </el-card>
+ </el-link>
+ </el-col>
+ </el-row>
</div>
+
+ <div class="container">
+ <el-row type="flex" justify="center">
+ <el-col :span="24">
+ <h3 style="color: rgb(104,104,103);padding-top: 20px;padding-bottom: 20px;">浜鸿劯杩愯鐩戞帶</h3>
+ </el-col>
+ </el-row>
+
+ <el-row type="flex" justify="center">
+ <el-col :span="6" v-for="(item, index) in faceData" :key="index">
+ <el-link @click="handleDetail(item)">
+ <el-card style="width:150px;height: 150px;text-align: center;">
+ <i style="font-size: 40px;padding: 15px;" :class="item.icon"></i>
+ <div>{{ item.name }}</div>
+ </el-card>
+ </el-link>
+ </el-col>
+ </el-row>
+ <br/>
+ <el-row type="flex" justify="center">
+ <el-col :span="6" v-for="(item, index) in faceData2" :key="index">
+ <el-link @click="handleDetail(item)" :style="item.name == '' ? 'display:none' : ''">
+ <el-card style="width:150px;height: 150px;text-align: center;">
+ <i style="font-size: 40px;padding: 15px;" :class="item.icon"></i>
+ <div>{{ item.name }}</div>
+ </el-card>
+ </el-link>
+ </el-col>
+ </el-row>
+ </div>
+ <br/><br/><br/><br/>
</div>
</template>
@@ -44,16 +97,53 @@
export default {
data() {
return {
- faceData: [
- { name: '浜鸿劯璇嗗埆鏃堕挓鍑嗙‘鎬�', icon: 'el-icon-alarm-clock', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
- { name: '浜鸿劯鎶撴媿鏁版嵁鐩戞祴', icon: 'el-icon-user', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
- { name: '浜鸿劯鏁版嵁瓒嬪娍鍒嗘瀽', icon: 'el-icon-data-line', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
- { name: '浜鸿劯鎶撴媿璁惧娲昏穬鎬�', icon: 'el-icon-timer', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
- { name: '浜鸿劯鎶撴媿涓婁紶鍙婃椂鎬�', icon: 'el-icon-money', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
- { name: '浜鸿劯鎶撴媿澶у浘鍙敤鎬�', icon: 'el-icon-data-analysis', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ videoData: [
+ { name: '骞冲彴鍦ㄧ嚎', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '涓�鏈轰竴妗�', icon: 'el-icon-folder', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '鐐逛綅鍦ㄧ嚎', icon: 'el-icon-search', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '褰曞儚鍙敤', icon: 'el-icon-turn-off', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '瑙嗛鏍囨敞', icon: 'el-icon-place', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜�', icon: 'el-icon-film', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ ],
+ videoData2: [
+ { name: '瑙嗛鍥惧儚璧勬簮瀹夊叏绠＄悊', icon: 'el-icon-house', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '瑙嗛鍥惧儚璐ㄩ噺', icon: 'el-icon-set-up', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' }
],
carData: [
- { name: '鍗″彛杩囪溅鏁版嵁涓�鑷存��', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' }
+ { name: '瑙嗗浘搴撳鎺ョǔ瀹氭��1', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '鐐逛綅鍦ㄧ嚎鐜�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' }
+ ],
+ carData2: [
+ { name: '杞﹁締鍗″彛璁惧鏃堕挓鍑嗙‘鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '杞﹁締鍗″彛璁惧url鍙敤鎬�0.5', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' }
+ ],
+ faceData: [
+ { name: '瑙嗗浘搴撳鎺ョǔ瀹氭��', icon: 'el-icon-alarm-clock', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '鐐逛綅鍦ㄧ嚎鐜�', icon: 'el-icon-user', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '鐩綍涓�鑷寸巼', icon: 'el-icon-data-line', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�', icon: 'el-icon-timer', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '璁惧鎶撴媿鍥剧墖鍚堟牸鎬�', icon: 'el-icon-money', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '璁惧鎶撴媿鍥剧墖鏃堕挓鍑嗙‘鎬�', icon: 'el-icon-data-analysis', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ ],
+ faceData2: [
+ { name: '鎶撴媿浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬�', icon: 'el-icon-thumb', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '浜鸿劯鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�', icon: 'el-icon-pie-chart', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '', icon: 'el-icon-data-line', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '', icon: 'el-icon-timer', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '', icon: 'el-icon-money', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+ { name: '', icon: 'el-icon-data-analysis', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
]
}
},
--
Gitblit v1.8.0