gitadmin/sk_fems_ui
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[Draf] compare dev vs main #43

Open
dev wants to merge 257 commits from dev into dev-base
pull from: dev
merge into: gitadmin:dev-base
Conversation 0 Commits 257 Files Changed 248 +40090 -30296
246 changed files with 40090 additions and 30296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f41bd1283a - Show all commits

12
components/common/modal/PlanPop.vue
View File

@ -238,7 +238,13 @@ export default {
type: Object,
require: false,
default: () => {
return {};
return {
selectTimeValue1: "00 : 00", // selectBoxTime에 필요한 prop
selectTimeValueList1: [], // selectBoxTime에 필요한 prop
selectTimeValue2: "01 : 00", // selectBoxTime에 필요한 prop
selectTimeValueList2: [], // selectBoxTime에 필요한 prop
minInterval: 10,
};
},
},
},
@ -536,8 +542,8 @@ export default {
let returnData = res[0];
this.strtDt = Utility.setFormatDate(returnData.strtDt, 'YYYY-MM-DD');
this.endDt = Utility.setFormatDate(returnData.endDt, 'YYYY-MM-DD');
this.selectTimeValue1 = returnData.strtHh+' : '+ returnData.strtMm;
this.selectTimeValue2 = returnData.endHh+' : '+ returnData.endMm;
this.selectTimeValue1 = returnData.strtHh + ' : ' + returnData.strtMm;
this.selectTimeValue2 = returnData.endHh + ' : ' + returnData.endMm;
this.planTitle = returnData.planTitle;
this.planCntn = returnData.planCntn;
this.planColor = returnData.planColor;

2
components/common/select/SelectBoxTime.vue
View File

@ -20,7 +20,7 @@
item-value="value"
solo
outlined
:menu-props="{ auto: true, offsetY: true }"
:menu-props="{ top: false, offsetY: true }"
:hide-details="true"
:class="['v-select__custom', customClass]"
:disabled="disabled"