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

src/router/index.js

@@ -45,9 +45,6 @@ import ExamHome from '@/views/exam/index';
 import ExamCourseDetail from '@/views/exam/detail/courseDetail';
 import ExamResult from '@/views/exam/result';
 
-import PublishExamRule from '@/views/publish/examRule/index';
-import PublishExamRuleDraft from '@/views/publish/examRule/draft/index';
-
 import DemonstrationDetail from '@/views/demonstration/detail/index';
 
 import PlanMonitorEditTool from '@/views/planMonitor/editTool/index';
@@ -71,12 +68,13 @@ import PublishMap from '@/views/publish/publishMap/index';
 import PublishMapDetail from '@/views/publish/publishMap/list'; // 发布历史
 import ProductStatus from '@/views/publish/productStatus/index';
 import PublishLesson from '@/views/publish/publishLesson/index';
-
+import RunPlanTemplate from '@/views/publish/runPlanTemplate/index';
 import RunPlanCommon from '@/views/publish/runPlanCommon/index';
 import RunPlanCommonDraft from '@/views/publish/runPlanCommon/draft';
-import RunPlanTemplate from '@/views/publish/runPlanTemplate/index';
 import RunPlanEveryDay from '@/views/publish/runPlanEveryDay/index';
-import RunplanView from '@/views/publish/runPlanView/index';
+import RunplanView from '@/views/publish/runPlanEveryDay/runPlanView';
+import PublishExamRule from '@/views/publish/examRule/index';
+import PublishExamRuleDraft from '@/views/publish/examRule/draft/index';
 
 import IbpEdit from '@/views/ibp/ibpDraft/ibpEdit/index';
 import TrainingPlatform from '@/views/trainingPlatform/index';
@@ -651,6 +649,11 @@ export const asyncRouter = [
                     i18n: 'router.runPlanEveryDayManage'
                 }
             },
+            {
+                path: 'runPlan/view/:mode',
+                component: RunplanView,
+                hidden: true
+            },
             {
                 path: 'examRule/manage',
                 component: PublishExamRule,
@@ -667,11 +670,6 @@ export const asyncRouter = [
                 path: 'runPlan/common/:mode',
                 component: RunPlanCommonDraft,
                 hidden: true
-            },
-            {
-                path: 'runPlan/view/:mode',
-                component: RunplanView,
-                hidden: true
             }
         ]
     },

src/scripts/OperationConfig.js

@@ -89,7 +89,7 @@ export const OperationList = {
                 trainingName: '站台扣车({10}-{12}站台)',
                 trainingRemark: '设置扣车功能',
                 trainingType: '05',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【扣车】' },
                     { deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【确定】按钮' }
@@ -103,7 +103,7 @@ export const OperationList = {
                 trainingName: '站台取消扣车({10}-{12}站台)',
                 trainingRemark: '设置取消扣车功能',
                 trainingType: '05',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
                     { deviceType: '06', orderNum: 2, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }
@@ -160,7 +160,7 @@ export const OperationList = {
                 trainingName: '站台跳停({10}-{12}站台)',
                 trainingRemark: '设置跳停功能',
                 trainingType: '05',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【跳停】' },
                     { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮', val: '{11}' }
@@ -174,7 +174,7 @@ export const OperationList = {
                 trainingName: '取消跳停({10}-{12}站台)',
                 trainingRemark: '设置取消跳停功能',
                 trainingType: '05',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' },
                     { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮', val: '{11}' }
@@ -188,7 +188,7 @@ export const OperationList = {
                 trainingName: '查询站台状态({10}-{12}站台)',
                 trainingRemark: '查询站台状态功能',
                 trainingType: '05',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【查询站台状态】' },
                     { deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【确定】按钮' }
@@ -316,7 +316,7 @@ export const OperationList = {
                 trainingName: '区段故障解锁({8}{9})',
                 trainingRemark: '故障解锁功能',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区段故障解锁】' },
                     { deviceType: '03', orderNum: 2, operateCode: '4026', tip: '鼠标左键点击【下达】按钮' },
@@ -333,7 +333,7 @@ export const OperationList = {
                 trainingName: '区段切除({8}{9})',
                 trainingRemark: '区段切除',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '405', tip: '鼠标右键菜单选择【区段切除】' },
                     { deviceType: '03', orderNum: 2, operateCode: '405', tip: '鼠标左键点击【确定】按钮' }
@@ -347,7 +347,7 @@ export const OperationList = {
                 trainingName: '区段激活({8}{9})',
                 trainingRemark: '区段激活功能',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '406', tip: '鼠标右键菜单选择【区段激活】' },
                     { deviceType: '03', orderNum: 2, operateCode: '406', tip: '鼠标左键点击【确定】按钮' }
@@ -378,7 +378,7 @@ export const OperationList = {
                 trainingName: '区段封锁({8}{9})',
                 trainingRemark: '区段封锁功能',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '403', tip: '鼠标右键菜单选择【区段封锁】' },
                     { deviceType: '03', orderNum: 2, operateCode: '403', tip: '鼠标左键点击【确定】按钮' }
@@ -392,7 +392,7 @@ export const OperationList = {
                 trainingName: '区段解封({8}{9})',
                 trainingRemark: '区段解封功能',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '404', tip: '鼠标右键菜单选择【区段解封】' },
                     { deviceType: '03', orderNum: 2, operateCode: '4041', tip: '鼠标左键点击【下达】按钮' },
@@ -409,7 +409,7 @@ export const OperationList = {
                 trainingName: '区段设置限速({8}{9})',
                 trainingRemark: '区段设置限速功能（限速值：5）',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【区段设置限速】' },
                     { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值5】', val: '5' },
@@ -428,7 +428,7 @@ export const OperationList = {
                 trainingName: '区段取消限速({8}{9})',
                 trainingRemark: '区段取消限速功能',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '408', tip: '鼠标右键菜单选择【区段取消限速】' },
                     { deviceType: '03', orderNum: 2, operateCode: '4081', tip: '鼠标左键点击【下达】按钮' },
@@ -447,7 +447,7 @@ export const OperationList = {
                 trainingName: '道岔单锁({7})',
                 trainingRemark: '道岔单锁功能',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '103', tip: '鼠标右键菜单选择【道岔单锁】' },
                     { deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【确定】按钮' }
@@ -461,7 +461,7 @@ export const OperationList = {
                 trainingName: '道岔单解({7})',
                 trainingRemark: '道岔单解功能',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔单解】' },
                     { deviceType: '02', orderNum: 2, operateCode: '1041', tip: '鼠标左键点击【下达】按钮' },
@@ -478,7 +478,7 @@ export const OperationList = {
                 trainingName: '道岔区段封闭({7})',
                 trainingRemark: '道岔区段封闭功能',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔区段封闭】' },
                     { deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' }
@@ -492,7 +492,7 @@ export const OperationList = {
                 trainingName: '道岔区段解封({7})',
                 trainingRemark: '道岔区段解封功能',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔区段解封】' },
                     { deviceType: '02', orderNum: 2, operateCode: '1061', tip: '鼠标左键点击【下达】按钮' },
@@ -509,7 +509,7 @@ export const OperationList = {
                 trainingName: '道岔转动({7})',
                 trainingRemark: '道岔转动功能({15}转{16})',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '107', tip: '鼠标右键菜单选择【道岔转动】' },
                     { deviceType: '02', orderNum: 2, operateCode: '107', tip: '鼠标左键点击【确定】按钮' }
@@ -523,7 +523,7 @@ export const OperationList = {
                 trainingName: '道岔区段故障解锁({7})',
                 trainingRemark: '道岔区段故障解锁功能',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '109', tip: '鼠标右键菜单选择【道岔区段故障解锁】' },
                     { deviceType: '02', orderNum: 2, operateCode: '1091', tip: '鼠标左键点击【下达】按钮' },
@@ -557,7 +557,7 @@ export const OperationList = {
                 trainingName: '区段切除({7})',
                 trainingRemark: '区段切除',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '111', tip: '鼠标右键菜单选择【区段切除】' },
                     { deviceType: '02', orderNum: 2, operateCode: '111', tip: '鼠标左键点击【确定】按钮' }
@@ -571,7 +571,7 @@ export const OperationList = {
                 trainingName: '区段激活({7})',
                 trainingRemark: '区段激活功能',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '112', tip: '鼠标右键菜单选择【区段激活】' },
                     { deviceType: '02', orderNum: 2, operateCode: '112', tip: '鼠标左键点击【确定】按钮' }
@@ -585,7 +585,7 @@ export const OperationList = {
                 trainingName: '道岔区段设置限速({7})',
                 trainingRemark: '道岔区段设置限速功能（限速值：5）',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【道岔区段设置限速】' },
                     { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值5】', val: '5' },
@@ -604,7 +604,7 @@ export const OperationList = {
                 trainingName: '道岔区段取消限速({7})',
                 trainingRemark: '道岔区段取消限速功能',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '114', tip: '鼠标右键菜单选择【道岔区段取消限速】' },
                     { deviceType: '02', orderNum: 2, operateCode: '1141', tip: '鼠标左键点击【下达】按钮' },
@@ -623,7 +623,7 @@ export const OperationList = {
                 trainingName: '进路选排({3})',
                 trainingRemark: '选择排列进路',
                 trainingType: '02',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【进路选排】' },
                     { deviceType: '04', orderNum: 2, operateCode: '3011', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
@@ -668,7 +668,7 @@ export const OperationList = {
                 trainingName: '信号封闭({5})',
                 trainingRemark: '信号封闭',
                 trainingType: '02',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封闭】' },
                     { deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' }
@@ -682,7 +682,7 @@ export const OperationList = {
                 trainingName: '信号解封({5})',
                 trainingRemark: '信号解封',
                 trainingType: '02',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '04', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' },
                     { deviceType: '04', orderNum: 2, operateCode: '3071', tip: '鼠标左键点击【下达】按钮' },
@@ -700,7 +700,7 @@ export const OperationList = {
                 trainingName: '信号关灯({3})',
                 trainingRemark: '信号关灯',
                 trainingType: '02',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '04', orderNum: 1, operateCode: '313', tip: '鼠标右键菜单选择【信号关灯】' },
                     { deviceType: '04', orderNum: 2, operateCode: '313', tip: '鼠标左键点击【确定】按钮' },
@@ -715,7 +715,7 @@ export const OperationList = {
                 trainingName: '信号重开({3})',
                 trainingRemark: '信号重开',
                 trainingType: '02',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' },
                     { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' },
@@ -851,7 +851,7 @@ export const OperationList = {
                 trainingName: '设置扣车({10}-{12} 站台)',
                 trainingRemark: '设置扣车功能',
                 trainingType: '05',
-                productTypes: ['01,02'], // 产品类型 01 现地 02 行调
+                productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【设置扣车】' },
                     { deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【确定】按钮' }
@@ -865,7 +865,7 @@ export const OperationList = {
                 trainingName: '取消扣车({10}-{12} 站台)',
                 trainingRemark: '取消扣车功能',
                 trainingType: '05',
-                productTypes: ['01,02'], // 产品类型 01 现地 02 行调
+                productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
                     { deviceType: '06', orderNum: 2, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }
@@ -879,7 +879,7 @@ export const OperationList = {
                 trainingName: '设置跳停({10}-{12} 站台)',
                 trainingRemark: '设置跳停功能',
                 trainingType: '05',
-                productTypes: ['01,02'], // 产品类型 01 现地 02 行调
+                productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【设置跳停】' },
                     { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮', val: '{11}' }
@@ -893,7 +893,7 @@ export const OperationList = {
                 trainingName: '设置跳停({10}-{12} 站台)',
                 trainingRemark: '设置指定001号列车跳停功能',
                 trainingType: '05',
-                productTypes: ['01,02'], // 产品类型 01 现地 02 行调
+                productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【设置跳停】' },
                     { deviceType: '06', orderNum: 2, operateCode: '5024', tip: '鼠标左键点击' },
@@ -909,7 +909,7 @@ export const OperationList = {
                 trainingName: '取消跳停({10}-{12} 站台)',
                 trainingRemark: '取消跳停功能',
                 trainingType: '05',
-                productTypes: ['01,02'], // 产品类型 01 现地 02 行调
+                productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' },
                     { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮', val: '{11}' }
@@ -923,7 +923,7 @@ export const OperationList = {
                 trainingName: '取消跳停({10}-{12} 站台)',
                 trainingRemark: '取消指定001号列车跳停功能',
                 trainingType: '05',
-                productTypes: ['01,02'], // 产品类型 01 现地 02 行调
+                productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' },
                     { deviceType: '06', orderNum: 2, operateCode: '5034', tip: '鼠标左键点击' },
@@ -939,7 +939,7 @@ export const OperationList = {
                 trainingName: '查询站台状态({10}-{12} 站台)',
                 trainingRemark: '查询站台状态功能',
                 trainingType: '05',
-                productTypes: ['01,02'], // 产品类型 01 现地 02 行调
+                productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【站台信息】' },
                     { deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【确定】按钮' }
@@ -1064,7 +1064,7 @@ export const OperationList = {
                 trainingName: '轨道切除({8}{9} 区段)',
                 trainingRemark: '轨道切除功能',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '405', tip: '鼠标右键菜单选择【轨道切除】' },
                     { deviceType: '03', orderNum: 2, operateCode: '405', tip: '鼠标左键点击【确定】按钮' }
@@ -1078,7 +1078,7 @@ export const OperationList = {
                 trainingName: '轨道激活({8}{9} 区段)',
                 trainingRemark: '轨道激活功能',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '406', tip: '鼠标右键菜单选择【轨道激活】' },
                     { deviceType: '03', orderNum: 2, operateCode: '406', tip: '鼠标左键点击【确定】按钮' }
@@ -1092,7 +1092,7 @@ export const OperationList = {
                 trainingName: '设置临时限速({8}{9} 区段)',
                 trainingRemark: '设置临时限速功能（限速值：15）',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' },
                     { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值15】', val: '15' },
@@ -1112,7 +1112,7 @@ export const OperationList = {
                 trainingName: '轨道切除({7} 道岔)',
                 trainingRemark: '轨道切除功能',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '111', tip: '鼠标右键菜单选择【轨道切除】' },
                     { deviceType: '02', orderNum: 2, operateCode: '111', tip: '鼠标左键点击【确定】按钮' }
@@ -1126,7 +1126,7 @@ export const OperationList = {
                 trainingName: '轨道激活({7} 道岔)',
                 trainingRemark: '轨道激活功能',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '112', tip: '鼠标右键菜单选择【轨道激活】' },
                     { deviceType: '02', orderNum: 2, operateCode: '112', tip: '鼠标左键点击【确定】按钮' }
@@ -1140,7 +1140,7 @@ export const OperationList = {
                 trainingName: '设置临时限速({7} 道岔)',
                 trainingRemark: '设置临时限速功能（限速值 35 零点西上行公里标0 - 零点西上行公里标3000）',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 // stepVOList: [
                 // 	{ deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【设置临时限速】' },
                 // 	{ deviceType: '02', orderNum: 2, operateCode: '1131', tip: '鼠标左键选择【打开会话】' },
@@ -1180,7 +1180,7 @@ export const OperationList = {
                 trainingName: '排列进路({3} 进路)',
                 trainingRemark: '排列进路功能',
                 trainingType: '02',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【排列进路】' },
                     { deviceType: '04', orderNum: 2, operateCode: '3011', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
@@ -1253,7 +1253,7 @@ export const OperationList = {
                 trainingName: '信号重开({3} 进路)',
                 trainingRemark: '信号重开功能',
                 trainingType: '02',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' },
                     { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' }
@@ -1268,7 +1268,7 @@ export const OperationList = {
                 trainingName: '全线取消临时限速',
                 trainingRemark: '全线取消临时限速功能',
                 trainingType: '08',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '10', orderNum: 1, operateCode: '800', tip: '鼠标右键菜单选择【取消全线临时限速】' },
                     { deviceType: '10', orderNum: 2, operateCode: '8001', tip: '鼠标左键点击【打开会话】按钮' },
@@ -1833,7 +1833,7 @@ export const OperationList = {
                 trainingName: '设置跳停({10}-{12}站台)',
                 trainingRemark: '设置跳停功能',
                 trainingType: '05',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【跳停】' },
                     { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮', val: '{11}' }
@@ -1847,7 +1847,7 @@ export const OperationList = {
                 trainingName: '取消跳停({10}-{12}站台)',
                 trainingRemark: '设置取消跳停功能',
                 trainingType: '05',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' },
                     { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮', val: '{11}' }
@@ -2031,7 +2031,7 @@ export const OperationList = {
                 trainingName: ' Train detaining({10}-{12}station)',
                 trainingRemark: 'Set the detaining function',
                 trainingType: '05',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '504', tip: 'Right click to select  [train detaining]' },
                     { deviceType: '06', orderNum: 2, operateCode: '504', tip: 'Left click  [ok] ' }
@@ -2045,7 +2045,7 @@ export const OperationList = {
                 trainingName: 'Cancel  train detaining({10}-{12}The platform)',
                 trainingRemark: 'Set cancelling detaining function',
                 trainingType: '05',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '505', tip: 'Right click to select  [cancel train detaining]]' },
                     { deviceType: '06', orderNum: 2, operateCode: '505', tip: 'Left click [ok] ' }
@@ -2102,7 +2102,7 @@ export const OperationList = {
                 trainingName: 'Skip to continue moving({10}-{12}The platform)',
                 trainingRemark: 'Set the skip to continue moving function',
                 trainingType: '05',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '502', tip: 'Right click to select [Skip to continue moving]' },
                     { deviceType: '06', orderNum: 2, operateCode: '502', tip: 'Left click [ok]', val: '{11}' }
@@ -2116,7 +2116,7 @@ export const OperationList = {
                 trainingName: 'Cancel skiping ({10}-{12}The platform)',
                 trainingRemark: 'Set cancelling skiping function',
                 trainingType: '05',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '503', tip: 'Right click to select [Cancel skiping]' },
                     { deviceType: '06', orderNum: 2, operateCode: '503', tip: 'Left click [ok]', val: '{11}' }
@@ -2130,7 +2130,7 @@ export const OperationList = {
                 trainingName: ' Platform status query({10}-{12}The platform)',
                 trainingRemark: 'Query platform status  function',
                 trainingType: '05',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '507', tip: 'Right click to select [Platform status query]' },
                     { deviceType: '06', orderNum: 2, operateCode: '0012', tip: 'Left click [ok] ' }
@@ -2258,7 +2258,7 @@ export const OperationList = {
                 trainingName: 'Section fault unlocking({8}{9})',
                 trainingRemark: 'Fault unlocking',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '402', tip: 'Right click to select "Section fault unlocking" ' },
                     { deviceType: '03', orderNum: 2, operateCode: '4026', tip: 'Left click  [Execute] ' },
@@ -2275,7 +2275,7 @@ export const OperationList = {
                 trainingName: 'Section resection({8}{9})',
                 trainingRemark: 'Section resection',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '405', tip: 'Right click to select  [Section resection]' },
                     { deviceType: '03', orderNum: 2, operateCode: '405', tip: 'Left click  [ok] ' }
@@ -2289,7 +2289,7 @@ export const OperationList = {
                 trainingName: 'Section  activation({8}{9})',
                 trainingRemark: 'Section activation function',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '406', tip: 'Right click to select [Section  activation]' },
                     { deviceType: '03', orderNum: 2, operateCode: '406', tip: 'Left click [ok]' }
@@ -2320,7 +2320,7 @@ export const OperationList = {
                 trainingName: 'Section blockade({8}{9})',
                 trainingRemark: 'Section blockade function',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '403', tip: 'Right click to select  [Section blockade]' },
                     { deviceType: '03', orderNum: 2, operateCode: '403', tip: 'Left click  [ok] ' }
@@ -2334,7 +2334,7 @@ export const OperationList = {
                 trainingName: 'Section unblockade({8}{9})',
                 trainingRemark: 'Section unblockade function',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '404', tip: 'Right click to select  [Section unblockade]' },
                     { deviceType: '03', orderNum: 2, operateCode: '4041', tip: 'Left click  [Execute]' },
@@ -2351,7 +2351,7 @@ export const OperationList = {
                 trainingName: 'Set speed limit on the section({8}{9})',
                 trainingRemark: 'Set speed limit on the section (speed limit value: 5)',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '407', tip: 'Right click to select [Set speed limit on the section]' },
                     { deviceType: '03', orderNum: 2, operateCode: '4076', tip: 'Left click to select  [speed limit  5] ', val: '5' },
@@ -2370,7 +2370,7 @@ export const OperationList = {
                 trainingName: 'Cancel speed limit on the section({8}{9})',
                 trainingRemark: 'Cancel speed limit on the section',
                 trainingType: '04',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '408', tip: 'Right click to select [Cancel speed limit on the section]' },
                     { deviceType: '03', orderNum: 2, operateCode: '4081', tip: 'Left click  [Execute]' },
@@ -2389,7 +2389,7 @@ export const OperationList = {
                 trainingName: 'Turnout single lock({7})',
                 trainingRemark: 'Turnout single lock function',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '103', tip: 'Right click to select [Turnout single lock]' },
                     { deviceType: '02', orderNum: 2, operateCode: '103', tip: 'Left click  [ok] ' }
@@ -2403,7 +2403,7 @@ export const OperationList = {
                 trainingName: 'Turnout single release({7})',
                 trainingRemark: 'Turnout single release function',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '104', tip: 'Right click to select [Turnout single release]' },
                     { deviceType: '02', orderNum: 2, operateCode: '1041', tip: 'Left click  [Execute]' },
@@ -2420,7 +2420,7 @@ export const OperationList = {
                 trainingName: 'Turnout section closure({7})',
                 trainingRemark: 'Turnout section closure ',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '105', tip: 'Right click to select  [Turnout section closure]' },
                     { deviceType: '02', orderNum: 2, operateCode: '105', tip: 'Left click [ok] ' }
@@ -2434,7 +2434,7 @@ export const OperationList = {
                 trainingName: 'Turnout section unsealing({7})',
                 trainingRemark: 'Turnout section unsealing function',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '106', tip: 'Right click to select [Turnout section unsealing]' },
                     { deviceType: '02', orderNum: 2, operateCode: '1061', tip: 'Left click  [Execute]' },
@@ -2451,7 +2451,7 @@ export const OperationList = {
                 trainingName: 'Switch rotation({7})',
                 trainingRemark: 'Switch rotation({15}turn{16})',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '107', tip: 'Right click to select  [Switch rotation]' },
                     { deviceType: '02', orderNum: 2, operateCode: '107', tip: 'Left click  [ok] ' }
@@ -2465,7 +2465,7 @@ export const OperationList = {
                 trainingName: 'Switch section fault unlocking({7})',
                 trainingRemark: 'Switch section fault unlocking function',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '109', tip: 'Right click to select [switch section fault unlocking]' },
                     { deviceType: '02', orderNum: 2, operateCode: '1091', tip: 'Left click  [Execute]' },
@@ -2499,7 +2499,7 @@ export const OperationList = {
                 trainingName: 'Section resection({7})',
                 trainingRemark: 'Section resection',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '111', tip: 'Right click to select [Section resection]' },
                     { deviceType: '02', orderNum: 2, operateCode: '111', tip: 'Left click [ok]' }
@@ -2513,7 +2513,7 @@ export const OperationList = {
                 trainingName: 'Section activation({7})',
                 trainingRemark: 'Section activation function',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '112', tip: 'Right click to select  [Section activation]' },
                     { deviceType: '02', orderNum: 2, operateCode: '112', tip: 'Left click [ok] ' }
@@ -2527,7 +2527,7 @@ export const OperationList = {
                 trainingName: 'Set speed limit on the section({7})',
                 trainingRemark: 'Set speed limit on the section (speed limit value: 5)',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '113', tip: 'Right click to select [Set speed limit on the section]' },
                     { deviceType: '02', orderNum: 2, operateCode: '1136', tip: 'Left click to select  [speed limit  5] ', val: '5' },
@@ -2546,7 +2546,7 @@ export const OperationList = {
                 trainingName: 'Cancel speed limit on the section({7})',
                 trainingRemark: 'Cancel speed limit on the section',
                 trainingType: '03',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '114', tip: 'Right click to select [Cancel speed limit on the section]' },
                     { deviceType: '02', orderNum: 2, operateCode: '1141', tip: 'Left click  [Execute]' },
@@ -2565,7 +2565,7 @@ export const OperationList = {
                 trainingName: 'Route selection({3})',
                 trainingRemark: 'Route selection',
                 trainingType: '02',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '04', orderNum: 1, operateCode: '301', tip: 'Right click to select [Route selection]' },
                     { deviceType: '04', orderNum: 2, operateCode: '3011', tip: 'Left click to select the route name【{3}】', val: '{4}' },
@@ -2610,7 +2610,7 @@ export const OperationList = {
                 trainingName: 'Signal closure({5})',
                 trainingRemark: 'Signal closure',
                 trainingType: '02',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '04', orderNum: 1, operateCode: '306', tip: 'Right click to select [Signal closure]' },
                     { deviceType: '04', orderNum: 2, operateCode: '306', tip: 'Left click [ok] ' }
@@ -2624,7 +2624,7 @@ export const OperationList = {
                 trainingName: 'Signal unsealing({5})',
                 trainingRemark: 'Signal unsealing',
                 trainingType: '02',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '04', orderNum: 1, operateCode: '307', tip: 'Right click to select [Signal unsealing]' },
                     { deviceType: '04', orderNum: 2, operateCode: '3071', tip: 'Left click  [Execute]' },
@@ -2642,7 +2642,7 @@ export const OperationList = {
                 trainingName: 'The signal light turns red({3})',
                 trainingRemark: 'The signal light turns red',
                 trainingType: '02',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '04', orderNum: 1, operateCode: '313', tip: 'Right click to select [The signal light turns red]' },
                     { deviceType: '04', orderNum: 2, operateCode: '313', tip: 'Left click [ok]' },
@@ -2657,7 +2657,7 @@ export const OperationList = {
                 trainingName: 'Signal reopen({3})',
                 trainingRemark: 'Signal reopen',
                 trainingType: '02',
-                productTypes: ['01,02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '04', orderNum: 1, operateCode: '304', tip: 'Right click to select [Signal reopen]' },
                     { deviceType: '04', orderNum: 2, operateCode: '304', tip: 'Left click [ok]' },

src/views/lesson/trainingRule/addEdit.vue

@@ -37,7 +37,8 @@ export default {
             mapIdList: [],
             trainingTypeList: [],
             trainingOperateTypeMap: {},
-            placeholderList: []
+            placeholderList: [],
+            productTypesList:[]
         };
     },
     computed: {
@@ -49,12 +50,14 @@ export default {
                     { prop: 'mapId', label: this.$t('lesson.mapName'), type: 'select', required: true, options: this.mapIdList, disabled: true },
                     { prop: 'trainingType', label: this.$t('lesson.trainingType'), type: 'select', required: true, options: this.trainingTypeList, disabled: !isAdd, change: true, onChange: this.changeList },
                     { prop: 'operateType', label: this.$t('lesson.operationType'), type: 'select', required: true, options: this.trainingOperateTypeMap[this.formModel.trainingType], disabled: !isAdd },
+                    { prop: 'productTypes', label: this.$t('lesson.productType'), type: 'select', multiple: true, required: true, options: this.productTypesList, disabled: !isAdd},
                     { label: '', type: 'button', options: this.placeholderList, style: 'margin-bottom: 0; margin-top: -10px;', typeBtn: 'info', click: this.addTrainName },
                     { prop: 'trainingName', label: this.$t('lesson.trainingName'), type: 'text', required: true, rightWidth: true, tooltip: true, info: this.$t('lesson.tipNamePlaceholderInfo') },
                     { prop: 'minDuration', label: this.$t('lesson.minDuration'), type: 'number', required: true, min:1},
                     { prop: 'maxDuration', label: this.$t('lesson.maxDuration'), type: 'number', required: true, min:1},
                     { label: '', type: 'button', options: this.placeholderList, style: 'margin-bottom: 0; margin-top: -10px;', typeBtn: 'info', click: this.addTrainRemark },
                     { prop: 'trainingRemark', label: this.$t('lesson.trainingRemark'), type: 'textarea', required: true, tooltip: true, info: this.$t('lesson.tipExplainPlaceholderInfo') }
+
                 ]
             };
             return form;
@@ -70,6 +73,9 @@ export default {
                 operateType: [
                     { required: true, message: this.$t('rules.inputOperationType'), trigger: 'change' }
                 ],
+                productTypes:[
+                    { required: true, message: this.$t('rules.productTypeInput'), trigger: 'change' }
+                ],
                 mapId: [
                     { required: true, message: this.$t('rules.selectMapName'), trigger: 'change' }
                 ],
@@ -93,13 +99,18 @@ export default {
             }
         }
     },
-    mounted() {
+    created() {
         this.init();
     },
+    // beforeupdate(data) {
+    //     this.$refs.dataform.clearValidate();
+    // },
     methods: {
         init() {
             // 获取地图列表
+            // this.$refs.dataform.resetForm();
             this.mapIdList = [];
+            this.productTypesList = [{ value:'01', label:'现地'}, {value:'02', label:'行调'}];
             listPublishMap().then(response => {
                 this.mapIdList = response.data.map(item => {
                     const params = {};
@@ -198,9 +209,10 @@ export default {
                     trainingRemark: this.repliceName(data.trainingRemark, this.placeholderList)
                 };
             } else {
-                this.formModel = {
+                this.formModel.mapId = this.$route.query.mapId;
-                    mapId: this.$route.query.mapId
+                // this.formModel = {
-                };
+                //     mapId: this.$route.query.mapId
+                // };
             }
         },
         repliceName(fieldValue, enumList) {
@@ -215,6 +227,7 @@ export default {
         },
         changeList(val) {
             // 获取操作占位列表
+            debugger;
             getPlaceholderList({ trainingType: val}).then(res => {
                 this.placeholderList = res.data;
             });
@@ -291,9 +304,11 @@ export default {
                 mapId: '',
                 minDuration: '',
                 maxDuration: '',
-                trainingRemark: ''
+                trainingRemark: '',
+                productTypes:[]
             };
             this.$refs.dataform.resetForm();
+            // this.$refs.dataform.clearValidate();
             this.dialogVisible = false;
         }
     }

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

@@ -1,22 +1,21 @@
 <template>
-  <el-card>
+  <!-- <el-card> -->
-    <div v-if="lessonName" slot="header" style="text-align: center;">
+  <!-- <div v-if="lessonName" slot="header" style="text-align: center;">
       <b>{{ $t('publish.lessonName') }}： {{ lessonName }}</b>
-    </div>
+    </div> -->
-    <div class="exam-box" :style="{ height: height +'px' }">
+  <div class="exam-box">
-      <el-scrollbar wrap-class="scrollbar-wrapper" style="">
     <el-steps class="steps" :active="display">
       <el-step :title="$t('publish.testDefinitionMaking')" icon="el-icon-edit" />
       <el-step :title="$t('publish.examRuleMaking')" icon="el-icon-setting" />
     </el-steps>
-        <el-card class="forms">
+    <div class="joylink-card forms">
       <template v-if="display == 1" class="definition">
-            <exam-from ref="exam" :height="height-260" @definition="definition" />
+        <exam-from ref="exam" @definition="definition" />
       </template>
       <template v-else class="rule">
-            <rule-from ref="rule" :course="course" :height="height-300" @regulation="regulation" />
+        <rule-from ref="rule" :course="course" @regulation="regulation" />
       </template>
-        </el-card>
+    </div>
     <div class="draft">
       <el-button-group>
         <el-button v-if="isPrevStep" type="primary" @click="prevStep">{{ this.$t('global.lastStep') }}</el-button>
@@ -26,9 +25,8 @@
         <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
       </el-button-group>
     </div>
-      </el-scrollbar>
   </div>
-  </el-card>
+  <!-- </el-card> -->
 </template>
 
 <script>
@@ -46,7 +44,7 @@ export default {
         return {
             display: 1,
             course: {},
-			lessonName: '',
+            // lessonName: '',
             formData: {}
         };
     },
@@ -62,9 +60,6 @@ export default {
         },
         isCreate() {
             return this.display == 2;
-		},
-		height() {
-			return /\/exam\//.test(`${this.$route.path}`)? this.$store.state.app.height - 92: this.$store.state.app.height - 65;
         }
     },
     mounted() {
@@ -74,11 +69,11 @@ export default {
         loadInitData() {
             getPublishLessonList().then(response => {
                 this.OrganizationList = response.data;
-				this.OrganizationList.forEach(elem => {
+                // this.OrganizationList.forEach(elem => {
-					if (elem.id == this.$route.params.lessonId) {
+                //     if (elem.id == this.$route.params.lessonId) {
-						this.lessonName = elem.name;
+                //         this.lessonName = elem.name;
-					}
+                //     }
-				});
+                // });
             });
         },
         definition(data) {
@@ -116,6 +111,7 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
     .exam-box {
         padding-top: 10px;
+		height: 100%;
 
         /deep/ {
             .el-step__icon.is-icon {

src/views/publish/runPlanCommon/draft.vue

@@ -4,8 +4,8 @@
       <el-step :title="title" icon="el-icon-edit-outline" />
       <el-step title="" icon="el-icon-upload" />
     </el-steps>
-    <el-card class="forms">
+    <div class="joylink-card forms">
-      <el-scrollbar wrap-class="scrollbar-wrapper" :style="{height:height -120 + 'px'}" style="padding-top: 40px">
+      <div style="padding-top: 40px; padding-bottom: 20px;">
         <el-form ref="form" :model="model" :rules="rules" label-width="140px" size="small">
           <el-form-item :label="`${$t('publish.selectMap')}:`" prop="mapId">
             <el-select v-model="model.mapId" filterable>
@@ -23,8 +23,8 @@
             </el-row>
           </el-form-item>
         </el-form>
-      </el-scrollbar>
+      </div>
-    </el-card>
+    </div>
     <div class="draft">
       <el-button-group>
         <el-button v-if="isAdd" type="primary" @click="create">{{ $t('global.create') }}</el-button>
@@ -75,9 +75,6 @@ export default {
             };
 
             return rules;
-		},
-		height() {
-			return this.$store.state.app.height - 130;
         }
     },
     mounted() {
@@ -129,11 +126,13 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+	.card-box{
+		height: 100%;
+		padding-top: 20px;
+	}
     .steps {
         width: 940px;
         margin: 0 auto;
-        margin-top: 20px;
-        height: 100%;
 
         /deep/ {
             .el-step__icon.is-icon {

src/views/publish/simulationScript/index.vue

@@ -1,124 +0,0 @@
-<template>
-  <div>
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-  </div>
-</template>
-
-<script>
-import { superAdmin } from '@/router';
-import { getSkinCodeList } from '@/api/management/mapskin';
-import { getQuestPageList, deleteQuest } from '@/api/quest';
-
-export default {
-	name: 'RunPlanTemplate',
-	data() {
-		return {
-			skinCodeList: [],
-			pagerConfig: {
-				pageSize: 'pageSize',
-				pageIndex: 'pageNum'
-			},
-			queryForm: {
-				labelWidth: '140px',
-				reset: true,
-				queryObject: {
-					skinCode: {
-						type: 'select',
-						label: this.$t('publish.skinType'),
-						config: {
-							data: []
-						}
-					}
-				}
-			},
-			queryList: {
-				query: getQuestPageList,
-				selectCheckShow: false,
-				indexShow: true,
-				columns: [
-					{
-						title: this.$t('publish.taskName'),
-						prop: 'name'
-					},
-					{
-						title: this.$t('publish.skinType'),
-						prop: 'skinCode',
-						type: 'tag',
-						columnValue: (row) => {
-							return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']);
-						},
-						tagType: (row) => { return ''; }
-					},
-					{
-						title: this.$t('publish.createTime'),
-						prop: 'createTime'
-					},
-					{
-						type: 'button',
-						title: this.$t('global.operate'),
-						width: '350',
-						hide: () => { return this.$store.state.user.roles.indexOf(superAdmin) < 0; },
-						buttons: [
-							{
-								name: this.$t('global.delete'),
-								handleClick: this.handleDelete,
-								type: 'danger'
-							},
-							{
-								name: this.$t('publish.detail'),
-								handleClick: this.handleDetail,
-								type: ''
-							}
-						]
-					}
-				]
-			},
-
-			currentModel: {}
-		};
-	},
-	created() {
-		this.loadInitData();
-	},
-	methods: {
-		loadInitData() {
-			this.skinCodeList = [];
-			getSkinCodeList().then(response => {
-				this.skinCodeList = response.data;
-				response.data.forEach(elem => {
-					this.queryForm.queryObject.skinCode.config.data.push({ value: elem.code, label: elem.name });
-				});
-			});
-		},
-		// 删除
-		handleDelete(index, row) {
-			this.$confirm(this.$t('publish.wellDelTemplate'), this.$t('global.tips'), {
-				confirmButtonText: this.$t('global.confirm'),
-				cancelButtonText: this.$t('global.cancel'),
-				type: 'warning'
-			}).then(() => {
-				deleteQuest(row.id).then(response => {
-					this.$message.success(this.$t('publish.deleteSuccess'));
-					this.reloadTable();
-				}).catch(error => {
-					this.reloadTable();
-					if (error.code == 500) {
-						this.$messageBox(this.$t('error.deleteFailed'));
-					} else if (error.code == 500009) {
-						this.$messageBox(this.$t('error.templateHasBeUse'));
-					}
-				});
-			}).catch(() => { });
-		},
-
-		// 查看详情
-		handleDetail(index, row) {
-			this.$messageBox(this.$t('global.notBeUse'));
-		},
-
-		reloadTable() {
-			this.queryList.reload();
-		}
-	}
-};
-</script>