Merge remote-tracking branch 'remotes/origin/dev' into test
This commit is contained in:
commit
6e8807d53c
@ -18,6 +18,7 @@ export default {
|
||||
residualPermissionDistributionMap: 'Residual permission distribution map',
|
||||
totalPermissions: 'total permissions',
|
||||
noMapLineDataYetAvailable: 'No map line data yet available',
|
||||
selectTheMapRoute: 'Please select the map route.',
|
||||
individual: 'individual',
|
||||
permissionMap: {
|
||||
'ATS local workstation - Course authority': 0,
|
||||
|
@ -167,5 +167,10 @@ export default {
|
||||
stationName: 'Station Name',
|
||||
stationMark: 'Station kilometer Mark',
|
||||
arrivalTime: 'ArrivalTime'
|
||||
},
|
||||
chatBox: {
|
||||
chatWindow: 'Chat Window',
|
||||
autoplay: 'Autoplay',
|
||||
holdAndTalk: 'Hold And Talk'
|
||||
}
|
||||
};
|
||||
|
@ -111,13 +111,17 @@ export default {
|
||||
creationTime: 'Create Time: ',
|
||||
amountPayable: 'Amounts Payable: ',
|
||||
screenName: 'Screen Name',
|
||||
courseName: 'Course Name',
|
||||
timeUnitPrice: 'Screen Unit Price',
|
||||
coursePrice: 'Course Unit Price',
|
||||
testPrice: 'Test Unit Price',
|
||||
|
||||
buyProject: 'The products you will purchase are virtual content services. After purchase, you will not be able to return, transfer or exchange. Please confirm.',
|
||||
relatedServices: 'You can view and use the related services in the “Permissions Details” area after purchase.',
|
||||
paymentSuccessful: 'Payment successful,click to return',
|
||||
cancelSuccessfully: 'Cancel success,click to return',
|
||||
paymentFailed: 'Payment failed,click to return',
|
||||
previousStep: 'Previous step',
|
||||
|
||||
putaway: 'Putaway',
|
||||
soldOut: 'Sold out',
|
||||
|
@ -96,5 +96,6 @@ export default {
|
||||
platform: 'Platform',
|
||||
train: 'Train',
|
||||
station: 'Station',
|
||||
trainWindow: 'Train window'
|
||||
trainWindow: 'Train window',
|
||||
editStepInfo: 'Edit step information'
|
||||
};
|
||||
|
@ -25,12 +25,34 @@ export default {
|
||||
contentShows: 'content show',
|
||||
createBatch: 'Create a batch',
|
||||
|
||||
publishMap: 'Publish map',
|
||||
bothCreate: 'Batch generation',
|
||||
automaticRouteTypeColon: 'Automatic route type:',
|
||||
stationstandPosition: 'Station stand position:',
|
||||
signalLinkCode: 'Signal link',
|
||||
signalNamePosition: 'Signal name position:',
|
||||
signalGuidePosition: 'Signal guide:',
|
||||
signalPosition: 'Signal position:',
|
||||
signalButtonPosition: 'button:',
|
||||
switchTp: 'Time coordinate offset:',
|
||||
buttonType: 'Button type',
|
||||
buttonControl: 'Button',
|
||||
textPoints: 'Coordinate:',
|
||||
codeC: 'code',
|
||||
delayUnlockPosition: 'Delay unlock position:',
|
||||
counterPosition: 'Counter position:',
|
||||
trainNumber: 'Train number',
|
||||
automaticRouteType: 'Automatic route type',
|
||||
routeRouteScreenData: 'Route screen door',
|
||||
routeRouteTurnoutData: 'Route turnout',
|
||||
trainWindowPoints: 'Train window points:',
|
||||
|
||||
createSection: '一键生成区段',
|
||||
createSwitch: '一键生成道岔',
|
||||
clearHint: '清除提示',
|
||||
batchOperation: '批量操作',
|
||||
breakUpNumber: '拆分数量',
|
||||
physicalSegmentName: '物理区段:',
|
||||
// physicalSegmentName: '物理区段:',
|
||||
|
||||
save: 'save',
|
||||
updata: 'update',
|
||||
@ -302,6 +324,7 @@ export default {
|
||||
stationKmPostFontColor: 'Font color of kilometer mark:',
|
||||
stationPositionX: 'X coordinate:',
|
||||
stationPositionY: 'Y coordinate:',
|
||||
stationPosition: 'Station position:',
|
||||
|
||||
stationControlCode: 'Control mode coding:',
|
||||
stationControlName: 'Control mode name:',
|
||||
@ -382,6 +405,7 @@ export default {
|
||||
switchShowName: 'Whether the switch name is displayed:',
|
||||
switchPositionX: 'Switch name x offset:',
|
||||
switchPositionY: 'Switch name y offset:',
|
||||
switchPosition: 'Switch name offset:',
|
||||
turnTime: 'The switch changes time:',
|
||||
timeoutShow: 'Whether to display switch countdown time:',
|
||||
sectionACode: 'Associated with A Section Code:',
|
||||
@ -420,6 +444,8 @@ export default {
|
||||
createTrainWindow: 'Create a train window with one click',
|
||||
|
||||
showZc: 'Whether or not visible:',
|
||||
interconnected: 'Interlock control name',
|
||||
stationControlPosition: 'Control mode coordinates:',
|
||||
|
||||
pathUnitList: 'Path unit list',
|
||||
startSectionCode: 'Starting stop',
|
||||
|
@ -129,35 +129,34 @@ export default {
|
||||
confirmRunToFrontStation: 'Confirm Run To Front Station'
|
||||
},
|
||||
passiveDialog: {
|
||||
// 级告警详细信息
|
||||
// 线路名称
|
||||
// 单位名称
|
||||
// 模块名称
|
||||
// 报警时间
|
||||
// 选择日期时间
|
||||
// 等 级
|
||||
// 确认状态
|
||||
// 类  型
|
||||
// 子类型
|
||||
// 时间摘要
|
||||
// 推荐操作
|
||||
// 报警详细描述
|
||||
// 请输入内容
|
||||
// 确 定
|
||||
// 未确认
|
||||
// 级报警数目:1
|
||||
// 中控
|
||||
// 站控
|
||||
// CMM控制模式转换模式
|
||||
// 0级告警
|
||||
// 确认状态
|
||||
// 系统事件
|
||||
// 依据信号设备操作命令设置控制模式
|
||||
// 控制模式摘要
|
||||
// 控制模式转换:
|
||||
// 由
|
||||
// 站控转为中控模式
|
||||
// 中控转为站控模式
|
||||
alarmDetailInformation: 'level alarm details',
|
||||
lineName: 'Line Name',
|
||||
unitName: 'Unit Name',
|
||||
moduleName: 'Module Name',
|
||||
alarmDate: 'Alarm Date',
|
||||
level: 'level',
|
||||
selectDate: 'Please select date',
|
||||
confirmStatus: 'Confirm',
|
||||
type: 'Type',
|
||||
childType: 'Child Type',
|
||||
timeSummary: 'Time Summary',
|
||||
recommendedOperation: 'Recommend Operation',
|
||||
alarmDetailedDescription: 'Alarm Detail Description',
|
||||
inputContent: 'Please input content',
|
||||
confirm: 'Confirm',
|
||||
unconfirmedMessageOne: 'number of level',
|
||||
unconfirmedMessageTwo: ' alarm is not confirmed:1',
|
||||
centralControl: 'Central Control',
|
||||
// stationControl: 'Station Control',
|
||||
cmmControlModeConversionMode: 'CMM Control Mode Transfer Mode',
|
||||
zeroLevelAlarm: 'Level 0 alarm',
|
||||
systemEvent: 'System Event',
|
||||
childTypeTips: 'Set the control mode according to the signal device operation command',
|
||||
controlModeSummary: 'Control Mode Summary',
|
||||
controlModeTransfer: 'Control Mode Transfer: ',
|
||||
alarmDetailOne: 'changed ',
|
||||
stationToCentral: 'from station control to central control mode',
|
||||
centralToStation: 'from central control to station control mode',
|
||||
|
||||
controlModeRequest: 'Control Mode Request',
|
||||
requestAreaControlMode: 'Request Area Control Mode',
|
||||
@ -170,7 +169,7 @@ export default {
|
||||
agree: 'Agree',
|
||||
refuse: 'Refuse',
|
||||
dispatcherWorkstation: 'Dispatcher One Workstation',
|
||||
inTheControl: 'In The Control',
|
||||
inTheControl: 'Central Control',
|
||||
stationControl: 'Station Control',
|
||||
selectData: 'Please select a piece of data',
|
||||
|
||||
@ -311,6 +310,8 @@ export default {
|
||||
range: ' (Range:16-99) '
|
||||
|
||||
},
|
||||
confirm: 'Confirm',
|
||||
cancel: 'Cancel',
|
||||
platform: 'Platform',
|
||||
arrivalTime: 'Arrival time',
|
||||
stopTime: 'Stop time',
|
||||
@ -455,6 +456,7 @@ export default {
|
||||
detainTrainStationList: 'Detain train station list (center setting)',
|
||||
allStationsHaveNoDetainTrainStatus: 'All stations have no detain train status!',
|
||||
detainTrainStation: 'Detain train station',
|
||||
nextPlatform: 'Next platform',
|
||||
intervalRunningTime: 'Interval running time',
|
||||
alwaysEffective: 'Always effective',
|
||||
setRunLevelTip: 'Tip: The next station to set the run level is not selected.',
|
||||
|
@ -102,5 +102,6 @@ export default {
|
||||
orderDetails: 'Order details',
|
||||
statusType: 'Status type',
|
||||
private: 'Private',
|
||||
public: 'Public'
|
||||
public: 'Public',
|
||||
pleaseEnterContent: 'Please enter content'
|
||||
};
|
||||
|
@ -29,5 +29,7 @@ export default {
|
||||
pleaseSelectTransferPermission: 'Select transfer permissions',
|
||||
permissionName: 'Permission Name',
|
||||
private: 'Private',
|
||||
public: 'Public'
|
||||
public: 'Public',
|
||||
userName: 'User Name',
|
||||
statusType: 'Status Type'
|
||||
};
|
||||
|
@ -266,5 +266,14 @@ export default {
|
||||
enterTheServiceNumber: 'Please enter the service number',
|
||||
enterTheTripNumber: 'Please enter the trip number',
|
||||
enterTheTargetCode: 'Please enter the target code',
|
||||
selectStation: 'Please select station'
|
||||
selectStation: 'Please select station',
|
||||
inputTrainingName: 'Please input training name',
|
||||
inputTrainingRemark: 'Please input training remark',
|
||||
inputTrainingType: 'Please input training type',
|
||||
inputOperationType: 'Please input operation type',
|
||||
inputMinDuration: 'Please input best duration',
|
||||
inputMaxDuration: 'Please input max duration',
|
||||
accessNumber: 'Please input the number of permissions',
|
||||
courseNameEmpty: 'Course name cannot be empty',
|
||||
purchaseMonth: 'Please input the number of months to buy'
|
||||
};
|
||||
|
@ -19,6 +19,7 @@ export default {
|
||||
residualPermissionDistributionMap: '剩余权限分布图',
|
||||
totalPermissions: '权限总计',
|
||||
noMapLineDataYetAvailable: '暂无地图线路数据',
|
||||
selectTheMapRoute: '请选择地图线路',
|
||||
individual: '个',
|
||||
permissionMap: {
|
||||
'ATS现地工作站-课程权限': 0,
|
||||
|
@ -167,6 +167,11 @@ export default {
|
||||
stationName: '车站名称',
|
||||
stationMark: '车站公里标',
|
||||
arrivalTime: '到站时间'
|
||||
},
|
||||
chatBox: {
|
||||
chatWindow: '聊天窗口',
|
||||
autoplay: '自动播放',
|
||||
holdAndTalk: '按住说话'
|
||||
}
|
||||
|
||||
};
|
||||
|
@ -84,6 +84,7 @@ export default {
|
||||
inputRoomNumber: '请输入房间号',
|
||||
chooseRoom: '选择房间',
|
||||
month: '月',
|
||||
previousStep: '上一步',
|
||||
|
||||
permissions: '权限',
|
||||
yuanMonth: '元/月',
|
||||
|
@ -126,35 +126,34 @@ export default {
|
||||
confirmRunToFrontStation: '确认运行至前方站'
|
||||
},
|
||||
passiveDialog: {
|
||||
// 级告警详细信息
|
||||
// 线路名称
|
||||
// 单位名称
|
||||
// 模块名称
|
||||
// 报警时间
|
||||
// 选择日期时间
|
||||
// 等 级
|
||||
// 确认状态
|
||||
// 类  型
|
||||
// 子类型
|
||||
// 时间摘要
|
||||
// 推荐操作
|
||||
// 报警详细描述
|
||||
// 请输入内容
|
||||
// 确 定
|
||||
// 未确认
|
||||
// 级报警数目:1
|
||||
// 中控
|
||||
// 站控
|
||||
// CMM控制模式转换模式
|
||||
// 0级告警
|
||||
// 确认状态
|
||||
// 系统事件
|
||||
// 依据信号设备操作命令设置控制模式
|
||||
// 控制模式摘要
|
||||
// 控制模式转换:
|
||||
// 由
|
||||
// 站控转为中控模式
|
||||
// 中控转为站控模式
|
||||
alarmDetailInformation: '级告警详细信息',
|
||||
lineName: '线路名称',
|
||||
unitName: '单位名称',
|
||||
moduleName: '模块名称',
|
||||
alarmDate: '报警时间',
|
||||
level: '等 级',
|
||||
selectDate: '选择日期时间',
|
||||
confirmStatus: '确认状态',
|
||||
type: '类 型',
|
||||
childType: '子类型',
|
||||
timeSummary: '时间摘要',
|
||||
recommendedOperation: '推荐操作',
|
||||
alarmDetailedDescription: '报警详细描述',
|
||||
inputContent: '请输入内容',
|
||||
confirm: '确 定',
|
||||
unconfirmedMessageOne: '未确认',
|
||||
unconfirmedMessageTwo: '级报警数目:1',
|
||||
centralControl: '中控',
|
||||
// stationControl: '站控',
|
||||
cmmControlModeConversionMode: 'CMM控制模式转换模式',
|
||||
zeroLevelAlarm: '0级告警',
|
||||
systemEvent: '系统事件',
|
||||
childTypeTips: '依据信号设备操作命令设置控制模式',
|
||||
controlModeSummary: '控制模式摘要',
|
||||
controlModeTransfer: '控制模式转换:',
|
||||
alarmDetailOne: '由',
|
||||
stationToCentral: '站控转为中控模式',
|
||||
centralToStation: '中控转为站控模式',
|
||||
|
||||
controlModeRequest: '控制模式请求',
|
||||
requestAreaControlMode: '请求如下区域的控制模式',
|
||||
@ -307,6 +306,8 @@ export default {
|
||||
fontSize: '字体大小',
|
||||
range: '(范围:16-99)'
|
||||
},
|
||||
confirm: '确定',
|
||||
cancel: '取消',
|
||||
platform: '站台',
|
||||
arrivalTime: '到点',
|
||||
stopTime: '停站时间',
|
||||
|
@ -101,5 +101,6 @@ export default {
|
||||
orderSelectionItem: '订单选择商品',
|
||||
orderDetails: '订单详情',
|
||||
statusType: '状态类型',
|
||||
createPackage: '创建权限'
|
||||
createPackage: '创建权限',
|
||||
pleaseEnterContent: '请输入内容'
|
||||
};
|
||||
|
@ -29,5 +29,7 @@ export default {
|
||||
pleaseSelectTransferPermission: '选择转赠权限',
|
||||
permissionName: '权限名称',
|
||||
private: '专用',
|
||||
public: '公用'
|
||||
public: '公用',
|
||||
userName: '用户名称',
|
||||
statusType: '状态类型'
|
||||
};
|
||||
|
@ -28,8 +28,8 @@
|
||||
<div style="padding: 0px 15px; height: 30px;">
|
||||
<div style=" position: relative; top:-5px;">
|
||||
<el-radio-group v-model="direction">
|
||||
<el-radio label="02" :disabled="disabledUp">{{$t('global.upDirection')}}</el-radio>
|
||||
<el-radio label="01" :disabled="disabledDown">{{$t('global.downDirection')}}</el-radio>
|
||||
<el-radio label="02" :disabled="disabledUp">{{$t('menu.upDirection')}}</el-radio>
|
||||
<el-radio label="01" :disabled="disabledDown">{{$t('menu.downDirection')}}</el-radio>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -1,39 +1,39 @@
|
||||
<template>
|
||||
<el-dialog class="fuzhou-01__systerm alarm-detail" :title="level+'级告警详细信息'" :visible.sync="show" width="760px"
|
||||
<el-dialog class="fuzhou-01__systerm alarm-detail" :title="level+$t('menu.passiveDialog.alarmDetailInformation')" :visible.sync="show" width="760px"
|
||||
:before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
|
||||
<el-form label-width="80px" size="mini">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="线路名称">
|
||||
<el-form-item :label="$t('menu.passiveDialog.lineName')">
|
||||
<el-input v-model="model.lineName" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="单位名称">
|
||||
<el-form-item :label="$t('menu.passiveDialog.unitName')">
|
||||
<el-input v-model="model.unitName" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="模块名称">
|
||||
<el-form-item :label="$t('menu.passiveDialog.moduleName')">
|
||||
<el-input v-model="model.moduleName" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="9">
|
||||
<el-form-item label="报警时间">
|
||||
<el-date-picker v-model="model.alarmDate" type="datetime" placeholder="选择日期时间" disabled>
|
||||
<el-form-item :label="$t('menu.passiveDialog.alarmDate')">
|
||||
<el-date-picker v-model="model.alarmDate" type="datetime" :placeholder="$t('menu.passiveDialog.selectDate')" disabled>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="7">
|
||||
<el-form-item>
|
||||
<span slot="label">等 级</span>
|
||||
<span slot="label">{{$t('menu.passiveDialog.level')}}</span>
|
||||
<el-input v-model="model.level" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="确认状态">
|
||||
<el-form-item :label="$t('menu.passiveDialog.confirmStatus')">
|
||||
<el-input v-model="model.confirm" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -41,34 +41,34 @@
|
||||
<el-row>
|
||||
<el-col :span="9" class="alarm-type">
|
||||
<el-form-item>
|
||||
<span slot="label">类  型</span>
|
||||
<span slot="label">{{$t('menu.passiveDialog.type')}}</span>
|
||||
<el-input v-model="model.type" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="15" class="alarm-child-type">
|
||||
<el-form-item label="子类型">
|
||||
<el-form-item :label="$t('menu.passiveDialog.childType')">
|
||||
<el-input v-model="model.childType" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item label="时间摘要">
|
||||
<el-form-item :label="$t('menu.passiveDialog.timeSummary')">
|
||||
<el-input v-model="model.timeSummary" disabled></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="推荐操作">
|
||||
<el-form-item :label="$t('menu.passiveDialog.recommendedOperation')">
|
||||
<el-input v-model="model.recommendedOperation" disabled></el-input>
|
||||
</el-form-item>
|
||||
<div class="alarm-detail-description">
|
||||
<span> 报警详细描述</span><br>
|
||||
<el-input type="textarea" :rows="5" placeholder="请输入内容" v-model="model.alarmDetail" disabled>
|
||||
<span>{{$t('menu.passiveDialog.alarmDetailedDescription')}}</span><br>
|
||||
<el-input type="textarea" :rows="5" :placeholder="$t('menu.passiveDialog.inputContent')" v-model="model.alarmDetail" disabled>
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form>
|
||||
<el-row class="button-group">
|
||||
<el-col :span="3" :offset="9">
|
||||
<el-button :id="domIdCancel" type="primary" :loading="loading" @click="commit">确 定</el-button>
|
||||
<el-button :id="domIdCancel" type="primary" :loading="loading" @click="commit">{{$t('menu.passiveDialog.confirm')}}</el-button>
|
||||
</el-col>
|
||||
<el-col :span="10">
|
||||
<span style="line-height:26px">未确认{{level}}级报警数目:1</span>
|
||||
<span style="line-height:26px">{{$t('menu.passiveDialog.unconfirmedMessageOne')}}{{level}}{{$t('menu.passiveDialog.unconfirmedMessageTwo')}}</span>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</span>
|
||||
@ -88,8 +88,8 @@
|
||||
level: 0,
|
||||
operate: null,
|
||||
controlProps: {
|
||||
'01': '中控',
|
||||
'02': '站控'
|
||||
'01': this.$t('menu.passiveDialog.centralControl'),
|
||||
'02': this.$t('menu.passiveDialog.stationControl')
|
||||
},
|
||||
model: {
|
||||
lineName: '',
|
||||
@ -146,15 +146,15 @@
|
||||
this.model = {
|
||||
lineName: this.name,
|
||||
unitName: this.operate.name,
|
||||
moduleName: 'CMM控制模式转换模式',
|
||||
level: '0级告警',
|
||||
confirm: '确认状态',
|
||||
moduleName: this.$t('menu.passiveDialog.cmmControlModeConversionMode'),
|
||||
level: this.$t('menu.passiveDialog.zeroLevelAlarm'),
|
||||
confirm: this.$t('menu.passiveDialog.confirmStatus'),
|
||||
alarmDate: new Date(),
|
||||
type: '系统事件',
|
||||
childType: '依据信号设备操作命令设置控制模式',
|
||||
timeSummary: '控制模式摘要',
|
||||
type: this.$t('menu.passiveDialog.systemEvent'),
|
||||
childType: this.$t('menu.passiveDialog.childTypeTips'),
|
||||
timeSummary: this.$t('menu.passiveDialog.controlModeSummary'),
|
||||
recommendedOperation: '',
|
||||
alarmDetail: `控制模式转换:${this.operate.name}由${operate.currentMode == '01' ? '站控转为中控模式' : '中控转为站控模式'}!`
|
||||
alarmDetail: `${$t('menu.passiveDialog.controlModeTransfer')} ${this.operate.name}${$t('menu.passiveDialog.alarmDetailOne')}${operate.currentMode == '01' ? this.$t('menu.passiveDialog.stationToCentral') : this.$t('menu.passiveDialog.centralToStation') }!`
|
||||
}
|
||||
this.dialogShow = true;
|
||||
this.$nextTick(function () {
|
||||
|
@ -44,7 +44,7 @@
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="3">
|
||||
<el-radio v-model="model.type" label="2">{{$t('global.addToTheEnd')}}</el-radio>
|
||||
<el-radio v-model="model.type" label="2">{{$t('menu.addToTheEnd')}}</el-radio>
|
||||
</el-col>
|
||||
<el-col :span="2" :offset="1">
|
||||
<span>{{$t('menu.tripNumber') + $t('global.colon')}}</span>
|
||||
|
@ -32,7 +32,7 @@
|
||||
<el-col :span="2">
|
||||
<el-row>
|
||||
<el-col :offset="4">
|
||||
<el-checkbox v-model="model.trainManual">{{this.$t('global.manual')}}</el-checkbox>
|
||||
<el-checkbox v-model="model.trainManual">{{this.$t('menu.manual')}}</el-checkbox>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
@ -102,7 +102,7 @@
|
||||
<el-col :span="2">
|
||||
<el-row>
|
||||
<el-col :offset="4">
|
||||
<el-checkbox v-model="model.serialManual">{{this.$t('global.manual')}}</el-checkbox>
|
||||
<el-checkbox v-model="model.serialManual">{{this.$t('menu.manual')}}</el-checkbox>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
|
@ -5,8 +5,8 @@ export function getBaseUrl() {
|
||||
// BASE_API = 'https://joylink.club/jlcloud';
|
||||
// BASE_API = 'https://test.joylink.club/jlcloud';
|
||||
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
|
||||
// BASE_API = 'http://192.168.3.6:9000'; // 旭强
|
||||
BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
|
||||
BASE_API = 'http://192.168.3.6:9000'; // 旭强
|
||||
// BASE_API = 'http://192.168.3.4:9000' // 琰培
|
||||
} else {
|
||||
BASE_API = process.env.VUE_APP_BASE_API;
|
||||
}
|
||||
|
@ -132,7 +132,7 @@ export default {
|
||||
initChart() {
|
||||
listUserPermision({pageSize: 9000, pageNum: 1}).then(resp => {
|
||||
this.permissionList = resp.data.list.filter(elem => { return parseInt(elem.status) > 0; });
|
||||
this.mapNameList = [...new Set(this.permissionList.map(elem => { return elem.mapName; }))];
|
||||
this.mapNameList = [...new Set(this.permissionList.filter(elem => { return elem.mapName; }).map(elem => { return elem.mapName; }))];
|
||||
this.$nextTick(() => { this.mapName = this.mapNameList[0] || ''; });
|
||||
});
|
||||
this.chart = echarts.init(document.getElementById(this.id));
|
||||
|
@ -2,7 +2,7 @@
|
||||
<div>
|
||||
<div v-show="showChat && !minimize" class="reminder-drag">
|
||||
<div class="tabs-roles">
|
||||
<div class="roles roles-first">聊天窗口</div>
|
||||
<div class="roles roles-first">{{$t('display.chatBox.chatWindow')}}</div>
|
||||
<div class="minimality" @click="handleMinimality('min')">
|
||||
<i class="el-icon-remove" />
|
||||
</div>
|
||||
@ -52,12 +52,12 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="switch-box">
|
||||
<span style="font-size: 12px;">自动播放</span>
|
||||
<span style="font-size: 12px;">{{$t('display.chatBox.autoplay')}}</span>
|
||||
<el-switch v-model="isAutoPlay" active-color="#13ce66" inactive-color="#d6d6d6" />
|
||||
</div>
|
||||
</div>
|
||||
<div v-show="showChat && minimize" class="reminder-drag minimize-box">
|
||||
<div class="chat-title">聊天窗口</div>
|
||||
<div class="chat-title">{{$t('display.chatBox.chatWindow')}}</div>
|
||||
<div class="minimality" @click="handleMinimality('max')">
|
||||
<i class="el-icon-circle-plus" />
|
||||
</div>
|
||||
@ -100,7 +100,7 @@ export default {
|
||||
label: '',
|
||||
message: {},
|
||||
sending: false,
|
||||
speak: '按住说话',
|
||||
speak: this.$t('display.chatBox.holdAndTalk'),
|
||||
conversationId: '',
|
||||
defaultProps: {
|
||||
children: 'children'
|
||||
|
@ -158,16 +158,16 @@ export default {
|
||||
{ required: true, message: this.$t('rules.selectPhysicalExtentName'), trigger: 'change' }
|
||||
],
|
||||
directionType: [
|
||||
{ required: true, message: this.$t('map.pleaseSelect') + '' + this.$t('rules.directionType'), trigger: 'change' }
|
||||
{ required: true, message: this.$t('map.pleaseSelect') + '' + this.$t('map.directionType'), trigger: 'change' }
|
||||
],
|
||||
directionShowType: [
|
||||
{ required: true, message: this.$t('map.pleaseSelect') + '' + this.$t('rules.directionType'), trigger: 'change' }
|
||||
{ required: true, message: this.$t('map.pleaseSelect') + '' + this.$t('map.directionType'), trigger: 'change' }
|
||||
],
|
||||
leftOrRight: [
|
||||
{ required: true, message: this.$t('map.pleaseSelect') + '' + this.$t('rules.leftOrRight'), trigger: 'change' }
|
||||
{ required: true, message: this.$t('map.pleaseSelect') + '' + this.$t('map.leftOrRight'), trigger: 'change' }
|
||||
],
|
||||
positionType: [
|
||||
{ required: true, message: this.$t('map.pleaseSelect') + '' + this.$t('rules.positionType'), trigger: 'change' }
|
||||
{ required: true, message: this.$t('map.pleaseSelect') + '' + this.$t('map.positionType'), trigger: 'change' }
|
||||
]
|
||||
}
|
||||
};
|
||||
|
@ -117,10 +117,10 @@ export default {
|
||||
updtRules() {
|
||||
return {
|
||||
'origin.x': [
|
||||
{ required: true, message: this.$t('map.enterXOffset'), trigger: 'blur' }
|
||||
{ required: true, message: this.$t('rules.enterXOffset'), trigger: 'blur' }
|
||||
],
|
||||
'origin.y': [
|
||||
{ required: true, message: this.$t('map.enterYOffset'), trigger: 'blur' }
|
||||
{ required: true, message: this.$t('rules.enterYOffset'), trigger: 'blur' }
|
||||
],
|
||||
scaling: [
|
||||
{ required: true, message: this.$t('rules.enterScale'), trigger: 'blur' }
|
||||
|
@ -23,6 +23,7 @@
|
||||
:span="22"
|
||||
@node-contextmenu="showContextMenu"
|
||||
@node-click="clickEvent"
|
||||
style="padding-bottom: 30px;"
|
||||
>
|
||||
<span slot-scope="{ node: tnode }" class="custom-tree-node">
|
||||
<span
|
||||
|
Loading…
Reference in New Issue
Block a user