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

Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-luannv24-s2s17s15-fixbug

Browse Source
This commit is contained in:
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK
2025-08-07 11:23:58 +09:00
parent 56607d0770 f715405ad2
commit 8bb0d56a80
8 changed files with 121 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,8 +119,7 @@
/>
</div> -->
<v-card-actions>
<v-spacer></v-spacer>
<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
<a-button color="primary" type="primary" @click="closePop()">확인</a-button>
</v-card-actions>
</v-card>
@ -275,7 +274,12 @@ export default {
// const gridHeight = this.$refs.gridParent.offsetHeight - 30;
const myOptions = {
rowHeaders: ['rowNum'],
rowHeaders: [
{
type: 'rowNum',
align: 'right',
},
],
columnOptions: {
resizable: true,
minWidth: 100
@ -319,19 +323,19 @@ export default {
header: '주의',
width: 100,
name: 'careStndVal',
align: 'center'
align: 'right'
},
{
header: '경고',
width: 100,
name: 'warnStndVal',
align: 'center'
align: 'right'
},
{
header: '가이드값',
width: 100,
name: 'totVal',
align: 'center'
align: 'right'
},
{
header: '알람내용',

87
components/common/modal/EqpmSelectPop.vue
View File

@ -8,47 +8,35 @@
</label>
</v-col>
<v-col :cols="textCols">
<v-text-field
readonly
v-model="selectValue"
append-icon="mdi-magnify"
:class="['v-input__custom', customClass]"
@click="dialogOpenCloseEvent(dialog)"
outlined
:hide-details="true"
:required="required || false"
:disabled="disabled || false"
:placeholder="placeholder"
>
<template v-slot:append>
<v-text-field readonly v-model="selectValue" append-icon="" :class="['v-input__custom', customClass]"
@click="dialogOpenCloseEvent(dialog)" outlined :hide-details="true" :required="required || false"
:disabled="disabled || false"><template v-slot:append>
<!-- Custom SVG icon -->
<v-icon>$icoSearch</v-icon>
</template>
</v-text-field>
</v-col>
<v-dialog ref="popModal" v-model="dialog" width="800" scrollable>
<v-card style="height: 90vh;">
<v-dialog ref="popModal" v-model="dialog" width="800" content-class="custom-dialog" scrollable>
<v-card style="height: 100%;">
<v-card-title class="px-5 py-4 d-flex align-center justify-space-between">
<span class="custom-title-4">설비 선택</span>
<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
</v-card-title>
<div class="pa-2 pt-0">
<div class="px-5 pt-2">
<!-- <v-card class="searchFilter">
</v-card> -->
<v-row align="end" class="searchFilter">
<v-col>
<v-row align="end">
<v-col :cols="3.5">
<!-- 설비그룹 -->
<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01"
:label="'설비그룹'" :disabled="eqpmGrpDisabled"
@update:propsValue="selectValue01 = $event" :labelCols="12" :textCols="12"
:iconShow="true" />
:label="'설비그룹'" :disabled="eqpmGrpDisabled" @update:propsValue="selectValue01 = $event"
:labelCols="12" :textCols="12" :iconShow="true" />
</v-col>
<v-col>
<!-- FAB -->
<component :is="'SelectBoxMulti'" :propsValue="selectValue02"
:itemList="selectValueList02" :label="'FAB'" :labelCols="12" :multiple="true"
:disabled="fabDisabled" @update:propsValue="selectValue02 = $event" :textCols="12"
:iconShow="true" />
<component :is="'SelectBoxMulti'" :propsValue="selectValue02" :itemList="selectValueList02"
:label="'FAB'" :labelCols="12" :multiple="true" :disabled="fabDisabled"
@update:propsValue="selectValue02 = $event" :textCols="12" :iconShow="true" />
</v-col>
<v-col >
<v-row>
@ -59,9 +47,8 @@
</label>
</v-col>
<v-col :cols="12" class="pt-0">
<v-text-field append-icon="" class="v-input__custom" outlined
:hide-details="true" v-model="searchWord" @keyup.enter="search"><template
v-slot:append>
<v-text-field append-icon="" class="v-input__custom" outlined :hide-details="true"
v-model="searchWord" @keyup.enter="search"><template v-slot:append>
<!-- Custom SVG icon -->
<v-icon>$icoSearch</v-icon>
@ -70,7 +57,11 @@
</v-row>
</v-col>
<a-button icon="search" type="primary" @click="search()" class="mb-1 mr-2">조회</a-button>
<v-col :cols="2" class="last-col mr-2">
<a-button icon="search" :ripple="false" type="primary" @click="search()"
class="search-button">조회</a-button>
</v-col>
</v-row>
<!-- <v-row align="center" no-gutters style="margin-top: 14px;">
@ -91,13 +82,13 @@
</v-row> -->
</div>
<v-card-text class="px-2 w100">
<div ref="modalGridParent" style="height: 450px;" class="h100 w100">
<div class="pa-5" style="height:calc(100% - 30px)">
<div ref="modalGridParent" class="h100 w100">
<component :ref="gridName" :is="loadGrid ? 'Grid' : null"
:dataPath="searchParam.eqpmSelectPopData.eqpmSelectPop" :gridName="gridName"
:parentPrgmId="parentPrgmId" @getRowsData="getRowData" />
</div>
</v-card-text>
</div>
<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)" class="mr-2">닫기</a-button>
@ -270,7 +261,7 @@ export default {
},
chkDialog() {
if (this.isMulti) {
this.$store.state.pageData[this.parentPrgmId][this.modalDataKey][this.myModalKey][this.gridName].option.rowHeaders = [{ type: 'checkbox' }];
this.$store.state.pageData[this.parentPrgmId][this.modalDataKey][this.myModalKey][this.gridName].option.rowHeaders = [{ type: 'checkbox', width: 72 }];
} else {
this.$store.state.pageData[this.parentPrgmId][this.modalDataKey][this.myModalKey][this.gridName].option.rowHeaders = [];
}
@ -437,18 +428,15 @@ export default {
{
header: 'FAB',
name: 'fabNm',
align: 'center'
},
{
header: '설비ID',
name: 'eqpmId',
align: 'center',
name: 'eqpmId'
// hidden:true
},
{
header: '설비명',
name: 'eqpmNm',
align: 'center'
name: 'eqpmNm'
},
{
header: 'eccId',
@ -532,11 +520,11 @@ export default {
this.loadGrid = true;
this.$nextTick(() => {
if (this.isMulti) {
this.getChecked();
}
});
// this.$nextTick(() => {
// if (this.isMulti) {
// this.getChecked();
// }
// });
},
setUpdate() {
@ -588,3 +576,16 @@ var eqpmSelectPop = {
}
</script>
<style lang="scss" scoped>
::v-deep {
.last-col {
flex-basis: content;
}
.v-dialog {
overflow-y: hidden;
}
}
</style>

4
components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue
View File

@ -332,7 +332,7 @@ const myReadPlcTagDetail = [
valueNm2: 'tagNm',
disabled: true,
cols: 6,
class: 'pr-4 pb-2 py-3',
class: 'pr-4 pb-2 py-2',
required: true,
labelCols: 12,
textCols: 12,
@ -345,7 +345,7 @@ const myReadPlcTagDetail = [
valueNm: 'ercId',
disabled: false,
cols: 6,
class: 'pl-4 py-3',
class: 'pl-4 pb-2 py-3',
list: 'ercNmList',
itemText: 'text',
itemValue: 'value',