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

dev-dungtv-0731 #28

Merged
dev merged 5 commits from dev-dungtv-0731 into dev 2025-07-31 18:22:11 +09:00
Conversation 0 Commits 5 Files Changed 12 +124 -206
12 changed files with 124 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
assets/scss/common.scss
View File

@ -691,6 +691,43 @@ a {
}
&>.v-treeview-node {
.v-treeview-node--active {
background-color: map-deep-get($config,
#{$theme},
"v-treeview-node-label-active-bg"
);
border: 1px solid map-deep-get($config,
#{$theme},
"v-treeview-node-label-active-border"
);
border-radius: 8px;
&:before {
background-color: map-deep-get($config,
#{$theme},
"v-treeview-node-subroot-backgroundColor"
);
}
&>.v-treeview-node__content {
.v-treeview-node__label {
color: map-deep-get($config,
#{$theme},
"v-treeview-node-label-active-color"
);
}
.v-icon {
color: map-deep-get($config,
#{$theme},
"v-treeview-icon-active-color"
);
}
}
}
&>.v-treeview-node__root {
&:before {
background-color: map-deep-get($config,
@ -736,6 +773,7 @@ a {
&>.v-treeview-node__children {
&>.v-treeview-node {
&>.v-treeview-node__root {
&:before {
background-color: map-deep-get($config,
@ -793,117 +831,6 @@ a {
);
}
&>.v-treeview-node--active {
&:before {
background-color: map-deep-get($config,
#{$theme},
"v-treeview-node-subroot-backgroundColor"
);
}
&>.v-treeview-node__content {
.v-treeview-node__label {
color: map-deep-get($config,
#{$theme},
"v-treeview-node-label-active-color"
);
}
.v-icon {
color: map-deep-get($config,
#{$theme},
"v-treeview-icon-active-color"
);
}
}
}
&>.v-treeview-node__children {
& .v-treeview-node {
&>.v-treeview-node__root {
&:before {
background-color: map-deep-get($config,
#{$theme},
"v-treeview-node-subroot-backgroundColor"
);
}
&>.v-treeview-node__content {
.v-treeview-node__label {
color: map-deep-get($config,
#{$theme},
"v-treeview-node-label-color"
);
}
.v-icon {
color: map-deep-get($config,
#{$theme},
"v-treeview-icon-color"
);
}
}
&:not(.v-treeview-node--active):hover {
&:before {
background-color: map-deep-get($config,
#{$theme},
"v-treeview-leaf-active-backgroundColor"
);
}
&>.v-treeview-node__content {
.v-treeview-node__label {
color: map-deep-get($config,
#{$theme},
"v-treeview-leaf-active-color"
);
}
.v-icon {
color: map-deep-get($config,
#{$theme},
"v-treeview-leaf-active-color"
);
}
}
}
}
&>.v-treeview-node--active {
background-color: map-deep-get($config,
#{$theme},
"v-treeview-node-label-active-bg"
);
border: 1px solid map-deep-get($config,
#{$theme},
"v-treeview-node-label-active-border"
);
border-radius: 8px;
&:before {
opacity: 0 !important;
}
&>.v-treeview-node__content {
.v-treeview-node__label {
color: map-deep-get($config,
#{$theme},
"v-treeview-node-label-active-color"
);
}
.v-icon {
color: map-deep-get($config,
#{$theme},
"v-treeview-node-label-active-color"
);
}
}
}
}
}
&[aria-expanded="true"] {
& .v-treeview-node__root>.v-treeview-node__content {
.v-treeview-node__label {

18
components/common/Grid.vue
View File

@ -4,12 +4,12 @@
:data="chkGridData"
:columns="chkGridColumns"
:options="chkGridOptions"
@mousedown="onMousedown"
@click="startEditing"
@editingFinish="editingFinish"
@dblclick="dblClick"
@mouseover="mouseoverEvent"
@mouseout="mouseoutEvent"
@mousedown="onMousedown"
@focusChange="focusChangeEvt"
/>
</template>
@ -251,11 +251,9 @@ export default {
this.gridInstance.invoke('check', rowData.rowKey, instance);
},
setSelectionRange(rowKey) {
// console.log("------------------DEBUG-------setSelectionRange:", rowKey);
const rowDatas = this.gridInstance.invoke('getData');
rowDatas.forEach(item => {
if (item.rowKey == rowKey) {
// console.log("------------------DEBUG-------setSelectionRange---item:", item);
this.gridInstance.invoke(
'addRowClassName',
item.rowKey,
@ -271,11 +269,14 @@ export default {
});
},
onMousedown(evt) {
// console.log("------------------DEBUG-------onMousedown:", evt);
this.focusChangeEvt(evt);
this.handleSelectedRow(evt);
},
focusChangeEvt(e) {
// console.log("------------------DEBUG-------focusChangeEvt:", e);
if(e.rowKey === 0) {
this.handleSelectedRow(e);
}
},
handleSelectedRow(e) {
// console.log('focusChangeEvt1...')
if (this.preventFocusChangeEvent(e)) {
// console.log('prevent focusChangeEvt')
@ -283,7 +284,7 @@ export default {
}
// console.log('focusChangeEvt2...')
// cell 선택시 row 선택 method
if (e.rowKey >= 0) {
if (e.rowKey > -1) {
this.$emit(
'getRowsData',
this.gridInstance.invoke('getRow', e.rowKey),
@ -296,7 +297,6 @@ export default {
this.sendSelectedRowData(e.rowKey);
},
startEditing(e) {
// console.log("------------------DEBUG-------startEditing:", e);
// console.log('startEditing1...')
if (this.preventFocusChangeEvent(e)) {
// console.log('prevent startEditing')
@ -323,7 +323,6 @@ export default {
}
},
async editingFinish(e) {
// console.log('------------------DEBUG-------editingFinish:', e);
// console.log("Editing END E::", e);
// editor 간 이동시 수정되는 문제 수정
// e.rowEditingFg: grid의 한 row를 한번에 수정할 시 각각의 cell 마다 click 이벤트가 발생하지 않아 this.editorStartKey값이 제대로 입력 되지 않는 경우를 대비하여 만든 Fg
@ -685,7 +684,6 @@ export default {
? this.gridInstance.invoke('getFocusedCell').rowKey
: eventRowKey;
var rowData = this.gridInstance.invoke('getRow', rowKey);
// console.log('------------------DEBUG-------sendSelectedRowData:', {eventRowKey, rowKey});
this.$emit('sendSelectedRowStatInfo', rowData);
}
},

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

@ -280,52 +280,41 @@ export default {
modalKey: this.myModalKey,
gridKey: this.grid_01,
modalDataKey: this.modalDataKey,
value: [{ header: '위치정보', name: 'eccNm' }],
value: [
{
align: 'center',
width: 30,
minWidth: 60,
formatter: (props) => {
return `<span class="custom-radio"><span class="radio-mark"></span></span>`;
}
},
{ header: '위치정보', name: 'eccNm' }
],
});
},
async getGridData() {
// this.loadGrid = false;
this.loadGrid = false;
// const res = await this.postApiReturn({
// apiKey: 'selectEccBaseInfo',
// resKey: 'eccBaseInfoData',
// sendParam: {
// blocId: this.myBindingData.blocId,
// eqpmYn: '0',
// search: this.searchWord,
// },
// });
const res = await this.postApiReturn({
apiKey: 'selectEccBaseInfo',
resKey: 'eccBaseInfoData',
sendParam: {
blocId: this.myBindingData.blocId,
eqpmYn: '0',
search: this.searchWord,
},
});
// const setTreeData = await this.setTree({
// gridKey: this.gridNameTree,
// treeKey: 'ECC_ID',
// value: res.map(item => ({
// ...item,
// eccNm: item.eccNm,
// })),
// });
//mockdata eccNm
let res = [
{ ECC_ID: 'ECC001', eccNm: '서울 본사', iconShow: false, align: 'center' },
{ ECC_ID: 'ECC002', eccNm: '부산 지사', useIcon: false, align: 'center' },
{ ECC_ID: 'ECC003', eccNm: '대구 센터', useIcon: false, align: 'center' },
{ ECC_ID: 'ECC004', eccNm: '광주 사무소' , useIcon: false, align: 'center'},
{ ECC_ID: 'ECC005', eccNm: '인천 물류창고' , useIcon: false, align: 'center'},
];
const setTreeData = {
ROOT: res.map(item => ({
const setTreeData = await this.setTree({
gridKey: this.gridNameTree,
treeKey: 'ECC_ID',
value: res.map(item => ({
...item,
eccNm: item.eccNm,
}))
};
})),
});
// console.log(res);
this.setModalGridData({
modalKey: this.myModalKey,
gridKey: this.grid_01,

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

@ -96,20 +96,20 @@ export default {
watch: {
selectedEqpmKindId(val) {
if (val) {
this.detailList[2].eqpmKindId = val;
this.detailList[1].eqpmKindId = val;
}
},
selectedEqpmGrpId(val) {
// if(!val){
// this.detailList[2].eqpmGrpId = '';
// this.detailList[1].eqpmGrpId = '';
// }else{
// this.detailList[2].eqpmGrpId = val;
// this.detailList[1].eqpmGrpId = val;
// }
// if(val){
// this.detailList[2].eqpmGrpId = val;
// this.detailList[1].eqpmGrpId = val;
// }
// else if(val == null || val == ''){
// this.detailList[2].eqpmGrpId = '';
// this.detailList[1].eqpmGrpId = '';
// }
},
},
@ -238,10 +238,10 @@ export default {
},
async getRowData(data, gridName) {
if (data.rowStat === 'I') {
this.detailList[2].disabled = false;
this.detailList[1].disabled = false;
this.detailList[3].disabled = false;
} else {
this.detailList[2].disabled = true;
this.detailList[1].disabled = true;
this.detailList[3].disabled = true;
}
@ -257,12 +257,12 @@ export default {
switch (action) {
case 'add':
this.$refs[this.gridName].addRow();
this.detailList[2].disabled = false;
this.detailList[1].disabled = false;
this.detailList[3].disabled = false;
break;
case 'remove':
this.detailList[2].disabled = true;
this.detailList[1].disabled = true;
this.detailList[3].disabled = true;
this.$refs[this.gridName].removeRow();
break;
@ -358,7 +358,6 @@ const myEqpmConstDetail = [
{
type: 'SelectBox',
label: '대상 유형',
disabled: true,
cols: 6,
class: 'py-3 pr-4',
list: 'emMapDivList2',
@ -371,6 +370,7 @@ const myEqpmConstDetail = [
textCols: 12,
iconShow: true,
},
// ==================
{
type: 'EgrpPysclQtyPop',
labelContent: '물리량',
@ -382,7 +382,7 @@ const myEqpmConstDetail = [
pysclQtyNm: 'pysclQtyNm',
},
valueNm: 'objId',
disabled: false,
disabled: true,
required: true,
openMode: 'CONST',
cols: 6,
@ -413,6 +413,7 @@ const myEqpmConstDetail = [
textCols: 12,
iconShow: true,
},
// ------------
{
type: 'InputText',
label: '물리량 값',

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

@ -18,7 +18,7 @@
:innerTabGridInfo="innerTabGridInfo"
/>
</div>
<div style="min-height: calc(100vh - 900px);">
<div style="min-height: calc(100vh - 900px);" class="mt-4">
<component
:is="'Form'"
:parentPrgmId="parentPrgmId"
@ -108,18 +108,24 @@ export default {
},
watch: {
selectedObjId(val) {
// console.log('selectedObjId : ', val);
if (val === 'TAG') {
// this.detailList[1].class = 'py-3 pl-4 pb-0';
this.detailList[1].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[4].class = 'py-3';
this.detailList[5].class = 'py-3';
this.detailList[5].class = 'py-3 pl-4';
this.detailList[6].class = 'py-3 pl-4 pt-0';
} else {
// }else if(val==="READ_PLC"){
this.detailList[5].class = 'py-3 d-none';
this.detailList[4].class = 'py-3 d-none';
this.detailList[3].class = 'py-3 pl-4 pt-1';
this.detailList[1].class = 'py-3 pl-4';
this.detailList[2].class = 'py-3';
this.detailList[3].class = 'py-3 pl-4 pt-0';
this.detailList[4].class = 'py-3 d-none';
this.detailList[5].class = 'py-3 d-none';
this.detailList[6].class = 'py-3 d-none';
}
},
selectedCalcFg(val) {
@ -282,13 +288,13 @@ export default {
async getRowData(data, gridName) {
if (data.rowStat === 'I') {
this.detailList[0].disabled = false;
this.detailList[2].disabled = false;
this.detailList[1].disabled = false;
this.detailList[3].disabled = false;
this.detailList[4].disabled = false;
this.detailList[5].disabled = false;
} else {
this.detailList[0].disabled = true;
this.detailList[2].disabled = true;
this.detailList[1].disabled = true;
this.detailList[3].disabled = true;
this.detailList[4].disabled = true;
this.detailList[5].disabled = true;
@ -306,7 +312,7 @@ export default {
case 'add':
this.$refs[this.gridName].addRow();
this.detailList[0].disabled = false;
this.detailList[2].disabled = false;
this.detailList[1].disabled = false;
this.detailList[3].disabled = false;
this.detailList[4].disabled = false;
this.detailList[5].disabled = false;
@ -315,7 +321,7 @@ export default {
case 'remove':
this.$refs[this.gridName].removeRow();
this.detailList[0].disabled = true;
this.detailList[2].disabled = true;
this.detailList[1].disabled = true;
this.detailList[3].disabled = true;
this.detailList[4].disabled = true;
this.detailList[5].disabled = true;
@ -436,10 +442,10 @@ const myEqpmIaoDetail = [
type: 'ReadPlcPop',
label: '대상 항목',
valueNm: 'objId',
disabled: true,
cols: 6,
class: 'py-3 pl-4',
class: 'py-3 pl-4 pb-0',
required: true,
disabled: true,
bindNm: 'objNm',
textCols: 12,
labelCols: 12,
@ -460,11 +466,12 @@ const myEqpmIaoDetail = [
readonly: true,
disabled: true,
cols: 6,
class: 'py-3 pl-4 pt-1',
class: 'py-3 pl-4 pt-0',
textCols: 12,
labelCols: 12,
iconShow: true
},
// ============
{
type: 'EvtObjPop',
labelContent: '대상 항목',
@ -474,16 +481,24 @@ const myEqpmIaoDetail = [
disabled: true,
required: true,
cols: 6,
class: 'py-3 d-none',
class: 'py-3 pl-4 d-none',
disableContent: true,
textCols: 12,
labelCols: 12,
iconShow: true
},
{
type: 'InputText',
type: 'Label',
cols: 6,
class: 'py-3 d-none',
disabled: true,
textCols: 12,
labelCols: 12,
},
{
type: 'InputText',
cols: 6,
class: 'py-3 pl-4 d-none',
valueNm: 'objNm',
readonly: true,
disabled: true,
@ -491,6 +506,7 @@ const myEqpmIaoDetail = [
labelCols: 12,
iconShow: true
},
// --------------------------------------------
{
type: 'SelectBox',
label: '에너지원',

2
nuxt.config.js
View File

@ -57,7 +57,7 @@ module.exports = {
],
// Modules: https://go.nuxtjs.dev/config-modules
modules: ['@nuxtjs/axios', '@nuxtjs/dayjs', '@nuxtjs/style-resources','@nuxtjs/google-fonts'],
modules: ['@nuxtjs/axios', '@nuxtjs/dayjs', '@nuxtjs/style-resources' ],
styleResources: {
scss: ['./assets/scss/*.scss'],
},

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

@ -398,14 +398,11 @@ export default {
const myTreeColumns = [
{
header: '',
name: '',
align: 'center',
width: 30,
minWidth: 60,
formatter: (props) => {
return `<span class="custom-radio">
<span class="radio-mark"></span>
</span>`;
return `<span class="custom-radio"><span class="radio-mark"></span></span>`;
}
},
{
@ -421,14 +418,11 @@ export default {
];
const myTreeColumns2 = [
{
header: '',
name: '',
align: 'center',
width: 30,
minWidth: 60,
formatter: (props) => {
return `<span class="custom-radio">
<span class="radio-mark"></span>
</span>`;
return `<span class="custom-radio"><span class="radio-mark"></span></span>`;
}
},
{ header: '역할ID', name: 'roleId', hidden: true },
@ -674,8 +668,6 @@ export default {
},
getUnAsgnRowData(data) {
console.log("------------------DEBUG-------getUnAsgnRowData:", data);
const getRowData = data;
this.leftSelectRowData = Object.assign({}, getRowData);
},

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

@ -1,5 +1,6 @@
<template>
<div class="l-layout">
<CommonPageTitle />
<!-- 조회조견 -->
<v-row ref="searchFilter">
<v-col :cols="12">
@ -314,7 +315,6 @@ export default {
});
},
async getRowData(data, gridName) {
// console.log("-----------------------DEBUG--getRowData--------------", {
// gridKey: gridName,
// gridSelect: true,
// rowGridSelectKey: data.rowKey,

2
pages/ems/base/EquipmentMasterMngPage.vue
View File

@ -969,7 +969,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
class: 'py-3 pr-4',
class: 'py-3 pr-4 pb-2',
},
{
type: 'CheckBox',

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

@ -282,7 +282,6 @@ export default {
mgnf: item.mgnf || 0,
})),
});
// console.log('--------------DEBUG-----res-------', res);
}
this.setPageData({ isFind: false });
this.$nextTick(() => {

1
pages/ems/effc/EnrgMapPage.vue
View File

@ -245,7 +245,6 @@ export default {
this.setChartOption({ chartKey: this.chartName, value: chartOption });
// console.log("----DEBUG chart-options-------", { chartOption });
this.$nextTick(() => {
this.loadChart = true;
});

5
pages/ems/effc/EnrgReptMngPage.vue
View File

@ -264,9 +264,6 @@ export default {
},
created() { },
async mounted() {
// console.log('----DEBUG---');
// await this.initTest();
// End Debug Test---
await this.init();
this.initedFlag = true;
},
@ -287,7 +284,7 @@ export default {
}),
async initTest() {
// debug test
console.log('----DEBUG init pages----');
// console.log('----DEBUG init pages----');
const seriesName1 = ['B01. 냉동기전력량', ' B01.COP'];
const seriesName2 = [
'UT_HT_CH101:냉동기전혁당', 'UT_HT_CH102:냉동기전력량', 'UT_HT_CH201:냉동기전력당',