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

派班工作站&运行图加载调整

Browse Source
This commit is contained in:
fan 2020-04-22 09:42:46 +08:00
parent 05c857aeb6
commit adfe7f0f05
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/baseUrl.js
View File

@ -2,9 +2,9 @@ export function getBaseUrl() {
let BASE_API; let BASE_API;
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud'; // BASE_API = 'https://joylink.club/jlcloud';
BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
// BASE_API = 'http://192.168.3.6:9000'; // 旭强 BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.41:9000'; // 张赛

1
src/views/newMap/displayNew/demon/scheduling.vue
View File

@ -303,6 +303,7 @@ export default {
this.setConflictList(resp.data.conflictList); this.setConflictList(resp.data.conflictList);
this.$message.warning(this.$t('display.schedule.checkFailed')); this.$message.warning(this.$t('display.schedule.checkFailed'));
} else { } else {
this.setConflictList([]);
this.$message.success(this.$t('display.schedule.saveSchedulePlanSuccess')); this.$message.success(this.$t('display.schedule.saveSchedulePlanSuccess'));
} }
}).catch(() => { }).catch(() => {

15
src/views/planSchedule/menusPlan/createWeekPlan.vue
View File

@ -11,7 +11,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<el-row> <el-row>
<el-form ref="form" :model="model" :rules="rules" label-width="140px" size="small"> <el-form v-if="dialogShow" ref="form" :model="model" :rules="rules" label-width="140px" size="small">
<el-form-item label="运行图名称:" prop="planId"> <el-form-item label="运行图名称:" prop="planId">
<el-row> <el-row>
<el-select v-model="model.planId"> <el-select v-model="model.planId">
@ -30,6 +30,7 @@
v-model="model.dateList" v-model="model.dateList"
type="dates" type="dates"
:clearable="false" :clearable="false"
:picker-options="pickerOptions"
placeholder="选择一个或多个日期" placeholder="选择一个或多个日期"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
/> />
@ -59,7 +60,12 @@ export default {
planName: '', planName: '',
dateList: [] dateList: []
}, },
runPlanList: [] runPlanList: [],
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 24 * 3600 * 1000;
}
}
}; };
}, },
computed: { computed: {
@ -96,6 +102,11 @@ export default {
doClose() { doClose() {
this.loading = false; this.loading = false;
this.dialogShow = false; this.dialogShow = false;
this.model = {
planId: '',
planName: '',
dateList: []
};
}, },
handleChoose() { handleChoose() {
this.$refs.choose.doShow(); this.$refs.choose.doShow();

2
src/views/planSchedule/menusPlan/managePlanList.vue
View File

@ -29,7 +29,7 @@ export default {
}, },
queryForm: { queryForm: {
labelWidth: '140px', labelWidth: '140px',
reset: true, // reset: true,
offsetSpan: 20 offsetSpan: 20
}, },
queryList: { queryList: {