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

src/jmap/config/deviceStyle.js

@@ -1,8 +1,8 @@
 const mapDeviceStyle = {
 	'01': 'chengdu_04',
 	'02': 'fuzhou_01',
-	'03': 'bejing_01',
+	// '03': 'bejing_01',
-	'04': 'chengdu_03',
+	'03': 'chengdu_03',
 	'05': 'batong_01' // 暂时没有画北京八通线
 };
 

src/jmap/shape/Switch/index.js

@@ -83,7 +83,7 @@ export default class Switch extends Group {
 		const rpoint3 = [rpoint2[0], rpoint2[1] + directy * switchWidth];
 		const rpoint4 = [rpoint1[0] + this.triangle.getCos(slen), rpoint1[1] + this.triangle.getSin(slen)];
 
-		const switchWidth1 = style.Section.line.width / 2;
+		const switchWidth1 = style.Section.line.width / 2 + 0.1;
 		const width1 = switchWidth1 * this.triangle.getSinRate();
 		const height1 = switchWidth1 * this.triangle.getCosRate();
 		const width2 = (height1 + switchWidth1) / this.triangle.getTanRate();
@@ -213,10 +213,8 @@ export default class Switch extends Group {
 		this.setSwitchCoreColor(this.style.backgroundColor);
 		this.name.getNameText().stopAnimation(false);
 		this.swCore.stopAnimation(false);
-		if (!this.model.cutOff) {
 		this.relocShelter.stopAnimation(false);
 		this.relocShelter.hide();
-		}
 		this.releaseBackground.hide();
 		this.setHasTextBorder(0);
 	}
@@ -234,9 +232,9 @@ export default class Switch extends Group {
 	setInversionAction() {
 		this.recover();
 		this.setSwitchCoreInvisible(true);
+		this.setTextColor(this.style.Switch.text.inversionColor);
 		this.locShelter.hide();
 		this.relocShelter.show();
-		this.setTextColor(this.style.Switch.text.inversionColor);
 		this.setSectionState(this.relocShelter.getSection(), 'fill', this.model);
 	}
 
@@ -324,7 +322,7 @@ export default class Switch extends Group {
 	}
 
 	setSectionState(section, style, state) {
-		if (section) {
+		if (section && !section.animators.length) {
 			switch (state.sectionAstatus) {
 			case '00': break;
 			case '01': 	/** 空闲*/
@@ -359,13 +357,14 @@ export default class Switch extends Group {
 				section.setStyle(style, this.style.Section.line.protectiveLockColor);
 				break;
 			}
-		}
 
-		if (state.cutOff && !section.animators.length ) {
+			if (state.cutOff) {
 				this.sectionCutOff(section);
 			}
 		}
 
+	}
+
 	setLocateType(model) {
 		switch (model.locateType) {
 		case '01':
@@ -387,6 +386,7 @@ export default class Switch extends Group {
 
 	setState(model) {
 		this.setLocateType(model);
+
 		switch (model.status) {
 		case '01':
 			this.spare(); 				/** 空闲*/

src/jmap/theme/chengdou_03/planConvert.js

@@ -14,10 +14,10 @@ export default {
 	ExcelConfig: {
 		beginRow: 1,
 		beginCol: 0,
-		fieldNum: 10,
+		fieldNum: 8,
 		sepField: '车次',
 		columns: {
-			'车站名': { key: 'stationName', formatter: (val) => { return val; } },
+			'车站名称': { key: 'stationName', formatter: (val) => { return val; } },
 			'到点': { key: 'arriveTime', formatter: (val) => { return val; } },
 			'发点': { key: 'departureTime', formatter: (val) => { return val; } }
 		}
@@ -25,40 +25,32 @@ export default {
 
 	/** 解析exal数据转换为Json后台数据*/
 	importData(Sheet, JsonData) {
-		var dataList = convertSheetToList(Sheet, true);
+		var dataList = convertSheetToList(Sheet, false);
 		var needList = Object.keys(this.ExcelConfig.columns);
 
 		if (dataList && dataList.length) {
-			for (var colIndex = this.ExcelConfig.beginCol; colIndex < dataList.length; colIndex += this.ExcelConfig.fieldNum + 1) {
+			for (var rowIndex = this.ExcelConfig.beginRow; rowIndex < dataList.length; rowIndex += 1) {
-				var isContinue = true;
+				for (var colIndex = this.ExcelConfig.beginCol; colIndex < dataList[this.ExcelConfig.beginCol].length; colIndex += this.ExcelConfig.fieldNum + 1) {
-				var tripObj = { code: '', arrivalList: [] };
+					var tripNew, tripObj;
-
-				for (var rowIndex = this.ExcelConfig.beginRow; isContinue; rowIndex += 1) {
-					isContinue = false;
-
 					var stationObj = {};
+
+					tripNew = tripObj = { code: '', arrivalList: [] };
 					for (var index = 0; index < this.ExcelConfig.fieldNum; index += 1) {
-						if (dataList[colIndex + index]) {
+						var title = dataList[0][colIndex + index];
-							var title = dataList[colIndex + index][0];
+						var value = dataList[rowIndex][colIndex + index];
-							var value = dataList[colIndex + index][rowIndex];
 
 						if (title && value) {
-								// 数据列解析
-								isContinue = true;
 							var titleStr = `${title}`.trim();
 							var valueStr = `${value}`.trim();
 
-								if (titleStr == this.ExcelConfig.sepField) {
+							if (titleStr.includes(this.ExcelConfig.sepField)) {
-									if (tripObj.code) {
-										const length = tripObj.arrivalList.length;
-										if (length == 1) {
-											tripObj.arrivalList[0]['flag'] = true;
-										}
-										JsonData.push(tripObj);
-										tripObj = { code: valueStr, arrivalList: [] };
-									} else {
 								tripObj.code = valueStr;
+								JsonData.forEach(elem => {
+									if (elem.code == valueStr) {
+										tripObj = elem;
+										return;
 									}
+								});
 							}
 
 							// 取需要的字段
@@ -67,24 +59,14 @@ export default {
 							}
 						}
 					}
-					}
 
-					// 添加字段值
-					if (Object.keys(stationObj).length) {
 					tripObj.arrivalList.push(stationObj);
-					}
+					if (tripObj == tripNew) {
-				}
-
-				// 添加最后那条没有车次的记录
-				if (tripObj.code) {
-					const length = tripObj.arrivalList.length;
-					if (length) {
-						tripObj.arrivalList[length - 1]['flag'] = true;
-					}
 						JsonData.push(tripObj);
 					}
 				}
 			}
+		}
 
 		return JsonData;
 	},

src/jmap/theme/factory.js

@@ -4,8 +4,8 @@ class Theme {
 		this._mapMenu = {
 			'01': 'default', // 成都4号线
 			'02': 'fuzhou_01',
-			'03': 'beijing_01',
+			// '03': 'beijing_01',
-			'04': 'chengdou_03',
+			'03': 'chengdou_03',
 			'05': 'batong_01'
 		};
 	}

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

@@ -177,6 +177,7 @@
                     case '5': return 'targetCode:serviceNumber:tripNumber';      //目的地号+表号+车次号
                     case '6': return 'targetCode:serviceNumber:groupNumber';  //目的地号+表号+车组号
                 }
+
                 return ''; //无格式类型
             }
         }