From 9371d956af8f882b300002190ca77eec122d08a6 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 19 Sep 2019 17:34:04 +0800
Subject: [PATCH] =?UTF-8?q?desc:=20=E8=B0=83=E6=95=B4=E5=86=B2=E7=AA=81,?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E5=9B=BE=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/planMonitor/editTool/menuTool.vue            |  2 +-
 .../planMonitor/editTool/menus/createEmptyPlan.vue     |  8 ++++----
 src/views/planMonitor/editTool/menus/openRunPlan.vue   | 10 ----------
 src/views/planMonitor/editTool/schedule.vue            |  2 +-
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/views/planMonitor/editTool/menuTool.vue b/src/views/planMonitor/editTool/menuTool.vue
index dd426cb16..9f7db4289 100644
--- a/src/views/planMonitor/editTool/menuTool.vue
+++ b/src/views/planMonitor/editTool/menuTool.vue
@@ -35,7 +35,7 @@ export default {
 					click: this.undeveloped
 				},
 				{
-					title:this.$t('planMonitor.frontMachine2'),
+					title: this.$t('planMonitor.frontMachine2'),
 					operate: '',
 					src: '',
 					click: this.undeveloped
diff --git a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
index 1cf176042..a73bdbe0a 100644
--- a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
+++ b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
@@ -196,7 +196,7 @@ export default {
 		loadingScreen() {
 			this.loadingDig = this.$loading({
 				lock: true,
-				text: '正在导入中...',
+				text: this.$t('tip.underImport'),
 				spinner: 'el-icon-loading',
 				background: 'rgba(0, 0, 0, 0.7)'
 			});
@@ -230,16 +230,16 @@ export default {
 
 									importRunPlan({ skinCode: that.$route.query.skinCode || '02', runPlanList: jsonData }).then(response => {
 										that.loadingDig.close();
-										that.$message.success(`导入运行图成功`);
+										that.$message.success(this.$t('tip.importOperationGraphSuccessfully'));
 										// this.$emit('dispatchDialog', { name: 'openRunPlan', params: {type: 'add'} });
 									}).catch(error => {
 										that.loadingDig.close();
-										that.$message.warning(`导入运行图失败: ${error.message}`);
+										that.$message.warning(`${this.$t('tip.importRunGraphFailed')} ${error.message}`);
 									});
 
 								} catch (error) {
 									that.loadingDig.close();
-									that.$message.warning(`解析运行图失败: ${error.message}`);
+									that.$message.warning(`${this.$t('tip.parseRunGraphFailed')} ${error.message}`);
 								}
 							}
 						};
diff --git a/src/views/planMonitor/editTool/menus/openRunPlan.vue b/src/views/planMonitor/editTool/menus/openRunPlan.vue
index 1553169f1..112ffd676 100644
--- a/src/views/planMonitor/editTool/menus/openRunPlan.vue
+++ b/src/views/planMonitor/editTool/menus/openRunPlan.vue
@@ -33,7 +33,6 @@
           :style="{height: height-20+'px'}"
           @node-click="handleNodeClick"
         />
-<<<<<<< HEAD
       </el-scrollbar> -->
       <!-- <el-row type="flex" justify="center" class="button-group">
         <el-button v-if="type == 'add'" type="primary" @click="handleConfirm">选择运行图</el-button>
@@ -41,15 +40,6 @@
         <el-button v-if="type == 'edit'" type="primary" @click="handleEdit">修改</el-button>
         <el-button @click="dialogShow = false">取 消</el-button>
       </el-row> -->
-=======
-      </el-scrollbar>
-      <el-row type="flex" justify="center" class="button-group">
-        <el-button v-if="type == 'add'" type="primary" @click="handleConfirm">{{$t('planMonitor.openRunPlan.selectRunplan')}}</el-button>
-        <el-button v-if="type == 'delete'" type="primary" @click="handleDelete">{{$t('planMonitor.openRunPlan.delete')}}</el-button>
-        <el-button v-if="type == 'edit'" type="primary" @click="handleEdit">{{$t('planMonitor.openRunPlan.modify')}}</el-button>
-        <el-button @click="dialogShow = false">{{$t('global.cancel')}}</el-button>
-      </el-row>
->>>>>>> 98054a93ff95215bd2cb145ef3db1ddc082e95e7
     </el-dialog>
     <edit-plan-name ref="editPlan" @renewal="getRunPlanList" />
   </div>
diff --git a/src/views/planMonitor/editTool/schedule.vue b/src/views/planMonitor/editTool/schedule.vue
index 57eaaf7d0..d3406f70c 100644
--- a/src/views/planMonitor/editTool/schedule.vue
+++ b/src/views/planMonitor/editTool/schedule.vue
@@ -86,7 +86,7 @@ export default {
 				columns: [
 					{
 						prop: 'tripNumber',
-						label: this.$t('planMonitor.tripNumber'),
+						label: this.$t('planMonitor.tripNumber')
 					}
 				]
 			},