Merge pull request 'dev-dungtv-0731' (#28) from dev-dungtv-0731 into dev

Reviewed-on: #28
This commit is contained in:
dev
2025-07-31 18:22:10 +09:00
12 changed files with 124 additions and 206 deletions

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: '물리량 값',

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: '에너지원',