joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/views/map/mapdraft/mapedit/mapoperate/train.bak.vue
This commit is contained in:
zyy 2019-08-20 11:17:50 +08:00
commit 2f0519488f
94 changed files with 3684 additions and 3133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/jmap/training.js
View File

@ -53,9 +53,9 @@ export function getTrainingTree() {
} }
/** 获取章节基本信息*/ /** 获取章节基本信息*/
export function getTrainingDetail(args) { export function getTrainingDetail(trainingId) {
return request({ return request({
url: `/api/training/${args.id}`, url: `/api/training/${trainingId}`,
method: 'get' method: 'get'
}); });
} }

16
src/api/simulation.js
View File

@ -435,3 +435,19 @@ export function saveTaskScript(group, data) {
data data
}); });
} }
/** 暂停剧本编制的仿真 */
export function scriptPause(group) {
return request({
url: `/api/simulation/${group}/scriptWrite/pause`,
method: 'post'
});
}
/** 恢复仿真运行并执行刚编辑的剧本动作 */
export function executeScript(group) {
return request({
url: `/api/simulation/${group}/scriptWrite/execute`,
method: 'post'
});
}

8
src/i18n/langs/en/error.js
View File

@ -3,6 +3,7 @@ export default {
createSimulationFailed: 'Failure to create simulation', createSimulationFailed: 'Failure to create simulation',
loadMapDataFailed: 'Failed to load map data', loadMapDataFailed: 'Failed to load map data',
getMapStepsFailed: 'Failed to get map step data', getMapStepsFailed: 'Failed to get map step data',
getMapDetailFailed: 'Failed to get map detail',
resetFailed: 'Reset failure', resetFailed: 'Reset failure',
startTrainingFailed: 'Failure to start training', startTrainingFailed: 'Failure to start training',
saveBackgroundFailed: 'Failed to save background', saveBackgroundFailed: 'Failed to save background',
@ -39,5 +40,10 @@ export default {
codeHasExist: 'Coding already exists', codeHasExist: 'Coding already exists',
formartError: 'The format is incorrect, only characters/numbers/_', formartError: 'The format is incorrect, only characters/numbers/_',
createDictionaryFailed: 'Failed to create dictionary', createDictionaryFailed: 'Failed to create dictionary',
updateDictionaryFailed: 'Failed to update dictionary' updateDictionaryFailed: 'Failed to update dictionary',
createDetailFailed: 'Failed to create details',
updateDetailFailed: 'Failed to update details',
addFailed: 'Failure to add',
updateFailed: 'Failure to update'
}; };

7
src/i18n/langs/en/global.js
View File

@ -75,9 +75,10 @@ export default {
synthesisTrainingTitle: 'Synthesis Training Fast Entrance', synthesisTrainingTitle: 'Synthesis Training Fast Entrance',
pleaseChooseRoom: 'You did not choose a room', pleaseChooseRoom: 'You did not choose a room',
inviteJoinRoom: 'Invite you to join the synthesis training!', inviteJoinRoom: 'Invite you to join the synthesis training!',
trainingHasStart: "(name)'s room has begun", trainingHasStart: "{name}'s room has begun",
trainingNotStart: "(name)'s room hasn't started yet", trainingNotStart: "{name}'s room hasn't started yet",
inputRoomNumber: 'Please enter the room number.', inputRoomNumber: 'Please enter the room number.',
chooseRoom: 'Choose Room' chooseRoom: 'Choose Room',
month: 'month'
}; };

31
src/i18n/langs/en/map.js
View File

@ -302,16 +302,8 @@ export default {
skinDesignation: 'SkinName', skinDesignation: 'SkinName',
skinCoding: 'SkinCoding', skinCoding: 'SkinCoding',
coordinatesOrigin: 'CoordinatesOrigin', coordinatesOrigin: 'CoordinatesOrigin',
skinDeleteConfirmation: 'This will permanently remove the skin. Do you want to continue?',
addMapSkin: 'AddMapSkin', addMapSkin: 'AddMapSkin',
updateMapSkin: 'UpdateMapSkin', updateMapSkin: 'UpdateMapSkin',
maxScaling: '(The maximum scale is 8 steps)',
skinCodingInput: 'Please enter skin code',
skinDesignationInput: 'Please enter skin name',
coordinatesOriginInput: 'Please enter the origin coordinates',
scalingInput: 'Please enter the scale',
scalingInputPrompt: 'Please enter a valid scale',
skinCodingExist: 'Map skin codes already exist',
stationKilometerMark: 'StationKilometerMark', stationKilometerMark: 'StationKilometerMark',
arrivalTime: 'ArrivalTime', arrivalTime: 'ArrivalTime',
operationGraphPublished: 'The operation diagram is published as', operationGraphPublished: 'The operation diagram is published as',
@ -320,10 +312,8 @@ export default {
importOperationGraph: 'ImportOperationGraph', importOperationGraph: 'ImportOperationGraph',
publishOperationGraph: 'PublishOperationGraph', publishOperationGraph: 'PublishOperationGraph',
deleteOperationGraph: 'DeleteOperationGraph', deleteOperationGraph: 'DeleteOperationGraph',
underImport: 'UnderImport...',
mapList: 'MapList', mapList: 'MapList',
import: 'Import', import: 'Import',
selectImportFiles: 'Select the file you want to import',
createNewOperationGraph: 'CreateNewOperationGraph', createNewOperationGraph: 'CreateNewOperationGraph',
setOperatingSpeed: 'SetOperatingSpeed', setOperatingSpeed: 'SetOperatingSpeed',
speedClass1: 'SpeedLevel 1', speedClass1: 'SpeedLevel 1',
@ -336,29 +326,17 @@ export default {
stopTime: 'StopTime', stopTime: 'StopTime',
entranceStation: 'EntranceStation', entranceStation: 'EntranceStation',
exportStation: 'ExportStation', exportStation: 'ExportStation',
speedLevelEnter1: 'Please enter speed level 1',
speedLevelEnter2: 'Please enter speed level 2',
speedLevelEnter3: 'Please enter speed level 3',
speedLevelEnter4: 'Please enter speed level 4',
nameEnter: 'Please enter name',
drivingDirectionSelect: 'Please choose your driving direction',
timeBetweenDeparturesEnter: 'Please enter the interval',
stopTimeEnter: 'Please enter the docking time',
entranceStationSelect: 'Please select the entrance',
exportStationSelect: 'Please select the exit gate',
validityCheck: 'ValidityCheck', validityCheck: 'ValidityCheck',
setupOperationGraph: 'SetupOperationGraph', setupOperationGraph: 'SetupOperationGraph',
selectOperationGraphDataRange: 'SelectOperationGraphDataRange', selectOperationGraphDataRange: 'SelectOperationGraphDataRange',
to: 'to', to: 'to',
selectionTimeRange: 'Please select time range', selectionTimeRange: 'Please select time range',
selectDataRange: 'Please select the data range range',
pointSystem1: 'OnePointSystem', pointSystem1: 'OnePointSystem',
pointSystem2: 'TwoPointSystem', pointSystem2: 'TwoPointSystem',
pointSystem5: 'FivePointSystem', pointSystem5: 'FivePointSystem',
skinType: 'SkinType', skinType: 'SkinType',
turnoverTime: 'TurnoverTime', turnoverTime: 'TurnoverTime',
productList: 'ProductList', productList: 'ProductList',
deleteTypeHint: 'This action deletes the type. Do you want to continue?',
belongsToMapName: 'BelongsToMapName', belongsToMapName: 'BelongsToMapName',
productType: 'ProductType', productType: 'ProductType',
productCode: 'ProductCode', productCode: 'ProductCode',
@ -367,20 +345,11 @@ export default {
associateTrainingTypes: 'AssociateTrainingTypes', associateTrainingTypes: 'AssociateTrainingTypes',
createTrainingCategories: 'CreateTrainingCategories', createTrainingCategories: 'CreateTrainingCategories',
editTrainingCategories: 'EditTrainingCategories', editTrainingCategories: 'EditTrainingCategories',
productCodeEnter: 'Please enter the product code',
productNameEnter: 'Please enter product name',
productDescriptionEnter: 'Please enter product description',
trainingTypeSelect: 'Please select the associated training type',
linkWidth: 'LinkWidth', linkWidth: 'LinkWidth',
maxLinkWidth: '(Link width is at most 20)', maxLinkWidth: '(Link width is at most 20)',
sectionWidth: 'SectionWidth', sectionWidth: 'SectionWidth',
maxSectionWidth: '(Section width is maximum 30)', maxSectionWidth: '(Section width is maximum 30)',
showWatermarkOrNot: 'ShowWatermarkOrNot', showWatermarkOrNot: 'ShowWatermarkOrNot',
linkWidthInput: 'Please enter Link width',
linkWidthInputPrompt: 'Please enter a valid Link width',
sectionWidthInput: 'Please enter section width',
sectionWidthInputPrompt: 'Please enter a valid segment width',
selectShowWatermark: 'Select whether or not to watermark',
stationstandName: 'Select station name:', stationstandName: 'Select station name:',
stationstandDirection: 'Direction of the platform:', stationstandDirection: 'Direction of the platform:',
stationstandHasDoor: 'Whether to display screen door:', stationstandHasDoor: 'Whether to display screen door:',

116
src/i18n/langs/en/orderAuthor.js
View File

@ -1,86 +1,88 @@
export default { export default {
name: 'Name', name: 'Name',
productType: 'ProductType', productType: 'Product type',
map: 'Map', map: 'Map',
state: 'State', state: 'State',
commodityName: 'CommodityName', commodityName: 'Commodity name',
mapName: 'MapName', mapName: 'Map name',
courseName: 'CourseName', courseName: 'Course name',
price: 'Price', price: 'Price',
describtion: 'Describtion', describtion: 'Describtion',
creationTime: 'CreationTime', creationTime: 'Creation time',
setupFailure: 'SetupFailure', setupFailure: 'Setup failure',
setupEffective: 'SetupEffective', setupEffective: 'Setup effective',
organizationOrEnterprise: 'Organization/Enterprise', organizationOrEnterprise: 'Organization/Enterprise',
userName: 'UserName', userName: 'User Name',
permissionType: 'PermissionType', permissionType: 'Permission type',
permissionNumber: 'PermissionNumber', permissionNumber: 'Permission number',
permanenceOrNot: 'PermanenceOrNot', permanenceOrNot: 'Permanence or not',
startDate: 'StartDate', startDate: 'StartDate',
purchaseMonths: 'PurchaseMonths', purchaseMonths: 'Purchase months',
totalPrice: 'TotalPrice', totalPrice: 'Total price',
paymentMethod: 'PaymentMethod', paymentMethod: 'Payment method',
creationDate: 'CreationDate', creationDate: 'Creation date',
orderType: 'OrderType', orderType: 'Order type',
contractNumber: 'ContractNumber', contractNumber: 'Contract number',
businessType: 'BusinessType', businessType: 'Business type',
paymentStatus: 'PaymentStatus', paymentStatus: 'Payment status',
salesman: 'Salesman', salesman: 'Salesman',
obtainQrCode: 'ObtainQrCode', obtainQrCode: 'Obtain QrCode',
userMobile: 'UserMobile', userMobile: 'User mobile',
mapProductName: 'MapProductName', mapProductName: 'Map product name',
publicOrPrivate: 'Public/Private', publicOrPrivate: 'Public/Private',
totalPermissions: 'TotalPermissions', totalPermissions: 'Total permissions',
residualPermissionNumber: 'ResidualPermissionNumber', residualPermissionNumber: 'Residual permissionNumber',
authorityStatus: 'AuthorityStatus', authorityStatus: 'Authority status',
startTime: 'StartTime', startTime: 'StartTime',
endTime: 'EndTime', endTime: 'EndTime',
courseAuthorityStatus: 'CourseAuthorityStatus', courseAuthorityStatus: 'Course authority status',
source: 'Source', source: 'Source',
founderPhone: 'FounderPhone', founderPhone: 'Founder phone',
founder: 'Founder', founder: 'Founder',
privilegePackaging: 'PrivilegePackaging', privilegePackaging: 'Privilege packaging',
packaging: 'Packaging', packaging: 'Packaging',
unpacking: 'Unpacking', unpacking: 'Unpacking',
authorityDetails: 'AuthorityDetails', authorityDetails: 'Authority details',
renew: 'Renew', renew: 'Renew',
productName: 'ProductName', productName: 'Product name',
recovery: 'Recovery', recovery: 'Recovery',
permissionPack: 'PermissionPack', permissionPack: 'Permission pack',
privilegeTransferQRCode: 'PrivilegeTransferQRCode', privilegeTransferQRCode: 'Privilege transfer QRCode',
generatingQRCode: 'GeneratingQRCode', generatingQRCode: 'Generating QRCode',
transferQRCode: 'TransferQRCode', transferQRCode: 'Transfer QRCode',
today: 'Today', today: 'Today',
yesterday: 'Yesterday', yesterday: 'Yesterday',
aWeekAgo: 'AWeekAgo', addOrder: 'AddOrder',
updateOrder: 'UpdateOrder', aWeekAgo: 'A week ago',
renewOrder: 'RenewOrder', updateOrder: 'Update order',
unknownRouter: 'UnknownRouter', renewOrder: 'Renew order',
increasePurchaseTime: 'IncreasePurchaseTime', unknownRouter: 'Unknown router',
choosePurchaseTime: 'ChoosePurchaseTime', increasePurchaseTime: 'Increase purchase time',
increasePermissionNumber: 'IncreasePermissionNumber', choosePurchaseTime: 'Choose purchase time',
choosePermissionNumber: 'ChoosePermissionNumber', increasePermissionNumber: 'Increase permission number',
choosePermissionNumber: 'Choose permission number',
itemPricing: 'itemPricing', itemPricing: 'itemPricing',
addUserPermissions: 'Add user permissions', addUserPermissions: 'Add user permissions',
publicAuthority: 'PublicAuthority', publicAuthority: 'Public authority',
privateAuthority: 'PrivateAuthority', privateAuthority: 'Private authority',
optionPrivilegeTransfer: 'Option privilege transfer', optionPrivilegeTransfer: 'Option privilege transfer',
trainingList: 'TrainingList', trainingList: 'Training list',
selectPermissionsPackage: 'Select package authority', selectPermissionsPackage: 'Select package authority',
addRecords: 'AddRecords', addRecords: 'Add records',
totalNumber: 'TotalNumber', totalNumber: 'Total number',
permissionToDistributeQRCode: 'Permission to distribute qr code', permissionToDistributeQRCode: 'Permission to distribute qr code',
selectPackagingRecord: 'Please select the packaging record',
editPermissionRules: 'Edit permission rules', editPermissionRules: 'Edit permission rules',
addGoods: 'AddGoods', addGoods: 'Add goods',
updateGoods: 'UpdateGoods', updateGoods: 'Update goods',
lesson: 'Lesson', lesson: 'Lesson',
whetherTrial: 'WhetherTrial', whetherTrial: 'WhetherTrial',
unitOfTime: 'UnitOfTime', unitOfTime: 'Unit of time',
trialTime: 'TrialTime', trialTime: 'Trial time',
distributionUser: 'DistributionUser', distributionUser: 'Distribution user',
orderNumber: 'OrderNumber', orderNumber: 'Order Number',
sourcesOfInformation: 'SourcesOfInformation', select: 'Select',
distributePermission: 'DistributePermission', sourcesOfInformation: 'Sources of information',
orderCreation: 'OrderCreation' distributePermission: 'Distribute permission',
orderCreation: 'Order creation',
chooseGoods: 'Choose goods'
}; };

33
src/i18n/langs/en/rules.js
View File

@ -180,6 +180,37 @@ export default {
unitOfTimeRadio: 'Please select a time unit', unitOfTimeRadio: 'Please select a time unit',
goodsDescribtionInput: 'Please enter product description', goodsDescribtionInput: 'Please enter product description',
userNameInput: 'Please enter user name', userNameInput: 'Please enter user name',
permissionTypeInput: 'Please select the permission type' permissionTypeInput: 'Please select the permission type',
timeInput: 'Please enter the time',
chooseUser: 'Please select the user',
pleaseInputLessonName: 'Please enter the course name',
pleaseSelectTraining: 'Please select training',
maxScaling: '(The maximum scale is 8 steps)',
skinCodingInput: 'Please enter skin code',
skinDesignationInput: 'Please enter skin name',
coordinatesOriginInput: 'Please enter the origin coordinates',
scalingInput: 'Please enter the scale',
scalingInputPrompt: 'Please enter a valid scale',
selectImportFiles: 'Select the file you want to import',
speedLevelEnter1: 'Please enter speed level 1',
speedLevelEnter2: 'Please enter speed level 2',
speedLevelEnter3: 'Please enter speed level 3',
speedLevelEnter4: 'Please enter speed level 4',
drivingDirectionSelect: 'Please choose your driving direction',
timeBetweenDeparturesEnter: 'Please enter the interval',
stopTimeEnter: 'Please enter the docking time',
entranceStationSelect: 'Please select the entrance',
exportStationSelect: 'Please select the exit gate',
selectDataRange: 'Please select the data range range',
productCodeEnter: 'Please enter the product code',
productNameEnter: 'Please enter product name',
productDescriptionEnter: 'Please enter product description',
trainingTypeSelect: 'Please select the associated training type',
linkWidthInput: 'Please enter Link width',
linkWidthInputPrompt: 'Please enter a valid Link width',
sectionWidthInput: 'Please enter section width',
sectionWidthInputPrompt: 'Please enter a valid segment width',
selectShowWatermark: 'Select whether or not to watermark'
}; };

35
src/i18n/langs/en/system.js
View File

@ -11,8 +11,8 @@ export default {
updateSuccess: 'Update successful', updateSuccess: 'Update successful',
destory: 'Destory', destory: 'Destory',
simulationGroup: 'Simulation Group', simulationGroup: 'Simulation Group',
username: 'User Name', userName: 'User Name',
phoneNumber: 'Cell-phone Number', mobile: 'Cell-phone Number',
skinCode: 'Skin Code', skinCode: 'Skin Code',
prdType: 'Product Type', prdType: 'Product Type',
simulationType: 'Simulation Type', simulationType: 'Simulation Type',
@ -21,5 +21,34 @@ export default {
isError: 'Is Error', isError: 'Is Error',
isSuspend: 'Is Suspend', isSuspend: 'Is Suspend',
isDrivingAsplanned: 'Whether to drive as planned', isDrivingAsplanned: 'Whether to drive as planned',
delUserSimulationIsContinue: 'This operation will delete the user simulation data. Do you want to continue?' delUserSimulationIsContinue: 'This operation will delete the user simulation data. Do you want to continue?',
createDetail: 'Create details',
editDetail: 'Editorial details',
mapName: 'Map Name',
trainingName: 'Training Name',
trainingUseTime: 'Training Time',
minute: 'Minute',
second: 'Second',
createSimulationTitle: 'Create Simulation Information',
addSuccess: 'Added Successfully',
pleaseInputNames: 'Please enter your nickname/name/cell phone number',
examUser: 'Examination Users',
examScore: 'Examination Score',
examResult: 'Examination Results',
examName: 'Paper Name',
delExamResultIsContinue: 'This operation will delete the test result. Do you want to continue?',
editExamDetail: 'Edit exam details',
subscribeMap: 'Subscribe',
roles: 'Roles',
email: 'Email',
nickname: 'Nickname',
delTypeIsContinue: 'This operation will delete the type. Do you want to continue?',
permission: 'Permission',
editUserPermission: 'Edit User Rights',
lessonName: 'Lesson Name',
selectTraining: 'Selection Training',
createUserTraining: 'Creating User Training',
editTrainingDetail: 'Editor Training Details',
trainingTime: 'Training duration'
}; };

8
src/i18n/langs/en/tip.js
View File

@ -83,5 +83,11 @@ export default {
updatePrivilegeTip: 'This action will modify the permission status. Do you want to continue?', updatePrivilegeTip: 'This action will modify the permission status. Do you want to continue?',
addOrganizationPrefix: 'Whether to add "', addOrganizationPrefix: 'Whether to add "',
addOrganizationSuffix: '" Organization/enterprise entry information?', addOrganizationSuffix: '" Organization/enterprise entry information?',
packagingFailed: 'Authority distribution packaging failed' packagingFailed: 'Authority distribution packaging failed',
selectPackagingRecord: 'Please select the packaging record',
skinDeleteConfirmation: 'This will permanently remove the skin. Do you want to continue?',
skinCodingExist: 'Map skin codes already exist',
underImport: 'UnderImport...',
deleteTypeHint: 'This action deletes the type. Do you want to continue?'
}; };

9
src/i18n/langs/zh/error.js
View File

@ -2,7 +2,8 @@ export default {
refreshFailed: '刷新失败', refreshFailed: '刷新失败',
createSimulationFailed: '创建仿真失败', createSimulationFailed: '创建仿真失败',
loadMapDataFailed: '加载地图数据失败', loadMapDataFailed: '加载地图数据失败',
getMapStepsFailed: '获取地图步骤数据', getMapStepsFailed: '获取地图步骤数据失败',
getMapDetailFailed: '获取地图详细信息失败',
resetFailed: '重置失败', resetFailed: '重置失败',
startTrainingFailed: '开始实训失败', startTrainingFailed: '开始实训失败',
saveBackgroundFailed: '保存背景失败', saveBackgroundFailed: '保存背景失败',
@ -39,6 +40,10 @@ export default {
codeHasExist: '编码已存在', codeHasExist: '编码已存在',
formartError: '格式不正确，只能是字符/数字/_', formartError: '格式不正确，只能是字符/数字/_',
createDictionaryFailed: '创建字典失败', createDictionaryFailed: '创建字典失败',
updateDictionaryFailed: '更新字典失败' updateDictionaryFailed: '更新字典失败',
createDetailFailed: '创建明细失败',
updateDetailFailed: '更新明细失败',
addFailed: '添加失败',
updateFailed: '更新失败'
}; };

7
src/i18n/langs/zh/global.js
View File

@ -76,8 +76,9 @@ export default {
synthesisTrainingTitle: '综合演练快速入口', synthesisTrainingTitle: '综合演练快速入口',
pleaseChooseRoom: '您没有选择房间', pleaseChooseRoom: '您没有选择房间',
inviteJoinRoom: '邀请你加入综合演练！', inviteJoinRoom: '邀请你加入综合演练！',
trainingHasStart: '{{name}}的房间已开始', trainingHasStart: '{name}的房间已开始',
trainingNotStart: '{{name}}的房间未开始', trainingNotStart: '{name}的房间未开始',
inputRoomNumber: '请输入房间号', inputRoomNumber: '请输入房间号',
chooseRoom: '选择房间' chooseRoom: '选择房间',
month: '月'
}; };

31
src/i18n/langs/zh/map.js
View File

@ -415,16 +415,8 @@ export default {
skinDesignation: '皮肤名称', skinDesignation: '皮肤名称',
skinCoding: '皮肤编码', skinCoding: '皮肤编码',
coordinatesOrigin: '坐标原点', coordinatesOrigin: '坐标原点',
skinDeleteConfirmation: '此操作将永久删除该皮肤, 是否继续?',
addMapSkin: '添加地图皮肤', addMapSkin: '添加地图皮肤',
updateMapSkin: '更新地图皮肤', updateMapSkin: '更新地图皮肤',
maxScaling: '(缩放比例最大为8级)',
skinCodingInput: '请输入皮肤编码',
skinDesignationInput: '请输入皮肤名称',
coordinatesOriginInput: '请输入原点坐标',
scalingInput: '请输入缩放比例',
scalingInputPrompt: '请输入有效的缩放比例',
skinCodingExist: '地图皮肤编码已存在',
stationKilometerMark: '车站公里标', stationKilometerMark: '车站公里标',
arrivalTime: '到站时间', arrivalTime: '到站时间',
operationGraphPublished: '运行图发布为', operationGraphPublished: '运行图发布为',
@ -433,10 +425,8 @@ export default {
importOperationGraph: '导入运行图', importOperationGraph: '导入运行图',
publishOperationGraph: '发布运行图', publishOperationGraph: '发布运行图',
deleteOperationGraph: '删除运行图', deleteOperationGraph: '删除运行图',
underImport: '正在导入中...',
mapList: '地图列表', mapList: '地图列表',
import: '导入', import: '导入',
selectImportFiles: '请选择需要导入的文件',
createNewOperationGraph: '新建运行图', createNewOperationGraph: '新建运行图',
setOperatingSpeed: '设置运行速度', setOperatingSpeed: '设置运行速度',
speedClass1: '速度等级1', speedClass1: '速度等级1',
@ -449,29 +439,17 @@ export default {
stopTime: '停靠时间', stopTime: '停靠时间',
entranceStation: '入口车站', entranceStation: '入口车站',
exportStation: '出口车站', exportStation: '出口车站',
speedLevelEnter1: '请输入速度等级1',
speedLevelEnter2: '请输入速度等级2',
speedLevelEnter3: '请输入速度等级3',
speedLevelEnter4: '请输入速度等级4',
nameEnter: '请输入名称',
drivingDirectionSelect: '请选择行驶方向',
timeBetweenDeparturesEnter: '请输入发车间隔时间',
stopTimeEnter: '请输入停靠时间',
entranceStationSelect: '请选择入站口',
exportStationSelect: '请选择出站口',
validityCheck: '有效性检查', validityCheck: '有效性检查',
setupOperationGraph: '设置运行图', setupOperationGraph: '设置运行图',
selectOperationGraphDataRange: '选取运行图数据范围', selectOperationGraphDataRange: '选取运行图数据范围',
to: '至', to: '至',
selectionTimeRange: '选择时间范围', selectionTimeRange: '选择时间范围',
selectDataRange: '请选择数据范围区间',
pointSystem1: '1分制', pointSystem1: '1分制',
pointSystem2: '2分制', pointSystem2: '2分制',
pointSystem5: '5分制', pointSystem5: '5分制',
skinType: '皮肤风格', skinType: '皮肤风格',
turnoverTime: '更新时间', turnoverTime: '更新时间',
productList: '产品列表', productList: '产品列表',
deleteTypeHint: '此操作将删除该类型, 是否继续？',
belongsToMapName: '所属地图名称', belongsToMapName: '所属地图名称',
productType: '产品类型', productType: '产品类型',
productCode: '产品编码', productCode: '产品编码',
@ -480,20 +458,11 @@ export default {
associateTrainingTypes: '关联实训类型', associateTrainingTypes: '关联实训类型',
createTrainingCategories: '创建实训类目', createTrainingCategories: '创建实训类目',
editTrainingCategories: '编辑实训类目', editTrainingCategories: '编辑实训类目',
productCodeEnter: '请输入产品编码',
productNameEnter: '请输入产品名称',
productDescriptionEnter: '请输入产品说明',
trainingTypeSelect: '请选择关联实训类型',
linkWidth: 'link宽度', linkWidth: 'link宽度',
maxLinkWidth: '(Link宽度最大为20)', maxLinkWidth: '(Link宽度最大为20)',
sectionWidth: '区段宽度', sectionWidth: '区段宽度',
maxSectionWidth: '(区段宽度最大为30)', maxSectionWidth: '(区段宽度最大为30)',
showWatermarkOrNot: '是否显示水印', showWatermarkOrNot: '是否显示水印',
linkWidthInput: '请输入Link宽度',
linkWidthInputPrompt: '请输入有效Link宽度',
sectionWidthInput: '请输入区段宽度',
sectionWidthInputPrompt: '请输入有效区段宽度',
selectShowWatermark: '请选择是否水印',
routingCode: '交路code', routingCode: '交路code',
routingName: '交路名称', routingName: '交路名称',
startStationCodeColon: '起始站:', startStationCodeColon: '起始站:',

5
src/i18n/langs/zh/orderAuthor.js
View File

@ -71,7 +71,6 @@ export default {
addRecords: '添加记录', addRecords: '添加记录',
totalNumber: '总数', totalNumber: '总数',
permissionToDistributeQRCode: '权限分发二维码', permissionToDistributeQRCode: '权限分发二维码',
selectPackagingRecord: '请选择打包记录',
editPermissionRules: '编辑权限规则', editPermissionRules: '编辑权限规则',
addGoods: '添加商品', addGoods: '添加商品',
updateGoods: '修改商品', updateGoods: '修改商品',
@ -83,5 +82,7 @@ export default {
orderNumber: '订单号', orderNumber: '订单号',
sourcesOfInformation: '信息来源', sourcesOfInformation: '信息来源',
distributePermission: '权限分发', distributePermission: '权限分发',
orderCreation: '订单创建' orderCreation: '订单创建',
select: '选择',
chooseGoods: '选择商品'
}; };

33
src/i18n/langs/zh/rules.js
View File

@ -179,5 +179,36 @@ export default {
unitOfTimeRadio: '请选择时间单位', unitOfTimeRadio: '请选择时间单位',
goodsDescribtionInput: '请输入商品描述', goodsDescribtionInput: '请输入商品描述',
userNameInput: '请输入用户名称', userNameInput: '请输入用户名称',
permissionTypeInput: '请选择权限类型' permissionTypeInput: '请选择权限类型',
timeInput: '请输入时长',
chooseUser: '请选择用户',
pleaseInputLessonName: '请输入课程名称',
pleaseSelectTraining: '请选择实训',
maxScaling: '(缩放比例最大为8级)',
skinCodingInput: '请输入皮肤编码',
skinDesignationInput: '请输入皮肤名称',
coordinatesOriginInput: '请输入原点坐标',
scalingInput: '请输入缩放比例',
scalingInputPrompt: '请输入有效的缩放比例',
selectImportFiles: '请选择需要导入的文件',
speedLevelEnter1: '请输入速度等级1',
speedLevelEnter2: '请输入速度等级2',
speedLevelEnter3: '请输入速度等级3',
speedLevelEnter4: '请输入速度等级4',
drivingDirectionSelect: '请选择行驶方向',
timeBetweenDeparturesEnter: '请输入发车间隔时间',
stopTimeEnter: '请输入停靠时间',
entranceStationSelect: '请选择入站口',
exportStationSelect: '请选择出站口',
selectDataRange: '请选择数据范围区间',
productCodeEnter: '请输入产品编码',
productNameEnter: '请输入产品名称',
productDescriptionEnter: '请输入产品说明',
trainingTypeSelect: '请选择关联实训类型',
linkWidthInput: '请输入Link宽度',
linkWidthInputPrompt: '请输入有效Link宽度',
sectionWidthInput: '请输入区段宽度',
sectionWidthInputPrompt: '请输入有效区段宽度',
selectShowWatermark: '请选择是否水印'
}; };

35
src/i18n/langs/zh/system.js
View File

@ -11,8 +11,8 @@ export default {
updateSuccess: '更新成功', updateSuccess: '更新成功',
destory: '销 毁', destory: '销 毁',
simulationGroup: '仿真Group', simulationGroup: '仿真Group',
username: '用户名', userName: '用户名',
phoneNumber: '手机号', mobile: '手机号',
skinCode: '皮肤编号', skinCode: '皮肤编号',
prdType: '产品类型', prdType: '产品类型',
simulationType: '仿真类型', simulationType: '仿真类型',
@ -21,5 +21,34 @@ export default {
isError: '是否错误', isError: '是否错误',
isSuspend: '是否暂停', isSuspend: '是否暂停',
isDrivingAsplanned: '是否按计划行车', isDrivingAsplanned: '是否按计划行车',
delUserSimulationIsContinue: '此操作将删除此用户仿真数据, 是否继续?' delUserSimulationIsContinue: '此操作将删除此用户仿真数据, 是否继续?',
createDetail: '创建明细',
editDetail: '编辑明细',
mapName: '地图名称',
trainingName: '实训名称',
trainingUseTime: '实训用时',
minute: '分',
second: '秒',
createSimulationTitle: '创建仿真信息',
addSuccess: '添加成功',
pleaseInputNames: '请输入昵称/名字/手机号',
examUser: '考试用户',
examScore: '考试成绩',
examResult: '考试结果',
examName: '试卷名称',
delExamResultIsContinue: '此操作将删除此考试结果, 是否继续?',
editExamDetail: '编辑考试详情',
subscribeMap: '订阅地图',
roles: '角色',
email: '邮箱',
nickname: '昵称',
delTypeIsContinue: '此操作将删除该类型, 是否继续?',
permission: '权限',
editUserPermission: '编辑用户权限',
lessonName: '课程名称',
selectTraining: '选择实训',
createUserTraining: '创建用户实训',
editTrainingDetail: '编辑实训详情',
trainingTime: '实训时长'
}; };

8
src/i18n/langs/zh/tip.js
View File

@ -83,6 +83,12 @@ export default {
updatePrivilegeTip: '此操作将修改权限状态，是否继续?', updatePrivilegeTip: '此操作将修改权限状态，是否继续?',
addOrganizationPrefix: '是否添加 "', addOrganizationPrefix: '是否添加 "',
addOrganizationSuffix: '" 组织/企业条目信息?', addOrganizationSuffix: '" 组织/企业条目信息?',
packagingFailed: '权限分发打包失败' packagingFailed: '权限分发打包失败',
selectPackagingRecord: '请选择打包记录',
skinDeleteConfirmation: '此操作将永久删除该皮肤, 是否继续?',
skinCodingExist: '地图皮肤编码已存在',
underImport: '正在导入中...',
deleteTypeHint: '此操作将删除该类型, 是否继续？'
}; };

8
src/jmap/config/skinCode/chengdu_03.js
View File

@ -374,6 +374,10 @@ class SkinCode extends defaultStyle {
type: '03', type: '03',
serviceNumber: '---', serviceNumber: '---',
nameFormat: 'groupNumber:serviceNumber' nameFormat: 'groupNumber:serviceNumber'
},
{
type: '03',
nameFormat: 'serviceNumber:trainNumber'
} }
], // 特殊列车类型需设置显示格式 ], // 特殊列车类型需设置显示格式
lrPadding: 4, // 两边间隔 lrPadding: 4, // 两边间隔
@ -435,6 +439,10 @@ class SkinCode extends defaultStyle {
useSelfText: true // 使用配置项的字体大小 useSelfText: true // 使用配置项的字体大小
}, },
trainStatusStyle: { trainStatusStyle: {
trainTypeStatus: [
{type: '03', serviceNumberColor: '#FFF000', groupNumberColor: '#FFF000'},
{type: '02', trainNumberColor: '#FFF000', groupNumberColor: '#FFF000'}
], // 列车类型对应的识别号样式
defaultDestinationColor: '#FFFFFF', // 默认目的地状态显示颜色 defaultDestinationColor: '#FFFFFF', // 默认目的地状态显示颜色
destinationStatusSetText: 'trainWindowBorder', // 目的地状态设置的对应哪个颜色 destinationStatusSetText: 'trainWindowBorder', // 目的地状态设置的对应哪个颜色
destinationStatus: [ destinationStatus: [

2
src/jmap/map.js
View File

@ -248,7 +248,7 @@ class Jlmap {
}); });
// 状态后处理 // 状态后处理
this.postHandle(list); this.postHandle(list || []);
if (this.methods.stateUpdate instanceof Function) { this.methods.stateUpdate(list); } if (this.methods.stateUpdate instanceof Function) { this.methods.stateUpdate(list); }
} }

16
src/jmap/shape/Train/TrainBody.js
View File

@ -174,12 +174,20 @@ export default class TrainBody extends Group {
this.trainBodyBox && this.trainBodyBox.setStyle('fill', color); this.trainBodyBox && this.trainBodyBox.setStyle('fill', color);
} }
setTextTrainServerColor(color) { setTextTrainServerColor(color) {
this.textTrainServer.setStyle('textFill', color); this.textTrainServer&&this.textTrainServer.setStyle('textFill', color);
this.textTrainServer.setStyle('textStroke', color); this.textTrainServer&&this.textTrainServer.setStyle('textStroke', color);
} }
setTextTrainTargetColor(color) { setTextTrainTargetColor(color) {
this.textTrainTarget.setStyle('textFill', color); this.textTrainTarget&&this.textTrainTarget.setStyle('textFill', color);
this.textTrainTarget.setStyle('textStroke', color); this.textTrainTarget&&this.textTrainTarget.setStyle('textStroke', color);
}
setTextTrainNumberColor(color) {
this.textTrainNumber&&this.textTrainNumber.setStyle('textFill', color);
this.textTrainNumber&&this.textTrainNumber.setStyle('textStroke', color);
}
setTextTrainTargetNumberColor(color) {
this.textTrainTargetNumber&&this.textTrainTargetNumber.setStyle('textFill', color);
this.textTrainTargetNumber&&this.textTrainTargetNumber.setStyle('textStroke', color);
} }
setHShow(isShow) { setHShow(isShow) {
if (this.textH) { if (this.textH) {

14
src/jmap/shape/Train/index.js
View File

@ -282,7 +282,18 @@ export default class Train extends Group {
}); });
} }
} }
setTrainTypeStatus(type) {
if (this.style.Train.trainStatusStyle.trainTypeStatus) {
this.style.Train.trainStatusStyle.trainTypeStatus.some((item) => {
if ( type === item.type) {
item.serviceNumberColor && this.trainB && this.trainB.setTextTrainServerColor(item.serviceNumberColor);
item.trainNumberColor && this.trainB && this.trainB.setTextTrainNumberColor(item.trainNumberColor);
item.trainTargetColor && this.trainB && this.trainB.setTextTrainTargetColor(item.trainTargetColor);
item.groupNumberColor && this.trainB && this.trainB.setTextTrainTargetNumberColor(item.groupNumberColor);
}
});
}
}
// 设置状态 // 设置状态
setState(model) { setState(model) {
this.model = model; this.model = model;
@ -296,6 +307,7 @@ export default class Train extends Group {
this.setDoorStatus(model.doorStatus); // 设置车门状态类型 this.setDoorStatus(model.doorStatus); // 设置车门状态类型
this.setCommunicationStatus(model.communicationStatus); // 设置通信状态类型 this.setCommunicationStatus(model.communicationStatus); // 设置通信状态类型
this.setAlarmStatus(model.alarmStatus); // 设置报警状态 this.setAlarmStatus(model.alarmStatus); // 设置报警状态
this.setTrainTypeStatus(model.type); // 根据列车类型设置列车识别号样式
} }
} }
// 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度 // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度

347
src/jmap/theme/batong_01/menus/menuDialog/viewTrainId.vue
View File

@ -1,183 +1,188 @@
<template> <template>
<el-dialog class="batong-01__systerm view-train-id" title="列车识别号显示设置" :visible.sync="show" width="420px" :before-close="doClose" <el-dialog
:zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag> class="batong-01__systerm view-train-id"
<div style="padding: 10px 20px; border: 1px double lightgray;"> title="列车识别号显示设置"
<span class="base-label">计划车显示模式</span> :visible.sync="show" width="420px" :before-close="doClose"
<el-radio-group v-model="planMode"> :z-index="2000"
<el-row> v-dialogDrag :modal="false" :close-on-click-modal="false"
<el-col :span="10"> >
<el-radio :label="1">表号+车次号</el-radio> <div style="padding: 10px 20px; border: 1px double lightgray;">
</el-col> <span class="base-label">计划车显示模式</span>
<el-col :span="10" :offset="4"> <el-radio-group v-model="planMode">
<el-radio :label="2">表号+车组号</el-radio> <el-row>
</el-col> <el-col :span="10">
</el-row> <el-radio :label="1">表号+车次号</el-radio>
<el-row> </el-col>
<el-col :span="10"> <el-col :span="10" :offset="4">
<el-radio :label="3">目的地号+车次号</el-radio> <el-radio :label="2">表号+车组号</el-radio>
</el-col> </el-col>
<el-col :span="10" :offset="4">
<el-radio :label="4">目的地号+车组号</el-radio>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-radio :label="5">目的地号+表号+车次号</el-radio>
</el-col>
<el-col :span="10" :offset="4">
<el-radio :label="6">目的地号+表号+车组号</el-radio>
</el-col>
</el-row>
</el-radio-group>
</div>
<div style="padding: 10px 20px; border: 1px double lightgray; margin: 20px 0px;">
<span class="base-label">头码车显示模式</span>
<el-radio-group v-model="headMode">
<el-row>
<el-col :span="10">
<el-radio :label="3">目的地号+车次号</el-radio>
</el-col>
<el-col :span="6" :offset="8">
<el-radio :label="4">目的地号+车组号</el-radio>
</el-col>
</el-row>
</el-radio-group>
</div>
<div style="padding: 10px 20px; border: 1px double lightgray;">
<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-col>
<el-col :span="10" :offset="1">
<span style="height:32px; line-height:32px;">（范围：16-99）</span>
</el-col>
</el-row>
</div>
<el-row class="button-group">
<el-col :span="6" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="4" :offset="8">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row> </el-row>
<notice-info ref="noticeInfo"></notice-info> <el-row>
</el-dialog> <el-col :span="10">
<el-radio :label="3">目的地号+车次号</el-radio>
</el-col>
<el-col :span="10" :offset="4">
<el-radio :label="4">目的地号+车组号</el-radio>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-radio :label="5">目的地号+表号+车次号</el-radio>
</el-col>
<el-col :span="10" :offset="4">
<el-radio :label="6">目的地号+表号+车组号</el-radio>
</el-col>
</el-row>
</el-radio-group>
</div>
<div style="padding: 10px 20px; border: 1px double lightgray; margin: 20px 0px;">
<span class="base-label">头码车显示模式</span>
<el-radio-group v-model="headMode">
<el-row>
<el-col :span="10">
<el-radio :label="3">目的地号+车次号</el-radio>
</el-col>
<el-col :span="6" :offset="8">
<el-radio :label="4">目的地号+车组号</el-radio>
</el-col>
</el-row>
</el-radio-group>
</div>
<div style="padding: 10px 20px; border: 1px double lightgray;">
<span class="base-label">字体大小</span>
<el-row>
<el-col :span="10">
<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>
</el-col>
</el-row>
</div>
<el-row class="button-group">
<el-col :span="6" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="4" :offset="8">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" />
</el-dialog>
</template> </template>
<script> <script>
import { MapDeviceType, OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic'; import { MapDeviceType, OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo'; import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
export default { export default {
name: 'ViewTrainId', name: 'ViewTrainId',
data() { components: {
return { NoticeInfo
dialogShow: false, },
loading: false, data() {
operate: null, return {
operation: '', dialogShow: false,
planMode: 5, loading: false,
headMode: 5, operate: null,
fontSize: 16, operation: '',
} planMode: 5,
}, headMode: 5,
components: { fontSize: 16
NoticeInfo };
}, },
computed: { computed: {
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
domIdCancel() { domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
domIdConfirm() { domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.close.confirm.domId : ''; return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
} }
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.setTrainDispaly(); this.setTrainDispaly();
this.$store.dispatch('training/tipReload'); this.$store.dispatch('training/tipReload');
}) });
}, },
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate || {}; this.operate = operate || {};
this.operation = operate.operation; this.operation = operate.operation;
//非断电激活时设置初始值 // 非断电激活时设置初始值
if (!this.dialogShow) { if (!this.dialogShow) {
this.loading = false; this.loading = false;
} }
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
doClose() { doClose() {
this.loading = false; this.loading = false;
this.dialogShow = false; this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}, },
cancel() { cancel() {
let operate = { const operate = {
type: this.operate.type, type: this.operate.type,
operation: OperationEvent.Command.cancel.menu.operation, operation: OperationEvent.Command.cancel.menu.operation
} };
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.doClose(); this.doClose();
} }
}) });
}, },
commit() { commit() {
let operate = { const operate = {
over: true, over: true,
type: this.operate.type, type: this.operate.type,
operation: OperationEvent.Command.close.confirm.operation, operation: OperationEvent.Command.close.confirm.operation,
val: [this.planMode, this.headMode, this.fontSize].join('::') val: [this.planMode, this.headMode, this.fontSize].join('::')
} };
this.loading = true this.loading = true;
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/next', operate).then(({ valid }) => {
this.loading = false this.loading = false;
if (valid) { if (valid) {
this.setTrainDispaly(); this.setTrainDispaly();
this.doClose(); this.doClose();
} }
}).catch(error => { }).catch(error => {
this.loading = false; this.loading = false;
}) });
}, },
setTrainDispaly() { setTrainDispaly() {
let updatList = []; const updatList = [];
let trainList = this.$store.getters['training/viewTrainList']; const trainList = this.$store.getters['training/viewTrainList']();
if (trainList && trainList.length > 0) { 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;
updatList.forEach(elem => { updatList.forEach(elem => {
deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameFormat, nameFontSize })); // 车次窗 deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameFormat, nameFontSize })); // 车次窗
}); });
this.$store.dispatch('map/updateMapDevices', updatList); this.$store.dispatch('map/updateMapDevices', updatList);
} }
}, },
trainNameFormatBy(mode) { trainNameFormatBy(mode) {
switch (mode.toString()) { switch (mode.toString()) {
case '1': return 'serverNo:trainNo'; //表号+车次号 case '1': return 'serverNo:trainNo'; // 表号+车次号
case '2': return 'serverNo:trainNumber'; //表号+车组号 case '2': return 'serverNo:trainNumber'; // 表号+车组号
case '3': return 'targetCode:trainNo'; //目的地号+车次号 case '3': return 'targetCode:trainNo'; // 目的地号+车次号
case '4': return 'targetCode:trainNumber'; //目的地号+车组号 case '4': return 'targetCode:trainNumber'; // 目的地号+车组号
case '5': return 'targetCode:serverNo:trainNo'; //目的地号+表号+车次号 case '5': return 'targetCode:serverNo:trainNo'; // 目的地号+表号+车次号
case '6': return 'targetCode:serverNo:trainNumber'; //目的地号+表号+车组号 case '6': return 'targetCode:serverNo:trainNumber'; // 目的地号+表号+车组号
} }
return ''; //无格式类型 return ''; // 无格式类型
} }
} }
} };
</script> </script>

324
src/jmap/theme/beijing_01/menus/menuDialog/viewTrainId.vue
View File

@ -1,77 +1,84 @@
<template> <template>
<el-dialog class="beijing-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> class="beijing-01__systerm view-train-id"
<div style="padding: 10px 20px; border: 1px double lightgray;"> title="列车识别号显示设置" :visible.sync="show" width="420px"
<span class="base-label">计划车显示模式</span> :before-close="doClose"
<el-radio-group v-model="planMode"> :z-index="2000" :modal="false" v-dialogDrag :close-on-click-modal="false"
<el-row> >
<el-col :span="10"> <div style="padding: 10px 20px; border: 1px double lightgray;">
<el-radio :label="1">表号+车次号</el-radio> <span class="base-label">计划车显示模式</span>
</el-col> <el-radio-group v-model="planMode">
<el-col :span="10" :offset="4"> <el-row>
<el-radio :label="2">表号+车组号</el-radio> <el-col :span="10">
</el-col> <el-radio :label="1">表号+车次号</el-radio>
</el-row> </el-col>
<el-row> <el-col :span="10" :offset="4">
<el-col :span="10"> <el-radio :label="2">表号+车组号</el-radio>
<el-radio :label="3">目的地号+车次号</el-radio> </el-col>
</el-col>
<el-col :span="10" :offset="4">
<el-radio :label="4">目的地号+车组号</el-radio>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-radio :label="5">目的地号+表号+车次号</el-radio>
</el-col>
<el-col :span="10" :offset="4">
<el-radio :label="6">目的地号+表号+车组号</el-radio>
</el-col>
</el-row>
</el-radio-group>
</div>
<div style="padding: 10px 20px; border: 1px double lightgray; margin: 20px 0px;">
<span class="base-label">头码车显示模式</span>
<el-radio-group v-model="headMode">
<el-row>
<el-col :span="10">
<el-radio :label="3">目的地号+车次号</el-radio>
</el-col>
<el-col :span="6" :offset="8">
<el-radio :label="4">目的地号+车组号</el-radio>
</el-col>
</el-row>
</el-radio-group>
</div>
<div style="padding: 10px 20px; border: 1px double lightgray;">
<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-col>
<el-col :span="10" :offset="1">
<span style="height:32px; line-height:32px;">（范围：16-99）</span>
</el-col>
</el-row>
</div>
<el-row class="button-group">
<el-col :span="6" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="4" :offset="8">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row> </el-row>
<notice-info ref="noticeInfo"></notice-info> <el-row>
</el-dialog> <el-col :span="10">
<el-radio :label="3">目的地号+车次号</el-radio>
</el-col>
<el-col :span="10" :offset="4">
<el-radio :label="4">目的地号+车组号</el-radio>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-radio :label="5">目的地号+表号+车次号</el-radio>
</el-col>
<el-col :span="10" :offset="4">
<el-radio :label="6">目的地号+表号+车组号</el-radio>
</el-col>
</el-row>
</el-radio-group>
</div>
<div style="padding: 10px 20px; border: 1px double lightgray; margin: 20px 0px;">
<span class="base-label">头码车显示模式</span>
<el-radio-group v-model="headMode">
<el-row>
<el-col :span="10">
<el-radio :label="3">目的地号+车次号</el-radio>
</el-col>
<el-col :span="6" :offset="8">
<el-radio :label="4">目的地号+车组号</el-radio>
</el-col>
</el-row>
</el-radio-group>
</div>
<div style="padding: 10px 20px; border: 1px double lightgray;">
<span class="base-label">字体大小</span>
<el-row>
<el-col :span="10">
<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>
</el-col>
</el-row>
</div>
<el-row class="button-group">
<el-col :span="6" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="4" :offset="8">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo"/>
</el-dialog>
</template> </template>
<script> <script>
import { MapDeviceType, OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic'; import { MapDeviceType, OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo'; import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
export default { export default {
name: 'ViewTrainId', name: 'ViewTrainId',
components: {
NoticeInfo
},
data() { data() {
return { return {
dialogShow: false, dialogShow: false,
@ -83,101 +90,98 @@
fontSize: 16, fontSize: 16,
} }
}, },
components: { computed: {
NoticeInfo show() {
}, return this.dialogShow && !this.$store.state.menuOperation.break;
computed: { },
show() { domIdCancel() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
domIdCancel() { domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
}, }
domIdConfirm() { },
return this.dialogShow ? OperationEvent.Command.close.confirm.domId : ''; mounted() {
} this.$nextTick(() => {
}, this.setTrainDispaly();
mounted() { this.$store.dispatch('training/tipReload');
this.$nextTick(() => { });
this.setTrainDispaly(); },
this.$store.dispatch('training/tipReload'); methods: {
}) doShow(operate) {
}, this.operate = operate || {};
methods: { this.operation = operate.operation;
doShow(operate) {
this.operate = operate || {};
this.operation = operate.operation;
//非断电激活时设置初始值 // 非断电激活时设置初始值
if (!this.dialogShow) { if (!this.dialogShow) {
this.loading = false; this.loading = false;
} }
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
doClose() { doClose() {
this.loading = false; this.loading = false;
this.dialogShow = false; this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}, },
cancel() { cancel() {
let operate = { const operate = {
type: this.operate.type, type: this.operate.type,
operation: OperationEvent.Command.cancel.menu.operation, operation: OperationEvent.Command.cancel.menu.operation
} };
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.doClose(); this.doClose();
} }
}) });
}, },
commit() { commit() {
let operate = { const operate = {
over: true, over: true,
type: this.operate.type, type: this.operate.type,
operation: OperationEvent.Command.close.confirm.operation, operation: OperationEvent.Command.close.confirm.operation,
val: [this.planMode, this.headMode, this.fontSize].join('::') val: [this.planMode, this.headMode, this.fontSize].join('::')
} };
this.loading = true this.loading = true;
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/next', operate).then(({ valid }) => {
this.loading = false this.loading = false;
if (valid) { if (valid) {
this.setTrainDispaly(); this.setTrainDispaly();
this.doClose(); this.doClose();
} }
}).catch(error => { }).catch(error => {
this.loading = false; this.loading = false;
}) });
}, },
setTrainDispaly() { setTrainDispaly() {
let updatList = []; const updatList = [];
let trainList = this.$store.getters['training/viewTrainList']; const trainList = this.$store.getters['training/viewTrainList']();
if (trainList && trainList.length > 0) { 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;
updatList.forEach(elem => { updatList.forEach(elem => {
deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameFormat, nameFontSize })); // 车次窗 deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameFormat, nameFontSize })); // 车次窗
}); });
this.$store.dispatch('map/updateMapDevices', updatList); this.$store.dispatch('map/updateMapDevices', updatList);
} }
}, },
trainNameFormatBy(mode) { trainNameFormatBy(mode) {
switch (mode.toString()) { switch (mode.toString()) {
case '1': return 'serviceNumber:tripNumber'; //表号+车次号 case '1': return 'serviceNumber:tripNumber'; // 表号+车次号
case '2': return 'serviceNumber:groupNumber'; //表号+车组号 case '2': return 'serviceNumber:groupNumber'; // 表号+车组号
case '3': return 'targetCode:tripNumber'; //目的地号+车次号 case '3': return 'targetCode:tripNumber'; // 目的地号+车次号
case '4': return 'targetCode:groupNumber'; //目的地号+车组号 case '4': return 'targetCode:groupNumber'; // 目的地号+车组号
case '5': return 'targetCode:serviceNumber:tripNumber'; //目的地号+表号+车次号 case '5': return 'targetCode:serviceNumber:tripNumber'; // 目的地号+表号+车次号
case '6': return 'targetCode:serviceNumber:groupNumber'; //目的地号+表号+车组号 case '6': return 'targetCode:serviceNumber:groupNumber'; // 目的地号+表号+车组号
} }
return ''; //无格式类型 return ''; // 无格式类型
} }
} }
} };
</script> </script>

324
src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue
View File

@ -1,77 +1,84 @@
<template> <template>
<el-dialog class="chengdou-03__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> class="chengdou-03__systerm view-train-id"
<div style="padding: 10px 20px; border: 1px double lightgray;"> title="列车识别号显示设置" :visible.sync="show" width="420px"
<span class="base-label">计划车显示模式</span> :before-close="doClose"
<el-radio-group v-model="planMode"> :z-index="2000" :modal="false" v-dialogDrag :close-on-click-modal="false"
<el-row> >
<el-col :span="10"> <div style="padding: 10px 20px; border: 1px double lightgray;">
<el-radio :label="1">表号+车次号</el-radio> <span class="base-label">计划车显示模式</span>
</el-col> <el-radio-group v-model="planMode">
<el-col :span="10" :offset="4"> <el-row>
<el-radio :label="2">表号+车组号</el-radio> <el-col :span="10">
</el-col> <el-radio :label="1">表号+车次号</el-radio>
</el-row> </el-col>
<el-row> <el-col :span="10" :offset="4">
<el-col :span="10"> <el-radio :label="2">表号+车组号</el-radio>
<el-radio :label="3">目的地号+车次号</el-radio> </el-col>
</el-col>
<el-col :span="10" :offset="4">
<el-radio :label="4">目的地号+车组号</el-radio>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-radio :label="5">目的地号+表号+车次号</el-radio>
</el-col>
<el-col :span="10" :offset="4">
<el-radio :label="6">目的地号+表号+车组号</el-radio>
</el-col>
</el-row>
</el-radio-group>
</div>
<div style="padding: 10px 20px; border: 1px double lightgray; margin: 20px 0px;">
<span class="base-label">头码车显示模式</span>
<el-radio-group v-model="headMode">
<el-row>
<el-col :span="10">
<el-radio :label="3">目的地号+车次号</el-radio>
</el-col>
<el-col :span="6" :offset="8">
<el-radio :label="4">目的地号+车组号</el-radio>
</el-col>
</el-row>
</el-radio-group>
</div>
<div style="padding: 10px 20px; border: 1px double lightgray;">
<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-col>
<el-col :span="10" :offset="1">
<span style="height:32px; line-height:32px;">（范围：16-99）</span>
</el-col>
</el-row>
</div>
<el-row class="button-group">
<el-col :span="6" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="4" :offset="8">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row> </el-row>
<notice-info ref="noticeInfo"></notice-info> <el-row>
</el-dialog> <el-col :span="10">
<el-radio :label="3">目的地号+车次号</el-radio>
</el-col>
<el-col :span="10" :offset="4">
<el-radio :label="4">目的地号+车组号</el-radio>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-radio :label="5">目的地号+表号+车次号</el-radio>
</el-col>
<el-col :span="10" :offset="4">
<el-radio :label="6">目的地号+表号+车组号</el-radio>
</el-col>
</el-row>
</el-radio-group>
</div>
<div style="padding: 10px 20px; border: 1px double lightgray; margin: 20px 0px;">
<span class="base-label">头码车显示模式</span>
<el-radio-group v-model="headMode">
<el-row>
<el-col :span="10">
<el-radio :label="3">目的地号+车次号</el-radio>
</el-col>
<el-col :span="6" :offset="8">
<el-radio :label="4">目的地号+车组号</el-radio>
</el-col>
</el-row>
</el-radio-group>
</div>
<div style="padding: 10px 20px; border: 1px double lightgray;">
<span class="base-label">字体大小</span>
<el-row>
<el-col :span="10">
<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>
</el-col>
</el-row>
</div>
<el-row class="button-group">
<el-col :span="6" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="4" :offset="8">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo"/>
</el-dialog>
</template> </template>
<script> <script>
import { MapDeviceType, OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic'; import { MapDeviceType, OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo'; import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
export default { export default {
name: 'ViewTrainId', name: 'ViewTrainId',
components: {
NoticeInfo
},
data() { data() {
return { return {
dialogShow: false, dialogShow: false,
@ -83,101 +90,98 @@
fontSize: 16, fontSize: 16,
} }
}, },
components: { computed: {
NoticeInfo show() {
}, return this.dialogShow && !this.$store.state.menuOperation.break;
computed: { },
show() { domIdCancel() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
domIdCancel() { domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
}, }
domIdConfirm() { },
return this.dialogShow ? OperationEvent.Command.close.confirm.domId : ''; mounted() {
} this.$nextTick(() => {
}, this.setTrainDispaly();
mounted() { this.$store.dispatch('training/tipReload');
this.$nextTick(() => { });
this.setTrainDispaly(); },
this.$store.dispatch('training/tipReload'); methods: {
}) doShow(operate) {
}, this.operate = operate || {};
methods: { this.operation = operate.operation;
doShow(operate) {
this.operate = operate || {};
this.operation = operate.operation;
//非断电激活时设置初始值 // 非断电激活时设置初始值
if (!this.dialogShow) { if (!this.dialogShow) {
this.loading = false; this.loading = false;
} }
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
doClose() { doClose() {
this.loading = false; this.loading = false;
this.dialogShow = false; this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}, },
cancel() { cancel() {
let operate = { const operate = {
type: this.operate.type, type: this.operate.type,
operation: OperationEvent.Command.cancel.menu.operation, operation: OperationEvent.Command.cancel.menu.operation
} };
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.doClose(); this.doClose();
} }
}) });
}, },
commit() { commit() {
let operate = { const operate = {
over: true, over: true,
type: this.operate.type, type: this.operate.type,
operation: OperationEvent.Command.close.confirm.operation, operation: OperationEvent.Command.close.confirm.operation,
val: [this.planMode, this.headMode, this.fontSize].join('::') val: [this.planMode, this.headMode, this.fontSize].join('::')
} };
this.loading = true this.loading = true;
this.$store.dispatch('training/next', operate).then(({ valid }) => { this.$store.dispatch('training/next', operate).then(({ valid }) => {
this.loading = false this.loading = false;
if (valid) { if (valid) {
this.setTrainDispaly(); this.setTrainDispaly();
this.doClose(); this.doClose();
} }
}).catch(error => { }).catch(error => {
this.loading = false; this.loading = false;
}) });
}, },
setTrainDispaly() { setTrainDispaly() {
let updatList = []; const updatList = [];
let trainList = this.$store.getters['training/viewTrainList']; const trainList = this.$store.getters['training/viewTrainList']();
if (trainList && trainList.length > 0) { 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 => { trainList.forEach(elem => {
updatList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameFormat, nameFontSize })); updatList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameFormat, nameFontSize }));
}); });
this.$store.dispatch('map/updateMapDevices', updatList); this.$store.dispatch('map/updateMapDevices', updatList);
} }
}, },
trainNameFormatBy(mode) { trainNameFormatBy(mode) {
switch (mode.toString()) { switch (mode.toString()) {
case '1': return 'serviceNumber:tripNumber'; //表号+车次号 case '1': return 'serviceNumber:tripNumber'; // 表号+车次号
case '2': return 'serviceNumber:groupNumber'; //表号+车组号 case '2': return 'serviceNumber:groupNumber'; // 表号+车组号
case '3': return 'targetCode:tripNumber'; //目的地号+车次号 case '3': return 'targetCode:tripNumber'; // 目的地号+车次号
case '4': return 'targetCode:groupNumber'; //目的地号+车组号 case '4': return 'targetCode:groupNumber'; // 目的地号+车组号
case '5': return 'targetCode:serviceNumber:tripNumber'; //目的地号+表号+车次号 case '5': return 'targetCode:serviceNumber:tripNumber'; // 目的地号+表号+车次号
case '6': return 'targetCode:serviceNumber:groupNumber'; //目的地号+表号+车组号 case '6': return 'targetCode:serviceNumber:groupNumber'; // 目的地号+表号+车组号
} }
return ''; //无格式类型 return ''; // 无格式类型
} }
} }
} };
</script> </script>

2
src/jmap/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
View File

@ -166,7 +166,7 @@ export default {
}, },
setTrainDispaly() { setTrainDispaly() {
const updatlist = []; const updatlist = [];
const trainList = this.$store.getters['training/viewTrainList']; const trainList = this.$store.getters['training/viewTrainList']();
if (trainList && trainList.length > 0) { if (trainList && trainList.length > 0) {
const nameFormat = this.trainNameFormatBy(this.planMode); const nameFormat = this.trainNameFormatBy(this.planMode);
const nameFontSize = this.fontSize; const nameFontSize = this.fontSize;

21
src/store/modules/scriptRecord.js
View File

@ -4,26 +4,35 @@
const scriptRecord = { const scriptRecord = {
namespaced: true, namespaced: true,
state: { state: {
mapLocation: {}, //地图定位 mapLocation: {}, //地图定位,
simulationPause: true ,
}, },
getters: { getters: {
mapLocation:(state)=>{ mapLocation: (state)=>{
return state.mapLocation; return state.mapLocation;
} },
simulationPause:(state)=>{
return state.simulationPause;
},
}, },
mutations: { mutations: {
setMapLocation:(state, mapLocation) => { setMapLocation: (state, mapLocation) => {
state.mapLocation = mapLocation; state.mapLocation = mapLocation;
}, },
setSimulationPause: (state, simulationPause) => {
state.simulationPause = simulationPause;
},
}, },
actions: { actions: {
/** /**
* 设置地图定位 * 设置地图定位
*/ */
updateMapLocation:({ commit }, mapLocation) => { updateMapLocation: ({ commit }, mapLocation) => {
commit('setMapLocation', mapLocation); commit('setMapLocation', mapLocation);
}, },
updateSimulationPause: ({ commit }, simulationPause) => {
commit('setSimulationPause', simulationPause);
},
} }
}; };
export default scriptRecord; export default scriptRecord;

2
src/store/modules/training.js
View File

@ -78,7 +78,7 @@ const training = {
return state.roles; return state.roles;
}, },
// 视图中的列车列表 // 视图中的列车列表
viewTrainList: (state) => { viewTrainList: (state) => () =>{
const trainList = []; const trainList = [];
const mapDevice = Vue.prototype.$jlmap.mapDevice; const mapDevice = Vue.prototype.$jlmap.mapDevice;
Object.values(mapDevice).forEach(device => { Object.values(mapDevice).forEach(device => {

7
src/views/demonstration/deomonList/index.vue
View File

@ -21,14 +21,13 @@
@node-click="clickEvent" @node-click="clickEvent"
> >
<span slot-scope="{ node, data }"> <span slot-scope="{ node, data }">
<span v-if="data.state=='01'">{{ $t('global.trainingHasStart').replace('(name)', data.creator.nickName) }}</span> <span v-if="data.state=='01'">{{ $t('global.trainingHasStart').replace('{name}', data.creator.nickName) }}</span>
<span v-else>{{ $t('global.trainingHasStart').replace('(name)', data.creator.nickName) }}</span> <span v-else>{{ $t('global.trainingHasStart').replace('{name}', data.creator.nickName) }}</span>
</span> </span>
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>
<span <span
slot=" slot="footer"
footer"
class="dialog-footer" class="dialog-footer"
> >
<el-button type="primary" @click="handleJoin">{{ $t('global.joinRoom') }}</el-button> <el-button type="primary" @click="handleJoin">{{ $t('global.joinRoom') }}</el-button>

2
src/views/display/demon/addQuest.vue
View File

@ -111,7 +111,7 @@ export default {
width: '250', width: '250',
buttons: [ buttons: [
{ {
name: '加载任务', name: '加载剧本',
type: 'primary', type: 'primary',
handleClick: this.handleLoad handleClick: this.handleLoad
} }

75
src/views/display/index.vue
View File

@ -70,7 +70,7 @@ import MenuScript from '@/views/display/menuScript';
import WindowResizeHandler from '@/mixin/WindowResizeHandler'; import WindowResizeHandler from '@/mixin/WindowResizeHandler';
import AddQuest from './demon/addQuest'; import AddQuest from './demon/addQuest';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { getTrainingStepsDetail } from '@/api/jmap/training'; import { getTrainingDetail, getTrainingStepsDetail } from '@/api/jmap/training';
import { setGoodsTryUse } from '@/api/management/goods'; import { setGoodsTryUse } from '@/api/management/goods';
import { getProductDetail } from '@/api/management/mapprd'; import { getProductDetail } from '@/api/management/mapprd';
import { runDiagramQuit, loadScript, getSimulationInfo } from '@/api/simulation'; import { runDiagramQuit, loadScript, getSimulationInfo } from '@/api/simulation';
@ -146,6 +146,18 @@ export default {
...mapGetters('config', [ ...mapGetters('config', [
'canvasId' 'canvasId'
]), ]),
trainingId() {
return this.$route.query.trainingId;
},
skinCode() {
return this.$route.query.skinCode;
},
mapId() {
return this.$route.query.mapId;
},
prdType() {
return this.$route.query.prdType;
},
isLesson() { isLesson() {
return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage'; return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage';
}, },
@ -168,10 +180,7 @@ export default {
return this.mode === 'plan'; return this.mode === 'plan';
}, },
isDrive() { isDrive() {
return this.$route.query.prdType == '04'; return this.prdType == '04';
},
trainingId() {
return this.$route.query.trainingId;
} }
}, },
watch: { watch: {
@ -181,6 +190,14 @@ export default {
'$store.state.map.mapViewLoadedCount': function (val) { '$store.state.map.mapViewLoadedCount': function (val) {
this.mapBoxP = document.getElementById(this.canvasId).children[0]; this.mapBoxP = document.getElementById(this.canvasId).children[0];
this.mapBox = document.getElementsByTagName('canvas'); this.mapBox = document.getElementsByTagName('canvas');
if (this.trainingId) {
getTrainingStepsDetail(this.trainingId, { group: this.group }).then(resp => {
this.trainingObj = resp.data;
this.$store.dispatch('training/setTrainingData', this.trainingObj);
});
}
}, },
'$store.state.socket.permissionOver': function () { '$store.state.socket.permissionOver': function () {
this.$alert('用户权限已被收回', '提示', { this.$alert('用户权限已被收回', '提示', {
@ -191,7 +208,9 @@ export default {
}); });
}, },
$route() { $route() {
this.initLoadData(); this.$nextTick(() => {
this.initLoadData();
});
} }
}, },
async created() { async created() {
@ -307,6 +326,7 @@ export default {
async loadSimulationInfo() { async loadSimulationInfo() {
const resp = await getSimulationInfo(this.group); const resp = await getSimulationInfo(this.group);
if (resp && resp.code == 200) { if (resp && resp.code == 200) {
this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
this.questId = Number(resp.data.questId) || 0; this.questId = Number(resp.data.questId) || 0;
} }
}, },
@ -349,14 +369,14 @@ export default {
if (parseInt(this.trainingId)) { if (parseInt(this.trainingId)) {
// 设置地图数据 // 设置地图数据
// 设置实训数据 // 设置实训数据
const resp = await getTrainingStepsDetail(this.trainingId, { group: this.group }); const resp = await getTrainingDetail(this.trainingId);
if (resp && resp.code == 200) { if (resp && resp.code == 200) {
const stepdData = this.trainingObj = resp.data; const detail = resp.data;
const rest = await getProductDetail(stepdData.prdCode); const rest = await getProductDetail(detail.prdCode);
if (rest && rest.code == 200) { if (rest && rest.code == 200) {
await this.$store.dispatch('training/setPrdType', rest.data.prdType); const data = rest.data;
await this.loadMapData(resp.data.skinCode); await this.$store.dispatch('training/setPrdType', data.prdType);
await this.$store.dispatch('training/setTrainingData', stepdData); await this.loadMapData(detail.skinCode);
} }
} else { } else {
this.$messageBox(`获取实训步骤数据失败`); this.$messageBox(`获取实训步骤数据失败`);
@ -372,9 +392,8 @@ export default {
this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式 this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setPrdType', '');
const skinCode = this.$route.query.skinCode; if (parseInt(this.skinCode)) {
if (parseInt(skinCode)) { await this.loadMapData(this.skinCode);
await this.loadMapData(skinCode);
} else { } else {
this.endViewLoading(); this.endViewLoading();
@ -384,11 +403,10 @@ export default {
async initLoadDemonData() { async initLoadDemonData() {
this.$store.dispatch('training/end', TrainingMode.NORMAL); this.$store.dispatch('training/end', TrainingMode.NORMAL);
this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式 this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
this.$store.dispatch('training/setPrdType', this.prdTypeMap[this.$route.query.prdType]); this.$store.dispatch('training/setPrdType', this.prdTypeMap[this.prdType]);
const skinCode = this.$route.query.skinCode; if (parseInt(this.skinCode)) {
if (parseInt(skinCode)) { await this.loadMapData(this.skinCode);
await this.loadMapData(skinCode);
} else { } else {
this.endViewLoading(); this.endViewLoading();
@ -400,9 +418,8 @@ export default {
this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式 this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
this.$store.dispatch('training/setPrdType', '01'); this.$store.dispatch('training/setPrdType', '01');
const skinCode = this.$route.query.skinCode; if (parseInt(this.skinCode)) {
if (parseInt(skinCode)) { await this.loadMapData(this.skinCode);
await this.loadMapData(skinCode);
} else { } else {
this.endViewLoading(); this.endViewLoading();
@ -414,9 +431,8 @@ export default {
this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式 this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
this.switchMode('01'); this.switchMode('01');
const mapId = this.$route.query.mapId; if (parseInt(this.mapId)) {
if (parseInt(mapId)) { await this.loadMapDataById(this.mapId);
await this.loadMapDataById(mapId);
} else { } else {
this.endViewLoading(); this.endViewLoading();
} }
@ -427,9 +443,8 @@ export default {
this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式 this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
this.$store.dispatch('training/setPrdType', '01'); this.$store.dispatch('training/setPrdType', '01');
const skinCode = this.$route.query.skinCode; if (parseInt(this.skinCode)) {
if (parseInt(skinCode)) { await this.loadMapData(this.skinCode);
await this.loadMapData(skinCode);
} else { } else {
this.endViewLoading(); this.endViewLoading();
@ -522,11 +537,11 @@ export default {
if (this.isDrive) { if (this.isDrive) {
this.panelShow = false; this.panelShow = false;
this.drivingShow = true; this.drivingShow = true;
this.$refs.Jl3dDrive.show(this.$route.query.skinCode); this.$refs.Jl3dDrive.show(this.skinCode);
} else { } else {
this.panelShow = false; this.panelShow = false;
this.simulationShow = true; this.simulationShow = true;
this.$refs.Jl3dSimulation.show(this.$route.query.skinCode); this.$refs.Jl3dSimulation.show(this.skinCode);
} }
}, },
showpanel() { showpanel() {

3
src/views/display/menuScript.vue
View File

@ -101,6 +101,9 @@ export default {
selectBeginTime() { selectBeginTime() {
this.$refs.setTime.doShow(); this.$refs.setTime.doShow();
}, },
resetBeginTime(){
this.isDisable = false;
},
start(model) { start(model) {
this.isDisable = true; this.isDisable = true;
runDiagramStart(model, this.group).then(res => { runDiagramStart(model, this.group).then(res => {

94
src/views/display/scriptRecord/addAction.vue
View File

@ -2,43 +2,40 @@
<div> <div>
<el-form :model="modalData" ref="modalData" :rules="rules" label-width="100px" class="actionInfo" label-position="right"> <el-form :model="modalData" ref="modalData" :rules="rules" label-width="100px" class="actionInfo" label-position="right">
<el-form-item label="主体角色" class="conditionVO" prop="actionVO.memberId"> <el-form-item label="主体角色" class="conditionVO" prop="actionVO.memberId">
<el-select v-model="modalData.actionVO.memberId" placeholder="请选择主体角色"> <el-select v-model="modalData.actionVO.memberId" placeholder="请选择主体角色" :disabled="isPause&&isNotModify">
<el-option v-for="member in memberList" :key="member.id" :label="member.role+(member.name==undefined?'':member.name)" :value="member.id"></el-option> <el-option v-for="member in memberList" :key="member.id" :label="member.role+(member.name==undefined?'':member.name)" :value="member.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="完成时间" class="conditionVO"> <el-form-item label="动作类型" class="conditionVO" prop="actionVO.type" >
<el-input-number v-model="modalData.actionVO.time " class="inputStyle" :min="0"></el-input-number> <el-select v-model="modalData.actionVO.type " placeholder="请选择动作类型" @change="changeType" :disabled="deviceTypeReadOnly||isPause">
</el-form-item> -->
<el-form-item label="动作类型" class="conditionVO" prop="actionVO.type">
<el-select v-model="modalData.actionVO.type " placeholder="请选择动作类型" @change="changeType">
<el-option v-for="actionType in actionTypeList" :key="actionType.label" :label="actionType.label" :value="actionType.value"></el-option> <el-option v-for="actionType in actionTypeList" :key="actionType.label" :label="actionType.label" :value="actionType.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="目标角色" class="conditionVO" prop="actionVO.targetId" v-if="isConversitionAdd"> <el-form-item label="目标角色" class="conditionVO" prop="actionVO.targetId" v-if="isConversitionAdd">
<el-select v-model="modalData.actionVO.targetId" placeholder="请选择目标角色"> <el-select v-model="modalData.actionVO.targetId" placeholder="请选择目标角色" :disabled="isPause&&isNotModify">
<el-option v-for="member in memberList" :key="member.id" :label="member.role+(member.name==undefined?'':member.name)" :value="member.id"></el-option> <el-option v-for="member in memberList" :key="member.id" :label="member.role+(member.name==undefined?'':member.name)" :value="member.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="内容" class="conditionVO" prop="actionVO.reply" v-if="isConversitionAdd"> <el-form-item label="内容" class="conditionVO" prop="actionVO.reply" v-if="isConversitionAdd">
<el-input v-model="modalData.actionVO.reply" type="textarea" class="textareaStyle" rows="3"></el-input> <el-input v-model="modalData.actionVO.reply" type="textarea" class="textareaStyle" rows="3" :disabled="isPause&&isNotModify"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="设备指令" class="conditionVO" prop="actionVO.type" v-if="isCommandAdd"> <el-form-item label="设备指令" class="conditionVO" prop="actionVO.deviceCommand" v-if="isCommandAdd">
<el-select v-model="modalData.actionVO.deviceCommand " placeholder="请选择设备指令" @change="changeCommand" class="inputStyle"> <el-select v-model="modalData.actionVO.deviceCommand " placeholder="请选择设备指令" @change="changeCommand" class="inputStyle" :disabled="isPause&&isModify">
<el-option v-for="deviceCommand in deviceCommandList" :key="deviceCommand.deviceCommand" :label="deviceCommand.label" :value="deviceCommand.deviceCommand"></el-option> <el-option v-for="deviceCommand in deviceCommandList" :key="deviceCommand.deviceCommand" :label="deviceCommand.label" :value="deviceCommand.deviceCommand"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="起始站台" class="conditionVO" v-if="isJinLu" prop="param.startStation"> <el-form-item label="起始站台" class="conditionVO" v-if="isJinLu" prop="param.startStation">
<el-select v-model="modalData.param.startStation " placeholder="请选择起始站台" class="inputStyle"> <el-select v-model="modalData.param.startStation " placeholder="请选择起始站台" class="inputStyle" :disabled="isPause&&isNotModify">
<el-option v-for="station in stationList" :key="station.code" :label="station.name" :value="station.code"></el-option> <el-option v-for="station in stationList" :key="station.code" :label="station.name" :value="station.code"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="终点站台" class="conditionVO" v-if="isJinLu" prop="param.endStation"> <el-form-item label="终点站台" class="conditionVO" v-if="isJinLu" prop="param.endStation">
<el-select v-model="modalData.param.endStation " placeholder="请选择终点站台" class="inputStyle"> <el-select v-model="modalData.param.endStation " placeholder="请选择终点站台" class="inputStyle" :disabled="isPause&&isNotModify">
<el-option v-for="station in stationList" :key="station.code" :label="station.name" :value="station.code"></el-option> <el-option v-for="station in stationList" :key="station.code" :label="station.name" :value="station.code"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="addScriptActionInfo('modalData')">{{buttonName}}</el-button> <el-button type="primary" @click="addScriptActionInfo('modalData')" :disabled="isPause&&isNotModify" :loading="modifying">{{buttonName}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -74,7 +71,16 @@
{ {
this.initData(); this.initData();
} }
} },
'$store.state.map.mapViewLoadedCount': function (val) {
Vue.prototype.$jlmap.setOptions(this.$store.state.scriptRecord.mapLocation);
this.isPause=!(this.$store.state.scriptRecord.simulationPause);
this.$parent.$parent.$parent.setIsParse(this.isPause);
},
'$store.state.scriptRecord.simulationPause': function(val){
this.isPause=!(this.$store.state.scriptRecord.simulationPause);
this.$parent.$parent.$parent.setIsParse(this.isPause);
},
}, },
data() { data() {
return { return {
@ -82,7 +88,6 @@
actionVO:{ actionVO:{
memberId:"", memberId:"",
targetId:"", targetId:"",
// time:0,
reply:"", reply:"",
type:"Conversation", type:"Conversation",
deviceCommand:"", deviceCommand:"",
@ -93,6 +98,10 @@
endStation:"", endStation:"",
} }
}, },
deviceTypeReadOnly:false,
isPause:false,
isNotModify:true,
modifying:false,
isConversitionAdd:true, isConversitionAdd:true,
isCommandAdd:false, isCommandAdd:false,
actionTypeList:DeviceTypeDic.ConstSelect.actionType, actionTypeList:DeviceTypeDic.ConstSelect.actionType,
@ -163,15 +172,17 @@
{this.modalData.actionVO.commandParamList=[this.modalData.param.startStation,this.modalData.param.endStation];} {this.modalData.actionVO.commandParamList=[this.modalData.param.startStation,this.modalData.param.endStation];}
let data=this.modalData.actionVO; let data=this.modalData.actionVO;
let obj=this; let obj=this;
this.modifying=true;
if(this.$props.operateType=="add") if(this.$props.operateType=="add")
{ {
addScriptAction(group,data).then(response=>{ addScriptAction(group,data).then(response=>{
this.initActionData(); this.modifying=false;
this.$message.success('添加动作成功'); this.$message.success('添加动作成功');
this.$emit('create'); this.$emit('create');
this.resetDisabled(); // this.resetDisabled();
this.initActionData();
}).catch(error => { }).catch(error => {
this.modifying=false;
this.$messageBox(`添加动作失败: ${error.message}`); this.$messageBox(`添加动作失败: ${error.message}`);
}); });
} }
@ -179,12 +190,17 @@
{ {
let actionId=this.modalData.actionVO.id; let actionId=this.modalData.actionVO.id;
modifyScriptAction(group,actionId,data).then(response=>{ modifyScriptAction(group,actionId,data).then(response=>{
this.initActionData(); this.modifying=false;
this.isNotModify=true;
this.$parent.$parent.$parent.setDisabled(this.isNotModify);
this.$emit('modifyButtonName'); this.$emit('modifyButtonName');
this.$message.success('修改动作成功'); this.$message.success('修改动作成功');
this.$emit('create'); this.$emit('create');
this.resetDisabled(); // this.resetDisabled();
this.initActionData();
}).catch(error => { }).catch(error => {
this.modifying=false;
this.$messageBox(`修改动作失败: ${error.message}`); this.$messageBox(`修改动作失败: ${error.message}`);
}); });
} }
@ -199,6 +215,19 @@
if(this.$refs['modalData']) if(this.$refs['modalData'])
{ {
this.$refs['modalData'].resetFields(); this.$refs['modalData'].resetFields();
// this.$nextTick(function(){
this.deviceTypeReadOnly=false;
this.modalData.actionVO.type="Conversation";
this.modalData.actionVO.memberId="";
this.modalData.actionVO.targetId="";
// this.modalData.actionVO.deviceCommand="";
this.modalData.actionVO.reply="";
this.modalData.param.startStation="";
this.isConversitionAdd=true;
this.isCommandAdd=false;
this.isJinLu=false;
this.modalData.param.endStation="";
// });
} }
}, },
clearValidate(){ clearValidate(){
@ -208,18 +237,7 @@
} }
}, },
initActionData(){ initActionData(){
// debugger; this.resetDisabled();
this.modalData.actionVO.memberId="";
this.modalData.actionVO.targetId="";
this.modalData.actionVO.type="Conversation";
// this.modalData.actionVO.time=0;
this.modalData.actionVO.reply="";
this.modalData.param.startStation="";
this.isConversitionAdd=true;
this.isCommandAdd=false;
this.isJinLu=false;
this.modalData.actionVO.deviceCommand=null;
this.modalData.param.endStation="";
}, },
changeType(index){ changeType(index){
switch(index) switch(index)
@ -254,6 +272,7 @@
}, },
changeCommand(index){ changeCommand(index){
this.modalData.actionVO.deviceCommand
switch(index) switch(index)
{ {
case "Train_Manual_Route_Blocking_Drive":{ case "Train_Manual_Route_Blocking_Drive":{
@ -273,14 +292,18 @@
doShow(data){ doShow(data){
if(data) if(data)
{ {
// debugger; this.clearValidate();
this.isNotModify=false;
this.$parent.$parent.$parent.setDisabled(this.isNotModify);
this.initData(); this.initData();
this.modalData.actionVO.id=data.id; this.modalData.actionVO.id=data.id;
this.modalData.actionVO.memberId=data.memberId; this.modalData.actionVO.memberId=data.memberId;
this.modalData.actionVO.type=data.type; this.modalData.actionVO.type=data.type;
this.deviceTypeReadOnly=true;
// this.modalData.actionVO.time=data.time; // this.modalData.actionVO.time=data.time;
if(data.type=="Conversation") if(data.type=="Conversation")
{ {
this.isJinLu=false;
this.modalData.actionVO.targetId=data.targetId; this.modalData.actionVO.targetId=data.targetId;
this.isConversitionAdd=true; this.isConversitionAdd=true;
this.isCommandAdd=false; this.isCommandAdd=false;
@ -288,6 +311,7 @@
} }
else if(data.type=="Command") else if(data.type=="Command")
{ {
this.isJinLu=false;
this.isConversitionAdd=false; this.isConversitionAdd=false;
this.isCommandAdd=true; this.isCommandAdd=true;
this.modalData.actionVO.reply=""; this.modalData.actionVO.reply="";
@ -312,10 +336,10 @@
font-size: 15px; font-size: 15px;
} }
.actionInfo{ .actionInfo{
margin-top:20px; margin-top:10px;
margin-left: 5px; margin-left: 5px;
font-size: 15px; font-size: 15px;
width:98%; // width:98%;
} }
.inputStyle{ .inputStyle{
width:300px; width:300px;

51
src/views/display/scriptRecord/getAction.vue
View File

@ -6,43 +6,24 @@
<div class="tab-pane-big"> <div class="tab-pane-big">
<el-scrollbar wrapClass="scrollbar-wrapper" ref="elActionScrollbar"> <el-scrollbar wrapClass="scrollbar-wrapper" ref="elActionScrollbar">
<add-action ref="addBehavior" :group="group" @create="create" :buttonName="buttonName" :operateType="operateType" @modifyButtonName="modifyButtonName" class="addScript"></add-action> <add-action ref="addBehavior" :group="group" @create="create" :buttonName="buttonName" :operateType="operateType" @modifyButtonName="modifyButtonName" class="addScript"></add-action>
<div class="vertialLine"></div>
<div class="block actionListTable"> <div class="block actionListTable">
<el-timeline :reverse="reverse"> <el-timeline :reverse="reverse">
<el-timeline-item v-for="(actionInfo,index) in actionInfoList" :key="index"> <el-timeline-item v-for="(actionInfo,index) in actionInfoList" :key="index">
<el-card> <el-card>
<div class="actionTable"> <div class="actionTable">
<span class="detail" v-html="actionInfo.detail"> <span class="detail" v-html="actionInfo.detail">
<!-- <span class="actionColor"></span> -->
</span> </span>
<span class="otherInfo">{{actionInfo.otherInfo}}</span> <span class="otherInfo">{{actionInfo.otherInfo}}</span>
</div> </div>
<div class="btnGroup"> <div class="btnGroup">
<el-button type="primary" size="mini" style="margin-left:10px;" @click="modifyAction(actionInfo.row)">修改</el-button> <el-button type="primary" size="mini" style="margin-left:10px;" @click="modifyAction(actionInfo.row)" :disabled="actionInfo.disabled">修改</el-button>
<el-button type="danger" size="mini" @click="deleteAction(actionInfo.id)">删除</el-button> <!-- <el-button type="danger" size="mini" @click="deleteAction(actionInfo.id)">删除</el-button> -->
</div> </div>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
</el-timeline> </el-timeline>
</div> </div>
<!-- <el-table
v-loading="loading"
:data="actionList" border class="actionListTable">
<el-table-column prop="reply" label="内容" width="200">
</el-table-column>
<el-table-column prop="time" label="完成时间" width="200">
</el-table-column>
<el-table-column prop="type" label="动作类型" width="200">
</el-table-column>
<el-table-column label="操作" width="200">
<template slot-scope="scope">
<el-row>
<el-button type="primary" size="mini" @click="modifyAction(scope.row)">修改</el-button>
<el-button type="primary" size="mini" @click="deleteAction(scope.row)">删除</el-button>
</el-row>
</template>
</el-table-column>
</el-table> -->
</el-scrollbar> </el-scrollbar>
</div> </div>
</div> </div>
@ -77,13 +58,11 @@
AddAction, AddAction,
}, },
mounted(){ mounted(){
this.loadInitData(this.$route.query); this.loadInitData();
// this.memberName=this.$store.state.scriptRecord.memberName;
// this.behaviorName=this.$store.state.scriptRecord.behaviorName;
}, },
methods:{ methods:{
loadInitData(obj) { loadInitData() {
let group=obj.group; let group=this.$route.query.group;
getAvailableDeviceCommand().then(response=>{ getAvailableDeviceCommand().then(response=>{
this.deviceCommandList=response.data; this.deviceCommandList=response.data;
this.loadOtherData(this.$route.query); this.loadOtherData(this.$route.query);
@ -101,7 +80,6 @@
}); });
memberVOList=JSON.parse(memberVOList); memberVOList=JSON.parse(memberVOList);
let actionList=response.data.actionVOList; let actionList=response.data.actionVOList;
// actionList=actionList.reverse();
actionList.forEach(element => { actionList.forEach(element => {
let member=memberVOList.find(elem=>{return elem.id==element.memberId}); let member=memberVOList.find(elem=>{return elem.id==element.memberId});
let memberName=member.name==undefined?"":" - "+member.name; let memberName=member.name==undefined?"":" - "+member.name;
@ -111,7 +89,7 @@
{ {
let target=memberVOList.find(elem=>{return elem.id==element.targetId}); let target=memberVOList.find(elem=>{return elem.id==element.targetId});
let targetName=target.name==undefined?"":" - "+target.name; let targetName=target.name==undefined?"":" - "+target.name;
this.actionInfoList.push({id:element.id,detail:"<span style='color:#409EFF'>"+member.role+memberName+"</span>"+" 对 "+"<span style='color:#409EFF'>"+target.role+targetName+"</span>：",otherInfo:element.reply,row:element}); this.actionInfoList.push({id:element.id,detail:"<span style='color:#409EFF'>"+member.role+memberName+"</span>"+" 对 "+"<span style='color:#409EFF'>"+target.role+targetName+"</span>：",otherInfo:element.reply,row:element,disabled:false});
break; break;
} }
case "Command": case "Command":
@ -121,12 +99,12 @@
{ {
case 'Train_Manual_Route_Blocking_Drive': case 'Train_Manual_Route_Blocking_Drive':
{ {
this.actionInfoList.push({id:element.id,detail:"<span style='color:#409EFF'>"+member.role+memberName+"</span>执行指令 ：",otherInfo:deviceCommand.label,row:element}); this.actionInfoList.push({id:element.id,detail:"<span style='color:#409EFF'>"+member.role+memberName+"</span>执行指令 ：",otherInfo:deviceCommand.label,row:element,disabled:true});
break; break;
} }
case 'Train_Manual_Limit_Drive': case 'Train_Manual_Limit_Drive':
{ {
this.actionInfoList.push({id:element.id,detail:"<span style='color:#409EFF'>"+member.role+memberName+"</span>执行指令 : ",otherInfo:deviceCommand.label,row:element}); this.actionInfoList.push({id:element.id,detail:"<span style='color:#409EFF'>"+member.role+memberName+"</span>执行指令 : ",otherInfo:deviceCommand.label,row:element,disabled:true});
break; break;
} }
default: default:
@ -137,7 +115,6 @@
} }
} }
}); });
// this.actionList=response.data.actionVOList;
if(response.data.mapLocation) if(response.data.mapLocation)
{ {
let mapLocation={"offsetX":response.data.mapLocation.x,"offsetY":response.data.mapLocation.y,"scaleRate":response.data.mapLocation.scale}; let mapLocation={"offsetX":response.data.mapLocation.x,"offsetY":response.data.mapLocation.y,"scaleRate":response.data.mapLocation.scale};
@ -156,7 +133,7 @@
}); });
}, },
reloadTable(){ reloadTable(){
this.loadInitData(this.$route.query); this.loadInitData();
}, },
create(){ create(){
this.reloadTable(); this.reloadTable();
@ -215,5 +192,11 @@
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
} }
.vertialLine{
height: 380px;
margin-left: 440px;
border-right: 1px #dadada solid;
position: fixed;
width: 0px;
}
</style> </style>

8
src/views/display/tipExamList.vue
View File

@ -140,10 +140,8 @@ export default {
} }
}); });
if (obj) { if (obj) {
const that = this; getTrainingDetail(obj.trainingId ).then(res => {
const data = { id: obj.trainingId }; this.courseModel = {
getTrainingDetail(data).then(res => {
that.courseModel = {
id: res.data.id, id: res.data.id,
name: res.data.name, name: res.data.name,
maxDuration: res.data.maxDuration, maxDuration: res.data.maxDuration,
@ -152,7 +150,7 @@ export default {
updateTime: res.data.updateTime updateTime: res.data.updateTime
}; };
}).catch(error => { }).catch(error => {
that.$message.error('获取试题息失败:' + error.message); this.$message.error('获取试题息失败:' + error.message);
}); });
} }

60
src/views/display/tipScriptRecord.vue
View File

@ -13,9 +13,14 @@
<div> <div>
<get-action ref="getAction" :group="group"></get-action> <get-action ref="getAction" :group="group"></get-action>
</div> </div>
<!-- <el-button-group class="button-group1"> -->
<!-- </el-button-group> -->
<el-button-group class="button-group"> <el-button-group class="button-group">
<el-button type="danger" @click="dumpScenesData">重置剧本</el-button> <el-button type="primary" @click="pauseScript" v-if="isPause" :disabled="executeDisabled">暂停</el-button>
<el-button type="primary" @click="executePlayScript" v-else :disabled="executeDisabled">恢复并执行</el-button>
<el-button type="primary" @click="saveMaplocation">{{$t('scriptRecord.saveMaplocation')}}</el-button> <el-button type="primary" @click="saveMaplocation">{{$t('scriptRecord.saveMaplocation')}}</el-button>
<el-button type="danger" @click="dumpScenesData">重置剧本</el-button>
<el-button type="primary" @click="saveScenesStage">{{$t('scriptRecord.saveBackground')}}</el-button> <el-button type="primary" @click="saveScenesStage">{{$t('scriptRecord.saveBackground')}}</el-button>
<el-button type="success" @click="saveScenesData" :loading="isSavingScript" >{{$t('scriptRecord.saveData')}}</el-button> <el-button type="success" @click="saveScenesData" :loading="isSavingScript" >{{$t('scriptRecord.saveData')}}</el-button>
<!-- 暂停 --> <!-- 暂停 -->
@ -29,7 +34,7 @@
import Vue from 'vue'; import Vue from 'vue';
import GetAction from './scriptRecord/getAction'; import GetAction from './scriptRecord/getAction';
import { launchFullscreen, exitFullscreen } from '@/utils/screen'; import { launchFullscreen, exitFullscreen } from '@/utils/screen';
import {saveScriptScenes, saveScriptData, dumpScriptData,updateMapLocation} from '@/api/simulation'; import {saveScriptScenes, saveScriptData, dumpScriptData,updateMapLocation,scriptPause,executeScript} from '@/api/simulation';
export default { export default {
name: 'TipScriptRecord', name: 'TipScriptRecord',
@ -50,14 +55,11 @@
mapLocation:{}, mapLocation:{},
autoSaveScript: null, autoSaveScript: null,
isSavingScript:false, isSavingScript:false,
isPause:false,
executeDisabled:false,
// isSaveStage: true, // isSaveStage: true,
} }
}, },
watch: {
'$store.state.map.mapViewLoadedCount': function (val) {
Vue.prototype.$jlmap.setOptions(this.$store.state.scriptRecord.mapLocation);
}
},
created() { created() {
}, },
mounted(){ mounted(){
@ -83,6 +85,13 @@
this.isShrink = true; this.isShrink = true;
} }
}, },
setIsParse(isPause){
this.isPause=isPause;
},
setDisabled(data)
{
this.executeDisabled=!data;
},
initAutoSaveScript() { initAutoSaveScript() {
const timeout = 1000 * 20; const timeout = 1000 * 20;
this.clearAutoSave(this.autoSaveScript); this.clearAutoSave(this.autoSaveScript);
@ -94,13 +103,25 @@
this.autoSaveScript = null; this.autoSaveScript = null;
} }
}, },
// getActions(row){ pauseScript(){
// this.displayType="action"; scriptPause(this.group).then(resp => {
// this.behaviorId=row.id; // this.isSaveStage = false;
// this.$store.dispatch('scriptRecord/updateBehaviorName',row.description); this.$store.dispatch('scriptRecord/updateSimulationPause',true);
// }, // this.$message.success('暂停成功');
}).catch(error => {
this.$messageBox('暂停失败!');
});
},
executePlayScript(){
executeScript(this.group).then(resp => {
// this.isSaveStage = false;
this.$store.dispatch('scriptRecord/updateSimulationPause',false);
// this.$message.success('暂停成功');
}).catch(error => {
this.$messageBox('恢复失败!');
});
},
saveScenesStage() { saveScenesStage() {
saveScriptScenes(this.group).then(resp => { saveScriptScenes(this.group).then(resp => {
// this.isSaveStage = false; // this.isSaveStage = false;
this.$message.success('保存背景成功'); this.$message.success('保存背景成功');
@ -125,6 +146,7 @@
}) })
}, },
dumpScenesData() { dumpScenesData() {
this.clearAutoSave();
let group=this.group; let group=this.group;
this.$confirm('此操作将会清除已保存的编制数据, 是否继续?', '提示', { this.$confirm('此操作将会清除已保存的编制数据, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
@ -133,11 +155,16 @@
}).then(() => { }).then(() => {
dumpScriptData(group).then(resp => { dumpScriptData(group).then(resp => {
// this.isSaveStage = true; // this.isSaveStage = true;
this.$parent.resetBeginTime();
this.$refs["getAction"].loadInitData();
this.initAutoSaveScript();
this.$message.success('清除数据成功'); this.$message.success('清除数据成功');
}).catch(error => { }).catch(error => {
this.$messageBox('清除数据失败!'); this.$messageBox('清除数据失败!');
}) })
}).catch(error => { }) }).catch(error => {
this.initAutoSaveScript();
})
}, },
saveMaplocation() saveMaplocation()
{ {
@ -205,6 +232,11 @@
margin-left: 20px; margin-left: 20px;
float:right; float:right;
} }
.button-group1{
margin-top:15px;
margin-left: 20px;
float:left;
}
.actionInfo{ .actionInfo{
margin-top:30px; margin-top:30px;
} }

6
src/views/exam/detail/questionDetail.vue
View File

@ -78,9 +78,9 @@ export default {
this.height = this._clientHeight; this.height = this._clientHeight;
}, },
initLoadPage() { initLoadPage() {
const data = { id: this.$route.query.trainingId }; const trainingId = this.$route.query.trainingId;
if (parseInt(data.id)) { if (parseInt(trainingId)) {
getTrainingDetail(data).then(res => { getTrainingDetail(trainingId).then(res => {
this.courseModel = { this.courseModel = {
id: res.data.id, id: res.data.id,
name: res.data.name, name: res.data.name,

1
src/views/jlmap/index.vue
View File

@ -116,6 +116,7 @@ export default {
EventBus.$off('refresh'); EventBus.$off('refresh');
EventBus.$off('viewLoading'); EventBus.$off('viewLoading');
EventBus.$off('viewProgressAt'); EventBus.$off('viewProgressAt');
this.$store.dispatch('map/mapClear');
if (this.$jlmap) { if (this.$jlmap) {
this.$jlmap.dispose(); this.$jlmap.dispose();
} }

2
src/views/jointTraining/chartView.vue
View File

@ -297,7 +297,7 @@ export default {
}, },
// 更新列车列表 // 更新列车列表
updateTrainList() { updateTrainList() {
const list = this.$store.getters['training/viewTrainList']; const list = this.$store.getters['training/viewTrainList']();
if (this.treeData[4].children.length != list.length) { if (this.treeData[4].children.length != list.length) {
this.treeData[4].children = []; this.treeData[4].children = [];
if (list && list.length) { if (list && list.length) {

16
src/views/jointTraining/index.vue
View File

@ -89,7 +89,10 @@ export default {
]), ]),
...mapGetters('config', [ ...mapGetters('config', [
'canvasId' 'canvasId'
]) ]),
skinCode() {
return this.$route.query.skinCode;
}
}, },
watch: { watch: {
'$store.state.config.menuBarLoadedCount': function (val) { '$store.state.config.menuBarLoadedCount': function (val) {
@ -123,7 +126,9 @@ export default {
} }
}, },
$route() { $route() {
this.initLoadData(); this.$nextTick(() => {
this.initLoadData();
});
} }
}, },
async created() { async created() {
@ -268,8 +273,7 @@ export default {
this.$store.dispatch('training/end', TrainingMode.NORMAL); this.$store.dispatch('training/end', TrainingMode.NORMAL);
this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式 this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
const skinCode = this.$route.query.skinCode; if (this.skinCode) {
if (skinCode) {
// 01 现地 02 行调 '' 观众 // 01 现地 02 行调 '' 观众
const resp = await this.getUserRole(); const resp = await this.getUserRole();
if (resp && resp.code == 200) { if (resp && resp.code == 200) {
@ -285,7 +289,7 @@ export default {
case 'Repair': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'Repair'); break; case 'Repair': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'Repair'); break;
} }
} }
await this.getTrainDetail(skinCode); await this.getTrainDetail(this.skinCode);
} else { } else {
this.endViewLoading(); this.endViewLoading();
} }
@ -318,7 +322,7 @@ export default {
hidepanel() { hidepanel() {
this.panelShow = false; this.panelShow = false;
this.drivingShow = true; this.drivingShow = true;
this.$refs.Jl3dDrive.show(this.$route.query.skinCode); this.$refs.Jl3dDrive.show(this.skinCode);
}, },
messageInfo(message, type) { messageInfo(message, type) {

2
src/views/lesson/trainingrecord/category/draft.vue
View File

@ -210,7 +210,7 @@ export default {
this.operateModel.id = node.data.id; this.operateModel.id = node.data.id;
this.operateModel.name = node.data.name; this.operateModel.name = node.data.name;
getTrainingDetail({ id: node.data.id }).then(response => { getTrainingDetail(node.data.id).then(response => {
this.operateModel.minDuration = response.data.minDuration; this.operateModel.minDuration = response.data.minDuration;
this.operateModel.maxDuration = response.data.maxDuration; this.operateModel.maxDuration = response.data.maxDuration;
this.operateModel.operateType = response.data.operateType; this.operateModel.operateType = response.data.operateType;

1
src/views/lesson/trainingrecord/index.vue
View File

@ -47,7 +47,6 @@ export default {
}, },
$route() { $route() {
this.resizeHandler(); this.resizeHandler();
this.$;
} }
}, },
mounted() { mounted() {

26
src/views/lesson/trainingrecord/manage/index.vue
View File

@ -15,7 +15,7 @@
import MapSystemDraft from '@/views/mapsystem/index'; import MapSystemDraft from '@/views/mapsystem/index';
import StepManage from './stepmanage/index'; import StepManage from './stepmanage/index';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { getTrainingStepsDetail } from '@/api/jmap/training'; import { getTrainingDetail, getTrainingStepsDetail } from '@/api/jmap/training';
import { getProductDetail } from '@/api/management/mapprd'; import { getProductDetail } from '@/api/management/mapprd';
import { TrainingMode, OperateMode } from '@/scripts/ConstDic'; import { TrainingMode, OperateMode } from '@/scripts/ConstDic';
import { loadMapData } from '@/utils/loaddata'; import { loadMapData } from '@/utils/loaddata';
@ -49,6 +49,16 @@ export default {
watch: { watch: {
$route(newVal) { $route(newVal) {
this.initLoadData(); this.initLoadData();
},
'$store.state.map.mapViewLoadedCount': function() {
if (this.trainingId) {
getTrainingStepsDetail(this.trainingId, { group: this.group }).then(response => {
this.$store.dispatch('training/setTrainingData', response.data);
}).catch(() => {
this.$messageBox(this.$t('error.getMapStepsFailed'));
this.endViewLoading();
});
}
} }
}, },
mounted() { mounted() {
@ -77,19 +87,19 @@ export default {
// 获取实训的详细数据 // 获取实训的详细数据
// 加载地图数据 // 加载地图数据
// 设置实训数据 // 设置实训数据
getTrainingStepsDetail(this.trainingId, { group: this.group }).then(response => { getTrainingDetail(this.trainingId).then(resp => {
const stepdData = response.data; const detail = resp.data;
getProductDetail(stepdData.prdCode).then(res => { getProductDetail(detail.prdCode).then(rest => {
loadMapData(stepdData.skinCode).then(() => { const data = rest.data;
this.$store.dispatch('training/setPrdType', res.data.prdType); loadMapData(detail.skinCode).then(() => {
this.$store.dispatch('training/setTrainingData', stepdData); this.$store.dispatch('training/setPrdType', data.prdType);
}).catch(() => { }).catch(() => {
this.$messageBox(this.$t('error.loadMapDataFailed')); this.$messageBox(this.$t('error.loadMapDataFailed'));
this.endViewLoading(); this.endViewLoading();
}); });
}); });
}).catch(() => { }).catch(() => {
this.$messageBox(this.$t('error.getMapStepsFailed')); this.$messageBox(this.$t('error.getMapDetailFailed'));
this.endViewLoading(); this.endViewLoading();
}); });
} else { } else {

38
src/views/management/dictionaryDetail/edit.vue
View File

@ -40,12 +40,12 @@ export default {
const form = { const form = {
labelWidth: '60px', labelWidth: '60px',
items: [ items: [
{ prop: 'code', label: '编码', type: 'text', required: true, disabled: !isAdd }, { prop: 'code', label: this.$t('system.code'), type: 'text', required: true, disabled: !isAdd },
{ prop: 'name', label: '名称', type: 'text', required: true }, { prop: 'name', label: this.$t('system.name'), type: 'text', required: true },
{ {
prop: 'status', label: '状态', type: 'select', required: true, options: this.$ConstSelect.Status prop: 'status', label: this.$t('system.status'), type: 'select', required: true, options: this.$ConstSelect.Status
}, },
{ prop: 'remarks', label: '备注', type: 'textarea', required: false } { prop: 'remarks', label: this.$t('system.remarks'), type: 'textarea', required: false }
] ]
}; };
return form; return form;
@ -53,21 +53,21 @@ export default {
rules() { rules() {
const crules = { const crules = {
name: [ name: [
{ required: true, message: '请输入名称', trigger: 'blur' }, { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' },
{ min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' } { min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' }
], ],
status: [ status: [
{ required: true, message: '请选择状态', trigger: 'change' } { required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' }
], ],
remarks: [ remarks: [
{ max: 50, message: '不能超过 50 个字符', trigger: 'blur' } { max: 50, message: this.$t('rules.strLengthNotExceed50'), trigger: 'blur' }
] ]
}; };
if (this.type === 'ADD') { if (this.type === 'ADD') {
return Object.assign(crules, { return Object.assign(crules, {
code: [ code: [
{ required: true, message: '请输入编码', trigger: 'blur' }, { required: true, message: this.$t('rules.pleaseInputCode'), trigger: 'blur' },
{ min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' }, { min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' },
{ validator: this.validateCode, trigger: 'blur' } { validator: this.validateCode, trigger: 'blur' }
] ]
}); });
@ -77,25 +77,25 @@ export default {
}, },
title() { title() {
if (this.type === 'ADD') { if (this.type === 'ADD') {
return '创建明细'; return this.$t('system.createDetail');
} else { } else {
return '编辑明细'; return this.$t('system.editDetail');
} }
} }
}, },
methods: { methods: {
validateCode(rule, value, callback) { validateCode(rule, value, callback) {
if (!validateCharCode(value)) { if (!validateCharCode(value)) {
return callback(new Error('格式不正确，只能是字符/数字/_')); return callback(new Error(this.$t('error.formartError')));
} else { } else {
checkDicDetailCodeExist(this.dicId, value).then(response => { checkDicDetailCodeExist(this.dicId, value).then(response => {
if (response.data) { if (response.data) {
return callback(new Error('编码已存在')); return callback(new Error(this.$t('error.codeHasExist')));
} else { } else {
return callback(); return callback();
} }
}).catch(() => { }).catch(() => {
return callback(new Error('服务异常')); return callback(new Error(this.$t('error.serviceException')));
}); });
} }
}, },
@ -121,21 +121,21 @@ export default {
create() { create() {
const self = this; const self = this;
create(this.dicId, this.formModel).then(response => { create(this.dicId, this.formModel).then(response => {
self.$message.success('创建字典目录成功'); self.$message.success(this.$t('system.createSuccess'));
self.handleClose(); self.handleClose();
self.$emit('reloadTable'); self.$emit('reloadTable');
}).catch(error => { }).catch(error => {
self.$message.error('创建字典目录失败：' + error.message); self.$message.error(`${this.$t('error.createDetailFailed')}:${error.message}`);
}); });
}, },
update() { update() {
const self = this; const self = this;
update(this.dicId, this.formModel).then(response => { update(this.dicId, this.formModel).then(response => {
self.$message.success('更新字典目录成功'); self.$message.success(this.$t('system.updateSuccess'));
self.handleClose(); self.handleClose();
self.$emit('reloadTable'); self.$emit('reloadTable');
}).catch(error => { }).catch(error => {
self.$message.error('更新字典目录失败：' + error.message); self.$message.error(`${this.$t('error.updateDetailFailed')}:${error.message}`);
}); });
}, },
handleClose(done) { handleClose(done) {

10
src/views/management/existingSimulation/index.vue
View File

@ -28,11 +28,11 @@ export default {
}, },
userName: { userName: {
type: 'text', type: 'text',
label: this.$t('system.username') label: this.$t('system.userName')
}, },
mobile: { mobile: {
type: 'text', type: 'text',
label: this.$t('system.phoneNumber') label: this.$t('system.mobile')
}, },
skinCode: { skinCode: {
type: 'select', type: 'select',
@ -64,11 +64,11 @@ export default {
indexShow: true, indexShow: true,
columns: [ columns: [
{ {
title: this.$t('system.username'), title: this.$t('system.userName'),
prop: 'creator.name' prop: 'creator.name'
}, },
{ {
title: this.$t('system.phoneNumber'), title: this.$t('system.mobile'),
prop: 'creator.mobile' prop: 'creator.mobile'
}, },
{ {
@ -170,7 +170,7 @@ export default {
return sessionId; return sessionId;
}, },
handleDelete(index, row) { handleDelete(index, row) {
this.$confirm(this.$t('global.delUserSimulationIsContinue'), this.$t('global.tips'), { this.$confirm(this.$t('system.delUserSimulationIsContinue'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'), confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'), cancelButtonText: this.$t('global.cancel'),
type: 'warning' type: 'warning'

20
src/views/management/userControl/edit.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<el-dialog :title="'编辑用户权限'" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center> <el-dialog :title="$t('system.editUserPermission')" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center>
<data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" /> <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="doSave">确 定</el-button> <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">{{ $t('global.cancel') }}</el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
@ -31,11 +31,11 @@ export default {
const form = { const form = {
labelWidth: '60px', labelWidth: '60px',
items: [ items: [
{ prop: 'name', label: '名称', type: 'text', required: true, disabled: true }, { prop: 'name', label: this.$t('system.name'), type: 'text', required: true, disabled: true },
// { prop: 'nickname', label: '昵称', type: 'text', required: true }, // { prop: 'nickname', label: '昵称', type: 'text', required: true },
// { prop: 'mobile', label: '电话', type: 'text', required: true }, // { prop: 'mobile', label: '电话', type: 'text', required: true },
// { prop: 'email', label: '邮箱', type: 'text' }, // { prop: 'email', label: '邮箱', type: 'text' },
{ prop: 'roles', label: '权限', type: 'select', required: true, options: this.$ConstSelect.roleList, multiple: true } { prop: 'roles', label: this.$t('system.permission'), type: 'select', required: true, options: this.$ConstSelect.roleList, multiple: true }
] ]
}; };
return form; return form;
@ -43,11 +43,11 @@ export default {
rules() { rules() {
const crules = { const crules = {
name: [ name: [
{ required: true, message: '请输入名称', trigger: 'blur' }, { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' },
{ min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' } { min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' }
], ],
status: [ status: [
{ required: true, message: '请选择状态', trigger: 'change' } { required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' }
] ]
}; };
return crules; return crules;
@ -76,11 +76,11 @@ export default {
update() { update() {
const self = this; const self = this;
putRoles(this.formModel).then(response => { putRoles(this.formModel).then(response => {
self.$message.success('修改成功'); self.$message.success(this.$t('system.updateSuccess'));
self.handleClose(); self.handleClose();
self.$emit('reloadTable'); self.$emit('reloadTable');
}).catch(error => { }).catch(error => {
self.$message.error('修改失败：' + error.message); self.$message.error(`${this.$t('error.updateFailed')}: ${error.message}`);
}); });
}, },
handleClose(done) { handleClose(done) {

26
src/views/management/userControl/index.vue
View File

@ -29,11 +29,11 @@ export default {
queryObject: { queryObject: {
name: { name: {
type: 'text', type: 'text',
label: '名称' label: this.$t('system.name')
}, },
roles: { roles: {
type: 'select', type: 'select',
label: '角色', label: this.$t('system.roles'),
config: { config: {
data: this.$ConstSelect.roleList data: this.$ConstSelect.roleList
} }
@ -47,23 +47,23 @@ export default {
indexShow: true, indexShow: true,
columns: [ columns: [
{ {
title: '名称', title: this.$t('system.name'),
prop: 'name' prop: 'name'
}, },
{ {
title: '昵称', title: this.$t('system.nickname'),
prop: 'nickname' prop: 'nickname'
}, },
{ {
title: '电话', title: this.$t('system.mobile'),
prop: 'mobile' prop: 'mobile'
}, },
{ {
title: '邮箱', title: this.$t('system.email'),
prop: 'email' prop: 'email'
}, },
{ {
title: '角色', title: this.$t('system.roles'),
prop: 'roles', prop: 'roles',
type: 'tagMore', type: 'tagMore',
columnValue: (row) => { return this.$convertField(row.roles, this.$ConstSelect.roleList, ['value', 'label'], true); }, columnValue: (row) => { return this.$convertField(row.roles, this.$ConstSelect.roleList, ['value', 'label'], true); },
@ -71,15 +71,15 @@ export default {
}, },
{ {
type: 'button', type: 'button',
title: '操作', title: this.$t('global.operate'),
width: '250', width: '250',
buttons: [ buttons: [
{ {
name: '编辑', name: this.$t('global.edit'),
handleClick: this.handleUserEdit handleClick: this.handleUserEdit
}, },
{ {
name: '订阅地图', name: this.$t('system.subscribeMap'),
handleClick: this.handleMapCorrelation, handleClick: this.handleMapCorrelation,
type: 'danger' type: 'danger'
} }
@ -100,9 +100,9 @@ export default {
// 删除 // 删除
handleUserDelete(index, row) { handleUserDelete(index, row) {
this.$confirm('此操作将删除该类型, 是否继续?', '提示', { this.$confirm(this.$t('system.delTypeIsContinue'), this.$t('global.tips'), {
confirmButtonText: '确定', confirmButtonText: this.$t('global.confirm'),
cancelButtonText: '取消', cancelButtonText: this.$t('global.cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
// delPublishMap(row.id).then(response => { // delPublishMap(row.id).then(response => {

24
src/views/management/userExam/edit.vue
View File

@ -2,8 +2,8 @@
<el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center> <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center>
<data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" /> <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="doSave">确 定</el-button> <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">{{ $t('global.cancel') }}</el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
@ -34,12 +34,12 @@ export default {
computed: { computed: {
form() { form() {
const form = { const form = {
labelWidth: '100px', labelWidth: '160px',
items: [ items: [
{ prop: 'userName', label: '用户名称', type: 'text', required: false, disabled: true }, { prop: 'userName', label: this.$t('system.userName'), type: 'text', required: false, disabled: true },
{ prop: 'examName', label: '试卷名称', type: 'text', required: true, disabled: true }, { prop: 'examName', label: this.$t('system.examName'), type: 'text', required: true, disabled: true },
{ prop: 'score', label: '考试分数', type: 'text', required: true }, { prop: 'score', label: this.$t('system.examScore'), type: 'text', required: true },
{ prop: 'result', label: '考试结果', type: 'select', required: true, options: this.$ConstSelect.examResultList } { prop: 'result', label: this.$t('system.examResult'), type: 'select', required: true, options: this.$ConstSelect.examResultList }
] ]
}; };
return form; return form;
@ -47,16 +47,16 @@ export default {
rules() { rules() {
const crules = { const crules = {
score: [ score: [
{ required: true, message: '请输入名称', trigger: 'blur' } { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' }
], ],
result: [ result: [
{ required: true, message: '请选择状态', trigger: 'change' } { required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' }
] ]
}; };
return crules; return crules;
}, },
title() { title() {
return '编辑考试详情'; return this.$t('system.editExamDetail');
} }
}, },
methods: { methods: {
@ -79,11 +79,11 @@ export default {
update() { update() {
const self = this; const self = this;
updateExam(this.formModel).then(response => { updateExam(this.formModel).then(response => {
self.$message.success('修改成功！'); self.$message.success(this.$t('system.updateSuccess'));
self.handleClose(); self.handleClose();
self.$emit('reloadTable'); self.$emit('reloadTable');
}).catch(error => { }).catch(error => {
self.$message.error('修改失败！' + error.message); self.$message.error(`${this.$t('error.updateFailed')}: ${error.message}`);
}); });
}, },
handleClose(done) { handleClose(done) {

34
src/views/management/userExam/index.vue
View File

@ -22,20 +22,20 @@ export default {
pageIndex: 'pageNum' pageIndex: 'pageNum'
}, },
queryForm: { queryForm: {
labelWidth: '80px', labelWidth: '150px',
reset: true, reset: true,
queryObject: { queryObject: {
examName: { examName: {
type: 'text', type: 'text',
label: '试卷名称' label: this.$t('system.examName')
}, },
userName: { userName: {
type: 'text', type: 'text',
label: '考试用户' label: this.$t('system.examUser')
}, },
result: { result: {
type: 'select', type: 'select',
label: '考试结果', label: this.$t('system.examResult'),
config: { config: {
data: this.$ConstSelect.examResultList data: this.$ConstSelect.examResultList
} }
@ -49,11 +49,11 @@ export default {
indexShow: true, indexShow: true,
columns: [ columns: [
{ {
title: '试卷名称', title: this.$t('system.examName'),
prop: 'examName' prop: 'examName'
}, },
{ {
title: '考试结果', title: this.$t('system.examResult'),
prop: 'result', prop: 'result',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$convertField(row.result, this.$ConstSelect.examResultList, ['value', 'label']); }, columnValue: (row) => { return this.$convertField(row.result, this.$ConstSelect.examResultList, ['value', 'label']); },
@ -67,28 +67,28 @@ export default {
} }
}, },
{ {
title: '考试成绩', title: this.$t('system.examScore'),
prop: 'score' prop: 'score'
}, },
{ {
title: '考试用户', title: this.$t('system.examUser'),
prop: 'userName' prop: 'userName'
}, },
{ {
title: '用户手机号', title: this.$t('system.mobile'),
prop: 'userMobile' prop: 'userMobile'
}, },
{ {
type: 'button', type: 'button',
title: '操作', title: this.$t('global.operate'),
width: '250', width: '250',
buttons: [ buttons: [
{ {
name: '编辑', name: this.$t('global.edit'),
handleClick: this.edit handleClick: this.edit
}, },
{ {
name: '删除', name: this.$t('global.delete'),
handleClick: this.handleDelete, handleClick: this.handleDelete,
type: 'danger' type: 'danger'
} }
@ -115,17 +115,17 @@ export default {
// 删除 // 删除
handleDelete(index, row) { handleDelete(index, row) {
this.$confirm('此操作将删除此考试结果, 是否继续?', '提示', { this.$confirm(this.$t('system.delExamResultIsContinue'), this.$t('global.tips'), {
confirmButtonText: '确定', confirmButtonText: this.$t('global.confirm'),
cancelButtonText: '取消', cancelButtonText: this.$t('global.cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
delPublishExam(row.id).then(response => { delPublishExam(row.id).then(response => {
this.$message.success('删除成功'); this.$message.success(this.$t('system.deleteSuccess'));
this.reloadTable(); this.reloadTable();
}).catch(() => { }).catch(() => {
this.reloadTable(); this.reloadTable();
this.$messageBox('删除失败'); this.$messageBox(this.$t('error.deleteFailed'));
}); });
}); });
}, },

39
src/views/management/userSimulation/add.vue
View File

@ -2,8 +2,8 @@
<el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center> <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center>
<data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" /> <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="doSave">确 定</el-button> <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
<el-button @click="handleClose">取 消</el-button> <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
@ -41,12 +41,12 @@ export default {
computed: { computed: {
form() { form() {
const form = { const form = {
labelWidth: '100px', labelWidth: '120px',
items: [ items: [
{ prop: 'mapId', label: '地图名称', type: 'select', required: true, options: this.LessonList, change: true, onChange: this.mapChange }, { prop: 'mapId', label: this.$t('system.mapName'), type: 'select', required: true, options: this.LessonList, change: true, onChange: this.mapChange, placeholder: this.$t('rules.mapInput') },
{ prop: 'mapPrdCode', label: '产品名称', type: 'select', required: true, options: this.mapPrdList, placeholder: '请选择产品' }, { prop: 'mapPrdCode', label: this.$t('system.productName'), type: 'select', required: true, options: this.mapPrdList, placeholder: this.$t('rules.productInput') },
{ prop: 'userName', label: '用户名称', type: 'complete', required: false, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: '请输入昵称/名字/手机号' }, { prop: 'userName', label: this.$t('system.userName'), type: 'complete', required: false, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: this.$t('system.pleaseInputNames') },
{ prop: 'duration', label: '实训时长', type: 'text', rightWidth: true, required: true, message: 's' } { prop: 'duration', label: this.$t('system.trainingUseTime'), type: 'text', rightWidth: true, required: true, message: 's' }
] ]
}; };
return form; return form;
@ -54,22 +54,22 @@ export default {
rules() { rules() {
const crules = { const crules = {
mapId: [ mapId: [
{ required: true, message: '请选择地图', trigger: 'change' } { required: true, message: this.$t('rules.mapInput'), trigger: 'change' }
], ],
userName: [ userName: [
{ required: true, message: '请选择用户', trigger: 'change' } { required: true, message: this.$t('rules.chooseUser'), trigger: 'change' }
], ],
mapPrdCode: [ mapPrdCode: [
{ required: true, message: '请选择产品', trigger: 'change' } { required: true, message: this.$t('rules.productInput'), trigger: 'change' }
], ],
duration: [ duration: [
{ required: true, message: '请输入时长', trigger: 'blur' } { required: true, message: this.$t('rules.timeInput'), trigger: 'blur' }
] ]
}; };
return crules; return crules;
}, },
title() { title() {
return '创建仿真信息'; return this.$t('system.createSimulationTitle');
} }
}, },
mounted() { mounted() {
@ -113,7 +113,7 @@ export default {
}); });
cb(results); cb(results);
} catch (error) { } catch (error) {
console.error(error, '查询用户list'); console.error(error);
cb(results); cb(results);
} }
} else { } else {
@ -148,13 +148,6 @@ export default {
}, },
show(data) { show(data) {
this.dialogVisible = true; this.dialogVisible = true;
// this.formModel = {
// mapId: '',
// mapPrdCode: '',
// userId: '',
// userName: '',
// duration: '',
// };
}, },
doSave() { doSave() {
const self = this; const self = this;
@ -172,14 +165,14 @@ export default {
}; };
if (params.userId) { if (params.userId) {
postSimulationStats(params).then(response => { postSimulationStats(params).then(response => {
self.$message.success('新增成功！'); self.$message.success(this.$t('system.addSuccess'));
self.handleClose(); self.handleClose();
self.$emit('reloadTable'); self.$emit('reloadTable');
}).catch(error => { }).catch(error => {
self.$message.error('新增失败！' + error.message); self.$message.error(this.$t('error.addFailed') + error.message);
}); });
} else { } else {
this.$message.error('请选择用户'); this.$message.error(this.$t('rules.chooseUser'));
} }
}, },
handleClose(done) { handleClose(done) {

38
src/views/management/userSimulation/index.vue
View File

@ -29,16 +29,16 @@ export default {
pageIndex: 'pageNum' pageIndex: 'pageNum'
}, },
queryForm: { queryForm: {
labelWidth: '80px', labelWidth: '120px',
reset: true, reset: true,
queryObject: { queryObject: {
trainingName: { trainingName: {
type: 'text', type: 'text',
label: '实训名称' label: this.$t('system.trainingName')
}, },
userName: { userName: {
type: 'text', type: 'text',
label: '用户名' label: this.$t('system.userName')
} }
} }
@ -49,41 +49,41 @@ export default {
indexShow: true, indexShow: true,
columns: [ columns: [
{ {
title: '用户名称', title: this.$t('system.userName'),
prop: 'userName' prop: 'userName'
}, },
{ {
title: '用户手机号', title: this.$t('system.mobile'),
prop: 'userMobile' prop: 'userMobile'
}, },
{ {
title: '地图名称', title: this.$t('system.mapName'),
prop: 'mapName' prop: 'mapName'
}, },
{ {
title: '实训用时', title: this.$t('system.trainingUseTime'),
prop: 'duration', prop: 'duration',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.computation(row.duration); }, columnValue: (row) => { return this.computation(row.duration); },
tagType: (row) => { return 'success'; } tagType: (row) => { return 'success'; }
}, },
{ {
title: '产品名称', title: this.$t('system.productName'),
prop: 'mapPrdName' prop: 'mapPrdName'
}, },
{ {
type: 'button', type: 'button',
title: '操作', title: this.$t('global.operate'),
width: '250', width: '250',
hide: (row) => { return !row.fake; }, hide: (row) => { return !row.fake; },
buttons: [ buttons: [
{ {
name: '编辑', name: this.$t('global.edit'),
handleClick: this.edit, handleClick: this.edit,
showControl: (row) => { return row.fake; } showControl: (row) => { return row.fake; }
}, },
{ {
name: '删除', name: this.$t('global.delete'),
handleClick: this.handleDelete, handleClick: this.handleDelete,
type: 'danger', type: 'danger',
showControl: (row) => { return row.fake; } showControl: (row) => { return row.fake; }
@ -92,7 +92,7 @@ export default {
} }
], ],
actions: [ actions: [
{ text: '新增', handler: this.createTraining } { text: this.$t('global.add'), handler: this.createTraining }
] ]
}, },
currentModel: {} currentModel: {}
@ -121,9 +121,9 @@ export default {
const f = parseInt(fieldValue / 60); const f = parseInt(fieldValue / 60);
const s = fieldValue % 60; const s = fieldValue % 60;
if (f > 0) { if (f > 0) {
return `${f}分${s}秒`; return `${f} ${this.$t('system.minute')} ${s} ${this.$t('system.second')}`;
} else { } else {
return `${s}秒`; return `${s} ${this.$t('system.second')}`;
} }
} }
}, },
@ -135,17 +135,17 @@ export default {
// 删除 // 删除
handleDelete(index, row) { handleDelete(index, row) {
this.$confirm('此操作将删除此用户仿真数据, 是否继续?', '提示', { this.$confirm(this.$t('system.delUserSimulationIsContinue'), this.$t('global.tips'), {
confirmButtonText: '确定', confirmButtonText: this.$t('global.confirm'),
cancelButtonText: '取消', cancelButtonText: this.$t('global.cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
deleteSimulationStats(row.id).then(response => { deleteSimulationStats(row.id).then(response => {
this.$message.success('删除成功'); this.$message.success(this.$t('system.deleteSuccess'));
this.reloadTable(); this.reloadTable();
}).catch(() => { }).catch(() => {
this.reloadTable(); this.reloadTable();
this.$messageBox('删除失败'); this.$messageBox(this.$t('error.deleteFailed'));
}); });
}); });
}, },

38
src/views/management/userTraining/add.vue
View File

@ -3,8 +3,8 @@
<el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center> <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center>
<data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" /> <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="doSave">确 定</el-button> <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
<el-button @click="handleClose">取 消</el-button> <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
</span> </span>
</el-dialog> </el-dialog>
<add-training ref="addTraining" @selectTrain="selectTrain" /> <add-training ref="addTraining" @selectTrain="selectTrain" />
@ -48,12 +48,12 @@ export default {
form() { form() {
this.type === 'ADD'; this.type === 'ADD';
const form = { const form = {
labelWidth: '100px', labelWidth: '150px',
items: [ items: [
{ prop: 'lessonId', label: '课程名称', type: 'select', required: true, options: this.LessonList }, { prop: 'lessonId', label: this.$t('system.lessonName'), type: 'select', required: true, options: this.LessonList },
{ prop: 'trainingName', label: '实训名称', type: 'text', required: true, rightWidth: true, disabled: true, buttontip: '选择实训', buttonClick: this.buttonClick, placeholder: '请选择实训' }, { prop: 'trainingName', label: this.$t('system.trainingName'), type: 'text', required: true, rightWidth: true, disabled: true, buttontip: this.$t('system.selectTraining'), buttonClick: this.buttonClick, placeholder: this.$t('rules.pleaseSelectTraining') },
{ prop: 'userName', label: '用户名称', type: 'complete', required: false, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: '请输入昵称/名字/手机号' }, { prop: 'userName', label: this.$t('system.userName'), type: 'complete', required: false, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: this.$t('system.pleaseInputNames') },
{ prop: 'duration', label: '实训时长', type: 'text', required: true, rightWidth: true, message: 's' } { prop: 'duration', label: this.$t('system.trainingTime'), type: 'text', required: true, rightWidth: true, message: 's' }
] ]
}; };
return form; return form;
@ -61,22 +61,22 @@ export default {
rules() { rules() {
const crules = { const crules = {
lessonId: [ lessonId: [
{ required: true, message: '请输入教学名称', trigger: 'change' } { required: true, message: this.$t('rules.pleaseInputLessonName'), trigger: 'change' }
], ],
trainingName: [ trainingName: [
{ required: true, message: '请选择实训', trigger: 'change' } { required: true, message: this.$t('rules.pleaseSelectTraining'), trigger: 'change' }
], ],
userName: [ userName: [
{ required: true, message: '请输入用户名称', trigger: 'change' } { required: true, message: this.$t('rules.userNameInput'), trigger: 'change' }
], ],
duration: [ duration: [
{ required: true, message: '请输入时长', trigger: 'blur' } { required: true, message: this.$t('rules.timeInput'), trigger: 'blur' }
] ]
}; };
return crules; return crules;
}, },
title() { title() {
return '创建用户实训'; return this.$t('system.createUserTraining');
} }
}, },
mounted() { mounted() {
@ -139,14 +139,6 @@ export default {
}, },
show(data) { show(data) {
this.dialogVisible = true; this.dialogVisible = true;
// this.formModel = {
// lessonId: '',
// trainingId: '',
// trainingName: '',
// userId: '',
// userName: '',
// duration: '',
// };
}, },
doSave() { doSave() {
const self = this; const self = this;
@ -158,14 +150,14 @@ export default {
const self = this; const self = this;
if (this.formModel.userId) { if (this.formModel.userId) {
addUserTraining(this.formModel).then(response => { addUserTraining(this.formModel).then(response => {
self.$message.success('创建成功！'); self.$message.success(this.$t('system.addSuccess'));
self.handleClose(); self.handleClose();
self.$emit('reloadTable'); self.$emit('reloadTable');
}).catch(error => { }).catch(error => {
self.$message.error('创建失败！' + error.message); self.$message.error(this.$t('error.addFailed') + error.message);
}); });
} else { } else {
self.$message.error('请选择用户'); self.$message.error(this.$t('rules.chooseUser'));
} }
}, },
handleClose(done) { handleClose(done) {

6
src/views/management/userTraining/addTraining.vue
View File

@ -17,8 +17,8 @@
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" :disabled="disabled" @click="doSave">确 定</el-button> <el-button type="primary" :disabled="disabled" @click="doSave">{{ $t('global.confirm') }}</el-button>
<el-button @click="handleClose">取 消</el-button> <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
@ -34,7 +34,7 @@ export default {
data() { data() {
return { return {
dialogVisibles: false, dialogVisibles: false,
title: '选择实训', title: this.$t('system.selectTraining'),
treeData: [{ treeData: [{
children: [], children: [],
name: '' name: ''

21
src/views/management/userTraining/edit.vue
View File

@ -2,8 +2,8 @@
<el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center> <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center>
<data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" /> <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="doSave">确 定</el-button> <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
<el-button @click="handleClose">取 消</el-button> <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
@ -37,10 +37,10 @@ export default {
const form = { const form = {
labelWidth: '100px', labelWidth: '100px',
items: [ items: [
{ prop: 'lessonName', label: '教学名称', type: 'text', required: false, disabled: true }, { prop: 'lessonName', label: this.$t('system.lessonName'), type: 'text', required: false, disabled: true },
{ prop: 'trainingName', label: '实训名称', type: 'text', required: true, disabled: true }, { prop: 'trainingName', label: this.$t('system.trainingName'), type: 'text', required: true, disabled: true },
{ prop: 'userName', label: '用户名称', type: 'text', required: true, disabled: true }, { prop: 'userName', label: this.$t('system.userName'), type: 'text', required: true, disabled: true },
{ prop: 'duration', label: '实训时长', type: 'text', required: true, rightWidth: true, message: 's' } { prop: 'duration', label: this.$t('system.trainingTime'), type: 'text', required: true, rightWidth: true, message: 's' }
] ]
}; };
return form; return form;
@ -48,13 +48,13 @@ export default {
rules() { rules() {
const crules = { const crules = {
duration: [ duration: [
{ required: true, message: '请输入时长', trigger: 'blur' } { required: true, message: this.$t('rules.timeInput'), trigger: 'blur' }
] ]
}; };
return crules; return crules;
}, },
title() { title() {
return '编辑实训详情'; return this.$t('system.editTrainingDetail');
} }
}, },
methods: { methods: {
@ -67,7 +67,6 @@ export default {
userName: data.userName, userName: data.userName,
trainingName: data.trainingName, trainingName: data.trainingName,
duration: data.duration duration: data.duration
// trainingCount: data.trainingCount
}; };
} }
}, },
@ -84,11 +83,11 @@ export default {
duration: this.formModel.duration duration: this.formModel.duration
}; };
putUserTraining(param).then(response => { putUserTraining(param).then(response => {
self.$message.success('修改成功！'); self.$message.success(this.$t('system.updateSuccess'));
self.handleClose(); self.handleClose();
self.$emit('reloadTable'); self.$emit('reloadTable');
}).catch(error => { }).catch(error => {
self.$message.error('修改失败！' + error.message); self.$message.error(`${this.$t('error.updateFailed')}: ${error.message}`);
}); });
}, },
handleClose(done) { handleClose(done) {

38
src/views/management/userTraining/index.vue
View File

@ -24,16 +24,16 @@ export default {
pageIndex: 'pageNum' pageIndex: 'pageNum'
}, },
queryForm: { queryForm: {
labelWidth: '80px', labelWidth: '120px',
reset: true, reset: true,
queryObject: { queryObject: {
trainingName: { trainingName: {
type: 'text', type: 'text',
label: '实训名称' label: this.$t('system.trainingName')
}, },
userName: { userName: {
type: 'text', type: 'text',
label: '用户名' label: this.$t('system.userName')
} }
} }
@ -44,40 +44,40 @@ export default {
indexShow: true, indexShow: true,
columns: [ columns: [
{ {
title: '用户名称', title: this.$t('system.userName'),
prop: 'userName' prop: 'userName'
}, },
{ {
title: '用户手机号', title: this.$t('system.mobile'),
prop: 'userMobile' prop: 'userMobile'
}, },
{ {
title: '课程名称', title: this.$t('system.lessonName'),
prop: 'lessonName' prop: 'lessonName'
}, },
{ {
title: '实训用时', title: this.$t('system.trainingUseTime'),
prop: 'duration', prop: 'duration',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.computation(row.duration); }, columnValue: (row) => { return this.computation(row.duration); },
tagType: (row) => { return 'success'; } tagType: (row) => { return 'success'; }
}, },
{ {
title: '实训名称', title: this.$t('system.trainingName'),
prop: 'trainingName' prop: 'trainingName'
}, },
{ {
type: 'button', type: 'button',
title: '操作', title: this.$t('global.operate'),
width: '250', width: '250',
buttons: [ buttons: [
{ {
name: '编辑', name: this.$t('global.edit'),
handleClick: this.edit, handleClick: this.edit,
showControl: (row) => { return row.fake != '0'; } showControl: (row) => { return row.fake != '0'; }
}, },
{ {
name: '删除', name: this.$t('global.delete'),
handleClick: this.handleDelete, handleClick: this.handleDelete,
type: 'danger', type: 'danger',
showControl: (row) => { return row.fake != '0'; } showControl: (row) => { return row.fake != '0'; }
@ -86,7 +86,7 @@ export default {
} }
], ],
actions: [ actions: [
{ text: '新增', handler: this.createTraining } { text: this.$t('global.add'), handler: this.createTraining }
] ]
}, },
currentModel: {} currentModel: {}
@ -107,9 +107,9 @@ export default {
const f = parseInt(fieldValue / 60); const f = parseInt(fieldValue / 60);
const s = fieldValue % 60; const s = fieldValue % 60;
if (f > 0) { if (f > 0) {
return `${f}分${s}秒`; return `${f} ${this.$t('system.minute')} ${s} ${this.$t('system.second')}`;
} else { } else {
return `${s}秒`; return `${s} ${this.$t('system.second')}`;
} }
} }
}, },
@ -121,17 +121,17 @@ export default {
// 删除 // 删除
handleDelete(index, row) { handleDelete(index, row) {
this.$confirm('此操作将删除此考试结果, 是否继续?', '提示', { this.$confirm(this.$t('system.delExamResultIsContinue'), this.$t('global.tips'), {
confirmButtonText: '确定', confirmButtonText: this.$t('global.confirm'),
cancelButtonText: '取消', cancelButtonText: this.$t('global.cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
deleteUserTraining(row.id).then(response => { deleteUserTraining(row.id).then(response => {
this.$message.success('删除成功'); this.$message.success(this.$t('system.deleteSuccess'));
this.reloadTable(); this.reloadTable();
}).catch(() => { }).catch(() => {
this.reloadTable(); this.reloadTable();
this.$messageBox('删除失败'); this.$messageBox(this.$t('error.deleteFailed'));
}); });
}); });
}, },

4
src/views/map/mapdraft/mapedit/index.vue
View File

@ -86,7 +86,9 @@ export default {
this.initAutoSaveTask(); this.initAutoSaveTask();
}, },
$route() { $route() {
this.loadInitPage(); this.$$nextTick(() => {
this.loadInitPage();
});
} }
}, },
mounted() { mounted() {

6
src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
View File

@ -177,8 +177,10 @@ export default {
this.deviceSelect(val); this.deviceSelect(val);
}, },
$route() { $route() {
this.$refs.form.resetFields(); this.$nextTick(() => {
this.activeName = 'first'; this.$refs.form.resetFields();
this.activeName = 'first';
});
} }
}, },
mounted() { mounted() {

6
src/views/map/mapdraft/mapedit/mapoperate/counter.vue
View File

@ -170,8 +170,10 @@ export default {
this.deviceSelect(val); this.deviceSelect(val);
}, },
$route() { $route() {
this.$refs.form.resetFields(); this.$nextTick(() => {
this.activeName = 'first'; this.$refs.form.resetFields();
this.activeName = 'first';
});
} }
}, },
mounted() { mounted() {

6
src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
View File

@ -152,8 +152,10 @@ export default {
this.deviceSelect(val); this.deviceSelect(val);
}, },
$route() { $route() {
this.$refs.form.resetFields(); this.$nextTick(() => {
this.activeName = 'first'; this.$refs.form.resetFields();
this.activeName = 'first';
});
} }
}, },
mounted() { mounted() {

6
src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
View File

@ -161,8 +161,10 @@ export default {
this.deviceSelect(val); this.deviceSelect(val);
}, },
$route() { $route() {
this.$refs.form.resetFields(); this.$nextTick(() => {
this.activeName = 'first'; this.$refs.form.resetFields();
this.activeName = 'first';
});
} }
}, },
mounted() { mounted() {

6
src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue
View File

@ -152,8 +152,10 @@ export default {
this.deviceSelect(val); this.deviceSelect(val);
}, },
$route() { $route() {
this.$refs.form.resetFields(); this.$nextTick(() => {
this.activeName = 'first'; this.$refs.form.resetFields();
this.activeName = 'first';
});
} }
}, },
mounted() { mounted() {

6
src/views/map/mapdraft/mapedit/mapoperate/line.vue
View File

@ -181,8 +181,10 @@ export default {
this.deviceSelect(val); this.deviceSelect(val);
}, },
$route() { $route() {
this.$refs.form.resetFields(); this.$nextTick(() => {
this.activeName = 'first'; this.$refs.form.resetFields();
this.activeName = 'first';
});
} }
}, },
mounted() { mounted() {

6
src/views/map/mapdraft/mapedit/mapoperate/signal.vue
View File

@ -294,8 +294,10 @@ export default {
this.deviceSelect(val); this.deviceSelect(val);
}, },
$route() { $route() {
this.$refs.dataform.resetFields(); this.$nextTick(() => {
this.activeName = 'first'; this.$refs.dataform.resetFields();
this.activeName = 'first';
});
} }
}, },
mounted() { mounted() {

6
src/views/map/mapdraft/mapedit/mapoperate/station.vue
View File

@ -181,8 +181,10 @@ export default {
this.deviceSelect(val); this.deviceSelect(val);
}, },
$route() { $route() {
this.$refs.dataform.resetFields(); this.$nextTick(() => {
this.activeName = 'first'; this.$refs.dataform.resetFields();
this.activeName = 'first';
});
} }
}, },
methods: { methods: {

6
src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
View File

@ -165,8 +165,10 @@ export default {
this.deviceSelect(val); this.deviceSelect(val);
}, },
$route() { $route() {
this.$refs.dataform.resetFields(); this.$nextTick(() => {
this.activeName = 'first'; this.$refs.dataform.resetFields();
this.activeName = 'first';
});
} }
}, },
mounted() { mounted() {

6
src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
View File

@ -217,8 +217,10 @@ export default {
this.deviceSelect(val); this.deviceSelect(val);
}, },
$route() { $route() {
this.$refs.dataform.resetFields(); this.$nextTick(() => {
this.activeName = 'first'; this.$refs.dataform.resetFields();
this.activeName = 'first';
});
} }
}, },
mounted() { mounted() {

6
src/views/map/mapdraft/mapedit/mapoperate/switch.vue
View File

@ -180,8 +180,10 @@ export default {
this.deviceSelect(val); this.deviceSelect(val);
}, },
$route() { $route() {
this.$refs.dataform.resetFields(); this.$nextTick(() => {
this.activeName = 'first'; this.$refs.dataform.resetFields();
this.activeName = 'first';
});
} }
}, },
mounted() { mounted() {

6
src/views/map/mapdraft/mapedit/mapoperate/text.vue
View File

@ -150,8 +150,10 @@ export default {
this.deviceSelect(val); this.deviceSelect(val);
}, },
$route() { $route() {
this.$refs.form.resetFields(); this.$nextTick(() => {
this.activeName = 'first'; this.$refs.form.resetFields();
this.activeName = 'first';
});
} }
}, },
methods: { methods: {

299
src/views/map/mapdraft/mapedit/mapoperate/train.bak.vue Normal file
View File

@ -0,0 +1,299 @@
<template>
<div>
<el-tabs v-model="activeName">
<el-tab-pane class="view-control" :label="$t('map.property')" name="first">
<el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: cardHeight +'px' }">
<el-form ref="form" :model="editModel" label-width="110px" size="mini" :rules="rules">
<el-form-item :label="$t('map.trainCode')" prop="code">
<el-select v-model="editModel.code" filterable @change="deviceChange">
<el-option
v-for="item in trainList"
:key="item.code"
:label="item.code"
:value="item.code"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('map.groupNumber')" prop="groupNumber">
<el-input v-model="editModel.groupNumber" />
</el-form-item>
<el-form-item :label="$t('map.modelCode')" prop="modelCode">
<el-select v-model="editModel.modelCode" filterable>
<el-option
v-for="item in trainModelList"
:key="item.code"
:label="item.name"
:value="item.code"
/>
</el-select>
<el-button-group>
<el-button type="primary" size="small" @click="newTrainMode">{{ $t('map.add') }}</el-button>
<el-button type="primary" size="small" @click="uptTrainMode(editModel.modelCode)">{{ $t('map.updata') }}
</el-button>
<el-button type="primary" size="small" @click="delTrainMode(editModel.modelCode)">{{ $t('map.deleteObj') }}
</el-button>
</el-button-group>
</el-form-item>
<el-form-item :label="$t('map.pointX')" prop="position.x">
<el-input-number v-model="editModel.position.x" />
</el-form-item>
<el-form-item :label="$t('map.pointY')" prop="position.y">
<el-input-number v-model="editModel.position.y" />
</el-form-item>
</el-form>
</el-scrollbar>
<el-button-group class="map-draft-group">
<el-button type="primary" @click="edit">{{ $t('map.updateObj') }}</el-button>
<el-button type="primary" @click="deleteObj">{{ $t('map.deleteObj') }}</el-button>
</el-button-group>
</el-tab-pane>
<el-tab-pane class="view-control" :label="$t('map.operation')" name="second">
<el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: cardHeight +'px' }">
<el-form ref="make" label-width="100px" :rules="createRules" :model="addModel" size="mini">
<el-form-item :label="$t('map.groupNumber')" prop="groupNumber">
<el-input v-model="addModel.groupNumber" />
</el-form-item>
<el-form-item :label="$t('map.modelCode')" prop="modelCode">
<el-select v-model="addModel.modelCode" filterable>
<el-option
v-for="item in trainModelList"
:key="item.code"
:label="item.name"
:value="item.code"
/>
</el-select>
<el-button-group>
<el-button type="primary" size="small" @click="newTrainMode">{{ $t('map.add') }}</el-button>
<el-button type="primary" size="small" @click="uptTrainMode(addModel.modelCode)">{{ $t('map.updata') }}
</el-button>
<el-button type="primary" size="small" @click="delTrainMode(addModel.modelCode)">{{ $t('map.deleteObj') }}
</el-button>
</el-button-group>
</el-form-item>
<el-form-item :label="$t('map.pointX')" prop="position.x">
<el-input-number v-model="addModel.position.x" />
</el-form-item>
<el-form-item :label="$t('map.pointY')" prop="position.y">
<el-input-number v-model="addModel.position.y" />
</el-form-item>
</el-form>
</el-scrollbar>
<el-button-group class="map-draft-group">
<el-button type="primary" @click="create">{{ $t('map.create') }}</el-button>
</el-button-group>
</el-tab-pane>
</el-tabs>
<train-model ref="trainMode" />
</div>
</template>
<script>
import { mapGetters } from 'vuex';
import { getUID } from '@/jmap/utils/Uid';
import TrainModel from './trainmodel';
export default {
name: 'TrainDraft',
components: {
TrainModel
},
props: {
selected: {
type: Object,
default: function () {
return null;
}
},
cardHeight: {
type: [String, Number],
required: true
}
},
data() {
return {
activeName: 'first',
mapData: null,
editModel: {
code: '',
groupNumber: '',
modelCode: '',
position: {
x: 0,
y: 0
}
},
addModel: {
modelCode: '',
groupNumber: '',
position: {
x: 0,
y: 0
}
},
rules: {
code: [
{ required: true, message: this.$t('rules.pleaseReSelectDevice'), trigger: 'change' }
],
groupNumber: [
{ required: true, message: this.$t('rules.pleaseEnterGroupNumber'), trigger: 'blur' }
],
modelCode: [
{ required: true, message: this.$t('rules.selectTrainType'), trigger: 'change' }
],
'position.x': [
{ required: true, message: this.$t('rules.trainPositionX'), trigger: 'blur' }
],
'position.y': [
{ required: true, message: this.$t('rules.trainPositionY'), trigger: 'blur' }
]
}
};
},
computed: {
...mapGetters('map', [
'sectionList',
'trainList',
'trainModelList',
'skinCode'
]),
createRules: function () {
return {
modelCode: [
{ required: true, message: this.$t('rules.selectTrainType'), trigger: 'change' }
],
groupNumber: [
{ required: true, message: this.$t('rules.pleaseEnterTrainNumber'), trigger: 'blur' }
],
'position.x': [
{ required: true, message: this.$t('rules.trainPositionX'), trigger: 'change' }
],
'position.y': [
{ required: true, message: this.$t('rules.trainPositionY'), trigger: 'change' }
]
};
}
},
watch: {
selected: function (val, oldVal) {
this.deviceSelect(val);
},
$route() {
this.$nextTick(() => {
this.$refs.form.resetFields();
this.activeName = 'first';
});
}
},
methods: {
deviceChange(code) {
this.$emit('setCenter', code);
this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
},
deviceSelect(selected) {
this.$refs.form.resetFields();
this.$refs.make.resetFields();
if (selected && selected._type.toUpperCase() === 'Train'.toUpperCase()) {
this.editModel.code = selected.code;
this.editModel.modelCode = selected.modelCode;
this.editModel.groupNumber = selected.groupNumber;
this.editModel.position = {
x: selected.position.x,
y: selected.position.y
};
this.activeName = 'first';
} else {
this.activeName = 'second';
}
},
create() {
this.$refs.make.validate((valid) => {
if (valid) {
const uid = getUID('Train');
const model = {
_type: 'Train',
code: uid,
safeDistance: '100',
maxSafeDistance: '100',
modelCode: this.addModel.modelCode,
groupNumber: this.addModel.groupNumber,
position: {
x: this.addModel.position.x,
y: this.addModel.position.y
}
};
this.$emit('addOrUpdateMapModel', model);
}
});
},
// 修改对象
edit() {
this.$refs['form'].validate((valid) => {
if (valid) {
this.$emit('addOrUpdateMapModel', this.buildEditModel());
}
});
},
buildEditModel() {
const model = {
_type: 'Train',
code: this.editModel.code,
safeDistance: this.editModel.safeDistance,
maxSafeDistance: this.editModel.maxSafeDistance,
modelCode: this.editModel.modelCode,
groupNumber: this.editModel.groupNumber,
position: {
x: this.editModel.position.x,
y: this.editModel.position.y
}
};
return model;
},
// 删除对象
deleteObj() {
const selected = this.$store.getters['map/getDeviceByCode'](this.editModel.code);
if (selected && selected._type.toUpperCase() === 'Train'.toUpperCase()) {
const _that = this;
this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), {
confirmButtonText: this.$t('tip.confirm'),
cancelButtonText: this.$t('tip.cancel'),
type: 'warning'
}).then(() => {
_that.$emit('delMapModel', selected);
_that.deviceSelect();
}).catch(() => {
_that.$message.info(this.$t('tip.cancelledDelete'));
});
}
},
newTrainMode() {
if (Object.keys(this.$store.state.map.map || {}).length) {
this.$refs.trainMode.doShow({}, 'ADD');
} else {
this.$messageBox(this.$t('tip.selectMap'));
}
},
uptTrainMode(code) {
if (code) {
this.trainModelList.forEach(elem => {
if (elem.code === code) {
this.$refs.trainMode.doShow(elem, 'UPT');
return;
}
});
} else {
this.$messageBox(this.$t('tip.selectTrainType'));
}
},
delTrainMode(code) {
if (code) {
const model = { code };
this.$refs.trainMode.operateTrainModel({ model, type: 'DEL' });
this.addModel.modelCode = this.editModel.modelCode = '';
}
}
}
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
@import "src/styles/mixin.scss";
</style>

6
src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
View File

@ -163,8 +163,10 @@ export default {
this.deviceSelect(val); this.deviceSelect(val);
}, },
$route() { $route() {
this.$refs.form.resetFields(); this.$nextTick(() => {
this.activeName = 'first'; this.$refs.form.resetFields();
this.activeName = 'first';
});
} }
}, },
methods: { methods: {

8
src/views/map/product/draft.vue
View File

@ -127,16 +127,16 @@ export default {
baseRules() { baseRules() {
return { return {
code: [ code: [
{ required: true, message: this.$t('map.productCodeEnter'), trigger: 'change' } { required: true, message: this.$t('rules.productCodeEnter'), trigger: 'change' }
], ],
name: [ name: [
{ required: true, message: this.$t('map.productNameEnter'), trigger: 'change' } { required: true, message: this.$t('rules.productNameEnter'), trigger: 'change' }
], ],
remarks: [ remarks: [
{ required: true, message: this.$t('map.productDescriptionEnter'), trigger: 'change' } { required: true, message: this.$t('rules.productDescriptionEnter'), trigger: 'change' }
], ],
trainTypes: [ trainTypes: [
{ required: true, message: this.$t('map.trainingTypeSelect'), trigger: 'change' } { required: true, message: this.$t('rules.trainingTypeSelect'), trigger: 'change' }
] ]
}; };
} }

2
src/views/map/product/list.vue
View File

@ -130,7 +130,7 @@ export default {
// 删除 // 删除
handleDelete(index, row) { handleDelete(index, row) {
this.$confirm(this.$t('map.deleteTypeHint'), this.$t('tip.hint'), { this.$confirm(this.$t('tip.deleteTypeHint'), this.$t('tip.hint'), {
confirmButtonText: this.$t('tip.confirm'), confirmButtonText: this.$t('tip.confirm'),
cancelButtonText: this.$t('tip.cancel'), cancelButtonText: this.$t('tip.cancel'),
type: 'warning' type: 'warning'

20
src/views/map/runplan/chart.vue
View File

@ -3,7 +3,7 @@
<div :id="runPlanId" /> <div :id="runPlanId" />
<div v-if="isShowBack" style="float: right; margin-right: 2%; margin-top: 10px; margin-bottom: 20px"> <div v-if="isShowBack" style="float: right; margin-right: 2%; margin-top: 10px; margin-bottom: 20px">
<el-button-group> <el-button-group>
<el-button type="primary" @click="back">{{$t('global.return')}}</el-button> <el-button type="primary" @click="back">{{ $t('global.return') }}</el-button>
</el-button-group> </el-button-group>
</div> </div>
</div> </div>
@ -136,14 +136,6 @@ export default {
kmRangeCoordMap: {} kmRangeCoordMap: {}
}; };
}, },
watch: {
'$store.state.runPlan.planSizeCount': function () {
this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
},
$route() {
this.loadChartPage(this.$route.query);
}
},
computed: { computed: {
...mapGetters('runPlan', [ ...mapGetters('runPlan', [
'stations' 'stations'
@ -158,6 +150,16 @@ export default {
return this.$route.params.mode; return this.$route.params.mode;
} }
}, },
watch: {
'$store.state.runPlan.planSizeCount': function () {
this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
},
$route() {
this.$nextTick(() => {
this.loadChartPage(this.$route.query);
});
}
},
mounted() { mounted() {
this.loadChartPage(this.$route.query); this.loadChartPage(this.$route.query);
}, },

2
src/views/map/runplan/draft/setting.vue
View File

@ -36,7 +36,7 @@
rules() { rules() {
return { return {
timeArea: [ timeArea: [
{ required: true, message: this.$t('map.selectDataRange'), trigger: 'change' } { required: true, message: this.$t('rules.selectDataRange'), trigger: 'change' }
] ]
} }
} }

20
src/views/map/runplan/manage/create.vue
View File

@ -163,29 +163,29 @@ export default {
levelRules() { levelRules() {
return { return {
level1: [ level1: [
{ required: true, message: this.$t('map.speedLevelEnter1'), trigger: 'change' } { required: true, message: this.$t('rules.speedLevelEnter1'), trigger: 'change' }
], ],
level2: [ level2: [
{ required: true, message: this.$t('map.speedLevelEnter2'), trigger: 'change' } { required: true, message: this.$t('rules.speedLevelEnter2'), trigger: 'change' }
], ],
level3: [ level3: [
{ required: true, message: this.$t('map.speedLevelEnter3'), trigger: 'change' } { required: true, message: this.$t('rules.speedLevelEnter3'), trigger: 'change' }
], ],
level4: [ level4: [
{ required: true, message: this.$t('map.speedLevelEnter4'), trigger: 'change' } { required: true, message: this.$t('rules.speedLevelEnter4'), trigger: 'change' }
] ]
}; };
}, },
chartRules() { chartRules() {
return { return {
name: [ name: [
{ required: true, message: this.$t('map.nameEnter'), trigger: 'blur' } { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' }
], ],
direct: [ direct: [
{ required: true, message: this.$t('map.drivingDirectionSelect'), trigger: 'change' } { required: true, message: this.$t('rules.drivingDirectionSelect'), trigger: 'change' }
], ],
timeInterval: [ timeInterval: [
{ required: true, message: this.$t('map.timeBetweenDeparturesEnter'), trigger: 'blur' } { required: true, message: this.$t('rules.timeBetweenDeparturesEnter'), trigger: 'blur' }
], ],
startTime: [ startTime: [
{ required: true, message: this.$t('global.enterStartTime'), trigger: 'blur' } { required: true, message: this.$t('global.enterStartTime'), trigger: 'blur' }
@ -194,13 +194,13 @@ export default {
{ required: true, message: this.$t('global.enterEndTime'), trigger: 'blur' } { required: true, message: this.$t('global.enterEndTime'), trigger: 'blur' }
], ],
parkingTime: [ parkingTime: [
{ required: true, message: this.$t('map.stopTimeEnter'), trigger: 'blur' } { required: true, message: this.$t('rules.stopTimeEnter'), trigger: 'blur' }
], ],
entrance: [ entrance: [
{ required: true, message: this.$t('map.entranceStationSelect'), trigger: 'change' } { required: true, message: this.$t('rules.entranceStationSelect'), trigger: 'change' }
], ],
exit: [ exit: [
{ required: true, message: this.$t('map.exportStationSelect'), trigger: 'change' } { required: true, message: this.$t('rules.exportStationSelect'), trigger: 'change' }
] ]
}; };
} }

4
src/views/map/runplan/manage/import.vue
View File

@ -36,7 +36,7 @@ export default {
rules() { rules() {
return { return {
filename: [ filename: [
{ required: true, message: this.$t('map.selectImportFiles'), trigger: 'change' } { required: true, message: this.$t('rules.selectImportFiles'), trigger: 'change' }
] ]
}; };
} }
@ -57,7 +57,7 @@ export default {
if (file) { if (file) {
const loading = this.$loading({ const loading = this.$loading({
lock: true, lock: true,
text: this.$t('map.underImport'), text: this.$t('tip.underImport'),
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
}); });

2
src/views/map/runplan/manage/operateMenu.vue
View File

@ -129,7 +129,7 @@ export default {
const loading = this.$loading({ const loading = this.$loading({
lock: true, lock: true,
visible: true, visible: true,
text: this.$t('map.underImport'), text: this.$t('tip.underImport'),
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
}); });

14
src/views/map/skinCode/draft.vue
View File

@ -71,7 +71,7 @@ export default {
{ prop: 'code', label: this.$t('map.skinCoding'), type: 'text', required: false, disabled: this.isDisabled }, { prop: 'code', label: this.$t('map.skinCoding'), type: 'text', required: false, disabled: this.isDisabled },
{ prop: 'name', label: this.$t('map.skinDesignation'), type: 'text', required: false }, { prop: 'name', label: this.$t('map.skinDesignation'), type: 'text', required: false },
{ prop: 'origin', label: this.$t('map.coordinatesOrigin'), type: 'point', required: false }, { prop: 'origin', label: this.$t('map.coordinatesOrigin'), type: 'point', required: false },
{ prop: 'scaling', label: this.$t('map.scaling'), type: 'number', required: false, message: this.$t('map.maxScaling') } { prop: 'scaling', label: this.$t('map.scaling'), type: 'number', required: false, message: this.$t('rules.maxScaling') }
] ]
}; };
return form; return form;
@ -80,22 +80,22 @@ export default {
rules() { rules() {
const baseRules = { const baseRules = {
code: [ code: [
{ required: true, message: this.$t('map.skinCodingInput'), trigger: 'blur' } { required: true, message: this.$t('rules.skinCodingInput'), trigger: 'blur' }
], ],
name: [ name: [
{ required: true, message: this.$t('map.skinDesignationInput'), trigger: 'blur' } { required: true, message: this.$t('rules.skinDesignationInput'), trigger: 'blur' }
], ],
origin: [ origin: [
{ required: true, message: this.$t('map.coordinatesOriginInput'), trigger: 'blur' } { required: true, message: this.$t('rules.coordinatesOriginInput'), trigger: 'blur' }
], ],
scaling: [ scaling: [
{ required: true, message: this.$t('map.scalingInput'), trigger: 'blur' }, { required: true, message: this.$t('rules.scalingInput'), trigger: 'blur' },
{ {
validator(rule, value, callback) { validator(rule, value, callback) {
if (Number(value) >= 1 && Number(value) <= 8) { if (Number(value) >= 1 && Number(value) <= 8) {
callback(); callback();
} else { } else {
callback(new Error(this.$t('map.scalingInputPrompt'))); callback(new Error(this.$t('rules.scalingInputPrompt')));
} }
}, },
trigger: 'blur' trigger: 'blur'
@ -151,7 +151,7 @@ export default {
this.$messageBox(this.$t('tip.creatingFailed')); this.$messageBox(this.$t('tip.creatingFailed'));
}); });
}).catch(() => { }).catch(() => {
this.$messageBox(this.$t('map.skinCodingExist')); this.$messageBox(this.$t('tip.skinCodingExist'));
}); });
}); });
}, },

2
src/views/map/skinCode/index.vue
View File

@ -103,7 +103,7 @@ export default {
this.$router.push(`${UrlConfig.map.skinCodeDraft}/edit/${row.id}`); this.$router.push(`${UrlConfig.map.skinCodeDraft}/edit/${row.id}`);
}, },
handleDelete(index, row) { handleDelete(index, row) {
this.$confirm(this.$t('map.skinDeleteConfirmation'), this.$t('tip.hint'), { this.$confirm(this.$t('tip.skinDeleteConfirmation'), this.$t('tip.hint'), {
confirmButtonText: this.$t('tip.confirm'), confirmButtonText: this.$t('tip.confirm'),
cancelButtonText: this.$t('tip.cancel'), cancelButtonText: this.$t('tip.cancel'),
type: 'warning' type: 'warning'

24
src/views/map/skinStyle/draft.vue
View File

@ -74,7 +74,7 @@ export default {
{ prop: 'code', label: this.$t('map.skinCoding'), type: 'text', required: false, disabled: this.isDisabled }, { prop: 'code', label: this.$t('map.skinCoding'), type: 'text', required: false, disabled: this.isDisabled },
{ prop: 'name', label: this.$t('map.skinDesignation'), type: 'text', required: false }, { prop: 'name', label: this.$t('map.skinDesignation'), type: 'text', required: false },
{ prop: 'origin', label: this.$t('map.coordinatesOrigin'), type: 'point', required: false }, { prop: 'origin', label: this.$t('map.coordinatesOrigin'), type: 'point', required: false },
{ prop: 'scaling', label: this.$t('map.scaling'), type: 'number', required: false, message: this.$t('map.maxScaling') }, { prop: 'scaling', label: this.$t('map.scaling'), type: 'number', required: false, message: this.$t('rules.maxScaling') },
{ prop: 'linkWidth', label: this.$t('map.linkWidth'), type: 'number', required: false, message: this.$t('map.maxLinkWidth') }, { prop: 'linkWidth', label: this.$t('map.linkWidth'), type: 'number', required: false, message: this.$t('map.maxLinkWidth') },
{ prop: 'zoneWidth', label: this.$t('map.sectionWidth'), type: 'number', required: false, message: this.$t('map.maxSectionWidth') }, { prop: 'zoneWidth', label: this.$t('map.sectionWidth'), type: 'number', required: false, message: this.$t('map.maxSectionWidth') },
{ prop: 'watermarkShow', label: this.$t('map.showWatermarkOrNot'), type: 'radio', required: false, options: this.$ConstSelect.Whether } { prop: 'watermarkShow', label: this.$t('map.showWatermarkOrNot'), type: 'radio', required: false, options: this.$ConstSelect.Whether }
@ -86,55 +86,55 @@ export default {
rules() { rules() {
const baseRules = { const baseRules = {
code: [ code: [
{ required: true, message: this.$t('map.skinCodingInput'), trigger: 'blur' } { required: true, message: this.$t('rules.skinCodingInput'), trigger: 'blur' }
], ],
name: [ name: [
{ required: true, message: this.$t('map.skinDesignationInput'), trigger: 'blur' } { required: true, message: this.$t('rules.skinDesignationInput'), trigger: 'blur' }
], ],
origin: [ origin: [
{ required: true, message: this.$t('map.coordinatesOriginInput'), trigger: 'blur' } { required: true, message: this.$t('rules.coordinatesOriginInput'), trigger: 'blur' }
], ],
scaling: [ scaling: [
{ required: true, message: this.$t('map.scalingInput'), trigger: 'blur' }, { required: true, message: this.$t('rules.scalingInput'), trigger: 'blur' },
{ {
validator(rule, value, callback) { validator(rule, value, callback) {
if (Number(value) >= 1 && Number(value) <= 8) { if (Number(value) >= 1 && Number(value) <= 8) {
callback(); callback();
} else { } else {
callback(new Error(this.$t('map.scalingInputPrompt'))); callback(new Error(this.$t('rules.scalingInputPrompt')));
} }
}, },
trigger: 'blur' trigger: 'blur'
} }
], ],
linkWidth: [ linkWidth: [
{ required: true, message: this.$t('map.linkWidthInput'), trigger: 'blur' }, { required: true, message: this.$t('rules.linkWidthInput'), trigger: 'blur' },
{ {
validator(rule, value, callback) { validator(rule, value, callback) {
if (Number.isInteger(Number(value)) && Number(value) >= 5 && Number(value) <= 20) { if (Number.isInteger(Number(value)) && Number(value) >= 5 && Number(value) <= 20) {
callback(); callback();
} else { } else {
callback(new Error(this.$t('map.linkWidthInputPrompt'))); callback(new Error(this.$t('rules.linkWidthInputPrompt')));
} }
}, },
trigger: 'blur' trigger: 'blur'
} }
], ],
zoneWidth: [ zoneWidth: [
{ required: true, message: this.$t('map.sectionWidthInput'), trigger: 'blur' }, { required: true, message: this.$t('rules.sectionWidthInput'), trigger: 'blur' },
{ {
validator(rule, value, callback) { validator(rule, value, callback) {
if (Number.isInteger(Number(value)) && Number(value) >= 5 && Number(value) <= 30) { if (Number.isInteger(Number(value)) && Number(value) >= 5 && Number(value) <= 30) {
callback(); callback();
} else { } else {
callback(new Error(this.$t('map.sectionWidthInputPrompt'))); callback(new Error(this.$t('rules.sectionWidthInputPrompt')));
} }
}, },
trigger: 'blur' trigger: 'blur'
} }
], ],
watermarkShow: [ watermarkShow: [
{ required: true, message: this.$t('map.selectShowWatermark'), trigger: 'change' } { required: true, message: this.$t('rules.selectShowWatermark'), trigger: 'change' }
] ]
}; };
@ -189,7 +189,7 @@ export default {
this.$messageBox(this.$t('tip.creatingFailed')); this.$messageBox(this.$t('tip.creatingFailed'));
}); });
}).catch(() => { }).catch(() => {
this.$messageBox(this.$t('map.skinCodingExist')); this.$messageBox(this.$t('tip.skinCodingExist'));
}); });
}); });
}, },

2
src/views/map/skinStyle/index.vue
View File

@ -120,7 +120,7 @@ export default {
this.$router.push(`${UrlConfig.map.skinCodeDraft}/edit/${row.id}`); this.$router.push(`${UrlConfig.map.skinCodeDraft}/edit/${row.id}`);
}, },
handleDelete(index, row) { handleDelete(index, row) {
this.$confirm(this.$t('map.skinDeleteConfirmation'), this.$t('tip.hint'), { this.$confirm(this.$t('tip.skinDeleteConfirmation'), this.$t('tip.hint'), {
confirmButtonText: this.$t('tip.confirm'), confirmButtonText: this.$t('tip.confirm'),
cancelButtonText: this.$t('tip.cancel'), cancelButtonText: this.$t('tip.cancel'),
type: 'warning' type: 'warning'

4
src/views/orderauthor/author/detail.vue
View File

@ -35,7 +35,7 @@ export default {
computed: { computed: {
form() { form() {
const form = { const form = {
labelWidth: '100px', labelWidth: '130px',
items: [ items: [
{ prop: 'source', label: this.$t('orderAuthor.source'), type: 'text', disabled: true }, { prop: 'source', label: this.$t('orderAuthor.source'), type: 'text', disabled: true },
{ prop: 'name', label: this.$t('orderAuthor.distributionUser'), type: 'text', disabled: true }, { prop: 'name', label: this.$t('orderAuthor.distributionUser'), type: 'text', disabled: true },
@ -46,7 +46,7 @@ export default {
}, },
formOrder() { formOrder() {
const form = { const form = {
labelWidth: '100px', labelWidth: '130px',
items: [ items: [
{ prop: 'source', label: this.$t('orderAuthor.source'), type: 'text', disabled: true }, { prop: 'source', label: this.$t('orderAuthor.source'), type: 'text', disabled: true },
{ prop: 'order', label: this.$t('orderAuthor.orderNumber'), type: 'text', disabled: true } { prop: 'order', label: this.$t('orderAuthor.orderNumber'), type: 'text', disabled: true }

6
src/views/orderauthor/author/draft.vue
View File

@ -11,8 +11,8 @@
</el-card> </el-card>
<div class="draft"> <div class="draft">
<el-button-group> <el-button-group>
<el-button type="primary" @click="create">{{$t('global.create')}}</el-button> <el-button type="primary" @click="create">{{ $t('global.create') }}</el-button>
<el-button type="primary" @click="turnback">{{$t('global.return')}}</el-button> <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
</el-button-group> </el-button-group>
</div> </div>
</div> </div>
@ -63,7 +63,7 @@ export default {
}, },
rules() { rules() {
const _this = this; const _this = this;
const baseRules = { const baseRules = {
userId: [ userId: [
{ required: true, message: this.$t('rules.userNameInput'), trigger: 'blur' } { required: true, message: this.$t('rules.userNameInput'), trigger: 'blur' }

469
src/views/orderauthor/author/index.vue
View File

@ -1,244 +1,241 @@
<template> <template>
<div> <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> <author-detail ref="authorDetail" />
<author-detail ref="authorDetail"></author-detail> </div>
</div>
</template> </template>
<script> <script>
import { getLessonPermissonPageList, setLessonPermisson, getDistribute } from '@/api/management/author'; import { getLessonPermissonPageList, setLessonPermisson, getDistribute } from '@/api/management/author';
import { UrlConfig } from '@/router/index'; import { UrlConfig } from '@/router/index';
import authorDetail from './detail'; import authorDetail from './detail';
export default { export default {
name: 'author', name: 'Author',
components: { components: {
authorDetail authorDetail
}, },
data() { data() {
return { return {
param: '', param: '',
WhetherTypeList: [], WhetherTypeList: [],
EffectiveTypeList: [], EffectiveTypeList: [],
PermissionTypeList: [], PermissionTypeList: [],
pagerConfig: { pagerConfig: {
pageSize: 'pageSize', pageSize: 'pageSize',
pageIndex: 'pageNum' pageIndex: 'pageNum'
}, },
queryForm: { queryForm: {
labelWidth: '120px', labelWidth: '140px',
reset: true, reset: true,
queryObject: { queryObject: {
'userMobile': { 'userMobile': {
type: 'text', type: 'text',
label: this.$t('orderAuthor.userMobile') label: this.$t('orderAuthor.userMobile')
}, },
'userName': { 'userName': {
type: 'text', type: 'text',
label: this.$t('orderAuthor.userName') label: this.$t('orderAuthor.userName')
}, },
'type': { 'type': {
type: 'select', type: 'select',
label: this.$t('orderAuthor.permissionType'), label: this.$t('orderAuthor.permissionType'),
config: { config: {
data: [] data: []
} }
} }
} }
}, },
queryList: { queryList: {
query: this.queryFunction, query: this.queryFunction,
selectCheckShow: false, selectCheckShow: false,
indexShow: true, indexShow: true,
columns: [ columns: [
{ {
title: this.$t('orderAuthor.userName'), title: this.$t('orderAuthor.userName'),
prop: 'userName' prop: 'userName'
}, },
{ {
title: this.$t('orderAuthor.userMobile'), title: this.$t('orderAuthor.userMobile'),
prop: 'userMobile' prop: 'userMobile'
}, },
{ {
title: this.$t('orderAuthor.mapName'), title: this.$t('orderAuthor.mapName'),
prop: 'mapName', prop: 'mapName'
}, },
{ {
title: this.$t('orderAuthor.mapProductName'), title: this.$t('orderAuthor.mapProductName'),
prop: 'mapProductName', prop: 'mapProductName'
}, },
{ {
title: this.$t('orderAuthor.courseName'), title: this.$t('orderAuthor.courseName'),
prop: 'lessonName', prop: 'lessonName'
}, },
{ {
title: this.$t('orderAuthor.permissionType'), title: this.$t('orderAuthor.permissionType'),
prop: 'type', prop: 'type',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$convertField(row.type, this.PermissionTypeList, ['value', 'label']) }, columnValue: (row) => { return this.$convertField(row.type, this.PermissionTypeList, ['value', 'label']); },
tagType: (row) => { return '' } tagType: (row) => { return ''; }
}, },
{ {
title: this.$t('orderAuthor.permanenceOrNot'), title: this.$t('orderAuthor.permanenceOrNot'),
prop: 'forever', prop: 'forever',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether') }, columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether'); },
tagType: (row) => { tagType: (row) => {
switch (row.forever) { switch (row.forever) {
case true: return 'success'; case true: return 'success';
case false: return 'danger'; case false: return 'danger';
} }
} }
}, },
{ {
title: this.$t('orderAuthor.publicOrPrivate'), title: this.$t('orderAuthor.publicOrPrivate'),
prop: 'canDistribute', prop: 'canDistribute',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$ConstSelect.translate(row.canDistribute, 'PermissionUseList') }, columnValue: (row) => { return this.$ConstSelect.translate(row.canDistribute, 'PermissionUseList'); },
tagType: (row) => { tagType: (row) => {
switch (row.canDistribute) { switch (row.canDistribute) {
case true: return 'success'; case true: return 'success';
case false: return 'danger'; case false: return 'danger';
} }
} }
}, },
{ {
title: this.$t('orderAuthor.totalPermissions'), title: this.$t('orderAuthor.totalPermissions'),
prop: 'amount' prop: 'amount'
}, },
{ {
title: this.$t('orderAuthor.residualPermissionNumber'), title: this.$t('orderAuthor.residualPermissionNumber'),
prop: 'remains' prop: 'remains'
}, },
{ {
title: this.$t('orderAuthor.startTime'), title: this.$t('orderAuthor.startTime'),
prop: 'startTime', prop: 'startTime',
type: 'formatter', type: 'formatter',
formatter: this.formatterDate formatter: this.formatterDate
}, },
{ {
title: this.$t('orderAuthor.endTime'), title: this.$t('orderAuthor.endTime'),
prop: 'endTime', prop: 'endTime',
type: 'formatter', type: 'formatter',
formatter: this.formatterDate formatter: this.formatterDate
}, },
{ {
title: this.$t('orderAuthor.courseAuthorityStatus'), title: this.$t('orderAuthor.courseAuthorityStatus'),
prop: 'status', prop: 'status',
type: 'tag', 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) => { tagType: (row) => {
switch (row.status) { switch (row.status) {
case '1': return 'success'; case '1': return 'success';
default: return 'danger'; default: return 'danger';
} }
} }
}, },
{ {
type: 'button', type: 'button',
title: this.$t('global.operate'), title: this.$t('global.operate'),
width: '250', width: '250',
buttons: [ buttons: [
{ {
name: this.$t('orderAuthor.setupFailure'), name: this.$t('orderAuthor.setupFailure'),
type: 'warning', type: 'warning',
handleClick: this.handleSetFailure, handleClick: this.handleSetFailure,
showControl: (row) => { showControl: (row) => {
return row.status === '1'; return row.status === '1';
} }
}, },
{ {
name: this.$t('orderAuthor.setupEffective'), name: this.$t('orderAuthor.setupEffective'),
type: 'primary', type: 'primary',
handleClick: this.handleSetFailure, handleClick: this.handleSetFailure,
showControl: (row) => { showControl: (row) => {
return row.status === '0'; return row.status === '0';
} }
}, },
{ {
name: this.$t('orderAuthor.renew'), name: this.$t('orderAuthor.renew'),
type: "warning", type: 'warning',
handleClick: this.handleRenewAdd, handleClick: this.handleRenewAdd,
showControl: (row) => { showControl: (row) => {
return row.origin === '01' && (row.forever || (row.endTime && Date.parse(new Date(row.endTime.replace(/\-/g, "\/"))) > Date.parse(new Date()))) return row.origin === '01' && (row.forever || (row.endTime && Date.parse(new Date(row.endTime.replace(/\-/g, '\/'))) > Date.parse(new Date())));
} }
}, },
{ {
name: this.$t('orderAuthor.source'), name: this.$t('orderAuthor.source'),
type: '', type: '',
handleClick: this.handleSource, handleClick: this.handleSource
}, }
] ]
} }
], ],
actions: [ actions: [
] ]
} }
} };
}, },
mounted() { mounted() {
this.loadInitData(); this.loadInitData();
}, },
methods: { methods: {
loadInitData() { loadInitData() {
this.$Dictionary.effectiveType().then(list => { this.$Dictionary.effectiveType().then(list => {
this.$convertList(list, this.EffectiveTypeList, elem => { this.$convertList(list, this.EffectiveTypeList, elem => {
return true; return true;
}); });
}); });
this.$Dictionary.permissionType().then(list => { this.$Dictionary.permissionType().then(list => {
list.forEach(elem => { list.forEach(elem => {
this.queryForm.queryObject.type.config.data.push({ value: elem.code, label: elem.name }); this.queryForm.queryObject.type.config.data.push({ value: elem.code, label: elem.name });
}); });
this.$convertList(list, this.PermissionTypeList, elem => { this.$convertList(list, this.PermissionTypeList, elem => {
return true; return true;
}); });
}); });
}, },
formatterDate(row, porpInfo) { formatterDate(row, porpInfo) {
if (row.hasOwnProperty(porpInfo.property)) { return row[porpInfo.property];
} },
return row[porpInfo.property]; queryFunction(params) {
}, return getLessonPermissonPageList(params);
queryFunction(params) { },
return getLessonPermissonPageList(params); handleSetFailure(index, row) {
}, this.$confirm(this.$t('tip.updatePrivilegeTip'), this.$t('global.tips'), {
handleSetFailure(index, row) { confirmButtonText: this.$t('global.confirm'),
this.$confirm(this.$t('tip.updatePrivilegeTip'), this.$t('tip.hint'), { cancelButtonText: this.$t('global.cancel'),
confirmButtonText: this.$t('tip.confirm'), type: 'warning'
cancelButtonText: this.$t('tip.cancel'), }).then(() => {
type: 'warning' setLessonPermisson({ id: row.id, status: row.status == 1 ? '0' : '1' }).then(res => {
}).then(() => { this.$message.success(this.$t('tip.setupSuccessfully'));
setLessonPermisson({ id: row.id, status: row.status == 1 ? '0' : '1' }).then(res => { this.reloadTable();
this.$message.success(this.$t('tip.setupSuccessfully')); }).catch(() => {
this.reloadTable(); this.$messageBox(this.$t('tip.setupFailed'));
}).catch(error => { });
this.$messageBox(this.$t('tip.setupFailed')); }).catch(() => { });
}) },
}).catch(() => { }) handleRenewAdd(index, row) {
}, this.$router.push({ path: `${UrlConfig.orderauthor.authorDraft}/renew/${row.id}` });
handleRenewAdd(index, row) { },
this.$router.push({ path: `${UrlConfig.orderauthor.authorDraft}/renew/${row.id}` }); handlePermissionAdd() {
}, this.$router.push({ path: `${UrlConfig.orderauthor.authorDraft}/add/0` });
handlePermissionAdd() { },
this.$router.push({ path: `${UrlConfig.orderauthor.authorDraft}/add/0` }); reloadTable() {
}, if (this.queryList && this.queryList.reload) {
reloadTable() { this.queryList.reload();
if (this.queryList && this.queryList.reload) { }
this.queryList.reload() },
} async handleSource(index, row) {
}, try {
async handleSource(index, row) { const res = await getDistribute(row.distributeId);
try { this.$refs.authorDetail.show(res.data);
let res = await getDistribute(row.distributeId); } catch (error) {
this.$refs.authorDetail.show(res.data); this.$messageBox(this.$t('tip.requestFailed'));
} catch (error) { }
this.$messageBox(this.$t('tip.requestFailed')); }
} }
} };
}
}
</script> </script>

4
src/views/orderauthor/commodity/draft.vue
View File

@ -19,7 +19,7 @@
<el-button-group> <el-button-group>
<el-button v-if="isAdd" type="primary" @click="create">{{ $t('global.create') }}</el-button> <el-button v-if="isAdd" type="primary" @click="create">{{ $t('global.create') }}</el-button>
<el-button v-if="isEdit" type="warning" @click="update">{{ $t('global.update') }}</el-button> <el-button v-if="isEdit" type="warning" @click="update">{{ $t('global.update') }}</el-button>
<el-button type="primary" @click="turnback">{{ $t('global.return') }}</el-button> <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
</el-button-group> </el-button-group>
</div> </div>
</div> </div>
@ -105,7 +105,7 @@ export default {
form() { form() {
const form = { const form = {
labelWidth: '135px', labelWidth: '140px',
items: [ items: [
{ prop: 'name', label: this.$t('orderAuthor.commodityName'), type: 'text', required: false }, { prop: 'name', label: this.$t('orderAuthor.commodityName'), type: 'text', required: false },
{ prop: 'productType', label: this.$t('orderAuthor.productType'), type: 'select', required: false, disabled: this.isDisabled, options: this.productTypeList, change: true, onChange: this.typeChange }, { prop: 'productType', label: this.$t('orderAuthor.productType'), type: 'select', required: false, disabled: this.isDisabled, options: this.productTypeList, change: true, onChange: this.typeChange },

423
src/views/orderauthor/commodity/index.vue
View File

@ -1,221 +1,220 @@
<template> <template>
<div> <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>
</div>
</template> </template>
<script> <script>
import { getCommodityList, delCommodity, setCommodityStatus } from '@/api/management/goods'; import { getCommodityList, delCommodity, setCommodityStatus } from '@/api/management/goods';
import { UrlConfig } from '@/router/index'; import { UrlConfig } from '@/router/index';
import { listPublishMap } from '@/api/jmap/map'; import { listPublishMap } from '@/api/jmap/map';
export default { export default {
name: 'Dictionary', name: 'Dictionary',
data() { data() {
return { return {
productTypeList: [], productTypeList: [],
EffectiveTypeList: [], EffectiveTypeList: [],
pagerConfig: { pagerConfig: {
pageSize: 'pageSize', pageSize: 'pageSize',
pageIndex: 'pageNum' pageIndex: 'pageNum'
}, },
queryForm: { queryForm: {
labelWidth: '80px', labelWidth: '100px',
reset: true, reset: true,
queryObject: { queryObject: {
name: { name: {
type: 'text', type: 'text',
label: this.$t('orderAuthor.name') label: this.$t('orderAuthor.name')
}, },
productType: { productType: {
type: 'select', type: 'select',
label: this.$t('orderAuthor.productType'), label: this.$t('orderAuthor.productType'),
config: { config: {
data: [] data: []
} }
}, },
mapId: { mapId: {
type: 'select', type: 'select',
label: this.$t('orderAuthor.map'), label: this.$t('orderAuthor.map'),
config: { config: {
data: [] data: []
} }
}, },
status: { status: {
type: 'select', type: 'select',
label: this.$t('orderAuthor.state'), label: this.$t('orderAuthor.state'),
config: { config: {
data: this.$ConstSelect.Status data: this.$ConstSelect.Status
} }
} }
} }
}, },
queryList: { queryList: {
query: getCommodityList, query: getCommodityList,
selectCheckShow: false, selectCheckShow: false,
indexShow: true, indexShow: true,
columns: [ columns: [
{ {
title: this.$t('orderAuthor.commodityName'), title: this.$t('orderAuthor.commodityName'),
prop: 'name' prop: 'name'
}, },
{ {
title: this.$t('orderAuthor.productType'), title: this.$t('orderAuthor.productType'),
prop: 'productType', prop: 'productType',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$convertField(row.productType, this.productTypeList, ['value', 'label']) }, columnValue: (row) => { return this.$convertField(row.productType, this.productTypeList, ['value', 'label']); },
tagType: (row) => { return 'success' } tagType: (row) => { return 'success'; }
}, },
{ {
title: this.$t('orderAuthor.mapName'), title: this.$t('orderAuthor.mapName'),
prop: 'mapName', prop: 'mapName'
}, },
{ {
title: this.$t('orderAuthor.productName'), title: this.$t('orderAuthor.productName'),
prop: 'prdName', prop: 'prdName'
}, },
{ {
title: this.$t('orderAuthor.courseName'), title: this.$t('orderAuthor.courseName'),
prop: 'lessonName', prop: 'lessonName'
}, },
{ {
title: this.$t('orderAuthor.price'), title: this.$t('orderAuthor.price'),
prop: 'price' prop: 'price'
}, },
{ {
title: this.$t('orderAuthor.state'), title: this.$t('orderAuthor.state'),
prop: 'status', prop: 'status',
type: 'tag', 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) => { tagType: (row) => {
switch (row.status) { switch (row.status) {
case '1': return 'success'; case '1': return 'success';
default: return 'danger'; default: return 'danger';
} }
} }
}, },
{ {
title: this.$t('orderAuthor.describtion'), title: this.$t('orderAuthor.describtion'),
prop: 'remarks' prop: 'remarks'
}, },
{ {
title: this.$t('orderAuthor.creationTime'), title: this.$t('orderAuthor.creationTime'),
prop: 'createTime' prop: 'createTime'
}, },
{ {
type: 'button', type: 'button',
title: this.$t('global.operate'), title: this.$t('global.operate'),
width: '250', width: this.$i18n.locale == 'en' ? '300': '250',
buttons: [ buttons: [
{ {
name: this.$t('global.edit'), name: this.$t('global.edit'),
type: 'primary', type: 'primary',
handleClick: this.handleEdit handleClick: this.handleEdit
}, },
{ {
name: this.$t('orderAuthor.setupFailure'), name: this.$t('orderAuthor.setupFailure'),
handleClick: this.handleEfficacy, handleClick: this.handleEfficacy,
type: 'warning', type: 'warning',
showControl: (row) => { showControl: (row) => {
return row.status == '1'; return row.status == '1';
} }
}, },
{ {
name: this.$t('orderAuthor.setupEffective'), name: this.$t('orderAuthor.setupEffective'),
type: 'primary', type: 'primary',
handleClick: this.handleEfficacy, handleClick: this.handleEfficacy,
showControl: (row) => { showControl: (row) => {
return row.status == '0'; return row.status == '0';
} }
}, },
{ {
name: this.$t('global.delete'), name: this.$t('global.delete'),
type: 'danger', type: 'danger',
handleClick: this.handleDelete, handleClick: this.handleDelete
}, }
] ]
} }
], ],
actions: [ actions: [
{ text: this.$t('global.add'), handler: this.handleAdd }, { text: this.$t('global.add'), handler: this.handleAdd }
] ]
}, },
currentModel: {} currentModel: {}
} };
}, },
mounted() { mounted() {
this.loadInitData(); this.loadInitData();
}, },
methods: { methods: {
async loadInitData() { async loadInitData() {
this.$Dictionary.effectiveType().then(list => { this.$Dictionary.effectiveType().then(list => {
this.$convertList(list, this.EffectiveTypeList, elem => { this.$convertList(list, this.EffectiveTypeList, elem => {
return true; return true;
}); });
}); });
// 产品类型 // 产品类型
this.$Dictionary.productType().then(list => { this.$Dictionary.productType().then(list => {
list.forEach(elem => { list.forEach(elem => {
this.queryForm.queryObject.productType.config.data.push({ value: elem.code, label: elem.name }); this.queryForm.queryObject.productType.config.data.push({ value: elem.code, label: elem.name });
}); });
this.$convertList(list, this.productTypeList, elem => { this.$convertList(list, this.productTypeList, elem => {
return true; return true;
}); });
}); });
try { try {
// 获取地图 // 获取地图
let res = await listPublishMap(); const res = await listPublishMap();
res.data.forEach(elem => { res.data.forEach(elem => {
this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name }); this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
}); });
} catch (error) { } catch (error) {
console.error(error, '获取发布地图'); console.error(error, '获取发布地图');
} }
}, },
handleEdit(index, row) { handleEdit(index, row) {
this.$router.push({ path: `${UrlConfig.orderauthor.commodityDraft}/edit/${row.id}` }); this.$router.push({ path: `${UrlConfig.orderauthor.commodityDraft}/edit/${row.id}` });
}, },
handleAdd() { handleAdd() {
this.$router.push({ path: `${UrlConfig.orderauthor.commodityDraft}/add/0` }); this.$router.push({ path: `${UrlConfig.orderauthor.commodityDraft}/add/0` });
}, },
// 设置失效 // 设置失效
handleEfficacy(index, row) { handleEfficacy(index, row) {
this.$confirm(this.$t('tip.updateProductTip'), this.$t('tip.hint'), { this.$confirm(this.$t('tip.updateProductTip'), this.$t('global.tips'), {
confirmButtonText: this.$t('tip.confirm'), confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('tip.cancel'), cancelButtonText: this.$t('global.cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
setCommodityStatus(row.id).then(res => { setCommodityStatus(row.id).then(res => {
this.$message.success(this.$t('tip.operationSuccessfully')); this.$message.success(this.$t('tip.operationSuccessfully'));
this.reloadTable() this.reloadTable();
}).catch(err => { }).catch(() => {
this.$messageBox(this.$t('tip.operationFailed')); this.$messageBox(this.$t('tip.operationFailed'));
this.reloadTable() this.reloadTable();
}) });
}).catch(() => { }) }).catch(() => { });
}, },
handleDelete(index, row) { handleDelete(index, row) {
this.$confirm(this.$t('tip.deleteProductTip'), this.$t('tip.hint'), { this.$confirm(this.$t('tip.deleteProductTip'), this.$t('global.tips'), {
confirmButtonText: this.$t('tip.confirm'), confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('tip.cancel'), cancelButtonText: this.$t('global.cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
delCommodity(row.id).then(response => { delCommodity(row.id).then(response => {
this.$message.success(this.$t('tip.successfullyDelete')); this.$message.success(this.$t('tip.successfullyDelete'));
this.reloadTable() this.reloadTable();
}).catch(error => { }).catch(() => {
this.reloadTable(); this.reloadTable();
this.$messageBox(this.$t('tip.failDelete')) this.$messageBox(this.$t('tip.failDelete'));
}) });
}).catch(() => { }) }).catch(() => { });
}, },
reloadTable() { reloadTable() {
this.queryList.reload() this.queryList.reload();
} }
} }
} };
</script> </script>

366
src/views/orderauthor/order/addGoods.vue
View File

@ -1,189 +1,195 @@
<template> <template>
<el-dialog :title="this.$t('orderAuthor.trainingList')" :visible.sync="show" top="20px" width="90%" :before-doClose="doClose" <el-dialog
:close-on-click-modal="false"> :title="this.$t('orderAuthor.trainingList')"
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList"> :visible.sync="show"
</QueryListPage> top="20px"
</el-dialog> width="90%"
:before-do-close="doClose"
:close-on-click-modal="false"
>
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
</el-dialog>
</template> </template>
<script> <script>
import { putMapProductOnLine, putMapProductOffLine } from '@/api/jmap/mapdraft'; import { getCommodityList } from '@/api/management/goods';
import { getCommodityList, delCommodity, setCommodityStatus } from '@/api/management/goods'; import { listPublishMap } from '@/api/jmap/map';
import { getProductList } from '@/api/management/mapprd';
import { pageQueryTraining } from '@/api/jmap/training';
import { getSkinCodeList } from '@/api/management/mapskin'
import localStore from 'storejs';
import { listPublishMap } from '@/api/jmap/map';
export default { export default {
name: 'addGoods', name: 'AddGoods',
props: { props: {
trainings: { trainings: {
type: Array, type: Array,
}, default() {
detail: { return [];
type: Object, }
} },
}, detail: {
data() { type: Object,
return { default() {
show: false, return null;
productTypeList: [], }
EffectiveTypeList: [], }
pagerConfig: { },
pageSize: 'pageSize', data() {
pageIndex: 'pageNum' return {
}, show: false,
queryForm: { productTypeList: [],
labelWidth: '80px', EffectiveTypeList: [],
reset: true, pagerConfig: {
queryObject: { pageSize: 'pageSize',
name: { pageIndex: 'pageNum'
type: 'text', },
label: this.$t('orderAuthor.name') queryForm: {
}, labelWidth: '80px',
productType: { reset: true,
type: 'select', queryObject: {
label: this.$t('orderAuthor.productType'), name: {
config: { type: 'text',
data: [] label: this.$t('orderAuthor.name')
} },
}, productType: {
mapId: { type: 'select',
type: 'select', label: this.$t('orderAuthor.productType'),
label: this.$t('orderAuthor.map'), config: {
config: { data: []
data: [] }
} },
}, mapId: {
status: { type: 'select',
type: 'select', label: this.$t('orderAuthor.map'),
label: this.$t('orderAuthor.state'), config: {
config: { data: []
data: this.$ConstSelect.Status }
} },
} status: {
} type: 'select',
}, label: this.$t('orderAuthor.state'),
queryList: { config: {
query: getCommodityList, data: this.$ConstSelect.Status
selectCheckShow: false, }
indexShow: true, }
columns: [ }
{ },
title: this.$t('orderAuthor.commodityName'), queryList: {
prop: 'name' query: getCommodityList,
}, selectCheckShow: false,
{ indexShow: true,
title: this.$t('orderAuthor.productType'), columns: [
prop: 'productType', {
type: 'tag', title: this.$t('orderAuthor.commodityName'),
columnValue: (row) => { return this.$convertField(row.productType, this.productTypeList, ['value', 'label']) }, prop: 'name'
tagType: (row) => { return 'success' } },
}, {
{ title: this.$t('orderAuthor.productType'),
title: this.$t('orderAuthor.mapName'), prop: 'productType',
prop: 'mapName', type: 'tag',
}, columnValue: (row) => { return this.$convertField(row.productType, this.productTypeList, ['value', 'label']); },
{ tagType: (row) => { return 'success'; }
title: this.$t('orderAuthor.productName'), },
prop: 'prdName', {
}, title: this.$t('orderAuthor.mapName'),
{ prop: 'mapName'
title: this.$t('orderAuthor.courseName'), },
prop: 'lessonName', {
}, title: this.$t('orderAuthor.productName'),
{ prop: 'prdName'
title: this.$t('orderAuthor.price'), },
prop: 'price' {
}, title: this.$t('orderAuthor.courseName'),
{ prop: 'lessonName'
title: this.$t('orderAuthor.state'), },
prop: 'status', {
type: 'tag', title: this.$t('orderAuthor.price'),
columnValue: (row) => { return this.$convertField(row.status, this.EffectiveTypeList, ['value', 'label']) }, prop: 'price'
tagType: (row) => { },
switch (row.status) { {
case '1': return 'success'; title: this.$t('orderAuthor.state'),
default: return 'danger'; prop: 'status',
} type: 'tag',
} columnValue: (row) => { return this.$convertField(row.status, this.EffectiveTypeList, ['value', 'label']); },
}, tagType: (row) => {
{ switch (row.status) {
title: this.$t('orderAuthor.describtion'), case '1': return 'success';
prop: 'remarks' default: return 'danger';
}, }
{ }
title: this.$t('orderAuthor.creationTime'), },
prop: 'createTime' {
}, title: this.$t('orderAuthor.describtion'),
{ prop: 'remarks'
type: 'button', },
title: this.$t('global.operate'), {
width: '250', title: this.$t('orderAuthor.creationTime'),
buttons: [ prop: 'createTime'
{ },
name: '选择', {
type: 'primary', type: 'button',
handleClick: this.handleAdd title: this.$t('global.operate'),
}, width: '250',
] buttons: [
} {
], name: this.$t('orderAuthor.select'),
actions: [ type: 'primary',
] handleClick: this.handleAdd
}, }
]
}
],
actions: [
]
},
currentModel: {} currentModel: {}
} };
}, },
created() { created() {
this.loadInitData(); this.loadInitData();
}, },
methods: { methods: {
doShow() { doShow() {
this.show = true; this.show = true;
this.reloadTable(); this.reloadTable();
}, },
doClose() { doClose() {
this.show = false; this.show = false;
}, },
async loadInitData() { async loadInitData() {
this.$Dictionary.effectiveType().then(list => { this.$Dictionary.effectiveType().then(list => {
this.$convertList(list, this.EffectiveTypeList, elem => { this.$convertList(list, this.EffectiveTypeList, elem => {
return true; return true;
}); });
}); });
// 产品类型 // 产品类型
this.$Dictionary.productType().then(list => { this.$Dictionary.productType().then(list => {
list.forEach(elem => { list.forEach(elem => {
this.queryForm.queryObject.productType.config.data.push({ value: elem.code, label: elem.name }); this.queryForm.queryObject.productType.config.data.push({ value: elem.code, label: elem.name });
}); });
this.$convertList(list, this.productTypeList, elem => { this.$convertList(list, this.productTypeList, elem => {
return true; return true;
}); });
}); });
try { try {
// 获取地图 // 获取地图
let res = await listPublishMap(); const res = await listPublishMap();
res.data.forEach(elem => { res.data.forEach(elem => {
this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name }); this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
}); });
} catch (error) { } catch (error) {
console.error(error, '获取发布地图'); console.error(error, '获取发布地图');
} }
}, },
handleAdd(index, row) { handleAdd(index, row) {
this.$emit('selectGoods', row); this.$emit('selectGoods', row);
this.doClose(); this.doClose();
}, },
reloadTable() { reloadTable() {
if (this.queryList && this.queryList.reload) { if (this.queryList && this.queryList.reload) {
this.queryList.reload(); this.queryList.reload();
} }
}, }
} }
} };
</script> </script>

106
src/views/orderauthor/order/canDistribute.vue
View File

@ -1,54 +1,62 @@
<template> <template>
<el-dialog :title="title" :visible.sync="show" width="360px" :before-close="doClose" :zIndex="2000" :modal="false" <el-dialog
:close-on-click-modal="false" v-dialogDrag> v-dialogDrag
<div style="text-align:center"> :title="title"
<el-radio-group v-model="formModel.canDistribute"> :visible.sync="show"
<el-radio :label="true">{{$t('orderAuthor.publicAuthority')}}</el-radio> width="360px"
<el-radio :label="false">{{$t('orderAuthor.privateAuthority')}}</el-radio> :before-close="doClose"
</el-radio-group> :z-index="2000"
</div> :modal="false"
<span slot="footer" class="dialog-footer"> :close-on-click-modal="false"
<el-button @click="handleClose">{{$t('global.cancel')}}</el-button> >
<el-button type="primary" @click="handleSure">{{$t('global.confirm')}}</el-button> <div style="text-align:center">
</span> <el-radio-group v-model="formModel.canDistribute">
</el-dialog> <el-radio :label="true">{{ $t('orderAuthor.publicAuthority') }}</el-radio>
<el-radio :label="false">{{ $t('orderAuthor.privateAuthority') }}</el-radio>
</el-radio-group>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
<el-button type="primary" @click="handleSure">{{ $t('global.confirm') }}</el-button>
</span>
</el-dialog>
</template> </template>
<script> <script>
export default { export default {
name: 'CanTransfer', name: 'CanTransfer',
data() { data() {
return { return {
dialogShow: false, dialogShow: false,
formModel: { formModel: {
canDistribute: true, canDistribute: true
}, },
data: {}, data: {}
} };
}, },
computed: { computed: {
show() { show() {
return this.dialogShow; return this.dialogShow;
}, },
title() { return this.$t('orderAuthor.optionPrivilegeTransfer'); } title() { return this.$t('orderAuthor.optionPrivilegeTransfer'); }
}, },
methods: { methods: {
doShow(data) { doShow(data) {
this.dialogShow = true; this.dialogShow = true;
this.formModel.canDistribute = true; this.formModel.canDistribute = true;
this.data = data; this.data = data;
}, },
doClose() { doClose() {
this.dialogShow = false; this.dialogShow = false;
}, },
handleSure() { handleSure() {
this.doClose(); this.doClose();
Object.assign(this.data, this.formModel); Object.assign(this.data, this.formModel);
this.$emit('distribute', this.data); this.$emit('distribute', this.data);
}, },
handleClose() { handleClose() {
this.doClose(); this.doClose();
} }
} }
} };
</script> </script>

961
src/views/orderauthor/order/draft.vue
View File

File diff suppressed because it is too large Load Diff

592
src/views/orderauthor/order/list.vue
View File

@ -1,312 +1,310 @@
<template> <template>
<div> <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> <can-distribute ref="canDistribute" @distribute="distribute" />
<can-distribute ref="canDistribute" @distribute="distribute"></can-distribute> <qr-code ref="qrCode" />
<qr-code ref="qrCode"></qr-code> </div>
</div>
</template> </template>
<script> <script>
import { getOrderPageList, giveOrder } from '@/api/management/order'; import { getOrderPageList } from '@/api/management/order';
import { getSellerList } from '@/api/management/user'; import { getSellerList } from '@/api/management/user';
import { getOrganizationList } from '@/api/management/organization'; import { getOrganizationList } from '@/api/management/organization';
import { giveLessons } from '@/api/management/distribute'; import { giveLessons } from '@/api/management/distribute';
import { OperatorModel } from '@/scripts/ConstDic'; import { OperatorModel } from '@/scripts/ConstDic';
import { UrlConfig } from '@/router/index'; import { UrlConfig } from '@/router/index';
import QrCode from '@/components/QrCode'; import QrCode from '@/components/QrCode';
import CanDistribute from './canDistribute'; import CanDistribute from './canDistribute';
export default { export default {
name: 'List', name: 'List',
components: { components: {
QrCode, QrCode,
CanDistribute CanDistribute
}, },
data() { data() {
return { return {
SellerList: [], SellerList: [],
BizTypeList: [], BizTypeList: [],
OrderTypeList: [], OrderTypeList: [],
PayTypeList: [], PayTypeList: [],
PayStatusList: [], PayStatusList: [],
// OrganizationList: [], // OrganizationList: [],
WhetherTypeList: [], WhetherTypeList: [],
EffectiveTypeList: [], EffectiveTypeList: [],
PermissionTypeList: [], PermissionTypeList: [],
pagerConfig: { pagerConfig: {
pageSize: 'pageSize', pageSize: 'pageSize',
pageIndex: 'pageNum' pageIndex: 'pageNum'
}, },
queryForm: { queryForm: {
labelWidth: '180px', labelWidth: '180px',
reset: true, reset: true,
queryObject: { queryObject: {
'organizationId': { 'organizationId': {
type: 'select', type: 'select',
label: this.$t('orderAuthor.organizationOrEnterprise'), label: this.$t('orderAuthor.organizationOrEnterprise'),
config: { config: {
data: [] data: []
} }
}, },
'userName': { 'userName': {
type: 'text', type: 'text',
label: this.$t('orderAuthor.userName'), label: this.$t('orderAuthor.userName')
}, },
'permissionType': { 'permissionType': {
type: 'select', type: 'select',
label: this.$t('orderAuthor.permissionType'), label: this.$t('orderAuthor.permissionType'),
config: { config: {
data: [] data: []
} }
} }
} }
}, },
queryList: { queryList: {
query: this.queryFunction, query: this.queryFunction,
selectCheckShow: false, selectCheckShow: false,
indexShow: true, indexShow: true,
columns: [ columns: [
{ {
title: this.$t('orderAuthor.organizationOrEnterprise'), title: this.$t('orderAuthor.organizationOrEnterprise'),
prop: 'organizationName', prop: 'organizationName',
type: 'tag', type: 'tag',
columnValue: (row) => { return row.organizationName }, columnValue: (row) => { return row.organizationName; },
tagType: (row) => { return '' } tagType: (row) => { return ''; }
}, },
{ {
title: this.$t('orderAuthor.userName'), title: this.$t('orderAuthor.userName'),
prop: 'userName' prop: 'userName'
}, },
{ {
title: this.$t('orderAuthor.commodityName'), title: this.$t('orderAuthor.commodityName'),
prop: 'goodsName', prop: 'goodsName'
}, },
{ {
title: this.$t('orderAuthor.permissionType'), title: this.$t('orderAuthor.permissionType'),
prop: 'permissionType', prop: 'permissionType',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']) }, columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
tagType: (row) => { return '' } tagType: (row) => { return ''; }
}, },
{ {
title: this.$t('orderAuthor.permissionNumber'), title: this.$t('orderAuthor.permissionNumber'),
prop: 'amount' prop: 'amount'
}, },
{ {
title: this.$t('orderAuthor.permanenceOrNot'), title: this.$t('orderAuthor.permanenceOrNot'),
prop: 'forever', prop: 'forever',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether') }, columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether'); },
tagType: (row) => { tagType: (row) => {
return row.forever ? 'success' : 'danger'; return row.forever ? 'success' : 'danger';
} }
}, },
{ {
title: this.$t('orderAuthor.startDate'), title: this.$t('orderAuthor.startDate'),
prop: 'startTime', prop: 'startTime',
type: 'formatter', type: 'formatter',
format: 'yyyy-MM-dd' format: 'yyyy-MM-dd'
}, },
{ {
title: this.$t('orderAuthor.purchaseMonths'), title: this.$t('orderAuthor.purchaseMonths'),
prop: 'monthAmount' prop: 'monthAmount'
}, },
{ {
title: this.$t('orderAuthor.totalPrice'), title: this.$t('orderAuthor.totalPrice'),
prop: 'totalPrice' prop: 'totalPrice'
}, },
{ {
title: this.$t('orderAuthor.paymentMethod'), title: this.$t('orderAuthor.paymentMethod'),
prop: 'payWays', prop: 'payWays',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$convertField(row.payWays, this.PayTypeList, ['value', 'label']) }, columnValue: (row) => { return this.$convertField(row.payWays, this.PayTypeList, ['value', 'label']); },
tagType: (row) => { return 'success' } tagType: (row) => { return 'success'; }
}, },
{ {
title: this.$t('orderAuthor.creationDate'), title: this.$t('orderAuthor.creationDate'),
prop: 'createTime' prop: 'createTime'
}, },
{ {
title: this.$t('orderAuthor.orderType'), title: this.$t('orderAuthor.orderType'),
prop: 'orderType', prop: 'orderType',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$convertField(row.orderType, this.OrderTypeList, ['value', 'label']) }, columnValue: (row) => { return this.$convertField(row.orderType, this.OrderTypeList, ['value', 'label']); },
tagType: (row) => { return 'success' } tagType: (row) => { return 'success'; }
}, },
{ {
title: this.$t('orderAuthor.contractNumber'), title: this.$t('orderAuthor.contractNumber'),
prop: 'contractNo' prop: 'contractNo'
}, },
{ {
title: this.$t('orderAuthor.businessType'), title: this.$t('orderAuthor.businessType'),
prop: 'bizType', prop: 'bizType',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$convertField(row.bizType, this.BizTypeList, ['value', 'label']) }, columnValue: (row) => { return this.$convertField(row.bizType, this.BizTypeList, ['value', 'label']); },
tagType: (row) => { return 'success' } tagType: (row) => { return 'success'; }
}, },
{ {
title: this.$t('orderAuthor.paymentStatus'), title: this.$t('orderAuthor.paymentStatus'),
prop: 'payStatus', prop: 'payStatus',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$convertField(row.payStatus, this.PayStatusList, ['value', 'label']) }, columnValue: (row) => { return this.$convertField(row.payStatus, this.PayStatusList, ['value', 'label']); },
tagType: (row) => { tagType: (row) => {
switch (row.payStatus) { switch (row.payStatus) {
case '01': return 'danger'; case '01': return 'danger';
case '02': return 'success'; case '02': return 'success';
case '03': return 'info'; case '03': return 'info';
} }
} }
}, },
{ {
title: this.$t('orderAuthor.salesman'), title: this.$t('orderAuthor.salesman'),
prop: 'sellerName', prop: 'sellerName',
type: 'tag', type: 'tag',
columnValue: (row) => { return row.sellerName }, columnValue: (row) => { return row.sellerName; },
tagType: (row) => { return 'success' } tagType: (row) => { return 'success'; }
}, },
{ {
type: 'button', type: 'button',
title: this.$t('global.operate'), title: this.$t('global.operate'),
width: '260', width: '260',
buttons: [ buttons: [
{ {
name: this.$t('global.edit'), name: this.$t('global.edit'),
handleClick: this.handleEdit handleClick: this.handleEdit
}, },
{ {
name: this.$t('orderAuthor.obtainQrCode'), name: this.$t('orderAuthor.obtainQrCode'),
type: "warning", type: 'warning',
handleClick: this.handleCanDistribute, handleClick: this.handleCanDistribute,
showControl: (row) => { return row.bizType !== '02' && row.orderType !== '01' && row.qrCodeGenerated } showControl: (row) => { return row.bizType !== '02' && row.orderType !== '01' && row.qrCodeGenerated; }
}, },
{ {
name: this.$t('orderAuthor.generatingQRCode'), name: this.$t('orderAuthor.generatingQRCode'),
type: "warning", type: 'warning',
handleClick: this.handleCanDistribute, handleClick: this.handleCanDistribute,
showControl: (row) => { return row.bizType !== '02' && row.orderType !== '01' && !row.qrCodeGenerated } showControl: (row) => { return row.bizType !== '02' && row.orderType !== '01' && !row.qrCodeGenerated; }
}, }
] ]
}, }
], ],
actions: [ actions: [
{ text: this.$t('global.add'), btnCode: 'employee_insert', handler: this.handleNormalAdd }, { text: this.$t('global.add'), btnCode: 'employee_insert', handler: this.handleNormalAdd }
] ]
} }
} };
}, },
created() { created() {
this.loadInitData(); this.loadInitData();
}, },
methods: { methods: {
loadInitData() { loadInitData() {
this.queryForm.queryObject.organizationId.config.data.length = 0; this.queryForm.queryObject.organizationId.config.data.length = 0;
getOrganizationList().then(response => { getOrganizationList().then(response => {
// this.OrganizationList = response.data; // this.OrganizationList = response.data;
response.data.forEach(elem => { response.data.forEach(elem => {
this.queryForm.queryObject.organizationId.config.data.push({ value: elem.id, label: elem.name }); this.queryForm.queryObject.organizationId.config.data.push({ value: elem.id, label: elem.name });
}); });
}); });
getSellerList().then(response => { getSellerList().then(response => {
this.SellerList = response.data; this.SellerList = response.data;
}) });
this.$Dictionary.bizType().then(list => { this.$Dictionary.bizType().then(list => {
this.$convertList(list, this.BizTypeList, elem => { this.$convertList(list, this.BizTypeList, elem => {
return true; return true;
}); });
}) });
this.$Dictionary.orderType().then(list => {
this.$convertList(list, this.OrderTypeList, elem => {
return true;
});
});
this.$Dictionary.orderType().then(list => { this.$Dictionary.payType().then(list => {
this.$convertList(list, this.OrderTypeList, elem => { this.$convertList(list, this.PayTypeList, elem => {
return true; return true;
}); });
}) });
this.$Dictionary.payType().then(list => { this.$Dictionary.payStatus().then(list => {
this.$convertList(list, this.PayTypeList, elem => { this.$convertList(list, this.PayStatusList, elem => {
return true; return true;
}); });
}) });
this.$Dictionary.payStatus().then(list => { this.$Dictionary.effectiveType().then(list => {
this.$convertList(list, this.PayStatusList, elem => { this.$convertList(list, this.EffectiveTypeList, elem => {
return true; return true;
}); });
}) });
this.$Dictionary.effectiveType().then(list => { this.$Dictionary.permissionType().then(list => {
this.$convertList(list, this.EffectiveTypeList, elem => { list.forEach(elem => {
return true; this.queryForm.queryObject.permissionType.config.data.push({ value: elem.code, label: elem.name });
}); });
}) this.$convertList(list, this.PermissionTypeList, elem => {
return true;
});
});
},
queryFunction(params) {
return getOrderPageList(params);
},
handleNormalAdd() {
this.$router.push({ path: `${UrlConfig.orderauthor.orderDraft}/add/0` });
},
handleEdit(index, data) {
this.$alert('功能待开发', this.$t('tip.hint'), {
confirmButtonText: this.$t('tip.confirm'),
callback: action => {
}
});
},
handleCanDistribute(index, data) {
if (data.qrCodeGenerated) {
data.canDistribute = true;
this.distribute(data);
} else {
this.$refs.canDistribute.doShow(data);
}
},
distribute(data) {
const model = {
amount: data.amount,
forever: data.forever,
orderCode: data.code,
startTime: data.startTime + ' 00:00:00',
monthAmount: data.monthAmount,
canDistribute: data.canDistribute,
operator: OperatorModel.TRANSFER,
mapId: data.mapId,
lessonId: data.lessonId || '',
mapProductCode: data.mapProductCode || '',
permissionType: data.permissionType,
organizationId: data.organizationId
};
this.$Dictionary.permissionType().then(list => { giveLessons(model).then(response => {
list.forEach(elem => { this.reloadTable();
this.queryForm.queryObject.permissionType.config.data.push({ value: elem.code, label: elem.name }); if (data.qrCodeGenerated) {
}); this.$refs.qrCode.doShow({
this.$convertList(list, this.PermissionTypeList, elem => { url: response.data,
return true; title: this.$t('orderAuthor.transferQRCode')
}); });
}) }
},
queryFunction(params) {
return getOrderPageList(params);
},
handleNormalAdd() {
this.$router.push({ path: `${UrlConfig.orderauthor.orderDraft}/add/0` })
},
handleEdit(index, data) {
this.$alert('功能待开发', this.$t('tip.hint'), {
confirmButtonText: this.$t('tip.confirm'),
callback: action => {
}
});
},
handleCanDistribute(index, data) {
if (data.qrCodeGenerated) {
data.canDistribute = true;
this.distribute(data);
} else {
this.$refs.canDistribute.doShow(data);
}
},
distribute(data) {
let model = {
amount: data.amount,
forever: data.forever,
orderCode: data.code,
startTime: data.startTime + " 00:00:00",
monthAmount: data.monthAmount,
canDistribute: data.canDistribute,
operator: OperatorModel.TRANSFER,
mapId: data.mapId,
lessonId: data.lessonId || '',
mapProductCode: data.mapProductCode || '',
permissionType: data.permissionType,
organizationId: data.organizationId
}
giveLessons(model).then(response => { }).catch(() => {
this.reloadTable(); this.$messageBox(this.$t('error.transferredQRCodeFailed'));
if (data.qrCodeGenerated) { });
this.$refs.qrCode.doShow({ },
url: response.data, reloadTable() {
title: this.$t('orderAuthor.transferQRCode') if (this.queryList && this.queryList.reload) {
}); this.queryList.reload();
} }
}
}).catch(error => { }
this.$messageBox(this.$t('error.transferredQRCodeFailed')); };
});
},
reloadTable() {
if (this.queryList && this.queryList.reload) {
this.queryList.reload()
}
}
}
}
</script> </script>

323
src/views/orderauthor/permission/detail.vue
View File

@ -1,174 +1,169 @@
<template> <template>
<div> <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 class="draft">
<div class="draft"> <el-button-group>
<el-button-group> <el-button type="primary" @click="turnback">{{ $t('global.return') }}</el-button>
<el-button type="primary" @click="turnback">{{$t('global.return')}}</el-button> </el-button-group>
</el-button-group>
</div>
</div> </div>
</div>
</template> </template>
<script> <script>
import { superAdmin } from '@/router'; import { getPermissionPackageDetail } from '@/api/management/distribute';
import { listPackagePermission, restorePackagePermission, getPermissionPackageDetail } from '@/api/management/distribute';
import { UrlConfig } from '@/router/index';
export default { export default {
name: 'TrainsferDetail', name: 'TrainsferDetail',
data() { data() {
return { return {
show: false, show: false,
height: 0, height: 0,
WhetherTypeList: [], WhetherTypeList: [],
EffectiveTypeList: [], EffectiveTypeList: [],
PermissionTypeList: [], PermissionTypeList: [],
pagerConfig: { pagerConfig: {
pageSize: 'pageSize', pageSize: 'pageSize',
pageIndex: 'pageNum' pageIndex: 'pageNum'
}, },
queryForm: { queryForm: {
labelWidth: '120px', labelWidth: '120px',
reset: true, reset: true,
queryObject: { queryObject: {
'permissionType': { 'permissionType': {
type: 'select', type: 'select',
label: this.$t('orderAuthor.permissionType'), label: this.$t('orderAuthor.permissionType'),
config: { config: {
data: [] data: []
} }
} }
} }
}, },
queryList: { queryList: {
query: this.queryFunction, query: this.queryFunction,
selectCheckShow: false, selectCheckShow: false,
indexShow: true, indexShow: true,
columns: [ columns: [
{ {
title: this.$t('orderAuthor.organizationOrEnterprise'), title: this.$t('orderAuthor.organizationOrEnterprise'),
prop: 'organizationName' prop: 'organizationName'
}, },
{ {
title: this.$t('orderAuthor.userName'), title: this.$t('orderAuthor.userName'),
prop: 'userName' prop: 'userName'
}, },
{ {
title: this.$t('orderAuthor.userMobile'), title: this.$t('orderAuthor.userMobile'),
prop: 'userMobile' prop: 'userMobile'
}, },
{ {
title: this.$t('orderAuthor.mapName'), title: this.$t('orderAuthor.mapName'),
prop: 'mapName', prop: 'mapName'
}, },
{ {
title: this.$t('orderAuthor.mapProductName'), title: this.$t('orderAuthor.mapProductName'),
prop: 'mapProductName', prop: 'mapProductName'
}, },
{ {
title: this.$t('orderAuthor.courseName'), title: this.$t('orderAuthor.courseName'),
prop: 'lessonName', prop: 'lessonName'
}, },
{ {
title: this.$t('orderAuthor.permissionType'), title: this.$t('orderAuthor.permissionType'),
prop: 'permissionType', prop: 'permissionType',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']) }, columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
tagType: (row) => { return '' } tagType: (row) => { return ''; }
}, },
{ {
title: this.$t('orderAuthor.publicOrPrivate'), title: this.$t('orderAuthor.publicOrPrivate'),
prop: 'canDistribute', prop: 'canDistribute',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$ConstSelect.translate(row.canDistribute, 'PermissionUseList') }, columnValue: (row) => { return this.$ConstSelect.translate(row.canDistribute, 'PermissionUseList'); },
tagType: (row) => { tagType: (row) => {
switch (row.canDistribute) { switch (row.canDistribute) {
case true: return 'success'; case true: return 'success';
case false: return 'danger'; case false: return 'danger';
} }
} }
}, },
{ {
title: this.$t('orderAuthor.permanenceOrNot'), title: this.$t('orderAuthor.permanenceOrNot'),
prop: 'forever', prop: 'forever',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether') }, columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether'); },
tagType: (row) => { tagType: (row) => {
switch (row.forever) { switch (row.forever) {
case true: return 'success'; case true: return 'success';
case false: return 'danger'; case false: return 'danger';
} }
} }
}, },
{ {
title: this.$t('orderAuthor.startTime'), title: this.$t('orderAuthor.startTime'),
prop: 'startTime', prop: 'startTime',
type: 'formatter', type: 'formatter',
formatter: this.formatterDate formatter: this.formatterDate
}, },
{ {
title: this.$t('orderAuthor.endTime'), title: this.$t('orderAuthor.endTime'),
prop: 'endTime', prop: 'endTime',
type: 'formatter', type: 'formatter',
formatter: this.formatterDate formatter: this.formatterDate
}, },
{ {
title: this.$t('orderAuthor.courseAuthorityStatus'), title: this.$t('orderAuthor.courseAuthorityStatus'),
prop: 'status', prop: 'status',
type: 'tag', 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) => { tagType: (row) => {
switch (row.status) { switch (row.status) {
case '1': return 'success'; case '1': return 'success';
default: return 'danger'; default: return 'danger';
} }
} }
} }
] ]
} }
} };
}, },
mounted() { mounted() {
this.loadInitData(); this.loadInitData();
}, },
methods: { methods: {
loadInitData() { loadInitData() {
this.$Dictionary.effectiveType().then(list => { this.$Dictionary.effectiveType().then(list => {
this.$convertList(list, this.EffectiveTypeList, elem => { this.$convertList(list, this.EffectiveTypeList, elem => {
return true; return true;
}); });
}); });
this.$Dictionary.permissionType().then(list => { this.$Dictionary.permissionType().then(list => {
list.forEach(elem => { list.forEach(elem => {
this.queryForm.queryObject.permissionType.config.data.push({ value: elem.code, label: elem.name }); this.queryForm.queryObject.permissionType.config.data.push({ value: elem.code, label: elem.name });
}); });
this.$convertList(list, this.PermissionTypeList, elem => { this.$convertList(list, this.PermissionTypeList, elem => {
return true; return true;
}); });
}); });
}, },
formatterDate(row, porpInfo) { formatterDate(row, porpInfo) {
if (row.hasOwnProperty(porpInfo.property)) { return row[porpInfo.property];
} },
return row[porpInfo.property]; queryFunction(params) {
}, // if (params.permissionType) {
queryFunction(params) { return getPermissionPackageDetail(this.$route.params.permissionId, params);
// if (params.permissionType) { // }
return getPermissionPackageDetail(this.$route.params.permissionId, params) },
// } reloadTable() {
}, if (this.queryList && this.queryList.reload) {
reloadTable() { this.queryList.reload();
if (this.queryList && this.queryList.reload) { }
this.queryList.reload() },
} turnback() {
}, this.$router.go(-1);
turnback() { }
this.$router.go(-1) }
} };
}
}
</script> </script>
<style rel="stylesheet/scss" lang="scss" scoped> <style rel="stylesheet/scss" lang="scss" scoped>
.draft { .draft {

413
src/views/orderauthor/permission/draft/choosePermission.vue
View File

@ -1,208 +1,221 @@
<template> <template>
<el-dialog :title="title" :visible.sync="show" top="20px" width="90%" :before-close="doClose" <el-dialog
:close-on-click-modal="false"> :title="title"
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList"> :visible.sync="show"
</QueryListPage> top="20px"
</el-dialog> width="90%"
:before-close="doClose"
:close-on-click-modal="false"
>
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
</el-dialog>
</template> </template>
<script> <script>
import { listCanPackagePermission } from '@/api/management/distribute'; import { listCanPackagePermission } from '@/api/management/distribute';
import { UrlConfig } from '@/router/index';
export default { export default {
name: 'author', name: 'Author',
props: { props: {
ruleList: { ruleList: {
type: Array type: Array,
}, default() {
EffectiveTypeList: { return [];
type: Array, }
}, },
PermissionTypeList: { effectiveTypeList: {
type: Array type: Array,
}, default() {
}, return [];
data() { }
return { },
show: false, permissionTypeList: {
param: '', type: Array,
pagerConfig: { default() {
pageSize: 'pageSize', return [];
pageIndex: 'pageNum' }
}, }
queryForm: { },
labelWidth: '100px', data() {
reset: true, return {
queryObject: { show: false,
'permissionType': { param: '',
type: 'select', pagerConfig: {
label: this.$t('orderAuthor.permissionType'), pageSize: 'pageSize',
config: { pageIndex: 'pageNum'
data: [] },
} queryForm: {
}, labelWidth: '100px',
'canDistribute': { reset: true,
type: 'select', queryObject: {
label: this.$t('orderAuthor.publicOrPrivate'), 'permissionType': {
config: { type: 'select',
data: [] label: this.$t('orderAuthor.permissionType'),
} config: {
} data: []
} }
}, },
queryList: { 'canDistribute': {
query: this.queryFunction, type: 'select',
selectCheckShow: false, label: this.$t('orderAuthor.publicOrPrivate'),
indexShow: true, config: {
columns: [ data: []
{ }
title: this.$t('orderAuthor.organizationOrEnterprise'), }
prop: 'organizationName' }
}, },
{ queryList: {
title: this.$t('orderAuthor.userName'), query: this.queryFunction,
prop: 'userName' selectCheckShow: false,
}, indexShow: true,
{ columns: [
title: this.$t('orderAuthor.userMobile'), {
prop: 'userMobile' title: this.$t('orderAuthor.organizationOrEnterprise'),
}, prop: 'organizationName'
{ },
title: this.$t('orderAuthor.mapName'), {
prop: 'mapName', title: this.$t('orderAuthor.userName'),
}, prop: 'userName'
{ },
title: this.$t('orderAuthor.mapProductName'), {
prop: 'mapProductName', title: this.$t('orderAuthor.userMobile'),
}, prop: 'userMobile'
{ },
title: this.$t('orderAuthor.courseName'), {
prop: 'lessonName', title: this.$t('orderAuthor.mapName'),
}, prop: 'mapName'
{ },
title: this.$t('orderAuthor.permissionType'), {
prop: 'permissionType', title: this.$t('orderAuthor.mapProductName'),
type: 'tag', prop: 'mapProductName'
columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']) }, },
tagType: (row) => { return '' } {
}, title: this.$t('orderAuthor.courseName'),
{ prop: 'lessonName'
title: this.$t('orderAuthor.publicOrPrivate'), },
prop: 'canDistribute', {
type: 'tag', title: this.$t('orderAuthor.permissionType'),
columnValue: (row) => { return this.$ConstSelect.translate(row.canDistribute, 'PermissionUseList') }, prop: 'permissionType',
tagType: (row) => { type: 'tag',
switch (row.canDistribute) { columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
case true: return 'success'; tagType: (row) => { return ''; }
case false: return 'danger'; },
} {
} title: this.$t('orderAuthor.publicOrPrivate'),
}, prop: 'canDistribute',
{ type: 'tag',
title: this.$t('orderAuthor.permanenceOrNot'), columnValue: (row) => { return this.$ConstSelect.translate(row.canDistribute, 'PermissionUseList'); },
prop: 'forever', tagType: (row) => {
type: 'tag', switch (row.canDistribute) {
columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether') }, case true: return 'success';
tagType: (row) => { case false: return 'danger';
switch (row.forever) { }
case true: return 'success'; }
case false: return 'danger'; },
} {
} title: this.$t('orderAuthor.permanenceOrNot'),
}, prop: 'forever',
// { type: 'tag',
// title: '权限总数', columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether'); },
// prop: 'amount' tagType: (row) => {
// }, switch (row.forever) {
// { case true: return 'success';
// title: '剩余权限数量', case false: return 'danger';
// prop: 'remains' }
// }, }
{ },
title: this.$t('orderAuthor.startTime'), // {
prop: 'startTime', // title: '权限总数',
type: 'formatter', // prop: 'amount'
formatter: this.formatterDate // },
// {
// title: '剩余权限数量',
// prop: 'remains'
// },
{
title: this.$t('orderAuthor.startTime'),
prop: 'startTime',
type: 'formatter',
formatter: this.formatterDate
}, },
{ {
title: this.$t('orderAuthor.endTime'), title: this.$t('orderAuthor.endTime'),
prop: 'endTime', prop: 'endTime',
type: 'formatter', type: 'formatter',
formatter: this.formatterDate formatter: this.formatterDate
}, },
{ {
type: 'button', type: 'button',
title: this.$t('global.operate'), title: this.$t('global.operate'),
width: '120', width: '120',
buttons: [ buttons: [
{ {
name: this.$t('global.add'), name: this.$t('global.add'),
handleClick: this.handlePut, handleClick: this.handlePut,
type: '', type: '',
showControl: (row) => { return !row.isPut && row.permissionType } showControl: (row) => { return !row.isPut && row.permissionType; }
}, },
{ {
name: this.$t('global.delete'), name: this.$t('global.delete'),
handleClick: this.handlePop, handleClick: this.handlePop,
type: 'warning', type: 'warning',
showControl: (row) => { return row.isPut && row.permissionType } showControl: (row) => { return row.isPut && row.permissionType; }
}, }
] ]
} }
] ]
} }
} };
}, },
watch: { computed: {
PermissionTypeList: function (list) { title() {
if (list && list.length) { return this.$t('orderAuthor.editPermissionRules');
this.queryForm.queryObject.permissionType.config.data = list; }
} },
} watch: {
}, PermissionTypeList: function (list) {
computed: { if (list && list.length) {
title() { this.queryForm.queryObject.permissionType.config.data = list;
return this.$t('orderAuthor.editPermissionRules'); }
} }
}, },
mounted() { mounted() {
this.queryForm.queryObject.canDistribute.config.data = this.$ConstSelect.PermissionUseList; this.queryForm.queryObject.canDistribute.config.data = this.$ConstSelect.PermissionUseList;
}, },
methods: { methods: {
formatterDate(row, porpInfo) { formatterDate(row, porpInfo) {
return String(row[porpInfo.property] || '').split(' ')[0]; return String(row[porpInfo.property] || '').split(' ')[0];
}, },
async queryFunction(params) { async queryFunction(params) {
let resp = await listCanPackagePermission(params); const resp = await listCanPackagePermission(params);
this.ruleList.forEach(elem => { this.ruleList.forEach(elem => {
resp.data.list.forEach(item => { resp.data.list.forEach(item => {
if (item.id == elem.id) { if (item.id == elem.id) {
item.isPut = true; item.isPut = true;
} }
}) });
}); });
return resp; return resp;
}, },
reloadTable() { reloadTable() {
if (this.queryList && this.queryList.reload) { if (this.queryList && this.queryList.reload) {
this.queryList.reload() this.queryList.reload();
} }
}, },
doShow() { doShow() {
this.show = true this.show = true;
}, },
doClose() { doClose() {
this.show = false; this.show = false;
}, },
handlePut(index, row) { handlePut(index, row) {
this.$emit('addRuleForm', index, row); this.$emit('addRuleForm', index, row);
}, },
handlePop(index, row) { handlePop(index, row) {
this.$emit('deleteForm', index, row); this.$emit('deleteForm', index, row);
} }
} }
} };
</script> </script>

12
src/views/orderauthor/permission/draft/ruleForm.vue
View File

@ -7,7 +7,7 @@
<el-step icon="el-icon-setting" /> <el-step icon="el-icon-setting" />
</el-steps> </el-steps>
<el-card class="forms pack-rule"> <el-card class="forms pack-rule">
<el-button class="addList" size="small" @click="dialogSelect">{{$t('orderAuthor.addRecords')}}</el-button> <el-button class="addList" size="small" @click="dialogSelect">{{ $t('orderAuthor.addRecords') }}</el-button>
<el-table <el-table
:data="ruleList" :data="ruleList"
border border
@ -28,7 +28,7 @@
<el-table-column prop="remains" :label="this.$t('orderAuthor.residualPermissionNumber')" width="80" /> <el-table-column prop="remains" :label="this.$t('orderAuthor.residualPermissionNumber')" width="80" />
<el-table-column :label="this.$t('global.operate')" width="60"> <el-table-column :label="this.$t('global.operate')" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="deleteForm(scope.$index, scope.row)">{{$t('global.delete')}} <el-button type="text" size="small" @click="deleteForm(scope.$index, scope.row)">{{ $t('global.delete') }}
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -36,9 +36,9 @@
</el-card> </el-card>
<div class="draft"> <div class="draft">
<el-button-group> <el-button-group>
<el-button v-if="!urlInfo.url" type="primary" @click="packForm">{{$t('orderAuthor.packaging')}}</el-button> <el-button v-if="!urlInfo.url" type="primary" @click="packForm">{{ $t('orderAuthor.packaging') }}</el-button>
<el-button v-if="urlInfo.url" type="primary" @click="QrCodeShow">{{$t('orderAuthor.obtainQrCode')}}</el-button> <el-button v-if="urlInfo.url" type="primary" @click="QrCodeShow">{{ $t('orderAuthor.obtainQrCode') }}</el-button>
<el-button type="primary" @click="turnback">{{$t('global.return')}}</el-button> <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
</el-button-group> </el-button-group>
</div> </div>
<choose-permission <choose-permission
@ -171,7 +171,7 @@ export default {
this.$messageBox(this.$t('tip.packagingFailed')); this.$messageBox(this.$t('tip.packagingFailed'));
}); });
} else { } else {
this.$messageBox(this.$t('orderAuthor.selectPackagingRecord')); this.$messageBox(this.$t('tip.selectPackagingRecord'));
} }
}, },
qrCodeShow() { qrCodeShow() {

509
src/views/orderauthor/permission/index.vue
View File

@ -1,264 +1,261 @@
<template> <template>
<div> <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> <qr-code ref="qrCode" />
<qr-code ref="qrCode"></qr-code> </div>
</div>
</template> </template>
<script> <script>
import { superAdmin } from '@/router'; import { superAdmin } from '@/router';
import { listPackagePermission, restorePackagePermission, getPackageQrCode, permissionDistributeUnPackage } from '@/api/management/distribute'; import { listPackagePermission, restorePackagePermission, getPackageQrCode, permissionDistributeUnPackage } from '@/api/management/distribute';
import { UrlConfig } from '@/router/index'; import { UrlConfig } from '@/router/index';
import QrCode from "@/components/QrCode"; import QrCode from '@/components/QrCode';
export default { export default {
name: 'author', name: 'Author',
components: { components: {
QrCode QrCode
}, },
data() { data() {
return { return {
EffectiveTypeList: [], EffectiveTypeList: [],
PermissionTypeList: [], PermissionTypeList: [],
pagerConfig: { pagerConfig: {
pageSize: 'pageSize', pageSize: 'pageSize',
pageIndex: 'pageNum' pageIndex: 'pageNum'
}, },
queryForm: { queryForm: {
labelWidth: '120px', labelWidth: '140px',
reset: true, reset: true,
queryObject: { queryObject: {
'userMobile': { 'userMobile': {
type: 'text', type: 'text',
label: this.$t('orderAuthor.founderPhone') label: this.$t('orderAuthor.founderPhone')
}, },
'userName': { 'userName': {
type: 'text', type: 'text',
label: this.$t('orderAuthor.founder') label: this.$t('orderAuthor.founder')
}, },
'permissionType': { 'permissionType': {
type: 'select', type: 'select',
label: this.$t('orderAuthor.permissionType'), label: this.$t('orderAuthor.permissionType'),
config: { config: {
data: [] data: []
} }
}, },
'status': { 'status': {
type: 'select', type: 'select',
label: this.$t('orderAuthor.authorityStatus'), label: this.$t('orderAuthor.authorityStatus'),
value: '1', value: '1',
config: { config: {
data: [] data: []
} }
} }
} }
}, },
queryList: { queryList: {
query: this.queryFunction, query: this.queryFunction,
selectCheckShow: false, selectCheckShow: false,
indexShow: true, indexShow: true,
columns: [ columns: [
{ {
title: this.$t('orderAuthor.organizationOrEnterprise'), title: this.$t('orderAuthor.organizationOrEnterprise'),
prop: 'organizationName' prop: 'organizationName'
}, },
{ {
title: this.$t('orderAuthor.founder'), title: this.$t('orderAuthor.founder'),
prop: 'userName' prop: 'userName'
}, },
{ {
title: this.$t('orderAuthor.founderPhone'), title: this.$t('orderAuthor.founderPhone'),
prop: 'userMobile' prop: 'userMobile'
}, },
{ {
title: this.$t('orderAuthor.mapName'), title: this.$t('orderAuthor.mapName'),
prop: 'mapName', prop: 'mapName'
}, },
{ {
title: this.$t('orderAuthor.mapProductName'), title: this.$t('orderAuthor.mapProductName'),
prop: 'mapProductName', prop: 'mapProductName'
}, },
{ {
title: this.$t('orderAuthor.courseName'), title: this.$t('orderAuthor.courseName'),
prop: 'lessonName', prop: 'lessonName'
}, },
{ {
title: this.$t('orderAuthor.permissionType'), title: this.$t('orderAuthor.permissionType'),
prop: 'permissionType', prop: 'permissionType',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']) }, columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
tagType: (row) => { return '' } tagType: (row) => { return ''; }
}, },
{ {
title: this.$t('orderAuthor.publicOrPrivate'), title: this.$t('orderAuthor.publicOrPrivate'),
prop: 'canDistribute', prop: 'canDistribute',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$ConstSelect.translate(row.canDistribute, 'PermissionUseList') }, columnValue: (row) => { return this.$ConstSelect.translate(row.canDistribute, 'PermissionUseList'); },
tagType: (row) => { tagType: (row) => {
switch (row.canDistribute) { switch (row.canDistribute) {
case true: return 'success'; case true: return 'success';
case false: return 'danger'; case false: return 'danger';
} }
} }
}, },
{ {
title: this.$t('orderAuthor.permanenceOrNot'), title: this.$t('orderAuthor.permanenceOrNot'),
prop: 'forever', prop: 'forever',
type: 'tag', type: 'tag',
columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether') }, columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether'); },
tagType: (row) => { tagType: (row) => {
switch (row.forever) { switch (row.forever) {
case true: return 'success'; case true: return 'success';
case false: return 'danger'; case false: return 'danger';
} }
} }
}, },
{ {
title: this.$t('orderAuthor.startTime'), title: this.$t('orderAuthor.startTime'),
prop: 'startTime', prop: 'startTime',
type: 'formatter', type: 'formatter',
formatter: this.formatterDate formatter: this.formatterDate
}, },
{ {
title: this.$t('orderAuthor.endTime'), title: this.$t('orderAuthor.endTime'),
prop: 'endTime', prop: 'endTime',
type: 'formatter', type: 'formatter',
formatter: this.formatterDate formatter: this.formatterDate
}, },
{ {
title: this.$t('orderAuthor.authorityStatus'), title: this.$t('orderAuthor.authorityStatus'),
prop: 'status', prop: 'status',
type: 'tag', 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) => { tagType: (row) => {
switch (row.status) { switch (row.status) {
case '1': return 'success'; case '1': return 'success';
default: return 'danger'; default: return 'danger';
} }
} }
}, },
{ {
type: 'button', type: 'button',
title: this.$t('global.operate'), title: this.$t('global.operate'),
width: '300', width: this.$i18n.locale == 'en' ? '400': '300',
hide: (row) => { return this.$store.state.user.roles.indexOf(superAdmin) < 0; }, hide: (row) => { return this.$store.state.user.roles.indexOf(superAdmin) < 0; },
buttons: [ buttons: [
{ {
name: this.$t('orderAuthor.obtainQrCode'), name: this.$t('orderAuthor.obtainQrCode'),
handleClick: this.handleRtCodeShow, handleClick: this.handleRtCodeShow,
type: '', type: '',
showControl: (row) => { return true } showControl: (row) => { return true; }
}, },
{ {
name: this.$t('orderAuthor.authorityDetails'), name: this.$t('orderAuthor.authorityDetails'),
handleClick: this.handlePermissionDetail, handleClick: this.handlePermissionDetail,
type: '', type: '',
showControl: (row) => { return row.status == '1' && (row.source == '02' || row.source == '04') } showControl: (row) => { return row.status == '1' && (row.source == '02' || row.source == '04'); }
}, },
{ {
name: this.$t('orderAuthor.recovery'), name: this.$t('orderAuthor.recovery'),
handleClick: this.handleRestore, handleClick: this.handleRestore,
type: 'danger', type: 'danger',
showControl: (row) => { return row.status == '1' && row.source == '04' } showControl: (row) => { return row.status == '1' && row.source == '04'; }
}, },
{ {
name: this.$t('orderAuthor.unpacking'), name: this.$t('orderAuthor.unpacking'),
handleClick: this.handleUnPackage, handleClick: this.handleUnPackage,
type: 'danger', type: 'danger',
showControl: (row) => { return row.status == '1' && row.source == '02' } showControl: (row) => { return row.status == '1' && row.source == '02'; }
} }
] ]
} }
], ],
actions: [ actions: [
{ text: this.$t('orderAuthor.privilegePackaging'), btnCode: 'employee_insert', handler: this.handlePackage }, { text: this.$t('orderAuthor.privilegePackaging'), btnCode: 'employee_insert', handler: this.handlePackage }
] ]
} }
} };
}, },
mounted() { mounted() {
this.loadInitData(); this.loadInitData();
}, },
methods: { methods: {
loadInitData() { loadInitData() {
this.$Dictionary.effectiveType().then(list => { this.$Dictionary.effectiveType().then(list => {
list.forEach(elem => { list.forEach(elem => {
this.queryForm.queryObject.status.config.data.push({ value: elem.code, label: elem.name }); this.queryForm.queryObject.status.config.data.push({ value: elem.code, label: elem.name });
}) });
this.$convertList(list, this.EffectiveTypeList, elem => { this.$convertList(list, this.EffectiveTypeList, elem => {
return true; return true;
}); });
}); });
this.$Dictionary.permissionType().then(list => { this.$Dictionary.permissionType().then(list => {
list.forEach(elem => { list.forEach(elem => {
this.queryForm.queryObject.permissionType.config.data.push({ value: elem.code, label: elem.name }); this.queryForm.queryObject.permissionType.config.data.push({ value: elem.code, label: elem.name });
}); });
this.$convertList(list, this.PermissionTypeList, elem => { this.$convertList(list, this.PermissionTypeList, elem => {
return true; return true;
}); });
this.PermissionTypeList.push({ value: undefined, label: this.$t('orderAuthor.permissionPack') }); this.PermissionTypeList.push({ value: undefined, label: this.$t('orderAuthor.permissionPack') });
}); });
}, },
formatterDate(row, porpInfo) { formatterDate(row, porpInfo) {
if (row.hasOwnProperty(porpInfo.property)) { return row[porpInfo.property];
} },
return row[porpInfo.property]; queryFunction(params) {
}, return listPackagePermission(params);
queryFunction(params) { },
return listPackagePermission(params); reloadTable() {
}, if (this.queryList && this.queryList.reload) {
reloadTable() { this.queryList.reload();
if (this.queryList && this.queryList.reload) { }
this.queryList.reload() },
} handlePermissionDetail(index, row) {
}, this.$router.push({ path: `${UrlConfig.orderauthor.transferDetail}/${row.id}` });
handlePermissionDetail(index, row) { },
this.$router.push({ path: `${UrlConfig.orderauthor.transferDetail}/${row.id}` }) handleRtCodeShow(index, row) {
}, getPackageQrCode({ id: row.id }).then(resp => {
handleRtCodeShow(index, row) { this.$refs.qrCode.doShow({
getPackageQrCode({ id: row.id }).then(resp => { url: resp.data,
this.$refs.qrCode.doShow({ title: this.$t('orderAuthor.privilegeTransferQRCode')
url: resp.data, });
title: this.$t('orderAuthor.privilegeTransferQRCode') }).catch(() => {
}); this.$messageBox(this.$t('tip.getQRCodeFailure'));
}).catch(error => { });
this.$messageBox(this.$t('tip.getQRCodeFailure')); },
}) handleRestore(index, row) {
}, this.$confirm(this.$t('tip.recoveryPrivilegeTip'), this.$t('global.tips'), {
handleRestore(index, row) { confirmButtonText: this.$t('global.confirm'),
this.$confirm(this.$t('tip.recoveryPrivilegeTip'), this.$t('tip.hint'), { cancelButtonText: this.$t('global.cancel'),
confirmButtonText: this.$t('tip.confirm'), type: 'warning'
cancelButtonText: this.$t('tip.cancel'), }).then(() => {
type: 'warning' restorePackagePermission(row.id).then(resp => {
}).then(() => { this.reloadTable();
restorePackagePermission(row.id).then(resp => { this.$message.success(this.$t('tip.recoveryPrivilegesSuccessful'));
this.reloadTable(); }).catch(() => {
this.$message.success(this.$t('tip.recoveryPrivilegesSuccessful')); this.$messageBox(this.$t('tip.recoveryPrivilegesFailed'));
}).catch(error => { });
this.$messageBox(this.$t('tip.recoveryPrivilegesFailed')); }).catch(() => { });
}) },
}).catch(() => { }); handleUnPackage(index, row) {
}, this.$confirm(this.$t('tip.unpackingTip'), this.$t('global.tips'), {
handleUnPackage(index, row) { confirmButtonText: this.$t('global.confirm'),
this.$confirm(this.$t('tip.unpackingTip'), this.$t('tip.hint'), { cancelButtonText: this.$t('global.cancel'),
confirmButtonText: this.$t('tip.confirm'), type: 'warning'
cancelButtonText: this.$t('tip.cancel'), }).then(() => {
type: 'warning' permissionDistributeUnPackage(row.id).then(resp => {
}).then(() => { this.reloadTable();
permissionDistributeUnPackage(row.id).then(resp => { this.$message.success(this.$t('tip.unpackingSuccessful'));
this.reloadTable(); }).catch(() => {
this.$message.success(this.$t('tip.unpackingSuccessful')); this.$messageBox(this.$t('tip.unpackingFailed'));
}).catch(error => { });
this.$messageBox(this.$t('tip.unpackingFailed')); }).catch(() => { });
}) },
}).catch(() => { }); handlePackage() {
}, this.$router.push({ path: `${UrlConfig.orderauthor.trainferPackage}` });
handlePackage() { }
this.$router.push({ path: `${UrlConfig.orderauthor.trainferPackage}` }) }
} };
}
}
</script> </script>

4
src/views/planMonitor/editTool/schedule.vue
View File

@ -248,7 +248,9 @@ export default {
this.loadChartPage(); this.loadChartPage();
}, },
$route() { $route() {
this.loadChartPage(); this.$nextTick(() => {
this.loadChartPage();
});
} }
}, },
mounted() { mounted() {

6
src/views/teach/practical/index.vue
View File

@ -67,9 +67,9 @@ export default {
this.height = this._clientHeight - 50; this.height = this._clientHeight - 50;
}, },
initLoadPage() { initLoadPage() {
const data = { id: this.$route.params.trainingId }; const trainingId = this.$route.params.trainingId;
if (parseInt(data.id)) { if (parseInt(trainingId)) {
getTrainingDetail(data) getTrainingDetail(trainingId)
.then(res => { .then(res => {
this.courseModel = { this.courseModel = {
id: res.data.id, id: res.data.id,