From 640b38285ab0e16146c43785c924405f71dd67e0 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 10 Dec 2019 15:44:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BD=A6=E7=AB=99=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=EF=BC=8C=E7=9A=AE?=
 =?UTF-8?q?=E8=82=A4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/bejing_01.js      |   2 +-
 src/jmapNew/config/skinCode/chengdu_03.js     |   2 +-
 src/jmapNew/config/skinCode/chengdu_04.js     |   2 +-
 src/views/components/font/index.vue           | 104 ++++++++++--------
 src/views/newMap/jlmapNew/index.vue           |   6 +
 .../newMap/newMapdraft/mapoperate/station.vue |   2 +-
 6 files changed, 66 insertions(+), 52 deletions(-)

diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js
index 6dd1862de..39d3a80c8 100644
--- a/src/jmapNew/config/skinCode/bejing_01.js
+++ b/src/jmapNew/config/skinCode/bejing_01.js
@@ -310,7 +310,7 @@ class SkinCode extends defaultStyle {
                     count: 3,											// 控制模式灯个数
                     offset: { x: 20, y: 0 },							// 偏移量
                     radiusR: 6,											// 控制模式灯的半径
-                    distance: 36,										// 控制模式之间灯之间的距离
+                    distance: 46,										// 控制模式之间灯之间的距离
                     grayColor: '#7F7F7F',								// 控制模式灰色
                     greenColor: '#00FF00',								// 控制模式绿色
                     redColor: '#FF0000',								// 控制模式红色
diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js
index eee5d9d25..0a0beb7fb 100644
--- a/src/jmapNew/config/skinCode/chengdu_03.js
+++ b/src/jmapNew/config/skinCode/chengdu_03.js
@@ -313,7 +313,7 @@ class SkinCode extends defaultStyle {
                     count: 4,									// 控制模式的个数
                     offset: {x: 0, y: 0},						// 偏移量
                     radiusR: 6,									// 控制模式灯的半径
-                    distance: 36,								// 控制模式之间灯之间的距离
+                    distance: 46,								// 控制模式之间灯之间的距离
                     grayColor: '#7F7F7F',						// 控制模式灰色
                     greenColor: '#00FF00',						// 控制模式绿色
                     redColor: '#FF0000',						// 控制模式红色
diff --git a/src/jmapNew/config/skinCode/chengdu_04.js b/src/jmapNew/config/skinCode/chengdu_04.js
index 954500031..afce87949 100644
--- a/src/jmapNew/config/skinCode/chengdu_04.js
+++ b/src/jmapNew/config/skinCode/chengdu_04.js
@@ -310,7 +310,7 @@ class SkinCode extends defaultStyle {
                     count: 4,									// 控制模式的个数
                     offset: {x: 0, y: 0},						// 偏移量
                     radiusR: 4,									// 控制模式灯的半径
-                    distance: 36,								// 控制模式之间灯之间的距离
+                    distance: 46,								// 控制模式之间灯之间的距离
                     grayColor: '#C0C0C0',						// 控制模式灰色
                     greenColor: 'green',						// 控制模式绿色
                     redColor: 'red',						// 控制模式红色
diff --git a/src/views/components/font/index.vue b/src/views/components/font/index.vue
index 03259fc24..dbebe1951 100644
--- a/src/views/components/font/index.vue
+++ b/src/views/components/font/index.vue
@@ -14,55 +14,63 @@
 
 <script>
 export default {
-	name: 'ElFont',
-	props: [
-		'value'
-	],
-	data() {
-		return {
-			fontList: [
-				{ code: 'consolas', name: 'consolas' },
-				{ code: 'sans-serif', name: 'sans-serif' },
-				{ code: 'STHeiti', name: '华文黑体' },
-				{ code: 'FangSong', name: '仿宋' }
-			],
-			sizeList: [
-				{ code: '4px', name: '4px' },
-				{ code: '6px', name: '6px' },
-				{ code: '8px', name: '8px' },
-				{ code: '10px', name: '10px' },
-				{ code: '12px', name: '12px' },
-				{ code: '14px', name: '14px' },
-				{ code: '16px', name: '16px' },
-				{ code: '18px', name: '18px' },
-				{ code: '20px', name: '20px' },
-				{ code: '22px', name: '22px' },
-				{ code: '24px', name: '24px' }
-			],
-			size: '10px',
-			font: 'consolas',
-			text: 'hello world'
-		};
-	},
-	computed: {
-		inputValue: function () {
-			return this.size + ' ' + this.font;
-		}
-	},
-	watch: {
-		value(val) {
-			if (val !== this.inputValue && val) {
-				const arr = val.split(' ');
-				if (arr && arr.length >= 2) {
-					this.size = arr[0];
-					this.font = arr[1];
-				}
-			}
-		}
-	},
-	methods: {
+    name: 'ElFont',
+    props: [
+        'value'
+    ],
+    data() {
+        return {
+            fontList: [
+                { code: 'consolas', name: 'consolas' },
+                { code: 'sans-serif', name: 'sans-serif' },
+                { code: 'STHeiti', name: '华文黑体' },
+                { code: 'FangSong', name: '仿宋' }
+            ],
+            sizeList: [
+                { code: '4px', name: '4px' },
+                { code: '6px', name: '6px' },
+                { code: '8px', name: '8px' },
+                { code: '10px', name: '10px' },
+                { code: '12px', name: '12px' },
+                { code: '14px', name: '14px' },
+                { code: '16px', name: '16px' },
+                { code: '18px', name: '18px' },
+                { code: '20px', name: '20px' },
+                { code: '22px', name: '22px' },
+                { code: '24px', name: '24px' },
+                { code: '26px', name: '26px' },
+                { code: '28px', name: '28px' },
+                { code: '30px', name: '30px' },
+                { code: '32px', name: '32px' },
+                { code: '34px', name: '34px' },
+                { code: '36px', name: '36px' },
+                { code: '38px', name: '38px' },
+                { code: '40px', name: '40px' }
+            ],
+            size: '10px',
+            font: 'consolas',
+            text: 'hello world'
+        };
+    },
+    computed: {
+        inputValue: function () {
+            return this.size + ' ' + this.font;
+        }
+    },
+    watch: {
+        value(val) {
+            if (val !== this.inputValue && val) {
+                const arr = val.split(' ');
+                if (arr && arr.length >= 2) {
+                    this.size = arr[0];
+                    this.font = arr[1];
+                }
+            }
+        }
+    },
+    methods: {
 
-	}
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue
index e5778b952..38c0d978e 100644
--- a/src/views/newMap/jlmapNew/index.vue
+++ b/src/views/newMap/jlmapNew/index.vue
@@ -11,6 +11,12 @@
         <el-form-item>
           <el-input v-model="dataZoom.offsetY" :disabled="true" />
         </el-form-item>
+        <el-form-item label="鼠标偏移">
+          <el-input v-model="dataZoom.offsetX" :disabled="true" />
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="dataZoom.offsetY" :disabled="true" />
+        </el-form-item>
         <el-form-item :label="$t(`global.zoom`)" style="float: right">
           <el-input v-model="dataZoom.scaleRate" :disabled="true" />
         </el-form-item>
diff --git a/src/views/newMap/newMapdraft/mapoperate/station.vue b/src/views/newMap/newMapdraft/mapoperate/station.vue
index e76004602..4de2e5257 100644
--- a/src/views/newMap/newMapdraft/mapoperate/station.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/station.vue
@@ -338,7 +338,7 @@ export default {
                                 zcCode: '',
                                 runPlanName: '',
                                 visible: true,
-                                nameFont: '14px consolas',
+                                nameFont: '22px consolas',
                                 nameFontColor: '#FFFFFF',
                                 kmPost: '1000km~2000km',
                                 kmPostShow: true,