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

desc: 调整冲突, 增加导入运行图国际化

Browse Source
This commit is contained in:
zyy 2019-09-19 17:34:04 +08:00
parent b5b9f4c1ff
commit 9371d956af
4 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/planMonitor/editTool/menuTool.vue
View File

@ -35,7 +35,7 @@ export default {
click: this.undeveloped click: this.undeveloped
}, },
{ {
title:this.$t('planMonitor.frontMachine2'), title: this.$t('planMonitor.frontMachine2'),
operate: '', operate: '',
src: '', src: '',
click: this.undeveloped click: this.undeveloped

8
src/views/planMonitor/editTool/menus/createEmptyPlan.vue
View File

@ -196,7 +196,7 @@ export default {
loadingScreen() { loadingScreen() {
this.loadingDig = this.$loading({ this.loadingDig = this.$loading({
lock: true, lock: true,
text: '正在导入中...', 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)'
}); });
@ -230,16 +230,16 @@ export default {
importRunPlan({ skinCode: that.$route.query.skinCode || '02', runPlanList: jsonData }).then(response => { importRunPlan({ skinCode: that.$route.query.skinCode || '02', runPlanList: jsonData }).then(response => {
that.loadingDig.close(); that.loadingDig.close();
that.$message.success(`导入运行图成功`); that.$message.success(this.$t('tip.importOperationGraphSuccessfully'));
// this.$emit('dispatchDialog', { name: 'openRunPlan', params: {type: 'add'} }); // this.$emit('dispatchDialog', { name: 'openRunPlan', params: {type: 'add'} });
}).catch(error => { }).catch(error => {
that.loadingDig.close(); that.loadingDig.close();
that.$message.warning(`导入运行图失败: ${error.message}`); that.$message.warning(`${this.$t('tip.importRunGraphFailed')} ${error.message}`);
}); });
} catch (error) { } catch (error) {
that.loadingDig.close(); that.loadingDig.close();
that.$message.warning(`解析运行图失败: ${error.message}`); that.$message.warning(`${this.$t('tip.parseRunGraphFailed')} ${error.message}`);
} }
} }
}; };

10
src/views/planMonitor/editTool/menus/openRunPlan.vue
View File

@ -33,7 +33,6 @@
:style="{height: height-20+'px'}" :style="{height: height-20+'px'}"
@node-click="handleNodeClick" @node-click="handleNodeClick"
/> />
<<<<<<< HEAD
</el-scrollbar> --> </el-scrollbar> -->
<!-- <el-row type="flex" justify="center" class="button-group"> <!-- <el-row type="flex" justify="center" class="button-group">
<el-button v-if="type == 'add'" type="primary" @click="handleConfirm">选择运行图</el-button> <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 v-if="type == 'edit'" type="primary" @click="handleEdit">修改</el-button>
<el-button @click="dialogShow = false">取 消</el-button> <el-button @click="dialogShow = false">取 消</el-button>
</el-row> --> </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> </el-dialog>
<edit-plan-name ref="editPlan" @renewal="getRunPlanList" /> <edit-plan-name ref="editPlan" @renewal="getRunPlanList" />
</div> </div>

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

@ -86,7 +86,7 @@ export default {
columns: [ columns: [
{ {
prop: 'tripNumber', prop: 'tripNumber',
label: this.$t('planMonitor.tripNumber'), label: this.$t('planMonitor.tripNumber')
} }
] ]
}, },