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

src/api/chat.js

@@ -5,7 +5,7 @@ export function postDataBd(data) {
 	return request({
 		url: `/api/audio/bd?group=${data.group}&conversationId=${data.conversationId}`,
 		method: 'post',
-		data: data.file,
+		data: data.file
 	});
 }
 
@@ -44,7 +44,7 @@ export function chatWithText(data, group) {
 		url: `/api/jointTraining/chatWithText?group=${group}`,
 		method: 'post',
 		data: {
-			message: data,
+			message: data
 		}
 	});
 }
@@ -67,7 +67,6 @@ export function getJoinTrainCode(data, group) {
 	});
 }
 
-
 // 创建房间
 export function postCreateRoom(data) {
 	return request({
@@ -90,7 +89,7 @@ export function checkRoomExist(params) {
 export function postRoomDetail(group) {
 	return request({
 		url: `/api/jointTraining/room/${group}`,
-		method: 'get',
+		method: 'get'
 	});
 }
 
@@ -100,7 +99,7 @@ export function deljointTrainRoom(group) {
 		url: `/api/jointTraining/room`,
 		method: 'delete',
 		params: {
-			group: group,
+			group: group
 		}
 	});
 }
@@ -119,7 +118,7 @@ export function getjointTraining(group) {
 		url: `/api/jointTraining/room/join`,
 		method: 'put',
 		params: {
-			group: group,
+			group: group
 		}
 	});
 }
@@ -137,7 +136,7 @@ export function putUserRoles(data, group) {
 export function getJointTrainRoomUserList(group) {
 	return request({
 		url: `/api/jointTraining/room/${group}/user/list`,
-		method: 'get',
+		method: 'get'
 	});
 }
 
@@ -147,7 +146,7 @@ export function putJointTrainingExit(group) {
 		url: `/api/jointTraining/room/exit`,
 		method: 'put',
 		params: {
-			group: group,
+			group: group
 		}
 	});
 }
@@ -178,7 +177,7 @@ export function getUserRoles(group) {
 export function putJointTrainingState() {
 	return request({
 		url: `/api/jointTraining/room/back`,
-		method: 'put',
+		method: 'put'
 	});
 }
 
@@ -189,7 +188,7 @@ export function putJointTrainingUserkicked(userId, group) {
 		method: 'put',
 		params: {
 			userId: userId,
-			group: group,
+			group: group
 		}
 	});
 }
@@ -200,7 +199,7 @@ export function putJointTrainingSimulation(group) {
 		url: `/api/jointTraining/room/simulation/all`,
 		method: 'put',
 		params: {
-			group: group,
+			group: group
 		}
 	});
 }
@@ -211,7 +210,7 @@ export function putJointTrainingSimulationUser(group) {
 		url: `/api/jointTraining/room/simulation/user/exit`,
 		method: 'put',
 		params: {
-			group: group,
+			group: group
 		}
 	});
 }
@@ -222,7 +221,7 @@ export function putJointTrainingSimulationEntrance(group) {
 		url: `/api/jointTraining/room/simulation/user/entrance`,
 		method: 'put',
 		params: {
-			group: group,
+			group: group
 		}
 	});
 }

src/api/jlmap3d/load3ddata.js

@@ -10,14 +10,13 @@ export function getPublishMapVersion(skinStyle) {
 
 /** 获取发布地图详细内容*/
 export function getPublishMapDetail(skinStyle) {
-  let datad = request({
+	const datad = request({
 		url: `/api/map/${skinStyle}/details`,
 		method: 'get'
 	});
 	return datad.then();
 }
 
-
 /** 根据地图id获取地图信息*/
 export function getPublishMapInfo(mapId) {
 	return request({
@@ -26,7 +25,6 @@ export function getPublishMapInfo(mapId) {
 	});
 }
 
-
 /** 获取草稿地图详细内容*/
 export function getMapDetail(id) {
 	return request({
@@ -69,7 +67,7 @@ export function loadmap3dModel() {
 	});
 }
 export function getPublish3dMapDetail(skinStyle) {
-  let datad = request({
+	const datad = request({
 		url: `/api/map/${skinStyle}/3dMapData`,
 		method: 'get'
 	});

src/api/jmap/lesson.js

@@ -45,7 +45,7 @@ export function delPublishLesson(lessonId) {
 export function putLessonOnLine(id) {
 	return request({
 		url: `/api/lesson/${id}/onLine`,
-        method: 'put',
+		method: 'put'
 	});
 }
 
@@ -53,7 +53,7 @@ export function putLessonOnLine(id) {
 export function putLessonOffLine(id) {
 	return request({
 		url: `/api/lesson/${id}/offLine`,
-        method: 'put',
+		method: 'put'
 	});
 }
 
@@ -63,6 +63,6 @@ export function putLessonOffLine(id) {
 export function getCommodityProductLesson(prdCode) {
 	return request({
 		url: `/api/lesson/${prdCode}/list`,
-        method: 'get',
+		method: 'get'
 	});
 }

src/api/jmap/lessondraft.js

@@ -43,7 +43,6 @@ export function updateLesson(data) {
 	});
 }
 
-
 /** 删除课程*/
 export function delLesson(data) {
 	return request({

src/api/jmap/map.js

@@ -77,7 +77,7 @@ export function delPublishMap(mapId) {
 export function putMapOnLine(mapId) {
 	return request({
 		url: `/api/map/${mapId}/onLine`,
-        method: 'put',
+		method: 'put'
 	});
 }
 
@@ -85,7 +85,7 @@ export function putMapOnLine(mapId) {
 export function putMapOffLine(mapId) {
 	return request({
 		url: `/api/map/${mapId}/offLine`,
-        method: 'put',
+		method: 'put'
 	});
 }
 

src/api/jmap/mapdraft.js

@@ -24,7 +24,6 @@ export function getMapDetail(id) {
 	});
 }
 
-
 /** 新建草稿地图*/
 export function newMap(data) {
 	return request({
@@ -89,7 +88,6 @@ export function publishMap(data) {
 	});
 }
 
-
 /** 草稿地图数据导入*/
 export function postBuildMapImport(data) {
 	return request({
@@ -248,7 +246,7 @@ export function listLinkageSwitch(mapId, params) {
 export function verifyMap(id) {
 	return request({
 		url: `/api/mapBuild/${id}/checkData`,
-        method: 'get',
+		method: 'get'
 	});
 }
 

src/api/jmap/pathunit.js

@@ -14,7 +14,7 @@ export function addRouteUnit(data) {
 	return request({
 		url: `/api/mapBuild/routeUnit`,
 		method: 'post',
-        data: data,
+		data: data
 	});
 }
 
@@ -39,6 +39,6 @@ export function setRouteUnit(data) {
 	return request({
 		url: `/api/mapBuild/routeUnit/${data.id}`,
 		method: 'put',
-        data: data,
+		data: data
 	});
 }

src/api/jmap/training.js

@@ -44,7 +44,6 @@ export function sendTrainingNextStep(data, group) {
 	});
 }
 
-
 /** 获取实训树*/
 export function getTrainingTree() {
 	return request({
@@ -202,6 +201,6 @@ export function putUserTraining(data) {
 export function deleteUserTraining(statsId) {
 	return request({
 		url: `/api/training/userTraining/${statsId}`,
-		method: 'delete',
+		method: 'delete'
 	});
 }

src/api/login.js

@@ -17,7 +17,6 @@ export function getLoginUrl(params) {
 	});
 }
 
-
 // 获取登录信息
 export function getInfo(token) {
 	return request({
@@ -63,6 +62,6 @@ export function checkLoginStatus(sessionId) {
 export function checkLoginLine() {
 	return request({
 		url: '/api/cache/heartBeat',
-        method: 'get',
+		method: 'get'
 	});
 }

src/api/management/author.js

@@ -1,8 +1,6 @@
 
-
 import request from '@/utils/request';
 
-
 /** 分页获取课程权限数据*/
 export function getLessonPermissonPageList(params) {
 	return request({
@@ -84,7 +82,6 @@ export function deleteLessonPermisson(id) {
 }
 */
 
-
 /**
  * 用户权限列表
  */
@@ -100,7 +97,7 @@ export function listUserPermision(params) {
 export function getDistribute(id) {
 	return request({
 		url: `/api/distribute/${id}`,
-        method: 'get',
+		method: 'get'
 	});
 }
 

src/api/management/distribute.js

@@ -58,7 +58,7 @@ export function packagePermissionDistribute(data) {
 export function restorePackagePermission(id) {
 	return request({
 		url: `/api/distribute/${id}/restore`,
-        method: 'put',
+		method: 'put'
 	});
 }
 

src/api/management/exam.js

@@ -22,7 +22,7 @@ export function setCourseList(data) {
 export function getCourseTypeList(data) {
 	return request({
 		url: `/api/exam/${data.lessonId}/trainingTypes`,
-        method: 'get',
+		method: 'get'
 	});
 }
 
@@ -82,7 +82,7 @@ export function getLessonTypeNum(data) {
 		method: 'get',
 		params: {
 			operateType: data.operateType
-        },
+		}
 	});
 }
 

src/api/management/goods.js

@@ -9,7 +9,6 @@ export function getCommodityDetailByParams(data) {
 	});
 }
 
-
 /**
  * 获取商品明细列表
  */
@@ -79,7 +78,7 @@ export function updataCommodityList(data) {
 export function setCommodityStatus(id) {
 	return request({
 		url: `/api/goods/${id}/status`,
-        method: 'put',
+		method: 'put'
 	});
 }
 

src/api/management/mapprd.js

@@ -55,7 +55,7 @@ export function updateTrainingCategory(data) {
 export function deleteTrainingCategory(data) {
 	return request({
 		url: `/api/mapPrd/${data.id}`,
-        method: 'delete',
+		method: 'delete'
 	});
 }
 
@@ -65,7 +65,7 @@ export function deleteTrainingCategory(data) {
 export function getCommodityMapProduct(skinStyle) {
 	return request({
 		url: `/api/mapPrd/${skinStyle}/list`,
-        method: 'get',
+		method: 'get'
 	});
 }
 
@@ -75,7 +75,7 @@ export function getCommodityMapProduct(skinStyle) {
 export function getMapProductDetail(prdCode) {
 	return request({
 		url: `/api/mapPrd/${prdCode}`,
-        method: 'get',
+		method: 'get'
 	});
 }
 
@@ -92,7 +92,7 @@ export function getProductList(data) {
 export function putMapProductOnLine(id) {
 	return request({
 		url: `/api/mapPrd/${id}/onLine`,
-        method: 'put',
+		method: 'put'
 	});
 }
 
@@ -100,7 +100,7 @@ export function putMapProductOnLine(id) {
 export function putMapProductOffLine(id) {
 	return request({
 		url: `/api/mapPrd/${id}/offLine`,
-        method: 'put',
+		method: 'put'
 	});
 }
 

src/api/management/operation.js

@@ -23,7 +23,6 @@ export function postTrainingRulesData(data) {
 	});
 }
 
-
 /**
  *  修改考试定义规则
  */
@@ -108,7 +107,7 @@ export function getPlaceholderList(data) {
 		method: 'get',
 		params: {
 			trainingType: data.trainingType,
-            skinStyle: data.skinStyle,
+			skinStyle: data.skinStyle
 		}
 	});
 }
@@ -122,7 +121,7 @@ export function getOperateTrainingList(data) {
 		method: 'get',
 		params: {
 			productType: data.productType,
-            skinStyle: data.skinStyle,
+			skinStyle: data.skinStyle
 		}
 	});
 }

src/api/management/order.js

@@ -19,7 +19,6 @@ export function getOrderDetail(id, params) {
 	});
 }
 
-
 /** 创建一个订单*/
 export function createOrder(data) {
 	return request({

src/api/management/user.js

@@ -68,7 +68,6 @@ export function getDimUserList(params) {
 	});
 }
 
-
 /** 获取用户订阅地图列表*/
 export function getUserSubscribe(userId) {
 	return request({
@@ -86,7 +85,6 @@ export function saveUserSubscribe(data) {
 	});
 }
 
-
 // 修改用户权限
 export function putRoles(data) {
 	return request({

src/api/management/userexam.js

@@ -1,6 +1,5 @@
 import request from '@/utils/request';
 
-
 /** 获取考题列表*/
 export function generateExamList(examId) {
 	return request({

src/api/quest.js

@@ -27,14 +27,14 @@ export function deleteQuest(id) {
 export function getQuestById(id) {
 	return request({
 		url: `/api/quest/${id}`,
-        method: 'get',
+		method: 'get'
 	});
 }
 /** 根据id查询任务基础信息 */
 export function getQuestByIdList(id) {
 	return request({
 		url: `/api/quest/${id}/detail`,
-        method: 'get',
+		method: 'get'
 	});
 }
 /** 更新任务基本信息 */

src/api/simulation.js

@@ -14,11 +14,10 @@ export function setFailureMode(data, group) {
 	return request({
 		url: `/api/simulation/${group}/failureMode`,
 		method: 'post',
-        data: data,
+		data: data
 	});
 }
 
-
 /**
  * 仿真系统按计划行车
  */
@@ -36,7 +35,7 @@ export function runDiagramStart(params, group) {
 export function runDiagramOver(group) {
 	return request({
 		url: `/api/simulation/${group}/over`,
-        method: 'put',
+		method: 'put'
 	});
 }
 
@@ -46,7 +45,7 @@ export function runDiagramOver(group) {
 export function runDiagramQuit(group) {
 	return request({
 		url: `/api/simulation/${group}/quit`,
-        method: 'put',
+		method: 'put'
 	});
 }
 
@@ -66,7 +65,6 @@ export function runDiagramIsStart(group) {
 	});
 }
 
-
 /**
  * 仿真系统CBTC
  * @param {*} mapId
@@ -111,7 +109,6 @@ export function examNotify({ examId }) {
 	});
 }
 
-
 /** 获取用户实训列表*/
 export function getSimulationList(data) {
 	return request({
@@ -143,16 +140,15 @@ export function putSimulationStats(data) {
 export function deleteSimulationStats(statsId) {
 	return request({
 		url: `/api/simulation/${statsId}`,
-        method: 'delete',
+		method: 'delete'
 	});
 }
 
-
 /** 获取用户鼠标左键选中的设备信息*/
 export function letfMouseSelectDevice(deviceCode, group) {
 	return request({
 		url: `/api/simulation/${group}/device/${deviceCode}`,
-        method: 'get',
+		method: 'get'
 	});
 }
 
@@ -160,7 +156,7 @@ export function letfMouseSelectDevice(deviceCode, group) {
 export function getEveryDayRunPlanData(group) {
 	return request({
 		url: `/api/simulation/${group}/runPlan`,
-        method: 'get',
+		method: 'get'
 	});
 }
 
@@ -177,7 +173,7 @@ export function scriptRecordNotify(questId) {
 	return request({
 		url: `/api/simulation/questRecord/${questId}`,
 		method: 'get'
-    })
+	});
 }
 
 /** 保存剧本背景*/
@@ -185,20 +181,17 @@ export function saveScriptScenes(group) {
 	return request({
 		url: `/api/simulation/${group}/questRecord/scenes`,
 		method: 'post'
-    })
+	});
 }
 
-
 /** 保存录制任务数据*/
 export function saveScriptData(group) {
 	return request({
 		url: `/api/simulation/${group}/questRecord`,
-        method: 'post',
+		method: 'post'
 	});
 }
 
-
-
 /** 清除仿真剧本数据*/
 export function dumpScriptData(scriptId) {
 	return request({
@@ -207,7 +200,6 @@ export function dumpScriptData(scriptId) {
 	});
 }
 
-
 /** 查询录制剧本步骤*/
 export function queryScriptStep(group) {
 	return request({
@@ -222,7 +214,7 @@ export function getDesignatedTimeTrainNum(params, group) {
 		url: `/api/simulation/${group}/plan/trainNum`,
 		method: 'get',
 		params
-    })
+	});
 }
 
 /** 根据成员角色查询设备列表*/
@@ -231,14 +223,14 @@ export function getDevicesByRole(group, params) {
 		url: `/api/simulation/${group}/role/devices`,
 		method: 'get',
 		params
-    })
+	});
 }
 /** 获取任务录制的成员角色列表 */
 export function getMembersByGroup(group) {
 	return request({
 		url: `/api/simulation/${group}/questRecord/members`,
-        method: 'get',
+		method: 'get'
-    })
+	});
 }
 
 /** 添加任务角色成员 */
@@ -247,15 +239,15 @@ export function postQuestMember(group, data) {
 		url: `/api/simulation/${group}/questRecord/member`,
 		method: 'post',
 		data
-    })
+	});
 }
 
 /** 删除任务角色成员 */
 export function deleteQuestMember(group, memberId) {
 	return request({
 		url: `/api/simulation/${group}/questRecord/member/${memberId}`,
-        method: 'delete',
+		method: 'delete'
-    })
+	});
 }
 
 // /** 添加/修改任务角色行为 */
@@ -264,21 +256,21 @@ export function postMemberBehavior(group, memberId, data) {
 		url: `/api/simulation/${group}/questRecord/${memberId}/behavior`,
 		method: 'post',
 		data
-    })
+	});
 }
 /** 删除任务角色行为 */
 export function deleteMemberBehavior(group, memberId, behaviorId) {
 	return request({
 		url: `/api/simulation/${group}/questRecord/${memberId}/behavior/${behaviorId}`,
 		method: 'delete'
-    })
+	});
 }
 /** 删除任务角色行为动作 */
 export function deleteMemberBehaviorAction(group, memberId, behaviorId, actionId) {
 	return request({
 		url: `/api/simulation/${group}/questRecord/${memberId}/behavior/${behaviorId}/action/${actionId}`,
 		method: 'delete'
-    })
+	});
 }
 /** 添加/修改任务角色行为动作 */
 export function postMemberBehaviorAction(group, memberId, behaviorId, data) {
@@ -286,7 +278,7 @@ export function postMemberBehaviorAction(group, memberId, behaviorId, data) {
 		url: `/api/simulation/${group}/questRecord/${memberId}/behavior/${behaviorId}/action`,
 		method: 'post',
 		data
-    })
+	});
 }
 /** 添加/修改任务目标条件*/
 export function postTargetConditionAction(group, data) {
@@ -294,14 +286,14 @@ export function postTargetConditionAction(group, data) {
 		url: `/api/simulation/${group}/questRecord/targetCondition`,
 		method: 'post',
 		data
-    })
+	});
 }
 /** 删除任务目标条件*/
 export function deleteTargetConditionAction(group, tcId) {
 	return request({
 		url: `/api/simulation/${group}/questRecord/targetCondition/${tcId}`,
 		method: 'delete'
-    })
+	});
 }
 
 /** 分页查询存在的仿真 */
@@ -309,7 +301,7 @@ export function getExistingSimulation(params) {
 	return request({
 		url: `/api/simulation/manage/page`,
 		method: 'get',
-        params,
+		params
 	});
 }
 
@@ -317,7 +309,7 @@ export function getExistingSimulation(params) {
 export function deleteExistingSimulation(group) {
 	return request({
 		url: `/api/simulation/manage/${group}`,
-        method: 'delete',
+		method: 'delete'
 	});
 }
 /** 根据设备类型获取设备列表 */
@@ -340,16 +332,15 @@ export function getDeviceCoditionByDeviceType(params) {
 export function getQuestRecord(group) {
 	return request({
 		url: `/api/simulation/${group}/questRecord`,
-        method: 'get',
+		method: 'get'
 	});
 }
 
-
 /** 加载任务*/
 export function loadQuest(questId, group) {
 	return request({
 		url: `/api/simulation/${group}/quest/${questId}`,
-        method: 'post',
+		method: 'post'
 	});
 }
 
@@ -358,7 +349,7 @@ export function quitQuest(group) {
 	return request({
 		url: `/api/simulation/${group}/quest`,
 		method: 'put'
-    })
+	});
 }
 
 /** 根据group获取仿真对象*/
@@ -366,7 +357,7 @@ export function getSimulationInfo(group) {
 	return request({
 		url: `/api/simulation/${group}`,
 		method: 'get'
-    })
+	});
 }
 
 /** 获取可用的设备指令*/
@@ -374,7 +365,7 @@ export function getAvailableDeviceCommand() {
 	return request({
 		url: `/api/simulation/deviceCommand/available`,
 		method: 'get'
-    })
+	});
 }
 
 /** 保存/修改任务剧本*/
@@ -383,5 +374,5 @@ export function saveTaskScript(group,data) {
 		url: `/api/simulation/${group}/questRecord/script`,
 		method: 'post',
 		data
-    })
+	});
 }

src/api/simulationRecord.js

@@ -14,7 +14,7 @@ export function getSimulationRelpayList(params) {
 export function delSimulationRecord(replayId) {
 	return request({
 		url: `/api/simulationRecord/${replayId}`,
-        method: 'delete',
+		method: 'delete'
 	});
 }
 
@@ -30,7 +30,7 @@ export function simulationRelpay(replayId) {
 export function putsSimulationRecord(replayId) {
 	return request({
 		url: `/api/simulationRecord/${replayId}/over`,
-        method: 'put',
+		method: 'put'
 	});
 }
 
@@ -38,7 +38,7 @@ export function putsSimulationRecord(replayId) {
 export function putsSimulationRecordPause(replayId) {
 	return request({
 		url: `/api/simulationRecord/${replayId}/pause`,
-        method: 'put',
+		method: 'put'
 	});
 }
 
@@ -46,7 +46,7 @@ export function putsSimulationRecordPause(replayId) {
 export function putsSimulationRecordPlay(replayId) {
 	return request({
 		url: `/api/simulationRecord/${replayId}/play`,
-        method: 'put',
+		method: 'put'
 	});
 }
 
@@ -54,7 +54,7 @@ export function putsSimulationRecordPlay(replayId) {
 export function putsSimulationRecordPlaySpeed(replayId, speed) {
 	return request({
 		url: `/api/simulationRecord/${replayId}/playSpeed?playSpeed=${speed}`,
-        method: 'put',
+		method: 'put'
 	});
 }
 
@@ -62,6 +62,6 @@ export function putsSimulationRecordPlaySpeed(replayId, speed) {
 export function putsSimulationRecordplayTime(replayId, offsetSeconds) {
 	return request({
 		url: `/api/simulationRecord/${replayId}/playTime?offsetSeconds=${offsetSeconds}`,
-        method: 'put',
+		method: 'put'
 	});
 }

src/components/Breadcrumb/index.vue

@@ -10,57 +10,57 @@
 </template>
 
 <script>
-import pathToRegexp from 'path-to-regexp'
+import pathToRegexp from 'path-to-regexp';
 
 export default {
 	data() {
 		return {
 			levelList: null
-		}
+		};
 	},
 	watch: {
 		$route() {
-			this.getBreadcrumb()
+			this.getBreadcrumb();
 		}
 	},
 	created() {
-		this.getBreadcrumb()
+		this.getBreadcrumb();
 	},
 	methods: {
 		getBreadcrumb() {
 			// only show routes with meta.title
-			let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
+			let matched = this.$route.matched.filter(item => item.meta && item.meta.title);
-			const first = matched[0]
+			const first = matched[0];
 
 			if (!this.isDashboard(first)) {
-				matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched)
+				matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched);
 			}
 
-			this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
+			this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false);
 		},
 		isDashboard(route) {
-			const name = route && route.name
+			const name = route && route.name;
 			if (!name) {
-				return false
+				return false;
 			}
-			return name.trim().toLocaleLowerCase() === 'Dashboard'.toLocaleLowerCase()
+			return name.trim().toLocaleLowerCase() === 'Dashboard'.toLocaleLowerCase();
 		},
 		pathCompile(path) {
 			// To solve this problem https://github.com/PanJiaChen/vue-element-admin/issues/561
-			const { params } = this.$route
+			const { params } = this.$route;
-			var toPath = pathToRegexp.compile(path)
+			var toPath = pathToRegexp.compile(path);
-			return toPath(params)
+			return toPath(params);
 		},
 		handleLink(item) {
-			const { redirect, path } = item
+			const { redirect, path } = item;
 			if (redirect) {
-				this.$router.push(redirect)
+				this.$router.push(redirect);
-				return
+				return;
-			}
-			this.$router.push(this.pathCompile(path))
 			}
+			this.$router.push(this.pathCompile(path));
 		}
 	}
+};
 </script>
 
 <style lang="scss" scoped>

src/components/Hamburger/index.vue

@@ -24,10 +24,10 @@ export default {
 	},
 	methods: {
 		toggleClick() {
-			this.$emit('toggleClick')
+			this.$emit('toggleClick');
-		}
 		}
 	}
+};
 </script>
 
 <style scoped>

src/components/PopMenu/index.vue

@@ -13,7 +13,7 @@
             v-show="show"
             style="list-style: none; margin: 0px; padding: 0px; padding-right:0px; border-radius:0px;"
           >
-            <li v-for="(child, index) in item.children" :key="index">
+            <li v-for="(child, idx) in item.children" :key="idx">
               <template v-if="child.type === 'separator'">
                 <div class="separator">&ensp;</div>
               </template>

src/components/QrCode/index.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog :title="title" :visible.sync="dialogVisible" width="35%" :before-close="done => {}" :show-close="false" center>
     <div style="text-align:center;  margin:auto;">
-            <qrcode-vue :value="url" :size="400" v-loading="loading"></qrcode-vue>
+      <qrcode-vue v-loading="loading" :value="url" :size="400" />
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="doClose">关闭</el-button>
@@ -21,7 +21,7 @@
 			title: '',
 			loading: false,
 			url: ''
-            }
+		};
 	},
 	methods: {
 		clearModel() {
@@ -37,8 +37,8 @@
 			}
 		},
 		doClose() {
-                this.dialogVisible = false
+			this.dialogVisible = false;
-            }
 		}
 	}
+};
 </script>

src/components/QueryListPage/QueryForm.vue

@@ -148,7 +148,7 @@
   </div>
 </template>
 <script>
-import localStore from 'storejs'
+import localStore from 'storejs';
 
 export default {
 	name: 'QueryForm',
@@ -156,7 +156,7 @@ export default {
 		queryList: {
 			type: Object,
 			default: function() {
-				return { actions: [] }
+				return { actions: [] };
 			}
 		},
 		queryForm: {
@@ -165,6 +165,9 @@ export default {
 		},
 		beforeQuery: {
 			type: Function,
+			default() {
+				return () => {};
+			}
 		},
 		canQuery: {
 			type: Boolean,
@@ -185,191 +188,191 @@ export default {
 				accessKeySecret: '7F7aWIi3ymq3J7uGxs9M2c2DnfSiF3',
 				bucket: 'kfexcel'
 			}
-		}
+		};
 	},
 	computed: {
 		rowColumnList() {
 			const alocateColumnNum = function(field) {
-				let need = 1
+				let need = 1;
 				switch (field.type) {
 				case 'daterange':
-					need = 2
+					need = 2;
-					break
+					break;
 				case 'timerange':
-					need = 2
+					need = 2;
-					break
+					break;
 				case 'datetimerange':
-					need = 2
+					need = 2;
-					break
+					break;
 				}
-				field.columnNeed = need
+				field.columnNeed = need;
-				return need
+				return need;
-			}
+			};
-			const objNumList = []
+			const objNumList = [];
-			let tempColumnNum = 0
+			let tempColumnNum = 0;
-			let rowColumnNum = 0
+			let rowColumnNum = 0;
 			for (const item in this.queryObject) {
-				var colNum = alocateColumnNum(this.queryObject[item])
+				var colNum = alocateColumnNum(this.queryObject[item]);
-				tempColumnNum = tempColumnNum + colNum
+				tempColumnNum = tempColumnNum + colNum;
 				if (tempColumnNum > this.columnNum) {
-					objNumList.push(rowColumnNum)
+					objNumList.push(rowColumnNum);
-					rowColumnNum = 1
+					rowColumnNum = 1;
-					tempColumnNum = colNum
+					tempColumnNum = colNum;
 				} else if (tempColumnNum === this.columnNum) {
-					objNumList.push(++rowColumnNum)
+					objNumList.push(++rowColumnNum);
-					rowColumnNum = 0
+					rowColumnNum = 0;
-					tempColumnNum = 0
+					tempColumnNum = 0;
 				} else {
-					++rowColumnNum
+					++rowColumnNum;
 				}
 			}
 			if (tempColumnNum > 0 && rowColumnNum > 0) {
-				objNumList.push(rowColumnNum)
+				objNumList.push(rowColumnNum);
 			}
-			return objNumList
+			return objNumList;
 		}
 	},
 	watch: {
 		'queryForm.queryObject': function(newVal) {
-			this.initPageData()
+			this.initPageData();
 		},
 		canQuery(newVal) {
-			this.queryFlag = newVal
+			this.queryFlag = newVal;
 		},
 		formModel: {
 			handler: function(form) {
 				if (form) {
-					localStore.set(this.$route.path, form)
+					localStore.set(this.$route.path, form);
 				}
 			},
 			deep: true
 		}
 	},
 	mounted() {
-		this.initPageData()
+		this.initPageData();
-		this.initQueryModel()
+		this.initQueryModel();
 	},
 	methods: {
 		// 获取默认查询参数
 		initQueryModel() {
-			this.formModel = localStore.get(this.$route.path) || this.formModel
+			this.formModel = localStore.get(this.$route.path) || this.formModel;
 			if (typeof this.queryForm.initLoadCallback === 'function') {
-				this.queryForm.initLoadCallback(this.formModel)
+				this.queryForm.initLoadCallback(this.formModel);
 			}
-			this.query()
+			this.query();
 		},
 		// 初始化页面数据
 		initPageData() {
-			this.modelFields = []
+			this.modelFields = [];
-			this.exportFlag = this.queryForm.canExport
+			this.exportFlag = this.queryForm.canExport;
-			this.resetShow = this.queryForm.reset
+			this.resetShow = this.queryForm.reset;
-			this.buildQueryField()
+			this.buildQueryField();
-			this.buildForm()
+			this.buildForm();
 		},
 		// 构建查询表单对象、显示的查询对象
 		buildForm() {
 			// 获取表单Field的默认值
 			const getDefaultValueByField = function(field) {
-				let defaultValue = ''
+				let defaultValue = '';
 				switch (field.type) {
 				case 'select':
 					if (field.config.multiple) {
-						defaultValue = []
+						defaultValue = [];
 					} else {
-						defaultValue = ''
+						defaultValue = '';
 					}
-					break
+					break;
 				case 'daterange':
-					defaultValue = []
+					defaultValue = [];
-					break
+					break;
 				case 'timerange':
-					defaultValue = []
+					defaultValue = [];
-					break
+					break;
 				case 'datetimerange':
-					defaultValue = []
+					defaultValue = [];
-					break
+					break;
-				}
-				return defaultValue
 				}
+				return defaultValue;
+			};
 			// 构建查询表单对象、显示的查询对象
-			const queryObject = {}
+			const queryObject = {};
-			const model = {}
+			const model = {};
 			for (const item in this.queryForm.queryObject) {
 				if (this.queryForm.queryObject.show === false) {
-					continue
+					continue;
 				} else if (this.queryForm.queryObject.visible === false) {
-					model[item] = this.queryForm.queryObject[item].value
+					model[item] = this.queryForm.queryObject[item].value;
 				} else {
-					queryObject[item] = this.queryForm.queryObject[item]
+					queryObject[item] = this.queryForm.queryObject[item];
-					model[item] = this.queryForm.queryObject[item].value || getDefaultValueByField(this.queryForm.queryObject[item])
+					model[item] = this.queryForm.queryObject[item].value || getDefaultValueByField(this.queryForm.queryObject[item]);
 				}
 			}
 
-			this.queryObject = queryObject
+			this.queryObject = queryObject;
-			this.formModel = model
+			this.formModel = model;
 		},
 		// 构建查询fieldName列表
 		buildQueryField() {
-			const fields = []
+			const fields = [];
 			for (const item in this.queryForm.queryObject) {
 				if (this.queryForm.queryObject.show === false) {
-					continue
+					continue;
 				} else if (this.queryForm.queryObject.visible === false) {
-					fields.push({ field: item })
+					fields.push({ field: item });
 				} else {
-					const type = this.queryForm.queryObject[item].type
+					const type = this.queryForm.queryObject[item].type;
 					switch (type) {
 					case 'text':
-						fields.push({ field: item })
+						fields.push({ field: item });
-						break
+						break;
 					case 'date':
-						fields.push({ field: item })
+						fields.push({ field: item });
-						break
+						break;
 					case 'daterange':
-						fields.push({ field: item, subFields: this.queryForm.queryObject[item].fieldsName })
+						fields.push({ field: item, subFields: this.queryForm.queryObject[item].fieldsName });
-						break
+						break;
 					case 'time':
-						fields.push({ field: item })
+						fields.push({ field: item });
-						break
+						break;
 					case 'timerange':
-						fields.push({ field: item, subFields: this.queryForm.queryObject[item].fieldsName })
+						fields.push({ field: item, subFields: this.queryForm.queryObject[item].fieldsName });
-						break
+						break;
 					case 'datetime':
-						fields.push({ field: item })
+						fields.push({ field: item });
-						break
+						break;
 					case 'datetimerange':
-						fields.push({ field: item, subFields: this.queryForm.queryObject[item].fieldsName })
+						fields.push({ field: item, subFields: this.queryForm.queryObject[item].fieldsName });
-						break
+						break;
 					case 'select':
-						fields.push({ field: item })
+						fields.push({ field: item });
-						break
+						break;
 					}
 				}
 			}
-			this.modelFields = fields
+			this.modelFields = fields;
 		},
 		checkColumnIndex(rowIndex, objIndex) {
-			var flag = false
+			var flag = false;
 			if (rowIndex === 0) {
 				if (objIndex >= 0 && objIndex < this.rowColumnList[rowIndex]) {
-					flag = true
+					flag = true;
 				}
 			} else {
-				let objNum = 0
+				let objNum = 0;
 				for (var i = 0; i < rowIndex; ++i) {
-					objNum += this.rowColumnList[i]
+					objNum += this.rowColumnList[i];
 				}
 				if (objIndex >= objNum && objIndex < objNum + this.rowColumnList[rowIndex]) {
-					flag = true
+					flag = true;
 				}
 			}
-			return flag
+			return flag;
 		},
 		checkFieldType(field, type, name) {
 			if (field.type === type) {
-				return true
+				return true;
 			} else {
-				return false
+				return false;
 			}
 		},
 		handleTreeListChildren(treeList) {
@@ -377,66 +380,66 @@ export default {
 				if (list && list.length > 0) {
 					list.forEach(element => {
 						if (element.children != null && element.children.length > 0) {
-							traverse(element.children)
+							traverse(element.children);
 						} else if (element.children != null && element.children.length === 0) {
-							element.children = null
+							element.children = null;
-						}
-					})
 						}
+					});
 				}
+			};
 			if (treeList && treeList.length > 0) {
-				traverse(treeList)
+				traverse(treeList);
-				return treeList
+				return treeList;
 			} else {
-				return []
+				return [];
 			}
 		},
 		// 重置操作
 		doClean() {
-			this.initPageData()
+			this.initPageData();
-			this.query()
+			this.query();
 		},
 		// 导出操作
 		doExport() {
-			this.doExportFront()
+			this.doExportFront();
 		},
 		// 前端方式导出
 		doExportFront() {
-			const resultData = this.prepareQueryData()
+			const resultData = this.prepareQueryData();
 			if (resultData === false) {
-				return
+				return;
 			}
-			this.$emit('queryExport', resultData)
+			this.$emit('queryExport', resultData);
 		},
 		// 将表单对象转换为查询对象
 		prepareQueryData() {
-			let resultData = {}
+			let resultData = {};
 			// 将formModel转换为查询对象
 			for (const item in this.formModel) {
 				for (var i = 0; i < this.modelFields.length; ++i) {
 					if (item === this.modelFields[i].field) {
 						if (this.modelFields[i].type === 'treeSelect') {
-							const qo = this.queryForm.queryObject[item]
+							const qo = this.queryForm.queryObject[item];
-							const nodeKey = qo.treeConfig.nodeKey ? qo.treeConfig.nodeKey : 'id'
+							const nodeKey = qo.treeConfig.nodeKey ? qo.treeConfig.nodeKey : 'id';
-							const tmpIds = []
+							const tmpIds = [];
 							for (var v = 0; v < this.formModel[item].length; ++v) {
-								tmpIds[v] = this.formModel[item][v][nodeKey]
+								tmpIds[v] = this.formModel[item][v][nodeKey];
 							}
-							resultData[item] = tmpIds
+							resultData[item] = tmpIds;
-							break
+							break;
 						} else {
 							if (this.modelFields[i].subFields) {
 								for (var j = 0; j < this.modelFields[i].subFields.length; ++j) {
 									if (this.formModel[item] && this.formModel[item].length > j) {
-										resultData[this.modelFields[i].subFields[j]] = this.formModel[item][j]
+										resultData[this.modelFields[i].subFields[j]] = this.formModel[item][j];
 									} else {
-										resultData[this.modelFields[i].subFields[j]] = ''
+										resultData[this.modelFields[i].subFields[j]] = '';
 									}
 								}
-								break
+								break;
 							} else {
-								resultData[item] = this.formModel[item]
+								resultData[item] = this.formModel[item];
-								break
+								break;
 							}
 						}
 					}
@@ -445,27 +448,27 @@ export default {
 			// 对所有的数据进行trim操作
 			for (const item in resultData) {
 				if (resultData[item].trim) {
-					resultData[item] = resultData[item].trim()
+					resultData[item] = resultData[item].trim();
 				}
 			}
 			// 查询前数据处理
-			resultData = this.beforeQuery ? this.beforeQuery(resultData) : resultData
+			resultData = this.beforeQuery ? this.beforeQuery(resultData) : resultData;
-			return resultData
+			return resultData;
 		},
 		query() {
-			const resultData = this.prepareQueryData()
+			const resultData = this.prepareQueryData();
 			if (resultData === false) {
-				return
+				return;
 			}
-			this.$emit('query', resultData)
+			this.$emit('query', resultData);
 		},
 		selectChange(row, form) {
 			if (row.change) {
-				row.change(form)
+				row.change(form);
-			}
 			}
 		}
 	}
+};
 </script>
 <style scoped>
     .query-form-main-custom .el-input {

src/components/SvgIcon/index.vue

@@ -19,17 +19,17 @@ export default {
 	},
 	computed: {
 		iconName() {
-			return `#icon-${this.iconClass}`
+			return `#icon-${this.iconClass}`;
 		},
 		svgClass() {
 			if (this.className) {
-				return 'svg-icon ' + this.className
+				return 'svg-icon ' + this.className;
 			} else {
-				return 'svg-icon'
+				return 'svg-icon';
-			}
 			}
 		}
 	}
+};
 </script>
 
 <style scoped>

src/components/TurnbackBar/index.vue

@@ -17,14 +17,14 @@ export default {
 	data() {
 		return {
 
-		}
+		};
 	},
 	methods: {
 		turnback() {
-			this.$router.go(-1)
+			this.$router.go(-1);
-		}
 		}
 	}
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

src/icons/index.js

@@ -1,9 +1,9 @@
-import Vue from 'vue'
+import Vue from 'vue';
-import SvgIcon from '@/components/SvgIcon'// svg component
+import SvgIcon from '@/components/SvgIcon';// svg component
 
 // register globally
-Vue.component('svg-icon', SvgIcon)
+Vue.component('svg-icon', SvgIcon);
 
-const req = require.context('./svg', false, /\.svg$/)
+const req = require.context('./svg', false, /\.svg$/);
-const requireAll = requireContext => requireContext.keys().map(requireContext)
+const requireAll = requireContext => requireContext.keys().map(requireContext);
-requireAll(req)
+requireAll(req);

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';
 
 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,7 +111,7 @@
 		this.$nextTick(() => {
 			this.setTrainDispaly();
 			this.$store.dispatch('training/tipReload');
-            })
+		});
 	},
 	methods: {
 		doShow(operate) {
@@ -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 }));
 				});
@@ -181,5 +190,5 @@
 			return ''; // 无格式类型
 		}
 	}
-    }
+};
 </script>

src/views/publish/examRule/draft/editRule.vue

@@ -1,27 +1,49 @@
 <template>
-    <el-dialog :title="title" :visible.sync="dialogShow" :before-close="handleCancel" :closeOnClickModal="false">
+  <el-dialog :title="title" :visible.sync="dialogShow" :before-close="handleCancel" :close-on-click-modal="false">
-        <el-form :model="form" ref="form" :rules="rules" label-width="80px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
       <el-form-item label="实训类型" prop="course">
-                <el-select v-model="form.course" placeholder="请选择类型范围" v-bind:disabled="editOk"
+        <el-select
-                    @change="changeCourse(form.course)">
+          v-model="form.course"
-                    <el-option :label="nor.name" :value="nor.code" v-for="nor in options" :key="nor.id"
+          placeholder="请选择类型范围"
-                        :disabled="nor.disabled"></el-option>
+          :disabled="editOk"
+          @change="changeCourse(form.course)"
+        >
+          <el-option
+            v-for="nor in options"
+            :key="nor.id"
+            :label="nor.name"
+            :value="nor.code"
+            :disabled="nor.disabled"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="操作类型">
-                <el-select v-model="form.operateType" clearable placeholder="请选择范围" v-bind:disabled="editOk"
+        <el-select
-                    @change="changeOperation(form.operateType)">
+          v-model="form.operateType"
-                    <el-option v-for="nor in operationTypeList" :label="nor.name" :value="nor.code" :key="nor.id"
+          clearable
-                        :disabled="nor.disabled"></el-option>
+          placeholder="请选择范围"
+          :disabled="editOk"
+          @change="changeOperation(form.operateType)"
+        >
+          <el-option
+            v-for="nor in operationTypeList"
+            :key="nor.id"
+            :label="nor.name"
+            :value="nor.code"
+            :disabled="nor.disabled"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="题数" prop="number">
-                <el-input v-model="form.number" placeholder=""
+        <el-input
-                    style="width: calc(100% - 200px); float: left; margin-right: 10px;"></el-input>
+          v-model="form.number"
+          placeholder=""
+          style="width: calc(100% - 200px); float: left; margin-right: 10px;"
+        />
         <span style="width: 190px; float: left;">此类型有{{ topicNum }}道题</span>
       </el-form-item>
       <el-form-item label="每题分值" prop="mark">
-                <el-input v-model="form.mark" placeholder=""></el-input>
+        <el-input v-model="form.mark" placeholder="" />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -37,13 +59,15 @@
 import { getDetailList } from '@/api/management/dictionary';
 
 export default {
-        name: 'editRule',
+	name: 'EditRule',
 	props: {
 		courseId: {
 			type: String,
+			required: true
 		},
 		editCourse: {
 			type: Object,
+			required: true
 		}
 	},
 	data() {
@@ -81,7 +105,7 @@
 				course: '',
 				operateType: '',
 				number: '',
-                    mark: '',
+				mark: ''
 			},
 			topicNum: 0,
 			dialogShow: false,
@@ -100,13 +124,13 @@
 			options: this.course,
 			typeList: [],
 			operationTypeList: [],
-                trainingOperateTypeMap: {},
+			trainingOperateTypeMap: {}
-            }
+		};
 	},
 	computed: {
 		...mapState([
-                'course',
+			'course'
-            ]),
+		])
 	},
 	watch: {
 		editCourse: function (val) {
@@ -116,7 +140,7 @@
 				course: val.trainingType,
 				operateType: val.operateType,
 				number: val.num,
-                    mark: val.point,
+				mark: val.point
 			};
 			this.changeCourse(val.trainingType);
 			this.changeOperation(val.operateType);
@@ -167,13 +191,13 @@
 						this.editOk = false;
 						setTimeout(() => {
 							this.handleCancel();
-                            }, 300)
+						}, 300);
 					} else {
 						// 新增
 						this.$emit('addRuleList', this.form);
 						setTimeout(() => {
 							this.handleCancel();
-                            }, 300)
+						}, 300);
 					}
 					this.topicNum = 0;
 				} else {
@@ -194,13 +218,13 @@
 			this.form = {
 				course: '',
 				number: '',
-                    mark: '',
+				mark: ''
 			};
 		},
 		// 获取课题下类型
 		async refresh() {
 			await getCourseTypeList({ lessonId: this.courseId }).then(res => {
-                    let list = [];
+				const list = [];
 				Array.sort(res.data);
 				res.data.forEach(ele => {
 					this.typeList.forEach(v => {
@@ -208,51 +232,56 @@
 							list.push(v);
 						}
 					});
-                    })
+				});
 				this.options = list;
 				this.changeCourseDisable();
 				this.$store.dispatch('app/handleCourse', this.options);
-                }).catch(error => {
+			}).catch(() => {
-                    this.$messageBox('刷新失败')
+				this.$messageBox('刷新失败');
 			});
 		},
 		async getList() {
 			this.typeList = [];
 			await getDetailList('training_type').then(res => {
 				this.typeList = res.data;
-                }).catch(error => {
+			}).catch(() => {
 				// console.log('获取列表失败：' + error.message);
-                    reject(error);
 			});
 		},
 		async changeCourse(val) {
-                let param = {
+			const param = {
 				lessonId: this.courseId,
 				trainingType: val,
-                    operateType: '',
+				operateType: ''
 			};
 			this.operationTypeList = this.trainingOperateTypeMap[val];
 			this.operationTypeList.forEach(item => {
 				item.disabled = false;
 			});
 			this.changeOperationDisabled(); // 禁用设置
-                let res = await getLessonTypeNum(param);
+			const resp = await getLessonTypeNum(param);
-                if (res.code == 200) return this.topicNum = res.data;
+			if (resp.code == 200) {
+				this.topicNum = resp.data;
+				return this.topicNum;
+			}
 			this.$store.dispatch('app/handleCourse', this.options);
 		},
 		async changeOperation(val) {
-                let param = {
+			const param = {
 				lessonId: this.courseId,
 				trainingType: this.form.course,
-                    operateType: val,
+				operateType: val
 			};
-                let res = await getLessonTypeNum(param);
+			const resp = await getLessonTypeNum(param);
-                if (res.code == 200) return this.topicNum = res.data;
+			if (resp.code == 200) {
+				this.topicNum = resp.data;
+				return this.topicNum;
+			}
 			this.$store.dispatch('app/handleCourse', this.options);
 		},
 		// 判断类型是否选择过
 		changeCourseDisable() {
-                let arr = this.$store.state.app.ruleList;
+			const arr = this.$store.state.app.ruleList;
 			arr.forEach(ele => {
 				this.options.forEach(res => {
 					// operateType 操作类型为空或没有值存在 禁用
@@ -261,17 +290,17 @@
 					}
 				});
 
-                })
+			});
 		},
 		changeOperationDisabled() {
-                let arr = this.$store.state.app.ruleList;
+			const arr = this.$store.state.app.ruleList;
 			arr.forEach(ele => {
 				this.operationTypeList.forEach(res => {
 					if (ele.operateType == res.code) {
 						res.disabled = true;
 					}
 				});
-                })
+			});
 		},
 		changeListDisabled(val) {
 			this.options.forEach(res => {
@@ -282,7 +311,7 @@
 			this.$store.dispatch('app/handleCourse', this.options);
 		}
 	}
-    }
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     /deep/ {

src/views/publish/examRule/draft/examFrom.vue

@@ -1,51 +1,70 @@
 <template>
   <div class="exam-rule">
-        <el-scrollbar wrapClass="scrollbar-wrapper" :style="{height: height + 'px'}">
+    <el-scrollbar wrap-class="scrollbar-wrapper" :style="{height: height + 'px'}">
-            <el-form :model="form" :rules="rules" ref="form" label-width="90px" class="demo-form">
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px" class="demo-form">
         <el-form-item label="试题名称" prop="name">
-                    <el-input v-model="form.name" placeholder="请填写试题名称"></el-input>
+          <el-input v-model="form.name" placeholder="请填写试题名称" />
         </el-form-item>
         <el-form-item label="试题范围" prop="region">
-                    <el-select v-model="form.region" placeholder="请选择试题范围" style="width: 100%;"
+          <el-select
-                        v-bind:disabled="selectDisable" :disabled="isEdit">
+            v-model="form.region"
-                        <el-option v-for="nor in options" :label="nor.name" :value="nor.id" :key="nor.id"></el-option>
+            placeholder="请选择试题范围"
+            style="width: 100%;"
+            :disabled="isEdit || selectDisable"
+          >
+            <el-option v-for="nor in options" :key="nor.id" :label="nor.name" :value="nor.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="时长" prop="duration">
-                    <el-input v-model="form.duration" placeholder="90" style="float: left; width: calc(100% - 40px);"
+          <el-input
-                        :disabled="isEdit">
+            v-model="form.duration"
-                    </el-input>
+            placeholder="90"
+            style="float: left; width: calc(100% - 40px);"
+            :disabled="isEdit"
+          />
           <span style="width: 40px; display: block;float: left; text-align: center;">分钟</span>
         </el-form-item>
         <el-form-item label="考试时间">
           <el-col :span="11">
             <el-form-item prop="startDate">
-                            <el-date-picker type="datetime" placeholder="开始考试时间" v-model="form.startDate"
+              <el-date-picker
-                                style="width: 100%;" value-format="timestamp" :disabled="isEdit"></el-date-picker>
+                v-model="form.startDate"
+                type="datetime"
+                placeholder="开始考试时间"
+                style="width: 100%;"
+                value-format="timestamp"
+                :disabled="isEdit"
+              />
             </el-form-item>
           </el-col>
           <el-col class="line" :span="2">-</el-col>
           <el-col :span="11">
             <el-form-item prop="endDate">
-                            <el-date-picker type="datetime" placeholder="结束考试时间" v-model="form.endDate" disabled
+              <el-date-picker
-                                style="width: 100%;" value-format="timestamp" :disabled="isEdit"></el-date-picker>
+                v-model="form.endDate"
+                type="datetime"
+                placeholder="结束考试时间"
+                style="width: 100%;"
+                value-format="timestamp"
+                :disabled="isEdit"
+              />
             </el-form-item>
           </el-col>
         </el-form-item>
         <el-form-item label="满分" prop="fullMark">
-                    <el-input v-model="form.fullMark" placeholder="" :disabled="isEdit"></el-input>
+          <el-input v-model="form.fullMark" placeholder="" :disabled="isEdit" />
         </el-form-item>
         <el-form-item label="及格分" prop="passMark">
-                    <el-input v-model="form.passMark" placeholder="" :disabled="isEdit"></el-input>
+          <el-input v-model="form.passMark" placeholder="" :disabled="isEdit" />
         </el-form-item>
-                <el-form-item label="是否试用" required v-if="trialShow">
+        <el-form-item v-if="trialShow" label="是否试用" required>
           <el-radio-group v-model="trial">
             <el-radio label="1">否</el-radio>
             <el-radio label="2">是</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="试题描述" prop="desc">
-                    <el-input type="textarea" v-model="form.desc" placeholder="请填写试题描述" :disabled="isEdit"></el-input>
+          <el-input v-model="form.desc" type="textarea" placeholder="请填写试题描述" :disabled="isEdit" />
         </el-form-item>
         <!-- <el-form-item>
                     <el-button type="primary" @click="updateForm" v-if="isEdit">修改</el-button>
@@ -59,10 +78,9 @@
 <script>
 import { getPublishLessonTree } from '@/api/jmap/lesson';
 import { getExamLessonDetail, updateExamRules } from '@/api/management/exam';
-    import { mapState } from 'vuex';
 
 export default {
-        name: 'examFrom',
+	name: 'ExamFrom',
 	props: {
 		height: {
 			type: Number,
@@ -120,7 +138,7 @@
 				type: '',
 				duration: '',
 				fullMark: '',
-                    passMark: '',
+				passMark: ''
 			},
 			trial: '1',
 			trialShow: false,
@@ -147,12 +165,12 @@
 					{ required: true, validator: passMark, trigger: 'blur' }
 				]
 			}
-            }
+		};
 	},
 	computed: {
 		isEdit() {
 			return this.$route.params.mode == 'edit';
-            },
+		}
 	},
 	watch: {
 		'form.startDate': function (val) {
@@ -174,9 +192,9 @@
 		this.refresh();
 	},
 	mounted() {
-            let user = this.$store.state.user;
+		const user = this.$store.state.user;
-            let roles = user.roles;
+		const roles = user.roles;
-            this.trialShow = roles.indexOf('04') != -1 ? true : false;
+		this.trialShow = roles.indexOf('04') != -1;
 		this.init();
 	},
 	methods: {
@@ -190,7 +208,7 @@
 				type: data.type,
 				duration: Number(data.duration),
 				fullMark: data.fullMark,
-                    passMark: data.passMark,
+				passMark: data.passMark
 			};
 		},
 		init() {
@@ -206,7 +224,7 @@
 							type: res.data.type,
 							duration: Number(res.data.duration) / 60,
 							fullMark: res.data.fullPoint,
-                                passMark: res.data.passingPoint,
+							passMark: res.data.passingPoint
 						};
 						if (!this.form.name) {
 							this.$store.dispatch('app/handleCourseDetail', this.formDetail);
@@ -214,7 +232,7 @@
 						} else {
 							this.$store.dispatch('app/handleCourseDetail', this.form);
 						}
-                        })
+					});
 				});
 			}
 		},
@@ -230,18 +248,18 @@
 		updateForm() {
 			this.$refs['form'].validate((valid) => {
 				if (valid) {
-                        let model = {
+					const model = {
 						id: this.$route.params.ruleId,
 						name: this.form.name,
-                            trial: this.trial == 2 ? true : false,
+						trial: this.trial == 2
-                        }
+					};
 
 					updateExamRules(model).then(response => {
 						this.$store.dispatch('app/handleCourseDetail', this.form);
 						this.$message.success('更新考试规则成功');
-                        }).catch(error => {
+					}).catch(() => {
 						this.$messageBox('更新考试规则失败');
-                        })
+					});
 				}
 			});
 
@@ -253,12 +271,12 @@
 					this.form.region = this.$route.params.lessonId;
 					this.selectDisable = true;
 				}
-                }).catch(error => {
+			}).catch(() => {
-                    this.$messageBox('刷新失败')
+				this.$messageBox('刷新失败');
 			});
 		}
 	}
-    }
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     .exam-rule {

src/views/publish/examRule/draft/index.vue

@@ -1,30 +1,29 @@
 <template>
   <el-card>
-        <div slot="header" style="text-align: center;" v-if="lessonName">
+    <div v-if="lessonName" slot="header" style="text-align: center;">
       <b>课程名称： {{ lessonName }}</b>
     </div>
     <!-- <turnback-bar :title="turnbackBarTitle"></turnback-bar> -->
     <div class="exam-box" :style="{ height: height +'px' }">
-            <el-scrollbar wrapClass="scrollbar-wrapper" style="">
+      <el-scrollbar wrap-class="scrollbar-wrapper" style="">
         <el-steps class="steps" :active="display">
-                    <el-step title="试题定义制定" icon="el-icon-edit"></el-step>
+          <el-step title="试题定义制定" icon="el-icon-edit" />
-                    <el-step title="考试规则制定" icon="el-icon-setting"></el-step>
+          <el-step title="考试规则制定" icon="el-icon-setting" />
         </el-steps>
         <el-card class="forms">
-                    <template class="definition" v-if="display == 1">
+          <template v-if="display == 1" class="definition">
-                        <exam-from ref="exam" :height="height-260" @definition="definition"></exam-from>
+            <exam-from ref="exam" :height="height-260" @definition="definition" />
           </template>
-                    <template class="rule" v-else>
+          <template v-else class="rule">
-                        <rule-from ref="rule" :course="course" :height="height-300" @regulation="regulation">
+            <rule-from ref="rule" :course="course" :height="height-300" @regulation="regulation" />
-                        </rule-from>
           </template>
         </el-card>
         <div class="draft">
           <el-button-group>
-                        <el-button type="primary" @click="prevStep" v-if="isPrevStep">上一步</el-button>
+            <el-button v-if="isPrevStep" type="primary" @click="prevStep">上一步</el-button>
-                        <el-button type="primary" @click="nextStep" v-if="isNextStep">下一步</el-button>
+            <el-button v-if="isNextStep" type="primary" @click="nextStep">下一步</el-button>
-                        <el-button type="warning" @click="update" v-if="isUpdate">修改</el-button>
+            <el-button v-if="isUpdate" type="warning" @click="update">修改</el-button>
-                        <el-button type="primary" @click="create" v-if="isCreate">创建</el-button>
+            <el-button v-if="isCreate" type="primary" @click="create">创建</el-button>
             <el-button type="primary" @click="turnback">返回</el-button>
           </el-button-group>
         </div>
@@ -40,7 +39,7 @@
 import ExamFrom from './examFrom';
 
 export default {
-        name: 'examRule',
+	name: 'ExamRule',
 	components: {
 		ExamFrom,
 		RuleFrom
@@ -54,8 +53,8 @@
 			course: {},
 			height: 0,
 			lessonName: '',
-                formData: {},
+			formData: {}
-            }
+		};
 	},
 	computed: {
 		// turnbackBarTitle() {
@@ -72,7 +71,7 @@
 		},
 		isCreate() {
 			return this.display == 2;
-            },
+		}
 	},
 	mounted() {
 		this.loadInitData();
@@ -107,7 +106,7 @@
 				if (this.$refs.exam) {
 					this.$refs.exam.setData(this.formData);
 				}
-                })
+			});
 		},
 		prevStep() {
 			this.$refs.rule.regulation();
@@ -122,10 +121,10 @@
 			this.$refs.rule.creatOk();
 		},
 		turnback() {
-                this.$router.go(-1)
+			this.$router.go(-1);
-            }
 		}
 	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     .exam-box {
@@ -156,7 +155,6 @@
         height: 10px;
     }
 
-
     .draft {
         width: 500px;
         text-align: center;

src/views/publish/examRule/draft/rule.vue

@@ -1,16 +1,12 @@
 <template>
   <div class="exam-rule">
     <span>满分为 {{ course.fullMark }}分</span>
-        <el-button class="addList" @click="handleAdd" size="small">添加规则</el-button>
+    <el-button class="addList" size="small" @click="handleAdd">添加规则</el-button>
     <el-table :data="ruleList" border show-summary style="width: 100%" :height="height">
-            <el-table-column prop="name" label="实训类型">
+      <el-table-column prop="name" label="实训类型" />
-            </el-table-column>
+      <el-table-column prop="num" label="题数" width="100" />
-            <el-table-column prop="num" label="题数" width="100">
+      <el-table-column prop="point" label="每题分值" width="100" />
-            </el-table-column>
+      <el-table-column prop="chapterIdLong" label="总分" width="100" />
-            <el-table-column prop="point" label="每题分值" width="100">
-            </el-table-column>
-            <el-table-column prop="chapterIdLong" label="总分" width="100">
-            </el-table-column>
       <el-table-column label="操作" width="100">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handleForm(scope)">修改</el-button>
@@ -22,8 +18,13 @@
             <el-button @click="regulation">上一步</el-button>
             <el-button type="primary" @click="creatOk">新增</el-button>
         </div> -->
-        <edit-rule ref="addRule" @addRuleList="addRuleList" @editRuleList="editRuleList" :courseId="courseId"
+    <edit-rule
-            :editCourse="editCourse"></edit-rule>
+      ref="addRule"
+      :course-id="courseId"
+      :edit-course="editCourse"
+      @addRuleList="addRuleList"
+      @editRuleList="editRuleList"
+    />
   </div>
 </template>
 
@@ -34,7 +35,7 @@
 import editRule from './editRule';
 
 export default {
-        name: 'rule',
+	name: 'Rule',
 	components: {
 		editRule
 	},
@@ -62,16 +63,16 @@
 				type: '',
 				duration: '',
 				fullMark: '',
-                    passMark: '',
+				passMark: ''
 			},
 			form: {
 				course: '',
 				number: '',
-                    mark: '',
+				mark: ''
 			},
 			typeList: [],
-                trainingOperateTypeMap: {},
+			trainingOperateTypeMap: {}
-            }
+		};
 	},
 	watch: {
 	},
@@ -107,14 +108,14 @@
 			await getDetailList('training_type').then(res => {
 				this.typeList = res.data;
 			}).catch(error => {
-                    reject(error);
+				console.error(error);
 			});
 		},
 		async init() {
 			if (this.$route.params.ruleId != 0 && this.ruleList.length == 0) {
 				await getExamLessonDetail(this.$route.params.ruleId).then(res => {
 					if (res.code == 200) {
-                            let arr = res.data.examDefinitionRulesVOList;
+						const arr = res.data.examDefinitionRulesVOList;
 						arr.forEach((ele, index) => {
 							this.typeList.forEach(v => {
 								if (ele.trainingType == v.code) {
@@ -125,18 +126,18 @@
 												arr[index].name = `${v.name}-${item.name}`;
 												return;
 											}
-                                            })
+										});
 									}
 								}
 							});
-                            })
+						});
 						this.ruleList = arr;
 						this.$store.dispatch('app/handleRuleList', this.ruleList);
 						this.ruleList.forEach(res => {
-                                res.chapterIdLong = Number(res.num) * Number(res.point)
+							res.chapterIdLong = Number(res.num) * Number(res.point);
-                            })
+						});
 						this.changeCourseDisable();
-                        };
+					}
 				});
 			}
 		},
@@ -150,7 +151,7 @@
 					flag += Number(res.chapterIdLong);
 				});
 				if (flag == this.course.fullMark) {
-                        let result = {
+					const result = {
 						duration: Number(this.course.duration) * 60, // 时长
 						examDefinitionRulesVOList: this.ruleList, // 规则
 						fullPoint: Number(this.course.fullMark), // 满分
@@ -161,8 +162,8 @@
 						endTime: this.course.endDate,
 						startTime: this.course.startDate,
 						type: this.course.type, // 类型
-                            trial: this.course.trial == 2 ? true : false,  // 权限判断
+						trial: this.course.trial == 2 // 权限判断
-                        }
+					};
 					await this.save(result);
 				} else {
 					this.$messageBox('添加规则不匹配满分');
@@ -176,8 +177,8 @@
 				this.$message.success({ message: res.message });
 				this.$store.dispatch('app/handleCourseDetail', this.formDetail); // 清空 form 表单数据
 				this.$store.dispatch('app/handleRuleList', []); // 清空规则列表数据
-                    let path = `${this.$route.path.match(/(\/.*)\/examRule/)[1]}${UrlConfig.examRuleManage}`;
+				const path = `${this.$route.path.match(/(\/.*)\/examRule/)[1]}${UrlConfig.examRuleManage}`;
-                    let lessonId = this.$route.params.lessonId;
+				const lessonId = this.$route.params.lessonId;
 				if (parseInt(lessonId)) {
 					this.$router.push({ path: `${path}`, query: { lessonId: lessonId } });
 				} else {
@@ -185,75 +186,84 @@
 				}
 			}).catch(res => {
 				this.$messageBox('保存规则失败');
-                })
+			});
 		},
 		addRuleList(data) {
 			var arr = this.$store.state.app.course;
 			let value;
 			arr.forEach(res => {
-                    if (res.code == data.course) return value = res
+				if (res.code == data.course) {
+					value = res;
+					return value;
+				}
 			});
 			let titleName = value.name;
 			if (data.name) {
-                    titleName = `${value.name}-${data.name}`
+				titleName = `${value.name}-${data.name}`;
 			}
-                let element = {
+			const element = {
 				trainingType: data.course,
 				operateType: data.operateType,
 				num: Number(data.number),
 				point: Number(data.mark),
 				name: titleName,
-                    chapterIdLong: Number(data.number) * Number(data.mark),
+				chapterIdLong: Number(data.number) * Number(data.mark)
-                }
+			};
 			this.ruleList.push(element);
 			this.$store.dispatch('app/handleRuleList', this.ruleList);
 			this.changeCourseDisable();
 		},
 		// 判断类型是否选择过
 		changeCourseDisable() {
-                let arr = this.$store.state.app.course;
+			const arr = this.$store.state.app.course;
 			this.ruleList.forEach(ele => {
 				arr.forEach(res => {
 					if (ele.trainingType == res.code && !ele.operateType) {
 						res.disabled = true;
 					}
 				});
-                })
+			});
 		},
 		editRuleList(data) {
 			var arr = this.$store.state.app.course;
 			let value;
 			arr.forEach(res => {
-                    if (res.code == data.course) return value = res
+				if (res.code == data.course) {
+					value = res;
+					return value;
+				}
 			});
 			let titleName = value.name;
 			if (data.name) {
-                    titleName = `${value.name}-${data.name}`
+				titleName = `${value.name}-${data.name}`;
 			}
-                let element = {
+			const element = {
 				trainingType: data.course,
 				operateType: data.operateType,
 				num: Number(data.number),
 				point: Number(data.mark),
 				name: titleName,
-                    chapterIdLong: data.number * data.mark,
+				chapterIdLong: data.number * data.mark
-                }
+			};
-                this.ruleList.splice(this.indexCourse, 1, element)
+			this.ruleList.splice(this.indexCourse, 1, element);
 		},
 		handleForm(data) {
 			// 子元素监听 editCourse 每次改变值
 			this.indexCourse = data.$index;
-                let list = JSON.stringify(data.row);
+			const list = JSON.stringify(data.row);
-                let detail = JSON.parse(list);
+			const detail = JSON.parse(list);
 			var arr = this.$store.state.app.course;
 			arr.forEach(res => {
-                    if (res.name == detail.name) return detail.name = res.id
+				if (res.name == detail.name) {
+					detail.name = res.id;
+					return detail.name;
+				}
 			});
 			this.editCourse = detail;
 			this.handleAdd();
 		},
 		deleteForm(data) {
-                let index = data.$index;
+			const index = data.$index;
 			this.ruleList.splice(index, 1);
 			this.$refs.addRule.changeListDisabled(data.row.trainingType);
 			this.$store.dispatch('app/handleRuleList', this.ruleList);
@@ -263,7 +273,7 @@
 			this.$emit('regulation', this.course);
 		}
 	}
-    }
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     .exam-rule {

src/views/publish/examRule/index.vue

@@ -1,12 +1,17 @@
 <template>
   <el-card>
-        <div slot="header" style="text-align: center;" v-if="lessonName">
+    <div v-if="lessonName" slot="header" style="text-align: center;">
       <b>课程名称： {{ lessonName }}</b>
     </div>
     <div :style="{ height: height +'px' }">
-            <el-scrollbar wrapClass="scrollbar-wrapper" style="">
+      <el-scrollbar wrap-class="scrollbar-wrapper" style="">
-                <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm"
+        <QueryListPage
-                    :query-list="queryList" style="height: 100%;"></QueryListPage>
+          ref="queryListPage"
+          :pager-config="pagerConfig"
+          :query-form="queryForm"
+          :query-list="queryList"
+          style="height: 100%;"
+        />
       </el-scrollbar>
     </div>
   </el-card>
@@ -57,7 +62,7 @@
 						label: '创建人'
 					}
 				},
-                    reset: this.$route.query.lessonId ? false : true,
+				reset: !this.$route.query.lessonId
 			},
 			queryList: {
 				query: this.queryFunction,
@@ -68,9 +73,9 @@
 						title: '课程名称',
 						prop: 'lessonId',
 						type: 'tag',
-                            show: this.$route.query.lessonId ? false : true,
+						show: !this.$route.query.lessonId,
-                            columnValue: (row) => { return this.convertField(row.lessonId, this.OrganizationList, ['id', 'name']) },
+						columnValue: (row) => { return this.convertField(row.lessonId, this.OrganizationList, ['id', 'name']); },
-                            tagType: (row) => { return '' }
+						tagType: (row) => { return ''; }
 					},
 					{
 						title: '试卷名称',
@@ -78,13 +83,13 @@
 					},
 					{
 						title: '创建人',
-                            prop: 'creatorName',
+						prop: 'creatorName'
 					},
 					{
 						title: '是否试用',
 						prop: 'trial',
 						type: 'tag',
-                            columnValue: (row) => { return this.$ConstSelect.translate(row.trial, 'Whether') },
+						columnValue: (row) => { return this.$ConstSelect.translate(row.trial, 'Whether'); },
 						tagType: (row) => {
 							switch (row.trial) {
 							case true: return 'success';
@@ -96,8 +101,8 @@
 						title: '时长',
 						prop: 'duration',
 						type: 'tag',
-                            columnValue: (row) => { return this.durationField(row.duration) },
+						columnValue: (row) => { return this.durationField(row.duration); },
-                            tagType: (row) => { return '' }
+						tagType: (row) => { return ''; }
 					},
 					{
 						title: '考试时间',
@@ -117,7 +122,7 @@
 						title: '状态',
 						prop: 'status',
 						type: 'tag',
-                            columnValue: (row) => { return this.convertField(row.status, this.EffectiveTypeList, ['value', 'label']) },
+						columnValue: (row) => { return this.convertField(row.status, this.EffectiveTypeList, ['value', 'label']); },
 						tagType: (row) => {
 							switch (row.status) {
 							case '1': return 'success';
@@ -132,46 +137,46 @@
 						buttons: [
 							{
 								name: '快速创建',
-                                    type: "primary",
+								type: 'primary',
 								handleClick: this.handleDistribute,
-                                    showControl: (row) => { return row.bizType !== '02' }
+								showControl: (row) => { return row.bizType !== '02'; }
 							},
 							{
 								name: '修改',
-                                    type: "primary",
+								type: 'primary',
-                                    showControl: (row) => { return row.creatorId == this.userId },
+								showControl: (row) => { return row.creatorId == this.userId; },
 								handleClick: this.handleUpdate
 							},
 							{
 								name: '下架',
-                                    type: "warning",
+								type: 'warning',
 								handleClick: this.handleEfficacy,
 								showControl: (row) => {
-                                        return (this.$route.query.lessonId ? row.creatorId == this.userId : true) && row.status == 1
+									return (this.$route.query.lessonId ? row.creatorId == this.userId : true) && row.status == 1;
 								}
 							},
 							{
 								name: '上架',
-                                    type: "primary",
+								type: 'primary',
 								handleClick: this.handleEffective,
 								showControl: (row) => {
-                                        return (this.$route.query.lessonId ? row.creatorId == this.userId : true) && row.status != 1
+									return (this.$route.query.lessonId ? row.creatorId == this.userId : true) && row.status != 1;
 								}
 							},
 							{
 								name: '删除',
-                                    type: "danger",
+								type: 'danger',
 								handleClick: this.deleteList,
-                                    showControl: (row) => { return row.creatorId == this.userId }
+								showControl: (row) => { return row.creatorId == this.userId; }
-                                },
+							}
 						]
-                        },
+					}
 				],
 				actions: [
-                        { text: '新增', btnCode: 'employee_insert', handler: this.handleNormalAdd },
+					{ text: '新增', btnCode: 'employee_insert', handler: this.handleNormalAdd }
 				]
 			}
-            }
+		};
 	},
 	created() {
 		this.loadInitData();
@@ -216,8 +221,8 @@
 		},
 		convertField(fieldValue, enumList, converFormat) {
 			if (converFormat && converFormat.length >= 2) {
-                    let value = converFormat[0];
+				const value = converFormat[0];
-                    let label = converFormat[1];
+				const label = converFormat[1];
 				for (let i = 0; enumList && i < enumList.length; i++) {
 					if ('' + fieldValue === '' + enumList[i][value]) {
 						return enumList[i][label];
@@ -227,7 +232,7 @@
 		},
 		durationField(fieldValue) {
 			if (fieldValue) {
-                    let time = Number(fieldValue) / 60;
+				const time = Number(fieldValue) / 60;
 				return `${time}分钟`;
 			}
 		},
@@ -238,18 +243,18 @@
 			return getExamList(params);
 		},
 		handleNormalAdd() {
-                let path = `${this.$route.path.match(/(\/.*)\/examRule/)[1]}${UrlConfig.examRuleDraft}`;
+			const path = `${this.$route.path.match(/(\/.*)\/examRule/)[1]}${UrlConfig.examRuleDraft}`;
-                let lessonId = this.$route.query.lessonId ? this.$route.query.lessonId : 0;
+			const lessonId = this.$route.query.lessonId ? this.$route.query.lessonId : 0;
 			this.$router.push({ path: `${path}/add/0/${lessonId}` });
 		},
 		handleUpdate(index, data) {
-                let path = `${this.$route.path.match(/(\/.*)\/examRule/)[1]}${UrlConfig.examRuleDraft}`;
+			const path = `${this.$route.path.match(/(\/.*)\/examRule/)[1]}${UrlConfig.examRuleDraft}`;
-                let lessonId = this.$route.query.lessonId ? this.$route.query.lessonId : 0;
+			const lessonId = this.$route.query.lessonId ? this.$route.query.lessonId : 0;
 			this.$router.push({ path: `${path}/edit/${data.id}/${lessonId}` });
 		},
 		handleDistribute(index, data) {
-                let path = `${this.$route.path.match(/(\/.*)\/examRule/)[1]}${UrlConfig.examRuleDraft}`;
+			const path = `${this.$route.path.match(/(\/.*)\/examRule/)[1]}${UrlConfig.examRuleDraft}`;
-                let lessonId = this.$route.query.lessonId ? this.$route.query.lessonId : 0;
+			const lessonId = this.$route.query.lessonId ? this.$route.query.lessonId : 0;
 			this.$router.push({ path: `${path}/add/${data.id}/${lessonId}` });
 		},
 		// 删除
@@ -271,7 +276,7 @@
 					} else {
 						this.$message({ type: 'error', message: '删除异常，请联系管理员' });
 					}
-                    })
+				});
 			}).catch(() => { });
 		},
 		handleEfficacy(index, data) {
@@ -288,7 +293,7 @@
 					});
 				}).catch(res => {
 					this.$message({ type: 'warning', message: '设置失败,' + res.message });
-                    })
+				});
 			}).catch(() => { });
 		},
 		handleEffective(index, data) {
@@ -305,11 +310,11 @@
 					});
 				}).catch(res => {
 					this.$message({ type: 'warning', message: '设置失败,' + res.message });
-                    })
+				});
 			}).catch(() => { });
 		}
 	}
-    }
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     /deep/ {

src/views/publish/productStatus/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
-        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList">
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-        </QueryListPage>
   </div>
 </template>
 
@@ -9,7 +8,6 @@
 import { getProductList, putMapProductOnLine, putMapProductOffLine } from '@/api/management/mapprd';
 import { delTrainingList } from '@/api/management/userexam';
 import { getSkinStyleList } from '@/api/management/mapskin';
-    import localStore from 'storejs';
 
 export default {
 	name: 'PublishExam',
@@ -48,8 +46,8 @@
 						title: '皮肤类型',
 						prop: 'skinStyle',
 						type: 'tag',
-                            columnValue: (row) => { return this.convertField(row.skinStyle, this.skinStyleList, ['code', 'name']) },
+						columnValue: (row) => { return this.convertField(row.skinStyle, this.skinStyleList, ['code', 'name']); },
-                            tagType: (row) => { return '' }
+						tagType: (row) => { return ''; }
 					},
 					{
 						title: '产品code',
@@ -59,8 +57,8 @@
 						title: '产品类型',
 						prop: 'prdType',
 						type: 'tag',
-                            columnValue: (row) => { return this.convertField(row.prdType, this.prdTypeList, ['code', 'name']) },
+						columnValue: (row) => { return this.convertField(row.prdType, this.prdTypeList, ['code', 'name']); },
-                            tagType: (row) => { return 'success' }
+						tagType: (row) => { return 'success'; }
 					},
 					// {
 					//     title: '产品说明',
@@ -80,21 +78,21 @@
 								name: '上架',
 								handleClick: this.handlePutaway,
 								type: '',
-                                    showControl: (row) => { return row.status != 1 }
+								showControl: (row) => { return row.status != 1; }
 							},
 							{
 								name: '下架',
 								handleClick: this.handleSoldOut,
 								type: 'warning',
-                                    showControl: (row) => { return row.status == 1 }
+								showControl: (row) => { return row.status == 1; }
-                                },
+							}
 						]
 					}
 				]
 			},
 
 			currentModel: {}
-            }
+		};
 	},
 	created() {
 		this.loadInitData();
@@ -109,13 +107,13 @@
 			this.skinStyleList = [];
 			getSkinStyleList().then(response => {
 				this.skinStyleList = response.data;
-                })
+			});
 		},
 		convertField(fieldValue, enumList, converFormat) {
 			if (converFormat && converFormat.length >= 2) {
-                    let value = converFormat[0];
+				const value = converFormat[0];
-                    let label = converFormat[1];
+				const label = converFormat[1];
-                    for (let i = 0; enumList && i < enumList.length; i++) {
+				for (let i = 0; i < enumList.length; i++) {
 					if ('' + fieldValue === '' + enumList[i][value]) {
 						return enumList[i][label];
 					}
@@ -131,13 +129,13 @@
 				type: 'warning'
 			}).then(() => {
 				delTrainingList(row.id).then(response => {
-                        this.$message.success('删除成功')
+					this.$message.success('删除成功');
-                        this.reloadTable()
+					this.reloadTable();
-                    }).catch(error => {
+				}).catch(() => {
-                        this.reloadTable()
+					this.reloadTable();
-                        this.$messageBox('删除失败')
+					this.$messageBox('删除失败');
-                    })
+				});
-                }).catch(() => { })
+			}).catch(() => { });
 		},
 
 		handlePutaway(index, row) {
@@ -147,13 +145,13 @@
 				type: 'warning'
 			}).then(() => {
 				putMapProductOnLine(row.id).then(response => {
-                        this.$message.success('操作成功')
+					this.$message.success('操作成功');
-                        this.reloadTable()
+					this.reloadTable();
-                    }).catch(error => {
+				}).catch(() => {
-                        this.reloadTable()
+					this.reloadTable();
-                        this.$messageBox('操作失败')
+					this.$messageBox('操作失败');
-                    })
+				});
-                }).catch(() => { })
+			}).catch(() => { });
 		},
 
 		handleSoldOut(index, row) {
@@ -163,18 +161,18 @@
 				type: 'warning'
 			}).then(() => {
 				putMapProductOffLine(row.id).then(response => {
-                        this.$message.success('操作成功')
+					this.$message.success('操作成功');
-                        this.reloadTable()
+					this.reloadTable();
-                    }).catch(error => {
+				}).catch(() => {
-                        this.reloadTable()
+					this.reloadTable();
-                        this.$messageBox('操作失败')
+					this.$messageBox('操作失败');
-                    })
+				});
-                }).catch(() => { })
+			}).catch(() => { });
 		},
 
 		reloadTable() {
-                this.queryList.reload()
+			this.queryList.reload();
-            }
 		}
 	}
+};
 </script>

src/views/publish/publishLesson/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
-        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList">
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-        </QueryListPage>
   </div>
 </template>
 
@@ -51,8 +50,8 @@
 						title: '所属城市',
 						prop: 'cityCode',
 						type: 'tag',
-                            columnValue: (row) => { return this.convertField(row.cityCode, this.cityList, ['code', 'name']) },
+						columnValue: (row) => { return this.convertField(row.cityCode, this.cityList, ['code', 'name']); },
-                            tagType: (row) => { return 'success' }
+						tagType: (row) => { return 'success'; }
 					},
 					{
 						title: '课程简介',
@@ -67,36 +66,36 @@
 								name: '上架',
 								handleClick: this.handlePutaway,
 								type: '',
-                                    showControl: (row) => { return row.status != 1 }
+								showControl: (row) => { return row.status != 1; }
 							},
 							{
 								name: '下架',
 								handleClick: this.handleSoldOut,
 								type: 'warning',
-                                    showControl: (row) => { return row.status == 1 }
+								showControl: (row) => { return row.status == 1; }
 							},
 							{
 								name: '删除',
 								handleClick: this.handleDelete,
 								type: 'danger',
-                                    showControl: () => { return this.isShow != -1 }
+								showControl: () => { return this.isShow != -1; }
-                                },
+							}
 						]
 					}
 				]
 			},
 
 			currentModel: {}
-            }
+		};
-        },
-        created() {
-            this.loadInitData();
 	},
 	computed: {
 		isShow() {
 			return this.$store.getters['roles'].indexOf('05');
 		}
 	},
+	created() {
+		this.loadInitData();
+	},
 	methods: {
 		loadInitData() {
 			this.cityList = [];
@@ -105,20 +104,20 @@
 				this.cityList.forEach(elem => {
 					this.queryForm.queryObject.cityCode.config.data.push({ value: elem.code, label: elem.name });
 				});
-                }).catch(error => {
+			}).catch(() => {
 				this.$messageBox('加载城市列表失败');
 			});
 
 			this.skinStyleList = [];
 			getSkinStyleList().then(response => {
 				this.skinStyleList = response.data;
-                })
+			});
 		},
 		convertField(fieldValue, enumList, converFormat) {
 			if (converFormat && converFormat.length >= 2) {
-                    let value = converFormat[0];
+				const value = converFormat[0];
-                    let label = converFormat[1];
+				const label = converFormat[1];
-                    for (let i = 0; enumList && i < enumList.length; i++) {
+				for (let i = 0; i < enumList.length; i++) {
 					if ('' + fieldValue === '' + enumList[i][value]) {
 						return enumList[i][label];
 					}
@@ -137,14 +136,14 @@
 				type: 'warning'
 			}).then(() => {
 				delPublishLesson(row.id).then(response => {
-                        this.$message.success('删除成功')
+					this.$message.success('删除成功');
-                        this.reloadTable()
+					this.reloadTable();
-                        localStore.remove('mapId')
+					localStore.remove('mapId');
-                    }).catch(error => {
+				}).catch(() => {
-                        this.reloadTable()
+					this.reloadTable();
 					this.$messageBox('删除失败');
-                    })
+				});
-                }).catch(() => { })
+			}).catch(() => { });
 		},
 
 		handlePutaway(index, row) {
@@ -154,13 +153,13 @@
 				type: 'warning'
 			}).then(() => {
 				putLessonOnLine(row.id).then(response => {
-                        this.$message.success('操作成功')
+					this.$message.success('操作成功');
-                        this.reloadTable()
+					this.reloadTable();
-                    }).catch(error => {
+				}).catch(() => {
-                        this.reloadTable()
+					this.reloadTable();
-                        this.$messageBox('操作失败')
+					this.$messageBox('操作失败');
-                    })
+				});
-                }).catch(() => { })
+			}).catch(() => { });
 		},
 
 		handleSoldOut(index, row) {
@@ -170,18 +169,18 @@
 				type: 'warning'
 			}).then(() => {
 				putLessonOffLine(row.id).then(response => {
-                        this.$message.success('操作成功')
+					this.$message.success('操作成功');
-                        this.reloadTable()
+					this.reloadTable();
-                    }).catch(error => {
+				}).catch(() => {
-                        this.reloadTable()
+					this.reloadTable();
-                        this.$messageBox('操作失败')
+					this.$messageBox('操作失败');
-                    })
+				});
-                }).catch(() => { })
+			}).catch(() => { });
 		},
 
 		reloadTable() {
-                this.queryList.reload()
+			this.queryList.reload();
-            }
 		}
 	}
+};
 </script>

src/views/publish/publishMap/draft.vue

@@ -2,17 +2,17 @@
   <div class="card-box">
     <!-- <turnback-bar :title="turnbackBarTitle"></turnback-bar> -->
     <el-steps class="steps" :active="display">
-            <el-step :title="title" icon="el-icon-edit-outline"></el-step>
+      <el-step :title="title" icon="el-icon-edit-outline" />
-            <el-step title="" icon="el-icon-upload"></el-step>
+      <el-step title="" icon="el-icon-upload" />
     </el-steps>
     <el-card class="forms">
-            <el-scrollbar wrapClass="scrollbar-wrapper" :style="{height:height -120 + 'px'}" style="padding-top: 40px">
+      <el-scrollbar wrap-class="scrollbar-wrapper" :style="{height:height -120 + 'px'}" style="padding-top: 40px">
-                <data-form ref="dataform" :form="form" :formModel="formModel" :rules="rules"></data-form>
+        <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
       </el-scrollbar>
     </el-card>
     <div class="draft">
       <el-button-group>
-                <el-button type="warning" v-if="isEdit" @click="update">更新</el-button>
+        <el-button v-if="isEdit" type="warning" @click="update">更新</el-button>
         <el-button type="primary" @click="turnback">返回</el-button>
       </el-button-group>
     </div>
@@ -36,9 +36,9 @@
 			UserLoading: false,
 			formModel: {
 				mapId: '',
-                    name: '',
+				name: ''
-                }
 			}
+		};
 	},
 	computed: {
 		// turnbackBarTitle() {
@@ -50,21 +50,21 @@
 		},
 
 		form() {
-                let form = {
+			const form = {
 				labelWidth: '140px',
 				items: [
 					{ prop: 'name', label: '地图名称', type: 'text', required: false }
 				]
-                }
+			};
-                return form
+			return form;
 		},
 
 		rules() {
-                let baseRules = {
+			const baseRules = {
 				name: [
 					{ required: true, message: '请输入地图的新名称', trigger: 'blur' }
 				]
-                }
+			};
 
 			// 清空表单验证提示信息
 			this.$nextTick(function () {
@@ -100,21 +100,19 @@
 					this.display = 2;
 					this.turnback();
 					this.$message.success('更新成功');
-                    }).catch(error => {
+				}).catch(() => {
-                        this.$messageBox("更新失败");
+					this.$messageBox('更新失败');
 				});
 			});
 		},
 		turnback() {
-                this.$router.go(-1)
+			this.$router.go(-1);
-            }
 		}
 	}
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-    .card-box {}
-
     .steps {
         width: 940px;
         margin: 0 auto;
@@ -151,7 +149,6 @@
         }
     }
 
-
     .draft {
         width: 400px;
         text-align: center;

src/views/publish/publishMap/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
-        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList">
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-        </QueryListPage>
   </div>
 </template>
 
@@ -52,15 +51,15 @@
 						title: '所属城市',
 						prop: 'cityCode',
 						type: 'tag',
-                            columnValue: (row) => { return this.convertField(row.cityCode, this.cityList, ['code', 'name']) },
+						columnValue: (row) => { return this.convertField(row.cityCode, this.cityList, ['code', 'name']); },
-                            tagType: (row) => { return 'success' }
+						tagType: (row) => { return 'success'; }
 					},
 					{
 						title: '皮肤类型',
 						prop: 'skinStyle',
 						type: 'tag',
-                            columnValue: (row) => { return this.convertField(row.skinStyle, this.skinStyleList, ['code', 'name']) },
+						columnValue: (row) => { return this.convertField(row.skinStyle, this.skinStyleList, ['code', 'name']); },
-                            tagType: (row) => { return '' }
+						tagType: (row) => { return ''; }
 					},
 					{
 						title: '更新时间',
@@ -75,44 +74,44 @@
 								name: '上架',
 								handleClick: this.handlePutaway,
 								type: '',
-                                    showControl: (row) => { return row.status != 1 }
+								showControl: (row) => { return row.status != 1; }
 							},
 							{
 								name: '下架',
 								handleClick: this.handleSoldOut,
 								type: 'warning',
-                                    showControl: (row) => { return row.status == 1 }
+								showControl: (row) => { return row.status == 1; }
 							},
 							{
 								name: '删除',
 								handleClick: this.handleDelete,
 								type: 'danger',
-                                    showControl: () => { return this.isShow != -1 }
+								showControl: () => { return this.isShow != -1; }
 							},
 							{
 								name: '更新地图名称',
-                                    handleClick: this.handleUpdate,
+								handleClick: this.handleUpdate
 							},
 							{
 								name: '导出地图',
-                                    handleClick: this.handleExportMap,
+								handleClick: this.handleExportMap
-                                },
+							}
 						]
 					}
 				]
 			},
 
 			currentModel: {}
-            }
+		};
-        },
-        created() {
-            this.loadInitData();
 	},
 	computed: {
 		isShow() {
 			return this.$store.getters['roles'].indexOf('05');
 		}
 	},
+	created() {
+		this.loadInitData();
+	},
 	methods: {
 		loadInitData() {
 			this.cityList = [];
@@ -121,21 +120,20 @@
 				this.cityList.forEach(elem => {
 					this.queryForm.queryObject.cityCode.config.data.push({ value: elem.code, label: elem.name });
 				});
-                }).catch(error => {
+			}).catch(() => {
 				this.$messageBox('加载城市列表失败');
 			});
 
-
 			this.skinStyleList = [];
 			getSkinStyleList().then(response => {
 				this.skinStyleList = response.data;
-                })
+			});
 		},
 		convertField(fieldValue, enumList, converFormat) {
 			if (converFormat && converFormat.length >= 2) {
-                    let value = converFormat[0];
+				const value = converFormat[0];
-                    let label = converFormat[1];
+				const label = converFormat[1];
-                    for (let i = 0; enumList && i < enumList.length; i++) {
+				for (let i = 0; i < enumList.length; i++) {
 					if ('' + fieldValue === '' + enumList[i][value]) {
 						return enumList[i][label];
 					}
@@ -155,18 +153,18 @@
 				type: 'warning'
 			}).then(() => {
 				delPublishMap(row.id).then(response => {
-                        this.$message.success('删除成功')
+					this.$message.success('删除成功');
-                        this.reloadTable()
+					this.reloadTable();
-                        localStore.remove('mapId')
+					localStore.remove('mapId');
-                    }).catch(error => {
+				}).catch(() => {
-                        this.reloadTable()
+					this.reloadTable();
 					this.$messageBox('删除失败');
-                    })
+				});
-                }).catch(() => { })
+			}).catch(() => { });
 		},
 
 		reloadTable() {
-                this.queryList.reload()
+			this.queryList.reload();
 		},
 
 		handlePutaway(index, row) {
@@ -176,13 +174,13 @@
 				type: 'warning'
 			}).then(() => {
 				putMapOnLine(row.id).then(response => {
-                        this.$message.success('操作成功')
+					this.$message.success('操作成功');
-                        this.reloadTable()
+					this.reloadTable();
-                    }).catch(error => {
+				}).catch(() => {
-                        this.reloadTable()
+					this.reloadTable();
-                        this.$messageBox('操作失败')
+					this.$messageBox('操作失败');
-                    })
+				});
-                }).catch(() => { })
+			}).catch(() => { });
 		},
 
 		handleSoldOut(index, row) {
@@ -192,28 +190,27 @@
 				type: 'warning'
 			}).then(() => {
 				putMapOffLine(row.id).then(response => {
-                        this.$message.success('操作成功')
+					this.$message.success('操作成功');
 					this.reloadTable();
 					localStore.remove('mapId');
-                    }).catch(error => {
+				}).catch(() => {
-                        this.reloadTable()
+					this.reloadTable();
-                        this.$messageBox('操作失败')
+					this.$messageBox('操作失败');
-                    })
+				});
-                }).catch(() => { })
+			}).catch(() => { });
 		},
 
 		// 导出地图
 		async handleExportMap(index, row) {
-                let res = await getPublishMapExport(row.id);
+			const res = await getPublishMapExport(row.id);
-                let resultData = res.data;
+			const resultData = res.data;
 			if (resultData === false) {
 				return;
 			}
-                let self = this;
+			const self = this;
             import('@/utils/Export2Excel').then(excel => {
             	self.queryExportData(resultData).then(data => {
             		excel.export_json_excel(data, resultData.name);
-
             	}).catch(error => {
             		self.$message.error('导出执行异常：' + error.message);
             	});
@@ -221,22 +218,21 @@
 		},
 
 		formatJson(filterVal, jsonData) {
-                return jsonData.map(v => filterVal.map(j => v[j]))
+			return jsonData.map(v => filterVal.map(j => v[j]));
 		},
 		// 格式化数据列表
 		queryExportData(data) {
 			return new Promise((resolve, reject) => {
-                    let result = {
+				const result = {
-                        base: [],
+					base: []
 				};
-                    let obj = {};
+				const obj = {};
-                    for (let i in data) {
+				for (const i in data) {
 					if (i == 'devices') {
-                            for (let v in data[i]) {
+						for (const v in data[i]) {
 							if (data[i][v].length) {
 								result[v] = [...data[i][v]];
-                                }
+							} else if (v == 'skinVO') {
-                                else if (v == 'skinVO') {
 								result[v] = [data[i][v]];
 							}
 						}
@@ -254,5 +250,5 @@
 			});
 		}
 	}
-    }
+};
 </script>

src/views/publish/runPlanCommon/chooseTemplatePlan.vue

@@ -1,10 +1,16 @@
 <template>
-    <el-dialog :title="title" :visible.sync="dialogShow" width="80%" :before-close="doClose" :modal="false"
+  <el-dialog
-        :close-on-click-modal="false" v-dialogDrag>
+    v-dialogDrag
-        <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList">
+    :title="title"
-        </QueryListPage>
+    :visible.sync="dialogShow"
+    width="80%"
+    :before-close="doClose"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <el-row type="flex" justify="center" class="button-group">
-            <el-button type="primary" @click="handleConfirm" :loading="loading">选 择</el-button>
+      <el-button type="primary" :loading="loading" @click="handleConfirm">选 择</el-button>
       <el-button @click="dialogShow = false">取 消</el-button>
     </el-row>
   </el-dialog>
@@ -12,8 +18,7 @@
 
 <script>
 import { runPlanTemplateList } from '@/api/runplan';
-    import { getSkinStyleList } from '@/api/management/mapskin'
+import { getSkinStyleList } from '@/api/management/mapskin';
-    import { UrlConfig } from '@/router/index';
 
 export default {
 	name: 'ChooseTemplatePlan',
@@ -51,19 +56,19 @@
 						prop: 'skinStyle',
 						type: 'tag',
 						columnValue: (row) => {
-                                return this.convertField(row.skinStyle, this.skinStyleList, ['code', 'name'])
+							return this.convertField(row.skinStyle, this.skinStyleList, ['code', 'name']);
 						},
-                            tagType: (row) => { return 'success' }
+						tagType: (row) => { return 'success'; }
 					}
 				]
 			},
 
 			currentModel: {}
-            }
+		};
 	},
 	computed: {
 		title() {
-                return '选择模板运行图'
+			return '选择模板运行图';
 		}
 	},
 	methods: {
@@ -71,7 +76,7 @@
 			this.skinStyleList = [];
 			getSkinStyleList().then(response => {
 				this.skinStyleList = response.data;
-                })
+			});
 		},
 		doShow(model) {
 			this.loading = false;
@@ -88,9 +93,9 @@
 		},
 		convertField(fieldValue, enumList, converFormat) {
 			if (converFormat && converFormat.length >= 2) {
-                    let value = converFormat[0];
+				const value = converFormat[0];
-                    let label = converFormat[1];
+				const label = converFormat[1];
-                    for (let i = 0; enumList && i < enumList.length; i++) {
+				for (let i = 0; i < enumList.length; i++) {
 					if ('' + fieldValue === '' + enumList[i][value]) {
 						return enumList[i][label];
 					}
@@ -109,10 +114,10 @@
 			}
 		},
 		reloadTable() {
-                this.queryList.reload()
+			this.queryList.reload();
-            }
 		}
 	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";

src/views/publish/runPlanCommon/draft.vue

@@ -1,22 +1,21 @@
 <template>
   <div class="card-box">
     <el-steps class="steps" :active="display">
-            <el-step :title="title" icon="el-icon-edit-outline"></el-step>
+      <el-step :title="title" icon="el-icon-edit-outline" />
-            <el-step title="" icon="el-icon-upload"></el-step>
+      <el-step title="" icon="el-icon-upload" />
     </el-steps>
     <el-card class="forms">
-            <el-scrollbar wrapClass="scrollbar-wrapper" :style="{height:height -120 + 'px'}" style="padding-top: 40px">
+      <el-scrollbar wrap-class="scrollbar-wrapper" :style="{height:height -120 + 'px'}" style="padding-top: 40px">
         <el-form ref="form" :model="model" :rules="rules" label-width="140px" size="small">
           <el-form-item label="选择地图:" prop="mapId">
             <el-select v-model="model.mapId" filterable>
-                            <el-option v-for="item in mapList" :key="item.id" :label="item.name" :value="item.id">
+              <el-option v-for="item in mapList" :key="item.id" :label="item.name" :value="item.id" />
-                            </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="运行图名称:" prop="planId">
             <el-row>
               <el-col :span="19">
-                                <el-input v-model="model.planName" :readonly="true"></el-input>
+                <el-input v-model="model.planName" :readonly="true" />
               </el-col>
               <el-col :span="4" :offset="1">
                 <el-button @click="handleChoose">选择 </el-button>
@@ -28,11 +27,11 @@
     </el-card>
     <div class="draft">
       <el-button-group>
-                <el-button type="primary" v-if="isAdd" @click="create">创建</el-button>
+        <el-button v-if="isAdd" type="primary" @click="create">创建</el-button>
         <el-button type="primary" @click="turnback">返回</el-button>
       </el-button-group>
     </div>
-        <choose-template-plan ref="choose" @chooseConfirm="chooseConfirm"></choose-template-plan>
+    <choose-template-plan ref="choose" @chooseConfirm="chooseConfirm" />
   </div>
 </template>
 
@@ -44,12 +43,12 @@
 
 export default {
 	name: 'CommonPlanDraft',
-        mixins: [
-            WindowResizeHandler
-        ],
 	components: {
 		ChooseTemplatePlan
 	},
+	mixins: [
+		WindowResizeHandler
+	],
 	data() {
 		return {
 			height: '',
@@ -59,26 +58,26 @@
 			model: {
 				mapId: '',
 				planId: '',
-                    planName: '',
+				planName: ''
-                }
 			}
+		};
 	},
 	computed: {
 		title() {
-                return '创建通用运行图'
+			return '创建通用运行图';
 		},
 		isAdd() {
 			return this.$route.params.mode.toUpperCase() == 'add'.toUpperCase();
 		},
 		rules() {
-                let rules = {
+			const rules = {
 				mapId: [
 					{ required: true, message: '请选择地图', trigger: 'blur' }
 				],
 				planId: [
 					{ required: true, message: '请选择模板运行图', trigger: 'change' }
 				]
-                }
+			};
 
 			return rules;
 		}
@@ -93,11 +92,11 @@
 		initLoadPage() {
 			listPublishMap().then(resp => {
 				this.mapList = resp.data;
-                })
+			});
 		},
 		handleChoose() {
 			let model = {};
-                let index = this.mapList.findIndex(elem => { return elem.id == this.model.mapId });
+			const index = this.mapList.findIndex(elem => { return elem.id == this.model.mapId; });
 			if (index >= 0) {
 				model = this.mapList[index];
 			}
@@ -113,7 +112,7 @@
 			return {
 				mapId: this.model.mapId,
 				templatePlanId: this.model.planId
-                }
+			};
 		},
 		create() {
 			this.$refs['form'].validate((valid) => {
@@ -121,22 +120,20 @@
 					createRunPlanCommon(this.buildModel()).then(response => {
 						this.$message.success('创建通用运行图成功');
 						this.$router.go(-1);
-                        }).catch(error => {
+					}).catch(() => {
 						this.$messageBox('创建通用运行图失败');
-                        })
+					});
 				}
 			});
 		},
 		turnback() {
-                this.$router.go(-1)
+			this.$router.go(-1);
-            }
 		}
 	}
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-    .card-box {}
-
     .steps {
         width: 940px;
         margin: 0 auto;
@@ -173,7 +170,6 @@
         }
     }
 
-
     .draft {
         width: 400px;
         text-align: center;

src/views/publish/runPlanCommon/index.vue

@@ -1,14 +1,12 @@
 <template>
   <div>
-        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList">
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-        </QueryListPage>
   </div>
 </template>
 
 <script>
 import { superAdmin } from '@/router';
-    import { getSkinStyleList } from '@/api/management/mapskin'
+import { getRunPlanLoadList, runPlanTemplateList } from '@/api/runplan';
-    import { getRunPlanLoadList, createRunPlanCommon, runPlanTemplateList } from '@/api/runplan';
 import { UrlConfig } from '@/router/index';
 
 export default {
@@ -61,25 +59,25 @@
 							{
 								name: '预览',
 								handleClick: this.handleView,
-                                    type: '',
+								type: ''
 							}
 						]
 					}
 				],
 				actions: [
-                        { text: '创建', btnCode: 'employee_insert', handler: this.handleCreateCommonPlan },
+					{ text: '创建', btnCode: 'employee_insert', handler: this.handleCreateCommonPlan }
 				]
 			},
 
 			currentModel: {}
-            }
+		};
 	},
 	methods: {
 		convertField(fieldValue, enumList, converFormat) {
 			if (converFormat && converFormat.length >= 2) {
-                    let value = converFormat[0];
+				const value = converFormat[0];
-                    let label = converFormat[1];
+				const label = converFormat[1];
-                    for (let i = 0; enumList && i < enumList.length; i++) {
+				for (let i = 0; i < enumList.length; i++) {
 					if ('' + fieldValue === '' + enumList[i][value]) {
 						return enumList[i][label];
 					}
@@ -106,16 +104,16 @@
 		// 预览
 		handleView(index, row) {
 			runPlanTemplateList({ pageSize: 10000 }).then(resp => {
-                    let list = resp.data.list || [];
+				const list = resp.data.list || [];
-                    let index = list.findIndex(elem => { return list.id == row.templateId; });
+				const index = list.findIndex(elem => { return list.id == row.templateId; });
 				if (index >= 0) {
 					this.$router.push({ path: `${UrlConfig.publish.runPlanView}/common`, query: { skinStyle: list[index].skinStyle, planId: list[index].id } });
 				}
-                })
+			});
 		},
 		reloadTable() {
-                this.queryList.reload()
+			this.queryList.reload();
-            }
 		}
 	}
+};
 </script>

src/views/publish/runPlanEveryDay/index.vue

@@ -1,14 +1,12 @@
 <template>
   <div>
-        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList">
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-        </QueryListPage>
   </div>
 </template>
 
 <script>
 import { superAdmin } from '@/router';
-    import { listPublishMap } from '@/api/jmap/mapdraft';
+import { getSkinStyleList } from '@/api/management/mapskin';
-    import { getSkinStyleList } from '@/api/management/mapskin'
 import { runPlanEveryDayList, deleteRunPlanEveryDay } from '@/api/runplan';
 import { UrlConfig } from '@/router/index';
 
@@ -52,9 +50,9 @@
 						prop: 'skinStyle',
 						type: 'tag',
 						columnValue: (row) => {
-                                return this.convertField(row.skinStyle, this.skinStyleList, ['code', 'name'])
+							return this.convertField(row.skinStyle, this.skinStyleList, ['code', 'name']);
 						},
-                            tagType: (row) => { return '' }
+						tagType: (row) => { return ''; }
 					},
 					{
 						title: '每日运行时间',
@@ -78,7 +76,7 @@
 							{
 								name: '预览',
 								handleClick: this.handleView,
-                                    type: '',
+								type: ''
 							}
 						]
 					}
@@ -86,7 +84,7 @@
 			},
 
 			currentModel: {}
-            }
+		};
 	},
 	created() {
 		this.loadInitData();
@@ -98,14 +96,14 @@
 				this.skinStyleList = response.data;
 				response.data.forEach(elem => {
 					this.queryForm.queryObject.skinStyle.config.data.push({ value: elem.code, label: elem.name });
-                    })
+				});
-                })
+			});
 		},
 		convertField(fieldValue, enumList, converFormat) {
 			if (converFormat && converFormat.length >= 2) {
-                    let value = converFormat[0];
+				const value = converFormat[0];
-                    let label = converFormat[1];
+				const label = converFormat[1];
-                    for (let i = 0; enumList && i < enumList.length; i++) {
+				for (let i = 0; i < enumList.length; i++) {
 					if ('' + fieldValue === '' + enumList[i][value]) {
 						return enumList[i][label];
 					}
@@ -119,21 +117,21 @@
 				type: 'warning'
 			}).then(() => {
 				deleteRunPlanEveryDay(row.id).then(response => {
-                        this.$message.success('删除成功')
+					this.$message.success('删除成功');
-                        this.reloadTable()
+					this.reloadTable();
-                    }).catch(error => {
+				}).catch(() => {
-                        this.reloadTable()
+					this.reloadTable();
-                        this.$messageBox('删除失败')
+					this.$messageBox('删除失败');
-                    })
+				});
-                }).catch(() => { })
+			}).catch(() => { });
 		},
 		// 预览
 		handleView(index, row) {
 			this.$router.push({ path: `${UrlConfig.publish.runPlanView}/everyDay`, query: { skinStyle: row.skinStyle, planId: row.id } });
 		},
 		reloadTable() {
-                this.queryList.reload()
+			this.queryList.reload();
-            }
 		}
 	}
+};
 </script>

src/views/publish/runPlanTemplate/index.vue

@@ -1,14 +1,12 @@
 <template>
   <div>
-        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList">
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-        </QueryListPage>
   </div>
 </template>
 
 <script>
 import { superAdmin } from '@/router';
-    import { listPublishMap } from '@/api/jmap/mapdraft';
+import { getSkinStyleList } from '@/api/management/mapskin';
-    import { getSkinStyleList } from '@/api/management/mapskin'
 import { runPlanTemplateList, deleteRunPlanTemplate, generateCommonRunPlanEveryDay } from '@/api/runplan';
 import { UrlConfig } from '@/router/index';
 
@@ -52,9 +50,9 @@
 						prop: 'skinStyle',
 						type: 'tag',
 						columnValue: (row) => {
-                                return this.convertField(row.skinStyle, this.skinStyleList, ['code', 'name'])
+							return this.convertField(row.skinStyle, this.skinStyleList, ['code', 'name']);
 						},
-                            tagType: (row) => { return '' }
+						tagType: (row) => { return ''; }
 					},
 					{
 						title: '创建时间',
@@ -69,17 +67,17 @@
 							{
 								name: '删除',
 								handleClick: this.handleDelete,
-                                    type: 'danger',
+								type: 'danger'
 							},
 							{
 								name: '生成每日运行图',
 								handleClick: this.handleGenerateEveryDay,
-                                    type: '',
+								type: ''
 							},
 							{
 								name: '预览',
 								handleClick: this.handleView,
-                                    type: '',
+								type: ''
 							}
 						]
 					}
@@ -87,7 +85,7 @@
 			},
 
 			currentModel: {}
-            }
+		};
 	},
 	created() {
 		this.loadInitData();
@@ -99,14 +97,14 @@
 				this.skinStyleList = response.data;
 				response.data.forEach(elem => {
 					this.queryForm.queryObject.skinStyle.config.data.push({ value: elem.code, label: elem.name });
-                    })
+				});
-                })
+			});
 		},
 		convertField(fieldValue, enumList, converFormat) {
 			if (converFormat && converFormat.length >= 2) {
-                    let value = converFormat[0];
+				const value = converFormat[0];
-                    let label = converFormat[1];
+				const label = converFormat[1];
-                    for (let i = 0; enumList && i < enumList.length; i++) {
+				for (let i = 0; i < enumList.length; i++) {
 					if ('' + fieldValue === '' + enumList[i][value]) {
 						return enumList[i][label];
 					}
@@ -121,17 +119,17 @@
 				type: 'warning'
 			}).then(() => {
 				deleteRunPlanTemplate(row.id).then(response => {
-                        this.$message.success('删除成功')
+					this.$message.success('删除成功');
-                        this.reloadTable()
+					this.reloadTable();
 				}).catch(error => {
-                        this.reloadTable()
+					this.reloadTable();
 					if (error.code == 500) {
-                            this.$messageBox('删除失败')
+						this.$messageBox('删除失败');
 					} else if (error.code == 500009) {
-                            this.$messageBox('该模板已被加载计划使用，无法删除')
+						this.$messageBox('该模板已被加载计划使用，无法删除');
 					}
-                    })
+				});
-                }).catch(() => { })
+			}).catch(() => { });
 		},
 		// 生成每日运行图
 		handleGenerateEveryDay(index, row) {
@@ -141,21 +139,21 @@
 				type: 'warning'
 			}).then(() => {
 				generateCommonRunPlanEveryDay(row.id).then(response => {
-                        this.reloadTable()
+					this.reloadTable();
-                        this.$message.success('生成通用每日运行图成功。')
+					this.$message.success('生成通用每日运行图成功。');
-                    }).catch(error => {
+				}).catch(() => {
-                        this.reloadTable()
+					this.reloadTable();
-                        this.$messageBox('生成通用每日运行图失败！')
+					this.$messageBox('生成通用每日运行图失败！');
-                    })
+				});
-                }).catch(() => { })
+			}).catch(() => { });
 		},
 		// 预览
 		handleView(index, row) {
 			this.$router.push({ path: `${UrlConfig.publish.runPlanView}/template`, query: { skinStyle: row.skinStyle, planId: row.id } });
 		},
 		reloadTable() {
-                this.queryList.reload()
+			this.queryList.reload();
-            }
 		}
 	}
+};
 </script>

src/views/publish/simulationScript/index.vue

@@ -1,16 +1,12 @@
 <template>
   <div>
-        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList">
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-        </QueryListPage>
   </div>
 </template>
 
 <script>
 import { superAdmin } from '@/router';
-    import { listPublishMap } from '@/api/jmap/mapdraft';
+import { getSkinStyleList } from '@/api/management/mapskin';
-    import { getSkinStyleList } from '@/api/management/mapskin'
-    import { runPlanTemplateList, deleteRunPlanTemplate, generateCommonRunPlanEveryDay } from '@/api/runplan';
-    import { UrlConfig } from '@/router/index';
 import { getQuestPageList, deleteQuest } from '@/api/quest';
 
 export default {
@@ -49,9 +45,9 @@
 						prop: 'skinCode',
 						type: 'tag',
 						columnValue: (row) => {
-                                return this.convertField(row.skinCode, this.skinCodeList, ['code', 'name'])
+							return this.convertField(row.skinCode, this.skinCodeList, ['code', 'name']);
 						},
-                            tagType: (row) => { return '' }
+						tagType: (row) => { return ''; }
 					},
 					{
 						title: '创建时间',
@@ -66,20 +62,20 @@
 							{
 								name: '删除',
 								handleClick: this.handleDelete,
-                                    type: 'danger',
+								type: 'danger'
 							},
 							{
 								name: '查看详情',
 								handleClick: this.handleDetail,
-                                    type: '',
+								type: ''
-                                },
+							}
 						]
 					}
 				]
 			},
 
 			currentModel: {}
-            }
+		};
 	},
 	created() {
 		this.loadInitData();
@@ -91,14 +87,14 @@
 				this.skinCodeList = response.data;
 				response.data.forEach(elem => {
 					this.queryForm.queryObject.skinCode.config.data.push({ value: elem.code, label: elem.name });
-                    })
+				});
-                })
+			});
 		},
 		convertField(fieldValue, enumList, converFormat) {
 			if (converFormat && converFormat.length >= 2) {
-                    let value = converFormat[0];
+				const value = converFormat[0];
-                    let label = converFormat[1];
+				const label = converFormat[1];
-                    for (let i = 0; enumList && i < enumList.length; i++) {
+				for (let i = 0; i < enumList.length; i++) {
 					if ('' + fieldValue === '' + enumList[i][value]) {
 						return enumList[i][label];
 					}
@@ -114,17 +110,17 @@
 				type: 'warning'
 			}).then(() => {
 				deleteQuest(row.id).then(response => {
-                        this.$message.success('删除成功')
+					this.$message.success('删除成功');
-                        this.reloadTable()
+					this.reloadTable();
 				}).catch(error => {
-                        this.reloadTable()
+					this.reloadTable();
 					if (error.code == 500) {
-                            this.$messageBox('删除失败')
+						this.$messageBox('删除失败');
 					} else if (error.code == 500009) {
-                            this.$messageBox('该模板已被加载计划使用，无法删除')
+						this.$messageBox('该模板已被加载计划使用，无法删除');
 					}
-                    })
+				});
-                }).catch(() => { })
+			}).catch(() => { });
 		},
 
 		// 查看详情
@@ -134,8 +130,8 @@
 		},
 
 		reloadTable() {
-                this.queryList.reload()
+			this.queryList.reload();
-            }
 		}
 	}
+};
 </script>