调整: 国际化+成都三号线人工车显示

This commit is contained in:
fan 2019-08-19 18:31:13 +08:00
parent cdf021cca9
commit c5ecf86107
9 changed files with 99 additions and 67 deletions

View File

@ -78,6 +78,7 @@ export default {
trainingHasStart: "(name)'s room has begun",
trainingNotStart: "(name)'s room hasn't started yet",
inputRoomNumber: 'Please enter the room number.',
chooseRoom: 'Choose Room'
chooseRoom: 'Choose Room',
month: 'month'
};

View File

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

View File

@ -79,5 +79,6 @@ export default {
trainingHasStart: '{{name}}的房间已开始',
trainingNotStart: '{{name}}的房间未开始',
inputRoomNumber: '请输入房间号',
chooseRoom: '选择房间'
chooseRoom: '选择房间',
month: '月'
};

View File

@ -82,5 +82,6 @@ export default {
orderNumber: '订单号',
sourcesOfInformation: '信息来源',
distributePermission: '权限分发',
orderCreation: '订单创建'
orderCreation: '订单创建',
chooseGoods: '选择商品'
};

View File

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

View File

@ -174,12 +174,20 @@ export default class TrainBody extends Group {
this.trainBodyBox && this.trainBodyBox.setStyle('fill', color);
}
setTextTrainServerColor(color) {
this.textTrainServer.setStyle('textFill', color);
this.textTrainServer.setStyle('textStroke', color);
this.textTrainServer&&this.textTrainServer.setStyle('textFill', color);
this.textTrainServer&&this.textTrainServer.setStyle('textStroke', color);
}
setTextTrainTargetColor(color) {
this.textTrainTarget.setStyle('textFill', color);
this.textTrainTarget.setStyle('textStroke', color);
this.textTrainTarget&&this.textTrainTarget.setStyle('textFill', 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) {
if (this.textH) {

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) {
this.model = model;
@ -296,6 +307,7 @@ export default class Train extends Group {
this.setDoorStatus(model.doorStatus); // 设置车门状态类型
this.setCommunicationStatus(model.communicationStatus); // 设置通信状态类型
this.setAlarmStatus(model.alarmStatus); // 设置报警状态
this.setTrainTypeStatus(model.type); // 根据列车类型设置列车识别号样式
}
}
// 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度

View File

@ -106,7 +106,7 @@
{
type: 'button',
title: this.$t('global.operate'),
width: '250',
width: '270',
buttons: [
{
name: this.$t('global.edit'),

View File

@ -163,16 +163,16 @@
items: [
{ prop: 'organizationId', label: this.$t('orderAuthor.organizationOrEnterprise'), type: 'select', required: false, disabled: this.isDisabled, options: this.OrganizationList, allowCreate: true, onChange: this.onChange },
// { prop: 'goodsId', label: '', type: 'select', required: false, disabled: this.isDisabled, options: this.goodsList, change: true, onChange: this.selectCommodity },
{ prop: 'goodsName', label: this.$t('orderAuthor.commodityName'), type: 'text', required: false, disabled: true, rightWidth: true, disabled: true, buttontip: '选择商品', buttonClick: this.buttonClick },
{ prop: 'price', label: this.$t('orderAuthor.itemPricing'), type: 'number', required: false, disabled: true, min: 0, message: '元' },
{ prop: 'goodsName', label: this.$t('orderAuthor.commodityName'), type: 'text', required: false, rightWidth: true, disabled: true, buttontip: this.$t('orderAuthor.chooseGoods'), buttonClick: this.buttonClick },
{ prop: 'price', label: this.$t('orderAuthor.itemPricing'), type: 'number', required: false, disabled: true, min: 0, message: this.$t('global.yuan') },
{ prop: 'orderType', label: this.$t('orderAuthor.orderType'), type: 'select', required: false, disabled: this.isDisabled, options: this.OrderTypeList },
{ prop: 'sellerId', label: this.$t('orderAuthor.salesman'), type: 'select', required: false, show: this.isShowSeller, disabled: this.isDisabled, options: this.SellerList },
{ prop: 'contractNo', label: this.$t('orderAuthor.contractNumber'), type: 'text', required: false, show: this.isShowContractNo },
{ prop: 'amount', label: this.totalTitle, type: 'number', required: false, show: true, min: 0 },
{ prop: 'forever', label: this.$t('orderAuthor.permanenceOrNot'), type: 'radio', required: false, options: this.$ConstSelect.Whether, disabled: this.foreverIsDisabled },
{ prop: 'startTime', label: this.$t('orderAuthor.startDate'), type: 'date', required: false, show: this.isShowStartDate, viewFormat: "yyyy-MM-dd", valueFormat: "yyyy-MM-dd", picker: this.DatePicker },
{ prop: 'monthAmount', label: this.monthsTitle, type: 'number', required: false, show: this.isShowMonths, min: 0, message: '月' },
{ prop: 'totalPrice', label: this.$t('orderAuthor.totalPrice'), type: 'number', required: false, show: this.isShowPrice, min: 0, message: '元' },
{ prop: 'monthAmount', label: this.monthsTitle, type: 'number', required: false, show: this.isShowMonths, min: 0, message: this.$t('global.month') },
{ prop: 'totalPrice', label: this.$t('orderAuthor.totalPrice'), type: 'number', required: false, show: this.isShowPrice, min: 0, message: this.$t('global.yuan') },
{ prop: 'bizType', label: this.$t('orderAuthor.businessType'), type: 'select', required: false, disabled: true, options: this.BizTypeList },
{ prop: 'payWays', label: this.$t('orderAuthor.paymentMethod'), type: 'select', required: false, disabled: this.payTypeIsDisabled, show: this.isShowPayType, options: this.PayTypeList },
{ prop: 'payStatus', label: this.$t('orderAuthor.paymentStatus'), type: 'select', required: false, disabled: this.payStatusDisabled, show: this.isShowPayStatus, options: this.PayStatusTypeList },