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

src/i18n/langs/en/error.js

@@ -87,5 +87,7 @@ export default {
 	startedComprehensiveDrillFailure: 'Started a comprehensive drill failure.',
 	stationAttendantStationCannotBeEmpty: 'Station attendant station cannot be empty',
 	destroyedRoomFailed: 'Destroyed room failed!',
-	exceededTheTotalNumberOfAssignableRoles: 'The number of assigned roles has exceeded the total number of assignable roles!'
+	exceededTheTotalNumberOfAssignableRoles: 'The number of assigned roles has exceeded the total number of assignable roles!',
+	getRunGraphDataFailed: 'Failed to get run graph data',
+	getStationListFail: 'Failed to get station list'
 };

src/i18n/langs/en/global.js

@@ -146,5 +146,6 @@ export default {
 	yes: 'Yes',
 	no: 'No',
 	details: 'Details',
-	enterNameToFilter: 'Enter a name to filter'
+	enterNameToFilter: 'Enter a name to filter',
+	colon: ':'
 };

src/i18n/langs/en/menu.js

@@ -85,5 +85,70 @@ export default {
 	},
 	menuTrain: {
 
-	}
+	},
+    platform: 'Platform',
+    arrivalTime: 'Arrival time',
+    stopTime: 'Stop time',
+    departureTime: 'Departure time',
+    runLevel: 'Run level',
+    serviceNumber: 'Service number',
+    tripNumber: 'Trip number',
+    stationName: 'Station name:',
+    stationKilometerMark: 'Station kilometer mark:',
+    arrivalTime2: 'Arrival time:',
+    file: 'File(F)',
+    view: 'View(V)',
+    edit: 'Edit(E)',
+    tool: 'Tool(T)',
+    help: 'help(H)',
+    viewPlanList: 'View plan list',
+    createAWeekPlan: 'Create a week plan',
+    loadTheDayPlan: 'Load the day plan',
+    achieving: 'Achieving......',
+    addToTheFront: 'Add to the front',
+    addToTheEnd: 'Add to the end',
+    crossing: 'Crossing',
+    date: 'Date',
+    name: 'Name',
+    address: 'Address',
+    displaysDefaultStopTimesAndRunLevels: 'Displays default stop times and run levels',
+    addTask: 'Add task',
+    runGraphName: 'Run graph name',
+    skinType: 'Skin type',
+    selectTemplateRunGraph: 'Select template run graph',
+    load: 'load',
+    plannedDateRange: 'Planned date range',
+    deleteAllPreviousTasks: 'Delete all previous tasks (including this task)',
+    deleteAllSubsequentTasks: 'Delete all subsequent tasks (including this task)',
+    deleteTask: 'Delete task',
+    deleteTheDayPlan: 'Delete the day plan',
+    mapName: 'Map name',
+    loadDate: 'Load date',
+    operationChartSchedule: 'Operation chart schedule',
+    trainLine: 'Train line',
+    startStation: 'Start station',
+    startPlatform: 'Start platform',
+    terminal: 'Terminal',
+    endPlatform: 'End platform',
+    addTask2: 'Add task',
+    deleteTask2: 'Delete task',
+    replace: 'replace',
+    inTheLibrary: 'In the library',
+    outOfTheLibrary: 'Out of the library',
+    changeTripNumber: 'Change trip number',
+    lineStartTime: 'Line start time',
+    lineEndTime: 'Line end time',
+    lineDetails: 'Line details',
+    station: 'Station',
+    affectSubsequentTasks: 'Affect subsequent tasks',
+    manual: 'manual',
+    defaultStopTime: 'Default stop time',
+    clearGuest: 'Clear guest',
+    continuationPlan: 'Continuation plan',
+    firstTrain: 'First train',
+    serialNumber: 'Serial number',
+    defaultRunLevel: 'Default run level',
+    lastTrain: 'Last train',
+    description: 'Description',
+    modifyTask: 'Modify task'
 };

src/i18n/langs/en/rules.js

@@ -256,5 +256,9 @@ export default {
 	selectTheCourseNameFirst: 'Please select the course name first',
 	selectMultiplePermissions: 'Please select multiple permissions',
 	enterPermissionName: 'Please enter a permission name',
-	pleaseSelectPermission: 'Please select permission'
+	pleaseSelectPermission: 'Please select permission',
+	pleaseSelectTemplateRunGraph: 'Please select a template to run the diagram',
+	selectTheRunningDiagramToBeLoaded: 'Please select the running diagram to be loaded',
+	selectOneOrMoreDates: 'Select one or more dates',
+	selectAPlannedDateRange: 'Please select a planned date range'
 };

src/i18n/langs/en/tip.js

@@ -146,5 +146,10 @@ export default {
 	obtainedPermissionSuccessfully: 'Successfully obtained permission',
 	modifyTheUserPermissionStatus: 'Will this action modify the user permission status?',
 	destroyRoomHint: 'You will destroy the room, are you sure you want to do this?',
-	contentIsEmptyAndCannotBeSent: 'The content is empty and cannot be sent!'
+	contentIsEmptyAndCannotBeSent: 'The content is empty and cannot be sent!',
+	generateUserDailyRunGraphSuccessfully: 'Generate user daily run graph successfully',
+	generateUserDailyRunGraphFailed: 'Generate user daily run graph failed',
+	createRunChartPlanSuccessfully: 'Create a run chart plan successfully',
+	createRunChartPlanFailed: 'Create run chart plan failed',
+    deleteTheRunningGraphLoadedTheNextDay: 'This operation will delete the running graph loaded the next day, will it continue?'
 };

src/i18n/langs/zh/error.js

@@ -87,5 +87,7 @@ export default {
 	startedComprehensiveDrillFailure: '开始综合演练失败。',
 	stationAttendantStationCannotBeEmpty: '值班员所属车站不能为空',
 	destroyedRoomFailed: '销毁房间失败！',
-	exceededTheTotalNumberOfAssignableRoles: '分配角色数量已超过可分配角色总数！'
+	exceededTheTotalNumberOfAssignableRoles: '分配角色数量已超过可分配角色总数！',
+	getRunGraphDataFailed: '获取运行图数据失败',
+	getStationListFail: '获取车站列表失败'
 };

src/i18n/langs/zh/global.js

@@ -65,7 +65,6 @@ export default {
 	update: '更 新',
 	return: '返 回',
 	toBeDeveloped: '功能待开发',
-	choose: '选 择',
 	yuan: '元',
 	filteringKeywords: '输入关键字进行过滤',
 	lastStep: '上一步',
@@ -152,5 +151,6 @@ export default {
 	yes: '是',
 	no: '否',
 	details: '详情',
-	enterNameToFilter: '输入名称进行过滤'
+	enterNameToFilter: '输入名称进行过滤',
+	colon: '：'
 };

src/i18n/langs/zh/menu.js

@@ -123,6 +123,70 @@ export default {
 		// 设置通信故障
 		// 取消通信故障
 		// 确认运行至前方站
-	}
+	},
-
+	platform: '站台',
+	arrivalTime: '到点',
+	stopTime: '停站时间',
+	departureTime: '发点',
+	runLevel: '运行等级',
+	serviceNumber: '表号',
+	tripNumber: '车次号',
+	stationName: '车站名称：',
+	stationKilometerMark: '车站公里标：',
+	arrivalTime2: '到站时间：',
+	file: '文件（F）',
+	view: '显示（V）',
+	edit: '编辑（E）',
+	tool: '工具（T）',
+	help: '帮助（H）',
+	viewPlanList: '查看计划列表',
+	createAWeekPlan: '创建一周计划',
+	loadTheDayPlan: '加载当天计划',
+	achieving: '实现中......',
+	addToTheFront: '加在前面',
+	addToTheEnd: '加在最后',
+	crossing: '交路',
+	date: '日期',
+	name: '姓名',
+	address: '地址',
+	displaysDefaultStopTimesAndRunLevels: '显示默认停站时间和运行等级',
+	addTask: '添加任务',
+	runGraphName: '运行图名称',
+	skinType: '皮肤类型',
+	selectTemplateRunGraph: '选择模板运行图',
+	load: '加载',
+	plannedDateRange: '计划日期范围',
+	deleteAllPreviousTasks: '删除以前所有任务（包含本任务）',
+	deleteAllSubsequentTasks: '删除以后所有任务（包含本任务）',
+	deleteTask: '删除任务',
+	deleteTheDayPlan: '删除当天计划',
+	mapName: '地图名称',
+	loadDate: '加载日期',
+	operationChartSchedule: '运行图计划表',
+	trainLine: '列车线路',
+	startStation: '起点站',
+	startPlatform: '起点站台',
+	terminal: '终点站',
+	endPlatform: '终点站台',
+	addTask2: '加任务',
+	deleteTask2: '删任务',
+	replace: '替  换',
+	inTheLibrary: '进库',
+	outOfTheLibrary: '出库',
+	changeTripNumber: '改车次号',
+	lineStartTime: '线路开始时间',
+	lineEndTime: '线路结束时间',
+	lineDetails: '线路详细信息',
+	station: '车站',
+	affectSubsequentTasks: '影响后续任务',
+	manual: '手工',
+	defaultStopTime: '缺省停站时间',
+	clearGuest: '清客',
+	continuationPlan: '延续计划',
+	firstTrain: '首班车',
+	serialNumber: '序列号',
+	defaultRunLevel: '缺省运行等级',
+	lastTrain: '模板车',
+	description: '描述',
+	modifyTask: '修改任务'
 };

src/i18n/langs/zh/rules.js

@@ -267,5 +267,9 @@ export default {
 	selectTheCourseNameFirst: '请先选择课程名称',
 	selectMultiplePermissions: '请选择多个权限',
 	enterPermissionName: '请输入权限名称',
-	pleaseSelectPermission: '请选择权限'
+	pleaseSelectPermission: '请选择权限',
+	pleaseSelectTemplateRunGraph: '请选择模板运行图',
+	selectTheRunningDiagramToBeLoaded: '请选择需要加载的运行图',
+	selectOneOrMoreDates: '选择一个或多个日期',
+	selectAPlannedDateRange: '请选择计划日期范围'
 };

src/i18n/langs/zh/tip.js

@@ -150,5 +150,10 @@ export default {
 	obtainedPermissionSuccessfully: '领取权限成功',
 	modifyTheUserPermissionStatus: '此操作将修改用户权限状态?',
 	destroyRoomHint: '您将销毁房间，是否确定执行此操作',
-	contentIsEmptyAndCannotBeSent: '内容为空，不可发送！'
+	contentIsEmptyAndCannotBeSent: '内容为空，不可发送！',
+	generateUserDailyRunGraphSuccessfully: '生成用户每日运行图成功',
+	generateUserDailyRunGraphFailed: '生成用户每日运行图成失败',
+	createRunChartPlanSuccessfully: '创建运行图计划成功',
+	createRunChartPlanFailed: '创建运行图计划失败',
+	deleteTheRunningGraphLoadedTheNextDay: '此操作将删除次日加载的运行图, 是否继续?'
 };

src/jmap/theme/fuzhou_01/menusPlan/addTask.vue

@@ -13,13 +13,13 @@
     <div style="margin: 10px">
       <el-row>
         <el-col :span="3">
-          <el-radio v-model="model.type" label="1">加在最前</el-radio>
+          <el-radio v-model="model.type" label="1">{{$t('menu.addToTheFront')}}</el-radio>
         </el-col>
         <el-col :span="2" :offset="1">
-          <span>车次号：</span>
+          <span>{{$t('menu.tripNumber') + $t('global.colon')}}</span>
         </el-col>
         <el-col :span="5">
-          <el-select v-model="model.tripNumber" placeholder="请选择">
+          <el-select v-model="model.tripNumber" :placeholder="this.$t('global.choose')">
             <el-option
               v-for="item in tripNumberList"
               :key="item.value"
@@ -29,10 +29,10 @@
           </el-select>
         </el-col>
         <el-col :span="3" :offset="1">
-          <span>开始时间：</span>
+          <span>{{$t('global.startTime') + $t('global.colon')}}</span>
         </el-col>
         <el-col :span="5">
-          <el-select v-model="model.startTime" placeholder="请选择">
+          <el-select v-model="model.startTime" :placeholder="this.$t('global.choose')">
             <el-option
               v-for="item in tripNumberList"
               :key="item.value"
@@ -44,13 +44,13 @@
       </el-row>
       <el-row>
         <el-col :span="3">
-          <el-radio v-model="model.type" label="2">加在最后</el-radio>
+          <el-radio v-model="model.type" label="2">{{$t('global.addToTheEnd')}}</el-radio>
         </el-col>
         <el-col :span="2" :offset="1">
-          <span>车次号：</span>
+          <span>{{$t('menu.tripNumber') + $t('global.colon')}}</span>
         </el-col>
         <el-col :span="5">
-          <el-select v-model="model.tripNumber" placeholder="请选择">
+          <el-select v-model="model.tripNumber" :placeholder="this.$t('global.choose')">
             <el-option
               v-for="item in tripNumberList"
               :key="item.value"
@@ -60,10 +60,10 @@
           </el-select>
         </el-col>
         <el-col :span="3" :offset="1">
-          <span>开始时间：</span>
+          <span>{{$t('global.startTime') + $t('global.colon')}}</span>
         </el-col>
         <el-col :span="5">
-          <el-select v-model="model.startTime" placeholder="请选择">
+          <el-select v-model="model.startTime" :placeholder="this.$t('global.choose')">
             <el-option
               v-for="item in tripNumberList"
               :key="item.value"
@@ -75,36 +75,36 @@
 
       </el-row>
       <el-row style="margin-bottom: 5px;">
-        交路：
+          {{$t('menu.crossing') + $t('global.colon')}}
       </el-row>
       <el-row>
         <el-table :data="model.route" border :height="180">
-          <el-table-column prop="date" label="日期" width="180" />
+          <el-table-column prop="date" :label="this.$t('menu.date')" width="180" />
-          <el-table-column prop="name" label="姓名" width="180" />
+          <el-table-column prop="name" :label="this.$t('menu.name')" width="180" />
-          <el-table-column prop="address" label="地址" />
+          <el-table-column prop="address" :label="this.$t('menu.address')" />
           <el-table-column width="20" />
         </el-table>
       </el-row>
       <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-        详情：
+          {{$t('global.details') + $t('global.colon')}}
       </el-row>
       <el-row>
         <el-table :data="model.detail" border :height="180">
-          <el-table-column prop="date" label="日期" width="180" />
+          <el-table-column prop="date" :label="this.$t('menu.date')" width="180" />
-          <el-table-column prop="name" label="姓名" width="180" />
+          <el-table-column prop="name" :label="this.$t('menu.name')" width="180" />
-          <el-table-column prop="address" label="地址" />
+          <el-table-column prop="address" :label="this.$t('menu.address')" />
           <el-table-column width="20" />
         </el-table>
       </el-row>
       <el-row>
         <el-col :offset="16">
-          <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
+          <el-checkbox v-model="model.default">{{$t('menu.displaysDefaultStopTimesAndRunLevels')}}</el-checkbox>
         </el-col>
       </el-row>
     </div>
     <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="commit">确 定</el-button>
+      <el-button @click="commit">{{$t('global.confirm')}}</el-button>
-      <el-button @click="doClose">取 消</el-button>
+      <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
     </el-row>
   </el-dialog>
 </template>
@@ -133,7 +133,7 @@ export default {
 	},
 	computed: {
 		title() {
-			return '添加任务';
+			return this.$t('menu.addTask');
 		}
 	},
 	mounted() {

src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue

@@ -11,8 +11,8 @@
   >
     <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <el-row type="flex" justify="center" class="button-group">
-      <el-button type="primary" :loading="loading" @click="handleConfirm">选 择</el-button>
+      <el-button type="primary" :loading="loading" @click="handleConfirm">{{$t('global.select')}}</el-button>
-      <el-button @click="dialogShow = false">取 消</el-button>
+      <el-button @click="dialogShow = false">{{$t('global.cancel')}}</el-button>
     </el-row>
   </el-dialog>
 </template>
@@ -34,11 +34,11 @@ export default {
 			},
 			queryForm: {
 				reset: true,
-				labelWidth: '100px',
+				labelWidth: '120px',
 				queryObject: {
 					name: {
 						type: 'text',
-						label: '运行图名称'
+						label: this.$t('menu.runGraphName')
 					}
 				}
 			},
@@ -48,11 +48,11 @@ export default {
 				radioShow: true,
 				columns: [
 					{
-						title: '运行图名称',
+						title: this.$t('menu.runGraphName'),
 						prop: 'name'
 					},
 					{
-						title: '皮肤类型',
+						title: this.$t('menu.skinType'),
 						prop: 'skinCode',
 						type: 'tag',
 						columnValue: (row) => {
@@ -68,7 +68,7 @@ export default {
 	},
 	computed: {
 		title() {
-			return '选择模板运行图';
+			return this.$t('menu.selectTemplateRunGraph');
 		}
 	},
 	methods: {
@@ -99,7 +99,7 @@ export default {
 					this.$emit('chooseConfirm', choose);
 					this.doClose();
 				} else {
-					this.$messageBox(`请选择模板运行图`);
+					this.$messageBox(this.$t('menu.pleaseSelectTemplateRunGraph'));
 				}
 			}
 		},

src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue

@@ -11,8 +11,8 @@
   >
     <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <el-row type="flex" justify="center" class="button-group">
-      <el-button type="primary" :loading="loading" @click="handleConfirm">加 载</el-button>
+      <el-button type="primary" :loading="loading" @click="handleConfirm">{{$t('menu.load')}}</el-button>
-      <el-button @click="dialogShow = false">取 消</el-button>
+      <el-button @click="dialogShow = false">{{$t('global.cancel')}}</el-button>
     </el-row>
   </el-dialog>
 </template>
@@ -36,11 +36,11 @@ export default {
 			},
 			queryForm: {
 				reset: true,
-				labelWidth: '100px',
+				labelWidth: '120px',
 				queryObject: {
 					name: {
 						type: 'text',
-						label: '运行图名称'
+						label: this.$t('menu.runGraphName')
 					}
 				}
 			},
@@ -50,11 +50,11 @@ export default {
 				radioShow: true,
 				columns: [
 					{
-						title: '运行图名称',
+						title: this.$t('menu.runGraphName'),
 						prop: 'name'
 					},
 					{
-						title: '皮肤类型',
+						title: this.$t('menu.skinType'),
 						prop: 'skinCode',
 						type: 'tag',
 						columnValue: (row) => {
@@ -70,7 +70,7 @@ export default {
 	},
 	computed: {
 		title() {
-			return '加载当天计划';
+			return this.$t('menu.loadTheDayPlan');
 		}
 	},
 	methods: {
@@ -105,14 +105,14 @@ export default {
 						this.reloadTable();
 						this.loadRunData();
 						this.doClose();
-						this.$message.success(`生成用户每日运行图成功`);
+						this.$message.success(this.$t('tip.generateUserDailyRunGraphSuccessfully'));
 					}).catch(() => {
 						this.loading = false;
 						this.reloadTable();
-						this.$messageBox(`生成用户每日运行图失败`);
+						this.$messageBox(this.$t('tip.generateUserDailyRunGraphFailed'));
 					});
 				} else {
-					this.$messageBox(`请选择需要加载的运行图`);
+					this.$messageBox(this.$t('rules.selectTheRunningDiagramToBeLoaded'));
 				}
 			}
 		},
@@ -128,11 +128,11 @@ export default {
 							this.$store.dispatch('runPlan/setPlanData', resp.data);
 						}).catch(() => {
 							this.$store.dispatch('runPlan/setPlanData', []);
-							this.$messageBox(`获取运行图数据失败`);
+							this.$messageBox(this.$t('error.getRunGraphDataFailed'));
 						});
 					});
 				}).catch(() => {
-					this.$messageBox(`获取车站列表失败`);
+					this.$messageBox(this.$t('error.getStationListFail'));
 				});
 			}
 		},

src/jmap/theme/fuzhou_01/menusPlan/createWeekPlan.vue

@@ -11,24 +11,24 @@
     :close-on-click-modal="false"
   >
     <el-row>
-      <el-form ref="form" :model="model" :rules="rules" label-width="140px" size="small">
+      <el-form ref="form" :model="model" :rules="rules" label-width="150px" size="small">
-        <el-form-item label="运行图名称:" prop="planId">
+        <el-form-item :label="this.$t('menu.runGraphName') + this.$t('global.colon')" prop="planId">
           <el-row>
             <el-col :span="19">
               <el-input v-model="model.planName" :readonly="true" />
             </el-col>
             <el-col :span="4" :offset="1">
-              <el-button @click="handleChoose">选择 </el-button>
+              <el-button @click="handleChoose">{{this.$t('global.select')}}</el-button>
             </el-col>
           </el-row>
         </el-form-item>
-        <el-form-item label="计划日期范围:" prop="dateList">
+        <el-form-item :label="this.$t('menu.plannedDateRange') + this.$t('global.colon')" prop="dateList">
           <el-row>
             <el-date-picker
               v-model="model.dateList"
               type="dates"
               :clearable="false"
-              placeholder="选择一个或多个日期"
+              :placeholder="this.$t('rules.selectOneOrMoreDates')"
               value-format="yyyy-MM-dd"
             />
           </el-row>
@@ -36,8 +36,8 @@
       </el-form>
     </el-row>
     <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="create">确 定</el-button>
+      <el-button @click="create">{{$t('global.confirm')}}</el-button>
-      <el-button @click="doClose">取 消</el-button>
+      <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
     </el-row>
     <choose-template-plan ref="choose" @chooseConfirm="chooseConfirm" />
   </el-dialog>
@@ -65,15 +65,15 @@ export default {
 	},
 	computed: {
 		title() {
-			return '创建一周计划';
+			return this.$t('menu.createAWeekPlan');
 		},
 		rules() {
 			const rules = {
 				planId: [
-					{ required: true, message: '请选择模板运行图', trigger: 'blur' }
+					{ required: true, message: this.$t('rules.inputTemplateRunPlan'), trigger: 'blur' }
 				],
 				dateList: [
-					{ required: true, message: '请选择计划日期范围', trigger: 'change' }
+					{ required: true, message: this.$t('rules.selectAPlannedDateRange'), trigger: 'change' }
 				]
 			};
 
@@ -110,11 +110,11 @@ export default {
 			this.$refs['form'].validate((valid) => {
 				if (valid) {
 					createRunPlanLoad(this.buildModel()).then(response => {
-						this.$message.success('创建运行图计划成功');
+						this.$message.success(this.$t('tip.createRunChartPlanSuccessfully'));
 						this.doClose();
 					}).catch(() => {
 						this.doClose();
-						this.$messageBox('创建运行图计划失败');
+						this.$messageBox(this.$t('tip.createRunChartPlanFailed'));
 					});
 				}
 			});

src/jmap/theme/fuzhou_01/menusPlan/deleteTask.vue

@@ -11,14 +11,14 @@
     :close-on-click-modal="false"
   >
     <el-row>
-      <el-radio v-model="type" :label="1">删除以前所有任务（包含本任务）</el-radio>
+      <el-radio v-model="type" :label="1">{{$t('menu.deleteAllPreviousTasks')}}</el-radio>
     </el-row>
     <el-row>
-      <el-radio v-model="type" :label="2">删除以后所有任务（包含本任务）</el-radio>
+      <el-radio v-model="type" :label="2">{{$t('menu.deleteAllSubsequentTasks')}}</el-radio>
     </el-row>
     <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="commit">确 定</el-button>
+      <el-button @click="commit">{{$t('global.confirm')}}</el-button>
-      <el-button @click="doClose">取 消</el-button>
+      <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
     </el-row>
   </el-dialog>
 </template>
@@ -40,7 +40,7 @@ export default {
 	},
 	computed: {
 		title() {
-			return '删除任务';
+			return this.$t('menu.deleteTask');
 		}
 	},
 	mounted() {

src/jmap/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue

@@ -11,8 +11,8 @@
     :close-on-click-modal="false"
   >
     <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="commit">确 定</el-button>
+      <el-button @click="commit">{{$t('global.confirm')}}</el-button>
-      <el-button @click="doClose">取 消</el-button>
+      <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
     </el-row>
   </el-dialog>
 </template>
@@ -31,7 +31,7 @@ export default {
 	},
 	computed: {
 		title() {
-			return '删除当天计划';
+			return this.$t('menu.deleteTheDayPlan');
 		}
 	},
 	mounted() {

src/jmap/theme/fuzhou_01/menusPlan/managePlanList.vue

@@ -38,30 +38,30 @@ export default {
 				indexShow: true,
 				columns: [
 					{
-						title: this.$t('publish.mapName'),
+						title: this.$t('menu.mapName'),
 						prop: 'mapId',
 						type: 'tag',
 						columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
 						tagType: (row) => { return ''; }
 					},
 					{
-						title: this.$t('publish.runPlanName'),
+						title: this.$t('menu.runGraphName'),
 						prop: 'templatePlanId',
 						type: 'tag',
 						columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
 						tagType: (row) => { return 'success'; }
 					},
 					{
-						title: '加载日期',
+						title: this.$t('menu.loadDate'),
 						prop: 'loadTime'
 					},
 					{
 						type: 'button',
-						title: '操作',
+						title: this.$t('global.operate'),
 						width: '100',
 						buttons: [
 							{
-								name: '删除',
+								name: this.$t('global.delete'),
 								handleClick: this.handleDelete,
 								type: 'danger'
 							}
@@ -69,7 +69,7 @@ export default {
 					}
 				],
 				actions: [
-					{ text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
+					{ text: this.$t('global.create'), btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
 				]
 			},
 
@@ -78,7 +78,7 @@ export default {
 	},
 	computed: {
 		title() {
-			return '运行图计划表';
+			return this.$t('menu.operationChartSchedule');
 		}
 	},
 	mounted() {
@@ -107,17 +107,17 @@ export default {
 			return getRunPlanLoadList(params);
 		},
 		handleDelete(index, row) {
-			this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
+			this.$confirm(this.$t('tip.deleteTheRunningGraphLoadedTheNextDay'), this.$t('tip.hint'), {
-				confirmButtonText: '确定',
+				confirmButtonText: this.$t('global.confirm'),
-				cancelButtonText: '取消',
+				cancelButtonText: this.$t('global.cancel'),
 				type: 'warning'
 			}).then(() => {
 				deleteRunPlanLoad(row.id).then(response => {
-					this.$message.success('删除成功');
+					this.$message.success(this.$t('global.successfullyDelete'));
 					this.reloadTable();
 				}).catch(() => {
 					this.reloadTable();
-					this.$messageBox('删除失败');
+					this.$messageBox(this.$t('global.failDelete'));
 				});
 			}).catch(() => { });
 		},

src/jmap/theme/fuzhou_01/menusPlan/modifyingPlan.vue

@@ -11,32 +11,32 @@
     :close-on-click-modal="false"
   >
     <el-row>
-      <el-col :offset="10">列车线路</el-col>
+      <el-col :offset="10">{{$t('menu.trainLine')}}</el-col>
     </el-row>
     <el-row>
       <el-col :span="17">
         <el-table :data="serviceData" border style="width: 100%" height="160">
-          <el-table-column prop="startStationCode" label="起点站" />
+          <el-table-column prop="startStationCode" :label="this.$t('menu.startStation')" />
-          <el-table-column prop="startStationStandCode" label="起点站台" />
+          <el-table-column prop="startStationStandCode" :label="this.$t('menu.startPlatform')" />
-          <el-table-column prop="endStationCode" label="终点站" />
+          <el-table-column prop="endStationCode" :label="this.$t('menu.terminal')" />
-          <el-table-column prop="endStationStandCode" label="终点站台" />
+          <el-table-column prop="endStationStandCode" :label="this.$t('menu.endPlatform')" />
         </el-table>
       </el-col>
       <el-col :span="6" :offset="1">
         <el-row type="flex" justify="center">
-          <el-button class="view-button" @click="handleAddTask">加任务</el-button>
+          <el-button class="view-button" @click="handleAddTask">{{this.$t('menu.addTask2')}}</el-button>
         </el-row>
         <el-row type="flex" justify="center">
-          <el-button class="view-button" @click="handleReplace">替&ensp;&ensp;换</el-button>
+          <el-button class="view-button" @click="handleReplace">{{this.$t('menu.replace')}}</el-button>
         </el-row>
         <el-row type="flex" justify="center">
-          <el-button class="view-button" @click="handleDeleteTask">删任务</el-button>
+          <el-button class="view-button" @click="handleDeleteTask">{{this.$t('menu.deleteTask2')}}</el-button>
         </el-row>
         <div class="view-box">
           <el-row type="flex" justify="center">
             <el-radio-group v-model="storeInOut">
-              <el-radio :label="1">进库</el-radio>
+              <el-radio :label="1">{{this.$t('menu.inTheLibrary')}}</el-radio>
-              <el-radio :label="2">出库</el-radio>
+              <el-radio :label="2">{{this.$t('menu.outOfTheLibrary')}}</el-radio>
             </el-radio-group>
           </el-row>
         </div>
@@ -50,37 +50,37 @@
         <el-input v-model="newServiceNumber" size="small" />
       </el-col>
       <el-col :span="5" style="padding-left: 20px">
-        <el-button style="width: 150px;" @click="handleModifyingTripNumber">改车次号</el-button>
+        <el-button style="width: 150px;" @click="handleModifyingTripNumber">{{$t('menu.changeTripNumber')}}</el-button>
       </el-col>
     </el-row>
     <el-row style="margin-top: 10px">
-      <el-col :span="4"><span class="view-label">线路开始时间</span></el-col>
+      <el-col :span="4"><span class="view-label">{{$t('menu.lineStartTime')}}</span></el-col>
       <el-col :span="8">
         <el-time-select v-model="serviceStartTime" size="small" />
       </el-col>
-      <el-col :span="4"><span class="view-label">线路结束时间</span></el-col>
+      <el-col :span="4"><span class="view-label">{{$t('menu.lineEndTime')}}</span></el-col>
       <el-col :span="8">
         <el-time-select v-model="serviceEndTime" size="small" />
       </el-col>
     </el-row>
     <el-row style="margin-top: 20px">
-      <el-col :offset="10">线路详细信息</el-col>
+      <el-col :offset="10">{{$t('menu.lineDetails')}}</el-col>
     </el-row>
     <el-row>
       <el-table :data="tripData" border style="width: 100%" height="200">
-        <el-table-column prop="arriveTime" label="到站时间" />
+        <el-table-column prop="arriveTime" :label="this.$t('menu.arrivalTime2')" />
-        <el-table-column prop="stationCode" label="车站" />
+        <el-table-column prop="stationCode" :label="this.$t('menu.station')" />
-        <el-table-column prop="stationStandCode" label="站台" />
+        <el-table-column prop="stationStandCode" :label="this.$t('menu.platform')" />
-        <el-table-column prop="stopTime" label="停站时间" />
+        <el-table-column prop="stopTime" :label="this.$t('menu.stopTime')" />
-        <el-table-column prop="level" label="运行等级" />
+        <el-table-column prop="level" :label="this.$t('menu.runLevel')" />
       </el-table>
     </el-row>
     <el-row style="margin-top: 20px">
-      <el-checkbox v-model="effect">影响后续任务</el-checkbox>
+      <el-checkbox v-model="effect">{{$t('menu.affectSubsequentTasks')}}</el-checkbox>
     </el-row>
     <el-row type="flex" justify="center">
-      <el-button @click="commit">确 定</el-button>
+      <el-button @click="commit">{{$t('global.confirm')}}</el-button>
-      <el-button @click="doClose">取 消</el-button>
+      <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
     </el-row>
   </el-dialog>
 </template>
@@ -106,7 +106,7 @@ export default {
 	},
 	computed: {
 		title() {
-			return '修改';
+			return this.$t('global.modify');
 		}
 	},
 	mounted() {

src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue

@@ -15,10 +15,10 @@
         <el-col :span="4">
           <el-row>
             <el-col :span="9">
-              <span>车次号：</span>
+              <span>{{$t('menu.tripNumber') + $t('global.colon')}}</span>
             </el-col>
             <el-col :span="15">
-              <el-select v-model="model.tripNumber" style="display: inline-black" placeholder="请选择">
+              <el-select v-model="model.tripNumber" style="display: inline-black" :placeholder="this.$t('global.choose')">
                 <el-option
                   v-for="item in tripNumberList"
                   :key="item.value"
@@ -32,17 +32,17 @@
         <el-col :span="2">
           <el-row>
             <el-col :offset="4">
-              <el-checkbox v-model="model.trainManual">手工</el-checkbox>
+              <el-checkbox v-model="model.trainManual">{{this.$t('global.manual')}}</el-checkbox>
             </el-col>
           </el-row>
         </el-col>
         <el-col :span="5">
           <el-row>
             <el-col :span="12">
-              <span>缺省停站时间：</span>
+              <span>{{$t('menu.defaultStopTime') + $t('global.colon')}}</span>
             </el-col>
             <el-col :span="12">
-              <el-select v-model="model.time" style="display: inline-black" placeholder="请选择">
+              <el-select v-model="model.time" style="display: inline-black" :placeholder="this.$t('global.choose')">
                 <el-option
                   v-for="item in timeList"
                   :key="item.value"
@@ -56,7 +56,7 @@
         <el-col :span="5">
           <el-row>
             <el-col :span="9" :offset="2">
-              <span>表号：</span>
+              <span>{{$t('menu.serviceNumber') + $t('global.colon')}}</span>
             </el-col>
             <el-col :span="13">
               <el-input v-model="model.serviceNumber" />
@@ -68,13 +68,13 @@
             <el-col :span="22" :offset="2">
               <el-row>
                 <el-col :span="6">
-                  <el-checkbox v-model="model.clearGuest">清客</el-checkbox>
+                  <el-checkbox v-model="model.clearGuest">{{$t('menu.clearGuest')}}</el-checkbox>
                 </el-col>
                 <el-col :span="8">
-                  <el-checkbox v-model="model.continuationPlan">延续计划</el-checkbox>
+                  <el-checkbox v-model="model.continuationPlan">{{$t('menu.continuationPlan')}}</el-checkbox>
                 </el-col>
                 <el-col :span="6">
-                  <el-checkbox v-model="model.firstTrain">首班车</el-checkbox>
+                  <el-checkbox v-model="model.firstTrain">{{$t('menu.firstTrain')}}</el-checkbox>
                 </el-col>
               </el-row>
             </el-col>
@@ -85,10 +85,10 @@
         <el-col :span="4">
           <el-row>
             <el-col :span="9">
-              <span>序列号：</span>
+              <span>{{$t('menu.serialNumber') + $t('global.colon')}}</span>
             </el-col>
             <el-col :span="15">
-              <el-select v-model="model.serialNumber" style="display: inline-black" placeholder="请选择">
+              <el-select v-model="model.serialNumber" style="display: inline-black" :placeholder="this.$t('global.choose')">
                 <el-option
                   v-for="item in serialNumberList"
                   :key="item.value"
@@ -102,17 +102,17 @@
         <el-col :span="2">
           <el-row>
             <el-col :offset="4">
-              <el-checkbox v-model="model.serialManual">手工</el-checkbox>
+              <el-checkbox v-model="model.serialManual">{{this.$t('global.manual')}}</el-checkbox>
             </el-col>
           </el-row>
         </el-col>
         <el-col :span="5">
           <el-row>
             <el-col :span="12">
-              <span>缺省运行等级：</span>
+              <span>{{$t('menu.defaultRunLevel') + $t('global.colon')}}</span>
             </el-col>
             <el-col :span="12">
-              <el-select v-model="model.level" style="display: inline-black" placeholder="请选择">
+              <el-select v-model="model.level" style="display: inline-black" :placeholder="this.$t('global.choose')">
                 <el-option
                   v-for="item in levelList"
                   :key="item.value"
@@ -126,10 +126,10 @@
         <el-col :span="5">
           <el-row>
             <el-col :span="9" :offset="2">
-              <span>开始时间：</span>
+              <span>{{$t('global.startTime') + $t('global.colon')}}</span>
             </el-col>
             <el-col :span="13">
-              <el-time-select v-model="model.startTime" placeholder="选择时间" :clearable="false" />
+              <el-time-select v-model="model.startTime" :placeholder="this.$t('global.selectionTime')" :clearable="false" />
             </el-col>
           </el-row>
         </el-col>
@@ -138,13 +138,13 @@
             <el-col :span="22" :offset="2">
               <el-row>
                 <el-col :span="6">
-                  <el-checkbox v-model="model.inStock">入库</el-checkbox>
+                  <el-checkbox v-model="model.inStock">{{ $t('menu.inTheLibrary') }}</el-checkbox>
                 </el-col>
                 <el-col :span="8">
-                  <el-checkbox v-model="model.outStock">出库</el-checkbox>
+                  <el-checkbox v-model="model.outStock">{{ $t('menu.outOfTheLibrary') }}</el-checkbox>
                 </el-col>
                 <el-col :span="6">
-                  <el-checkbox v-model="model.lastTrain">末班车</el-checkbox>
+                  <el-checkbox v-model="model.lastTrain">{{ $t('menu.lastTrain') }}</el-checkbox>
                 </el-col>
               </el-row>
             </el-col>
@@ -152,64 +152,64 @@
         </el-col>
       </el-row>
       <el-row style="margin-bottom: 5px;">
-        交路：
+          {{$t('menu.crossing') + $t('global.colon')}}
       </el-row>
       <el-row>
         <el-table :data="model.route" border :height="140">
-          <el-table-column prop="beginStationCode" label="起始站">
+          <el-table-column prop="beginStationCode" :label="this.$t('menu.startStation')">
             <template slot-scope="scope">
               {{ formatName(scope.row.beginStationCode) }}
             </template>
           </el-table-column>
-          <el-table-column prop="beginStationStandCode" label="起始站台" />
+          <el-table-column prop="beginStationStandCode" :label="this.$t('menu.startPlatform')"/>
-          <el-table-column prop="endStationCode" label="终到站">
+          <el-table-column prop="endStationCode" :label="this.$t('menu.terminal')">
             <template slot-scope="scope">
               {{ formatName(scope.row.endStationCode) }}
             </template>
           </el-table-column>
-          <el-table-column prop="endStationStandCode" label="终到站台" />
+          <el-table-column prop="endStationStandCode" :label="this.$t('menu.endPlatform')" />
-          <el-table-column prop="describe" label="描述" :width="280" />
+          <el-table-column prop="describe" :label="this.$t('menu.description')" :width="280" />
           <el-table-column :width="40" />
         </el-table>
       </el-row>
       <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-        详情：
+        {{$t('global.details') + $t('global.colon')}}
       </el-row>
       <el-row>
         <el-table :data="model.detail" border :height="140">
-          <el-table-column prop="stationCode" label="站台" :width="160">
+          <el-table-column prop="stationCode" :label="this.$t('menu.platform')" :width="160">
             <template slot-scope="scope">
               {{ formatName(scope.row.stationCode) }}
             </template>
           </el-table-column>
-          <el-table-column prop="startTime" label="到点">
+          <el-table-column prop="startTime" :label="this.$t('menu.arrivalTime')">
             <template slot-scope="scope">
               {{ formatTime(scope.row.startTime) }}
             </template>
           </el-table-column>
-          <el-table-column prop="stopTime" label="停站时间">
+          <el-table-column prop="stopTime" :label="this.$t('menu.stopTime')">
             <template slot-scope="scope">
               {{ formatTime(scope.row.stopTime) }}
             </template>
           </el-table-column>
-          <el-table-column prop="endTime" label="发点">
+          <el-table-column prop="endTime" :label="this.$t('menu.departureTime')">
             <template slot-scope="scope">
               {{ formatTime(scope.row.endTime) }}
             </template>
           </el-table-column>
-          <el-table-column prop="level" label="运行等级" />
+          <el-table-column prop="level" :label="this.$t('menu.runLevel')" />
           <el-table-column width="280" />
         </el-table>
       </el-row>
       <el-row>
         <el-col :offset="16">
-          <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
+          <el-checkbox v-model="model.default">{{$t('menu.displaysDefaultStopTimesAndRunLevels')}}</el-checkbox>
         </el-col>
       </el-row>
     </div>
     <el-row type="flex" justify="center" class="button-group">
-      <el-button @click="commit">确 定</el-button>
+      <el-button @click="commit">{{$t('global.confirm')}}</el-button>
-      <el-button @click="doClose">取 消</el-button>
+      <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
     </el-row>
   </el-dialog>
 </template>
@@ -248,7 +248,7 @@ export default {
 	},
 	computed: {
 		title() {
-			return '修改任务';
+			return this.$t('menu.modifyTask');
 		}
 	},
 	mounted() {

src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue

@@ -142,12 +142,12 @@ export default {
 			tempClassB: -1,
 			menu: [
 				{
-					title: '文件（F）',
+					title: this.$t('menu.file'),
 					children: [
 					]
 				},
 				{
-					title: '显示（V）',
+					title: this.$t('menu.view'),
 					children: [
 						// {
 						//     title: '缩放',
@@ -161,7 +161,7 @@ export default {
 					]
 				},
 				{
-					title: '编辑（E）',
+					title: this.$t('menu.edit'),
 					children: [
 						// {
 						//     title: '修改',
@@ -186,19 +186,22 @@ export default {
 					]
 				},
 				{
-					title: '工具（T）',
+					title: this.$t('menu.tool'),
 					children: [
 						{
-							title: '查看计划列表',
+							title: this.$t('menu.viewPlanList'),
-							click: this.handleViewPlanSchedule
+							click: this.handleViewPlanSchedule,
+                            width: 150
 						},
 						{
-							title: '创建一周计划',
+							title: this.$t('menu.createAWeekPlan'),
-							click: this.handleCreateWeekPlan
+							click: this.handleCreateWeekPlan,
+                            width: 150
 						},
 						{
-							title: '加载当天计划',
+							title: this.$t('menu.loadTheDayPlan'),
-							click: this.handleReloadTodayPlan
+							click: this.handleReloadTodayPlan,
+                            width: 150
 						}
 						// {
 						//     title: '有效性检查',
@@ -207,7 +210,7 @@ export default {
 					]
 				},
 				{
-					title: '帮助（H）',
+					title: this.$t('menu.help'),
 					children: [
 					]
 				}
@@ -305,8 +308,8 @@ export default {
 		},
 		undeveloped() {
 			this.doClose();
-			this.$alert('实现中......', '提示', {
+			this.$alert(this.$t('menu.achieving'), this.$t('tip.hint'), {
-				confirmButtonText: '确定',
+				confirmButtonText: this.$t('tip.confirm'),
 				callback: action => {
 				}
 			});
@@ -364,7 +367,7 @@ export default {
     $height: 20px;
     $menuPadding: 10px;
     $menuItemHeight: 30px;
-    $menuItemWidth: 160px;
+    $menuItemWidth: 170px;
     $menuItemPadding: 5px;
 
     #PlanMenuBar {

src/jmap/theme/fuzhou_01/planSchedule/schedule.vue

@@ -67,7 +67,7 @@ export default {
 				columns: [
 					{
 						prop: 'serviceNumber',
-						label: '表号'
+						label: this.$t('menu.serviceNumber')
 					},
 					{
 						width: 40
@@ -82,7 +82,7 @@ export default {
 				columns: [
 					{
 						prop: 'tripNumber',
-						label: '车次号'
+						label: this.$t('menu.tripNumber')
 					},
 					{
 						width: 40
@@ -322,7 +322,7 @@ export default {
 
 			} catch (error) {
 				this.viewDisabled = false;
-				this.$messageBox(`加载运行图数据失败`);
+				this.$messageBox(this.$t('error.loadingOperationGraphFailed'));
 			}
 		},
 		async loadInitData(series) {
@@ -441,9 +441,9 @@ export default {
 			const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
 			return [
 				`Point Data <hr size=1 style=" margin: 3px 0">`,
-				`车站名称: ${station.name}<br>`,
+				`${this.$t('menu.stationName') + station.name}<br>`,
-				`车站公里标: ${station.kmRange} km <br>`,
+				`${this.$t('menu.stationKilometerMark') + station.kmRange} km <br>`,
-				`到站时间: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
+				`${this.$t('menu.arrivalTime2') + timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
 			].join('');
 		},
 		mouseClick(params) {

src/jmap/theme/fuzhou_01/planSchedule/statusBar.vue

@@ -36,24 +36,24 @@ export default {
 				columns: [
 					{
 						prop: 'stationName',
-						label: '站台',
+						label: this.$t('menu.platform'),
 						width: 400
 					},
 					{
 						prop: 'startTime',
-						label: '到点'
+						label: this.$t('menu.arrivalTime'),
 					},
 					{
 						prop: 'stopTime',
-						label: '停站时间'
+						label: this.$t('menu.stopTime')
 					},
 					{
 						prop: 'endTime',
-						label: '发点'
+						label: this.$t('menu.departureTime')
 					},
 					{
 						prop: 'level',
-						label: '运行等级'
+						label: this.$t('menu.runLevel')
 
 					}
 				]