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

Merge pull request 'fixbugs screen 10' (#45) from dev-dungtv-0807 into dev

Browse Source 
Reviewed-on: #45
This commit is contained in:
dev
2025-08-07 12:45:25 +09:00
parent 6f6f19349f 537a16fbc7
commit 93dd46c225
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,10 @@
<template>
<div>
<div class="d-flex justify-space-between align-center" style="min-height: 80px;">
<span class="txt custom-subtitle-tab">Data Set TAG 연결 정보</span>
<div class="d-flex justify-space-between align-center pb-5" >
<!-- <span class="txt custom-title-4">Data Set TAG 연결 정보</span> -->
<v-card-title class="pa-0">
Data Set TAG 연결 정보
</v-card-title>
<Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :detailList="detailDataSetTagList"
:btnActionsFnc="btnActions" />
</div>
@ -14,22 +17,20 @@
@gridEditingFinish="gridEditingFinish" />
</div>
<div ref="formParent" style="min-height: 100px;" class="w100 h100">
<v-row ref="contents" class="w100">
<v-col :cols="6">
<div ref="formParent" class="h100">
<v-row align="end" ref="contents" class="">
<v-col>
<component :is="'Datepicker'" :parentPrgmId="parentPrgmId" :label="'검색기간'" :labelCols="12" :textCols="12" />
</v-col>
<v-col :cols="4">
<v-col >
<component :is="'selectCodeList'" :parentPrgmId="parentPrgmId" :label="'주기'" dataKey="mdlDataTerm"
:sendParam="{ commGrpCd: 'MDL_DATA_TERM', useFg: '1' }" :addAll="false" :labelCols="12" :textCols="12" :iconShow="true" />
</v-col>
<v-col class="text-right align-self-end">
<a-button @click="jamoviProcClickEvent('view1')" type="primary" :ripple="false" class="mr-1">데이터 분석</a-button>
</v-row>
<v-row align="center" no-gutters class="searchFilter mt-2">
<v-col class="d-flex justify-end">
<a-button @click="jamoviProcClickEvent('view1')" type="primary" :ripple="false" class="mb-1">데이터 분석</a-button>
</v-col>
<!-- <v-card class="searchFilter w100">
<v-row align="center" no-gutters>
</v-row>
</v-card> -->
</v-row>
</div>
</div>
@ -156,7 +157,7 @@ export default {
{
header: '모델 Data 구분',
name: 'mdlDataTypeCd',
align: 'center',
align: 'left',
width: 120,
formatter({ value }) {
var retVal = '';
@ -173,7 +174,7 @@ export default {
{
header: '사용여부',
name: 'useFg',
align: 'center',
align: 'left',
width: 100,
formatter({ value }) {
value = value === true ? '1' : '0';

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

@ -53,7 +53,8 @@
</v-col>
<v-col :cols="7" >
<v-card class="pb-5">
<v-card-title class="custom-title-4" style="min-height:76px;">Data Set 상세
<v-card-title class="custom-title-4 pb-0 mb-2" >
Data Set 상세
</v-card-title>
<div class="px-5" style="min-height:calc(100% - 76px)">
<v-tabs v-model="tab">
@ -312,7 +313,7 @@ export default {
header: '사용 여부',
name: 'useFg',
minWidth: 200,
align: 'center',
align: 'left',
formatter({ value }) {
value = value === true ? '1' : '0';
const newValue = _this.pageData.useFgList.filter(