Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient

src/jmap/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue

@@ -1,6 +1,15 @@
 <template>
-    <el-dialog class="fuzhou-01__systerm view-train-id" title="列车识别号显示设置" :visible.sync="show" width="420px"
+  <el-dialog
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+    v-dialogDrag
+    class="fuzhou-01__systerm view-train-id"
+    title="列车识别号显示设置"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
     <div style="padding: 10px 20px; border: 1px double lightgray;">
       <span class="base-label">计划车显示模式</span>
       <el-radio-group v-model="planMode">
@@ -47,7 +56,7 @@
       <span class="base-label">字体大小</span>
       <el-row>
         <el-col :span="10">
-                    <el-input v-model="fontSize" size="small" min="16" max="99"></el-input>
+          <el-input v-model="fontSize" size="small" min="16" max="99" />
         </el-col>
         <el-col :span="10" :offset="1">
           <span style="height:32px; line-height:32px;">（范围：16-99）</span>
@@ -62,17 +71,20 @@
         <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
       </el-col>
     </el-row>
-        <notice-info ref="noticeInfo"></notice-info>
+    <notice-info ref="noticeInfo" />
   </el-dialog>
 </template>
 
 <script>
-    import { OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/ConstDic';
-    import deviceType from '@/jmap/constant/deviceType';
+// import deviceType from '@/jmap/constant/deviceType';
-    import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
+import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
 
-    export default {
+export default {
 	name: 'ViewTrainId',
+	components: {
+		NoticeInfo
+	},
 	data() {
 		return {
 			dialogShow: false,
@@ -81,11 +93,8 @@
 			operation: '',
 			planMode: 5,
 			headMode: 5,
-                fontSize: 16,
+			fontSize: 16
-            }
+		};
-        },
-        components: {
-            NoticeInfo
 	},
 	computed: {
 		show() {
@@ -102,14 +111,14 @@
 		this.$nextTick(() => {
 			this.setTrainDispaly();
 			this.$store.dispatch('training/tipReload');
-            })
+		});
 	},
 	methods: {
 		doShow(operate) {
 			this.operate = operate || {};
 			this.operation = operate.operation;
 
-                //非断电激活时设置初始值
+			// 非断电激活时设置初始值
 			if (!this.dialogShow) {
 				this.loading = false;
 			}
@@ -125,42 +134,42 @@
 			this.$store.dispatch('training/emitTipFresh');
 		},
 		cancel() {
-                let operate = {
+			const operate = {
 				type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
+				operation: OperationEvent.Command.cancel.menu.operation
-                }
+			};
 
 			this.$store.dispatch('training/next', operate).then(({ valid }) => {
 				if (valid) {
 					this.doClose();
 				}
-                })
+			});
 		},
 		commit() {
-                let operate = {
+			const operate = {
 				over: true,
 				type: this.operate.type,
 				operation: OperationEvent.Command.close.confirm.operation,
 				val: [this.planMode, this.headMode, this.fontSize].join('::')
-                }
+			};
 
-                this.loading = true
+			this.loading = true;
 			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false
+				this.loading = false;
 				if (valid) {
 					this.setTrainDispaly();
 					this.doClose();
 				}
-                }).catch(error => {
+			}).catch(() => {
 				this.loading = false;
-                })
+			});
 		},
 		setTrainDispaly() {
-                let updatlist = [];
+			const updatlist = [];
-                let trainList = this.$store.getters['training/viewTrainList'];
+			const trainList = this.$store.getters['training/viewTrainList'];
 			if (trainList && trainList.length > 0) {
-                    let nameFormat = this.trainNameFormatBy(this.planMode);
+				const nameFormat = this.trainNameFormatBy(this.planMode);
-                    let nameFontSize = this.fontSize;
+				const nameFontSize = this.fontSize;
 				trainList.forEach(elem => {
 					updatlist.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), {nameFormat, nameFontSize }));
 				});
@@ -170,16 +179,16 @@
 		},
 		trainNameFormatBy(mode) {
 			switch (mode.toString()) {
-                    case '1': return 'serviceNumber:tripNumber';                 //表号+车次号
+			case '1': return 'serviceNumber:tripNumber'; // 表号+车次号
-                    case '2': return 'serviceNumber:groupNumber';             //表号+车组号
+			case '2': return 'serviceNumber:groupNumber'; // 表号+车组号
-                    case '3': return 'targetCode:tripNumber';               //目的地号+车次号
+			case '3': return 'targetCode:tripNumber'; // 目的地号+车次号
-                    case '4': return 'targetCode:groupNumber';           //目的地号+车组号
+			case '4': return 'targetCode:groupNumber'; // 目的地号+车组号
-                    case '5': return 'targetCode:serviceNumber:tripNumber';      //目的地号+表号+车次号
+			case '5': return 'targetCode:serviceNumber:tripNumber'; // 目的地号+表号+车次号
-                    case '6': return 'targetCode:serviceNumber:groupNumber';  //目的地号+表号+车组号
+			case '6': return 'targetCode:serviceNumber:groupNumber'; // 目的地号+表号+车组号
 			}
 
-                return ''; //无格式类型
+			return ''; // 无格式类型
-            }
 		}
 	}
+};
 </script>