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

update screen 33, 44, 20, fix bug Grid

Browse Source
This commit is contained in:
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
2025-07-30 14:03:41 +07:00
parent b4f8e41c7e
commit 9603353ab3
26 changed files with 199 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/scss/common.scss
View File

@ -486,7 +486,7 @@ a {
.container--fluid { .container--fluid {
background-color: map-deep-get($config, #{$theme}, "container-fluid"); background-color: map-deep-get($config, #{$theme}, "container-fluid");
.menu-container { .menu-container {
max-height:calc(100vh - 60px); height:calc(100vh - 60px);
overflow-y: auto; overflow-y: auto;
} }
} }

25
assets/scss/common/grid.scss
View File

@ -254,12 +254,23 @@
"tui-grid-border-vertical-color" "tui-grid-border-vertical-color"
); );
&-current-row{ // &-current-row{
td { // }
td.row-selected {
.custom-radio { .custom-radio {
background-color: map-deep-get($config,
#{$theme},
"ant-btn-primary-color"
);
.radio-mark{ .radio-mark{
border-color: #1677ff; border-color: map-deep-get($config,
background-color: #fff; #{$theme},
"arow-line-color"
);
background-color: map-deep-get($config,
#{$theme},
"arow-line-btn-bg-color"
);
&::after { &::after {
content: ""; content: "";
position: absolute; position: absolute;
@ -269,8 +280,10 @@
height: 11px; height: 11px;
width: 11px; width: 11px;
border-radius: 50%; border-radius: 50%;
background-color: #1677ff; background-color: map-deep-get($config,
} #{$theme},
"arow-line-color"
);
} }
} }
} }

16
assets/scss/common/input.scss
View File

@ -188,7 +188,7 @@
transform: translateY(-50%); transform: translateY(-50%);
height: 18px; height: 18px;
width: 18px; width: 18px;
background-color: white; // background-color: white;
border: 2px solid #ccc; border: 2px solid #ccc;
border-radius: 50%; border-radius: 50%;
transition: all 0.2s ease; transition: all 0.2s ease;
@ -263,9 +263,6 @@
"v-input-backgroundColor" "v-input-backgroundColor"
); );
&:not(.v-input--radio-group, .v-input--checkbox) { &:not(.v-input--radio-group, .v-input--checkbox) {
.v-input__slot { .v-input__slot {
background-color: map-deep-get($config, background-color: map-deep-get($config,
@ -372,6 +369,17 @@
} }
} }
} }
.radio-mark {
background-color: map-deep-get($config,
#{$theme},
"ant-btn-primary-color"
);
border-color: map-deep-get($config,
#{$theme},
"v-input-textarea-border"
);
}
} }
.v-radio { .v-radio {

26
components/common/Grid.vue
View File

@ -4,14 +4,14 @@
:data="chkGridData" :data="chkGridData"
:columns="chkGridColumns" :columns="chkGridColumns"
:options="chkGridOptions" :options="chkGridOptions"
@mousedown="focusChangeEvt" @mousedown="onMousedown"
@click="startEditing" @click="startEditing"
@editingFinish="editingFinish" @editingFinish="editingFinish"
@dblclick="dblClick" @dblclick="dblClick"
@mouseover="mouseoverEvent" @mouseover="mouseoverEvent"
@mouseout="mouseoutEvent" @mouseout="mouseoutEvent"
@focusChange="focusChangeEvt"
/> />
<!-- @focusChange="focusChangeEvt" -->
</template> </template>
<script> <script>
import { mapState, mapMutations } from 'vuex'; import { mapState, mapMutations } from 'vuex';
@ -184,13 +184,13 @@ export default {
}), }),
// true : 현재 행 혹은 연결된 그리드가 수정중인 상태 // true : 현재 행 혹은 연결된 그리드가 수정중인 상태
checkGridState() { checkGridState() {
var rowStatList = ['I', 'U', 'D']; const rowStatList = ['I', 'U', 'D'];
var row = this.gridInstance.invoke('getFocusedCell'); const row = this.gridInstance.invoke('getFocusedCell');
if (row) { if (row) {
var rowData = this.gridInstance.invoke('getRow', row.rowKey); const rowData = this.gridInstance.invoke('getRow', row.rowKey);
if (rowData) { if (rowData) {
var rowStat = rowData['rowStat']; const rowStat = rowData['rowStat'];
if (rowStatList.includes(rowStat)) { if (rowStatList.includes(rowStat)) {
return true; return true;
} }
@ -198,8 +198,8 @@ export default {
} }
if (this.preventFocusChangeEventTargetGridList) { if (this.preventFocusChangeEventTargetGridList) {
for (var gridInstance of this.preventFocusChangeEventTargetGridList) { for (let gridInstance of this.preventFocusChangeEventTargetGridList) {
var dataArr = gridInstance.save(); const dataArr = gridInstance.save();
if (dataArr.length > 0) { if (dataArr.length > 0) {
return true; return true;
@ -251,9 +251,11 @@ export default {
this.gridInstance.invoke('check', rowData.rowKey, instance); this.gridInstance.invoke('check', rowData.rowKey, instance);
}, },
setSelectionRange(rowKey) { setSelectionRange(rowKey) {
// console.log("------------------DEBUG-------setSelectionRange:", rowKey);
const rowDatas = this.gridInstance.invoke('getData'); const rowDatas = this.gridInstance.invoke('getData');
rowDatas.forEach(item => { rowDatas.forEach(item => {
if (item.rowKey == rowKey) { if (item.rowKey == rowKey) {
// console.log("------------------DEBUG-------setSelectionRange---item:", item);
this.gridInstance.invoke( this.gridInstance.invoke(
'addRowClassName', 'addRowClassName',
item.rowKey, item.rowKey,
@ -268,6 +270,10 @@ export default {
} }
}); });
}, },
onMousedown(evt) {
// console.log("------------------DEBUG-------onMousedown:", evt);
this.focusChangeEvt(evt);
},
focusChangeEvt(e) { focusChangeEvt(e) {
// console.log("------------------DEBUG-------focusChangeEvt:", e); // console.log("------------------DEBUG-------focusChangeEvt:", e);
// console.log('focusChangeEvt1...') // console.log('focusChangeEvt1...')
@ -290,7 +296,7 @@ export default {
this.sendSelectedRowData(e.rowKey); this.sendSelectedRowData(e.rowKey);
}, },
startEditing(e) { startEditing(e) {
// console.log("------------DEBUG-----startEditing----", e); // console.log("------------------DEBUG-------startEditing:", e);
// console.log('startEditing1...') // console.log('startEditing1...')
if (this.preventFocusChangeEvent(e)) { if (this.preventFocusChangeEvent(e)) {
// console.log('prevent startEditing') // console.log('prevent startEditing')
@ -317,6 +323,7 @@ export default {
} }
}, },
async editingFinish(e) { async editingFinish(e) {
// console.log('------------------DEBUG-------editingFinish:', e);
// console.log("Editing END E::", e); // console.log("Editing END E::", e);
// editor 간 이동시 수정되는 문제 수정 // editor 간 이동시 수정되는 문제 수정
// e.rowEditingFg: grid의 한 row를 한번에 수정할 시 각각의 cell 마다 click 이벤트가 발생하지 않아 this.editorStartKey값이 제대로 입력 되지 않는 경우를 대비하여 만든 Fg // e.rowEditingFg: grid의 한 row를 한번에 수정할 시 각각의 cell 마다 click 이벤트가 발생하지 않아 this.editorStartKey값이 제대로 입력 되지 않는 경우를 대비하여 만든 Fg
@ -678,6 +685,7 @@ export default {
? this.gridInstance.invoke('getFocusedCell').rowKey ? this.gridInstance.invoke('getFocusedCell').rowKey
: eventRowKey; : eventRowKey;
var rowData = this.gridInstance.invoke('getRow', rowKey); var rowData = this.gridInstance.invoke('getRow', rowKey);
// console.log('------------------DEBUG-------sendSelectedRowData:', {eventRowKey, rowKey});
this.$emit('sendSelectedRowStatInfo', rowData); this.$emit('sendSelectedRowStatInfo', rowData);
} }
}, },

4
components/common/ThemeSwitch.vue
View File

@ -31,8 +31,8 @@ export default {
this.mode = !this.mode; this.mode = !this.mode;
this.$vuetify.theme.isDark = this.mode; this.$vuetify.theme.isDark = this.mode;
this.setThemeChange(this.mode); this.setThemeChange(this.mode);
console.log(this.mode) // console.log(this.mode)
console.log(this.$vuetify.theme.isDark) // console.log(this.$vuetify.theme.isDark)
}, },
}, },
}; };

4
components/common/form/InputNumber.vue
View File

@ -125,7 +125,7 @@ export default {
modifyValue(e) { modifyValue(e) {
let val = e.target.value.replace(/[^-.0-9]/g, ''); let val = e.target.value.replace(/[^-.0-9]/g, '');
console.log('val : ', val); // console.log('val : ', val);
if(this.item.min != undefined && parseFloat(val) < this.item.min){ if(this.item.min != undefined && parseFloat(val) < this.item.min){
val = this.item.min; val = this.item.min;
@ -134,7 +134,7 @@ export default {
if(this.item.max != undefined && parseFloat(val) > this.item.max){ if(this.item.max != undefined && parseFloat(val) > this.item.max){
val = this.item.max; val = this.item.max;
} }
console.log('val2 : ', val); // console.log('val2 : ', val);
this.textValue = val; this.textValue = val;
// this.textValue = this.validateNumber(val); // this.textValue = this.validateNumber(val);

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

@ -152,12 +152,12 @@ export default {
const snarData = this.searchParam.isMulti const snarData = this.searchParam.isMulti
? this.searchParam.snarInfoList ? this.searchParam.snarInfoList
: this.searchParam.snarInfo; : this.searchParam.snarInfo;
console.log('this.searchParam.isMulti', this.searchParam.isMulti); // console.log('this.searchParam.isMulti', this.searchParam.isMulti);
console.log( // console.log(
'this.searchParam.snarInfoList', // 'this.searchParam.snarInfoList',
this.searchParam.snarInfoList, // this.searchParam.snarInfoList,
); // );
console.log('this.searchParam.snarInfo', this.searchParam.snarInfo); // console.log('this.searchParam.snarInfo', this.searchParam.snarInfo);
if (Array.isArray(snarData)) { if (Array.isArray(snarData)) {
if (snarData.length > 0) { if (snarData.length > 0) {
for (const item of snarData) { for (const item of snarData) {

2
components/common/modal/DrSnarExecPop.vue
View File

@ -394,7 +394,7 @@ export default {
params: {}, params: {},
}, },
}); });
console.log('statusCd', statusCd); // console.log('statusCd', statusCd);
if (statusCd.data.retnCd == 0) { if (statusCd.data.retnCd == 0) {
const params2 = { const params2 = {
simulationId: statusCd.data.dataset.simulId, simulationId: statusCd.data.dataset.simulId,

3
components/common/modal/EgrpPysclQtyPop.vue
View File

@ -46,11 +46,10 @@
v-model="searchWord" @keyup.enter="search"><template v-slot:append> v-model="searchWord" @keyup.enter="search"><template v-slot:append>
<!-- Custom SVG icon --> <!-- Custom SVG icon -->
<v-icon>$icoSearch</v-icon> <v-icon>$icoSearch</v-icon>
</template></v-text-field> </template></v-text-field>
</v-col> </v-col>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-col cols="3" class="text-right"> <v-col :cols="3" class="text-right">
<a-button icon="search" type="primary" @click="search()" <a-button icon="search" type="primary" @click="search()"
class="search-button">조회</a-button> class="search-button">조회</a-button>
<!-- <v-btn :ripple="false" @click="initSearch()"> <!-- <v-btn :ripple="false" @click="initSearch()">

6
components/common/modal/EqpmSelectPop_bk.vue
View File

@ -286,8 +286,8 @@ export default {
// Row selection config // Row selection config
rowSelection: { rowSelection: {
onChange: (selectedRowKeys, selectedRows) => { onChange: (selectedRowKeys, selectedRows) => {
console.log('Selected Row Keys:', selectedRowKeys); // console.log('Selected Row Keys:', selectedRowKeys);
console.log('Selected Rows:', selectedRows); // console.log('Selected Rows:', selectedRows);
}, },
} }
}; };
@ -332,7 +332,7 @@ export default {
// this.getRowGridData(); // this.getRowGridData();
// }, // },
searchFab() { searchFab() {
console.log('tttttttttttt') // console.log('tttttttttttt')
// this.filteredData = this.data.filter(item => { // this.filteredData = this.data.filter(item => {
// const matchGrp = this.eqpmGrpSelected ? item.group === this.eqpmGrpSelected : true; // const matchGrp = this.eqpmGrpSelected ? item.group === this.eqpmGrpSelected : true;
// const matchFab = this.localFabSelected ? item.fab === this.localFabSelected : true; // const matchFab = this.localFabSelected ? item.fab === this.localFabSelected : true;

2
components/common/modal/FixedValueModiPop.vue
View File

@ -126,7 +126,7 @@ export default {
async chkDialog(val) { async chkDialog(val) {
if (val) { if (val) {
// 열릴 때 // 열릴 때
console.log('dsfafds'); // console.log('dsfafds');
await this.getData(); await this.getData();
// console.log("chkDialog: ", val); // console.log("chkDialog: ", val);
// if(this.searchParam.selecUserList.length > 0){ // if(this.searchParam.selecUserList.length > 0){

96
components/common/modal/FtnPlcFormPop.vue
View File

@ -22,8 +22,8 @@
outlined outlined
:hide-details="true" :hide-details="true"
> >
<template v-slot:append>
<!-- Custom SVG icon --> <!-- Custom SVG icon -->
<template v-slot:append>
<v-icon>$icoSearch</v-icon> <v-icon>$icoSearch</v-icon>
</template> </template>
</v-text-field> </v-text-field>
@ -31,28 +31,20 @@
<v-dialog v-model="dialog" scrollable width="700px"> <v-dialog v-model="dialog" scrollable width="700px">
<v-card style="height: 100%"> <v-card style="height: 100%">
<v-card-title class="pa-5 d-flex align-center justify-space-between"> <v-card-title class="px-6 py-4 d-flex align-center justify-space-between">
<span class="custom-title-4">{{ option.modalTitle }}</span> <span class="custom-title-4">{{ option.modalTitle }}</span>
<v-btn <a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
icon
tile
:ripple="false"
@click="dialogOpenCloseEvent(dialog)"
>
<v-icon>mdi-close</v-icon>
</v-btn>
</v-card-title> </v-card-title>
<div class="pa-5"> <div class="pa-5">
<v-row align="center" no-gutters> <v-row align="center" no-gutters>
<v-col :cols="3"> <v-col :cols="12">
<label for="" class="search-box-label"> <label for="" class="search-box-label">
<v-icon x-small color="primary" class="mr-1" <!-- <v-icon x-small color="primary" class="mr-1">mdi-record-circle</v-icon> -->
>mdi-record-circle</v-icon <v-icon small :class="['mr-1 icon-blue']">$icoBulletPoint</v-icon>
>
검색 검색
</label> </label>
</v-col> </v-col>
<v-col :cols="5"> <v-col :cols="9">
<v-text-field <v-text-field
append-icon="mdi-magnify" append-icon="mdi-magnify"
class="v-input__custom" class="v-input__custom"
@ -63,21 +55,19 @@
></v-text-field> ></v-text-field>
</v-col> </v-col>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-col cols="4" class="text-right"> <v-col :cols="3" class="text-right">
<v-btn :ripple="false" @click="search()"> <a-button type="primary" @click="search()" icon="search">
조회 조회
</v-btn> </a-button>
<v-btn :ripple="false" @click="initSearch()"> <a-button @click="initSearch()">
초기화 초기화
</v-btn> </a-button>
</v-col> </v-col>
</v-row> </v-row>
</div> </div>
<v-divider></v-divider> <!-- <v-divider></v-divider> -->
<!-- <div :style="'height: calc(65vh)'"> --> <div style="height: 429px;" class="py-3 px-5">
<div :style="'height: 429px;'"> <div ref="modalGridParent" class="h100 w100">
<!-- <div :style="{ height: 'calc(100% - 213px)' }"> -->
<div ref="modalGridParent" class="h100 w100 py-3">
<component <component
:is="loadGrid && dialog ? 'Grid' : null" :is="loadGrid && dialog ? 'Grid' : null"
:gridName="grid_01" :gridName="grid_01"
@ -88,11 +78,9 @@
/> />
</div> </div>
</div> </div>
<v-card-actions class="pa-5 d-flex align-center justify-center"> <v-card-actions class="pa-5 d-flex align-center justify-end">
<v-btn :ripple="false" @click="setUpdate($event)">확인</v-btn> <a-button class="mr-2" @click="dialogOpenCloseEvent(dialog)">닫기</a-button>
<v-btn :ripple="false" @click="dialogOpenCloseEvent(dialog)" <a-button type="primary" @click="setUpdate($event)">확인</a-button>
>닫기</v-btn
>
</v-card-actions> </v-card-actions>
</v-card> </v-card>
</v-dialog> </v-dialog>
@ -336,7 +324,7 @@ export default {
})) }))
}; };
console.log(res); // console.log(res);
this.setModalGridData({ this.setModalGridData({
modalKey: this.myModalKey, modalKey: this.myModalKey,
@ -395,7 +383,31 @@ var FtnPlcFormPop = {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
// @each $theme in dark, light {
// @include theme($theme);
// .v-application.#{$theme}-mode {
// .v-input--is-readonly {
// border-color: map-deep-get($config,
// #{$theme},
// "v-input-readonly-border-color"
// );
// ::v-deep {
// &:not(.v-input--radio-group, .v-input--checkbox) {
// .v-input__slot {
// background-color: map-deep-get($config,
// #{$theme},
// "v-input-backgroundColor"
// ) !important;
// }
// }
// }
// }
// }
// }
::v-deep { ::v-deep {
.v-dialog { .v-dialog {
overflow-y: hidden !important; overflow-y: hidden !important;
} }
@ -418,26 +430,4 @@ var FtnPlcFormPop = {
} }
} }
@each $theme in dark, light {
.v-application.#{$theme}-mode {
.v-dialog {
.v-card {
&__title {
color: map-deep-get($color, 'white', '0');
@if $theme == dark {
background-color: #2d3355;
.v-btn {
background-color: #2d3355;
}
} @else {
background-color: #3f4d7d;
.v-btn {
background-color: #3f4d7d;
}
}
}
}
}
}
}
</style> </style>

8
components/common/modal/FtnPlcMultiPop3.vue
View File

@ -294,10 +294,10 @@ export default {
if (this.searchParam.energyCd < 0) { if (this.searchParam.energyCd < 0) {
roiIdVal = null; roiIdVal = null;
} else { } else {
console.log( // console.log(
'this.searchParam.energyList[this.searchParam.energyCd]', // 'this.searchParam.energyList[this.searchParam.energyCd]',
this.searchParam.energyList[this.searchParam.energyCd], // this.searchParam.energyList[this.searchParam.energyCd],
); // );
roiIdVal = this.searchParam.energyList[this.searchParam.energyCd + 1] roiIdVal = this.searchParam.energyList[this.searchParam.energyCd + 1]
.cd; .cd;
} }

16
components/common/modal/OnlnBaseEccPop.vue
View File

@ -239,13 +239,13 @@ export default {
this.selectedData.eccNm = ''; this.selectedData.eccNm = '';
if (this.bindOption === null) { if (this.bindOption === null) {
console.log('this.bindOption is null...'); // console.log('this.bindOption is null...');
this.setPageData({ this.setPageData({
modalEccId: '', modalEccId: '',
modalEccNm: '', modalEccNm: '',
}); });
} else { } else {
console.log('this.bindOption is not null...'); // console.log('this.bindOption is not null...');
this.setPageData({ this.setPageData({
[this.bindOption.eccId]: '', [this.bindOption.eccId]: '',
[this.bindOption.eccNm]: '', [this.bindOption.eccNm]: '',
@ -296,12 +296,12 @@ export default {
? localStorage.getItem(this.parentPrgmId + 'ModalEccNm') ? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')
: '', : '',
}); });
console.log( // console.log(
'localStorage.getItem(this.parentPrgmId + "ModalEccNm") : ', // 'localStorage.getItem(this.parentPrgmId + "ModalEccNm") : ',
localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null // localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null
? localStorage.getItem(this.parentPrgmId + 'ModalEccNm') // ? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')
: '', // : '',
); // );
this.textFieldData = this.textFieldData =
localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null
? localStorage.getItem(this.parentPrgmId + 'ModalEccNm') ? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')

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

@ -296,25 +296,25 @@ export default {
} }
}, },
strtDt(val) { strtDt(val) {
console.log('strtDt : ', val); // console.log('strtDt : ', val);
this.checkStrtAndEndDateTime('start'); this.checkStrtAndEndDateTime('start');
if (this.startDatepickerInstance3) { if (this.startDatepickerInstance3) {
this.startDatepickerInstance3.setDate(new Date(this.endDt)); this.startDatepickerInstance3.setDate(new Date(this.endDt));
} }
}, },
endDt(val) { endDt(val) {
console.log('endDt : ', val); // console.log('endDt : ', val);
this.checkStrtAndEndDateTime('end'); this.checkStrtAndEndDateTime('end');
if (this.startDatepickerInstance) { if (this.startDatepickerInstance) {
this.startDatepickerInstance.setDate(new Date(this.strtDt)); this.startDatepickerInstance.setDate(new Date(this.strtDt));
} }
}, },
strtHh(val) { strtHh(val) {
console.log('strtHh : ', val); // console.log('strtHh : ', val);
this.checkStrtAndEndDateTime('start'); this.checkStrtAndEndDateTime('start');
}, },
endHh(val) { endHh(val) {
console.log('endHh : ', val); // console.log('endHh : ', val);
this.checkStrtAndEndDateTime('end'); this.checkStrtAndEndDateTime('end');
}, },
strtMm(val) { strtMm(val) {

4
components/common/modal/ReadPlcDisableFuncPop.vue
View File

@ -253,7 +253,7 @@ export default {
readObjid: this.searchParam.energyCd, readObjid: this.searchParam.energyCd,
}, },
}); });
console.log('getTreeData : ', res); // console.log('getTreeData : ', res);
// this.treeData = res; // this.treeData = res;
// const ROOT = res[0].plcCd; // const ROOT = res[0].plcCd;
const setTreeData = await this.setTree({ const setTreeData = await this.setTree({
@ -327,7 +327,7 @@ export default {
// 공정/설비 트리 row 클릭이벤트 // 공정/설비 트리 row 클릭이벤트
async getRowData(data) { async getRowData(data) {
// console.log("getRowData 시작..."); // console.log("getRowData 시작...");
console.log('data', data); // console.log('data', data);
this.activeRowData = data; this.activeRowData = data;
// if(data.enableFg == 1){ // if(data.enableFg == 1){
// this.activeRowData = data; // this.activeRowData = data;

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

@ -70,7 +70,7 @@ export default {
return this.searchParam[this.parentPrgmId][this.enrgCd]; return this.searchParam[this.parentPrgmId][this.enrgCd];
}, },
set(value) { set(value) {
console.log('value : ', value); // console.log('value : ', value);
return this.setPageData({ [this.enrgCd]: value }); return this.setPageData({ [this.enrgCd]: value });
}, },
}, },

4
components/form/CustomInput.vue
View File

@ -270,8 +270,8 @@ export default {
filteredData: [], filteredData: [],
rowSelection: { rowSelection: {
onChange: (selectedRowKeys, selectedRows) => { onChange: (selectedRowKeys, selectedRows) => {
console.log('Selected Row Keys:', selectedRowKeys); // console.log('Selected Row Keys:', selectedRowKeys);
console.log('Selected Rows:', selectedRows); // console.log('Selected Rows:', selectedRows);
}, },
} }
}; };

4
components/pages/ems/DataSetInfo/DataSetTagRelTab.vue
View File

@ -213,7 +213,7 @@ export default {
let dataArr = []; let dataArr = [];
switch (action) { switch (action) {
case 'add': case 'add':
console.log('add this.pageData : '); // , this.pageData); // console.log('add this.pageData : '); // , this.pageData);
const defaultRow = { const defaultRow = {
dataSetId: this.pageData.dataSetId, dataSetId: this.pageData.dataSetId,
dataSetNm: this.pageData.dataSetNm, dataSetNm: this.pageData.dataSetNm,
@ -296,7 +296,7 @@ export default {
comId: this.selectedComId, comId: this.selectedComId,
dataSetId: this.selectedDataSetId, dataSetId: this.selectedDataSetId,
}; };
console.log('data : ', data); // console.log('data : ', data);
this.$emit('jamoviClickEvent', 'view1', data); this.$emit('jamoviClickEvent', 'view1', data);
}, },
}, },

7
components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue
View File

@ -1,10 +1,7 @@
<template> <template>
<div> <div>
<div <div class="d-flex justify-space-between align-center my-5" >
class="d-flex justify-space-between align-center" <span class="txt custom-subtitle-tab">설비 추가 정보</span>
style="height: 80px;"
>
<span class="txt custom-title-4-new">설비 추가 정보</span>
<Buttons <Buttons
:parentPrgmId="parentPrgmId" :parentPrgmId="parentPrgmId"
:bindingData="gridName" :bindingData="gridName"

8
components/pages/ems/EqpmInfo/EqpmConstTab.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<div class="d-flex justify-space-between align-center" style="height: 80px;"> <div class="d-flex justify-space-between align-center my-5" >
<span class="txt custom-title-4-new">설비 상수 정보</span> <span class="txt custom-subtitle-tab">설비 상수 정보</span>
<Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" /> <Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
</div> </div>
<div ref="gridParent" style="min-height: calc(100vh - 800px);"> <div ref="gridParent" style="min-height: calc(100vh - 800px);">
@ -291,8 +291,8 @@ export default {
dataArr.map(item => { dataArr.map(item => {
for (var key of Object.keys(item)) { for (var key of Object.keys(item)) {
console.log('key : ', key); // console.log('key : ', key);
console.log('item[key] : ', item[key]); // console.log('item[key] : ', item[key]);
if (!item[key] && requiredKeyList.includes(key)) { if (!item[key] && requiredKeyList.includes(key)) {
validCheck = false; validCheck = false;
} }

11
components/pages/ems/EqpmInfo/EqpmIaoTab.vue
View File

@ -1,10 +1,7 @@
<template> <template>
<div> <div>
<div <div class="d-flex justify-space-between align-center my-5" >
class="d-flex justify-space-between align-center" <span class="txt custom-subtitle-tab">설비 입출력 정보</span>
style="height: 80px;"
>
<span class="txt">설비 입출력 정보</span>
<Buttons <Buttons
:parentPrgmId="parentPrgmId" :parentPrgmId="parentPrgmId"
:bindingData="gridName" :bindingData="gridName"
@ -111,7 +108,7 @@ export default {
}, },
watch: { watch: {
selectedObjId(val) { selectedObjId(val) {
console.log('selectedObjId : ', val); // console.log('selectedObjId : ', val);
if (val === 'TAG') { if (val === 'TAG') {
this.detailList[2].class = 'py-3 d-none'; this.detailList[2].class = 'py-3 d-none';
this.detailList[3].class = 'py-3 pl-4 pt-1 d-none'; this.detailList[3].class = 'py-3 pl-4 pt-1 d-none';
@ -338,7 +335,7 @@ export default {
} }
if (dataArr.length > 0) { if (dataArr.length > 0) {
console.log('dataArr : ', dataArr); // console.log('dataArr : ', dataArr);
var requiredKeyList = this.detailList var requiredKeyList = this.detailList
.filter(item => { .filter(item => {

30
pages/comm/auth/MenuRoleMngPage.vue
View File

@ -36,11 +36,7 @@
<v-card-title> <v-card-title>
<span class="custom-title-4">역할 리스트</span> <span class="custom-title-4">역할 리스트</span>
</v-card-title> </v-card-title>
<div class="px-5" style="height:calc(100% - 100px)"> <div ref="gridParent" class="px-5" style="height: 60vh;">
<div
ref="gridParent"
class="w100 h100"
>
<component <component
:is="loadGrid ? 'Grid' : null" :is="loadGrid ? 'Grid' : null"
:ref="gridName + myPrgmId" :ref="gridName + myPrgmId"
@ -49,7 +45,6 @@
@getRowsData="getRowData" @getRowsData="getRowData"
/> />
</div> </div>
</div>
</v-card> </v-card>
</v-col> </v-col>
<v-col cols="12" lg="10" > <v-col cols="12" lg="10" >
@ -69,11 +64,12 @@
:style="{ minHeight: '36px' }" :style="{ minHeight: '36px' }"
>[미배정]메뉴리스트</span >[미배정]메뉴리스트</span
> >
<div class="px-0 mt-2" style="height:calc(100% - 64px)"> <div ref="treeGridParent" class="px-0 mt-2" style="height: 60vh;">
<div <!-- <div
ref="treeGridParent" ref="treeGridParent"
class="w100 h100" class="w100 h100"
> >
</div> -->
<component <component
:is="loadTreeGrid ? 'Grid' : null" :is="loadTreeGrid ? 'Grid' : null"
:ref="gridName2 + myPrgmId" :ref="gridName2 + myPrgmId"
@ -82,7 +78,6 @@
@getRowsData="getUnAsgnRowData" @getRowsData="getUnAsgnRowData"
/> />
</div> </div>
</div>
</v-col> </v-col>
<v-col :cols="1"> <v-col :cols="1">
<ActionButtons <ActionButtons
@ -112,11 +107,12 @@
/> />
</v-col> </v-col>
</v-row> </v-row>
<div class="px-0 mt-2" style="height:calc(100% - 64px)"> <div ref="treeGridParent2" class="px-0 mt-2" style="height: 60vh;">
<div <!-- <div
ref="treeGridParent2" ref="treeGridParent2"
class="w100 h100" class="w100 h100"
> >
</div> -->
<component <component
:is="loadTreeGrid2 ? 'Grid' : null" :is="loadTreeGrid2 ? 'Grid' : null"
:ref="gridName3 + myPrgmId" :ref="gridName3 + myPrgmId"
@ -126,7 +122,6 @@
@getRowsData="getAsgnRowData" @getRowsData="getAsgnRowData"
/> />
</div> </div>
</div>
</v-col> </v-col>
</v-row> </v-row>
</v-card> </v-card>
@ -408,9 +403,9 @@ export default {
align: 'center', align: 'center',
width: 30, width: 30,
formatter: (props) => { formatter: (props) => {
return `<label class="custom-radio"> return `<span class="custom-radio">
<span class="radio-mark"></span> <span class="radio-mark"></span>
</label>`; </span>`;
} }
}, },
{ {
@ -431,9 +426,9 @@ export default {
align: 'center', align: 'center',
width: 30, width: 30,
formatter: (props) => { formatter: (props) => {
return `<label class="custom-radio"> return `<span class="custom-radio">
<span class="radio-mark"></span> <span class="radio-mark"></span>
</label>`; </span>`;
} }
}, },
{ header: '역할ID', name: 'roleId', hidden: true }, { header: '역할ID', name: 'roleId', hidden: true },
@ -573,6 +568,7 @@ export default {
}); });
}, },
async getRowData(data) { async getRowData(data) {
await this.setPageData({ await this.setPageData({
rowGridSelectKey: data.rowKey, rowGridSelectKey: data.rowKey,
rowGridSelectData: { rowGridSelectData: {
@ -678,6 +674,8 @@ export default {
}, },
getUnAsgnRowData(data) { getUnAsgnRowData(data) {
console.log("------------------DEBUG-------getUnAsgnRowData:", data);
const getRowData = data; const getRowData = data;
this.leftSelectRowData = Object.assign({}, getRowData); this.leftSelectRowData = Object.assign({}, getRowData);
}, },

2
pages/comm/base/PrgmMngPage.vue
View File

@ -50,7 +50,7 @@
/> />
</div> </div>
</div> </div>
<div ref="gridParent" style="height: 100vh"> <div ref="gridParent" style="height: 60vh">
<!-- <div ref="gridParent" class="px-5 h100"> <!-- <div ref="gridParent" class="px-5 h100">
</div> --> </div> -->
<component <component

6
pages/ems/base/ReadResultCloseMngPage.vue
View File

@ -91,7 +91,7 @@
</a-button> </a-button>
</div> </div>
</div> </div>
<div ref="gridParent" class="px-5 w100" style="min-height: 60vh"> <div ref="gridParent" class="px-5 w100" style="height: 55vh;">
<component <component
:is="loadGrid ? 'Grid' : null" :is="loadGrid ? 'Grid' : null"
:ref="gridName" :ref="gridName"
@ -242,6 +242,10 @@ export default {
columnOptions: { columnOptions: {
resizable: true, resizable: true,
}, },
pageOptions: {
useClient: true,
perPage: 13,
},
}; };
this.setGridOption({ this.setGridOption({
gridKey: this.gridName, gridKey: this.gridName,

8
pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue
View File

@ -975,7 +975,7 @@ export default {
var seriesData = null; var seriesData = null;
xAxisData = this.makeChartGroup01XaxisData(); xAxisData = this.makeChartGroup01XaxisData();
console.log("text xaxis", xAxisData); // console.log("text xaxis", xAxisData);
for (var i = 0; i < dataKeyList.length; i++) { for (var i = 0; i < dataKeyList.length; i++) {
seriesData = new Array(xAxisData.length).fill(10); seriesData = new Array(xAxisData.length).fill(10);
@ -988,12 +988,12 @@ export default {
currentChartData["data"][j]["totVal"]; currentChartData["data"][j]["totVal"];
} }
console.log("text seri data", seriesData); // console.log("text seri data", seriesData);
this.$store.state.pageData[myPrgmId][chartKey]["xAxis"]["data"] = xAxisData; this.$store.state.pageData[myPrgmId][chartKey]["xAxis"]["data"] = xAxisData;
this.$store.state.pageData[myPrgmId][chartKey]["series"][0]["data"] = seriesData; this.$store.state.pageData[myPrgmId][chartKey]["series"][0]["data"] = seriesData;
console.log("chart data", this.$store.state.pageData[myPrgmId][chartKey]); // console.log("chart data", this.$store.state.pageData[myPrgmId][chartKey]);
} }
}, },
getGroup01ChartOption() { getGroup01ChartOption() {
@ -1007,7 +1007,7 @@ export default {
}; };
chartOption["series"][0]["symbol"] = "none"; chartOption["series"][0]["symbol"] = "none";
console.log("chartOption: ", chartOption); // console.log("chartOption: ", chartOption);
return chartOption; return chartOption;
}, },
makeChartGroup01XaxisData() { makeChartGroup01XaxisData() {