diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index e9046878d..7cedc6817 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,9 +2,9 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // 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.6:9000'; // 旭强 + BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 diff --git a/src/views/newMap/displayNew/demon/scheduling.vue b/src/views/newMap/displayNew/demon/scheduling.vue index 9d13c93dd..3c760e0e0 100644 --- a/src/views/newMap/displayNew/demon/scheduling.vue +++ b/src/views/newMap/displayNew/demon/scheduling.vue @@ -303,6 +303,7 @@ export default { this.setConflictList(resp.data.conflictList); this.$message.warning(this.$t('display.schedule.checkFailed')); } else { + this.setConflictList([]); this.$message.success(this.$t('display.schedule.saveSchedulePlanSuccess')); } }).catch(() => { diff --git a/src/views/planSchedule/menusPlan/createWeekPlan.vue b/src/views/planSchedule/menusPlan/createWeekPlan.vue index 0bccedffb..26066f48a 100644 --- a/src/views/planSchedule/menusPlan/createWeekPlan.vue +++ b/src/views/planSchedule/menusPlan/createWeekPlan.vue @@ -11,7 +11,7 @@ :close-on-click-modal="false" > - + @@ -30,6 +30,7 @@ v-model="model.dateList" type="dates" :clearable="false" + :picker-options="pickerOptions" placeholder="选择一个或多个日期" value-format="yyyy-MM-dd" /> @@ -59,7 +60,12 @@ export default { planName: '', dateList: [] }, - runPlanList: [] + runPlanList: [], + pickerOptions: { + disabledDate(time) { + return time.getTime() < Date.now() - 24 * 3600 * 1000; + } + } }; }, computed: { @@ -96,6 +102,11 @@ export default { doClose() { this.loading = false; this.dialogShow = false; + this.model = { + planId: '', + planName: '', + dateList: [] + }; }, handleChoose() { this.$refs.choose.doShow(); diff --git a/src/views/planSchedule/menusPlan/managePlanList.vue b/src/views/planSchedule/menusPlan/managePlanList.vue index 9e6fbd179..86534909f 100644 --- a/src/views/planSchedule/menusPlan/managePlanList.vue +++ b/src/views/planSchedule/menusPlan/managePlanList.vue @@ -29,7 +29,7 @@ export default { }, queryForm: { labelWidth: '140px', - reset: true, + // reset: true, offsetSpan: 20 }, queryList: {