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

Merge pull request 'Commit 3107' (#27) from dev-trungvq7-0729 into dev

Browse Source 
Reviewed-on: #27
This commit is contained in:
dev
2025-07-31 15:39:36 +09:00
parent 44077048e6 056d1a1e17
commit f9643f46a0
6 changed files with 105 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,8 +278,8 @@
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
height: 11px;
width: 11px;
height: 8px;
width: 8px;
border-radius: 50%;
background-color: map-deep-get($config,
#{$theme},

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

@ -171,8 +171,8 @@
align-items: center;
cursor: pointer;
position: relative;
padding-left: 28px;
margin: 10px;
padding-left: 0;
margin: 5px;
font-size: 16px;
}
.custom-radio input[type="radio"] {
@ -183,13 +183,13 @@
/* Custom radio appearance */
.radio-mark {
position: absolute;
left: 0;
left: -8px;
top: 50%;
transform: translateY(-50%);
height: 18px;
width: 18px;
height: 14px;
width: 14px;
// background-color: white;
border: 2px solid #ccc;
border: 1px solid #ccc;
border-radius: 50%;
transition: all 0.2s ease;
}

9
components/common/modal/ReadPlcPop.vue
View File

@ -268,7 +268,7 @@ export default {
header: '',
name: '',
align: 'center',
width: 50,
width: 20,
formatter: (props) => {
return `<label class="custom-radio">
<span class="radio-mark"></span>
@ -278,10 +278,10 @@ export default {
{
header: '검침개소명',
name: 'readPlcNm',
width: 300,
width: 500,
align: 'left',
},
{ header: '검침개소', name: 'name', align: 'center' },
{ header: '검침개소', name: 'name', align: 'left', width: 200 },
],
});
},
@ -307,6 +307,9 @@ export default {
// console.log("treeData", res)
let myOptionsTree = {
columnOptions: {
resizable: true,
},
treeColumnOptions: {
name: 'readPlcNm',
},

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

@ -6,12 +6,23 @@
:btnActionsFnc="btnActions" />
</div>
<div ref="gridParent" style="height: calc((100vh - 520px) /2);">
<Grid :ref="gridName" :gridName="gridName" :parentPrgmId="parentPrgmId" @getRowsData="getRowData"
:innerTabGridInfo="innerTabGridInfo" />
<Grid
:ref="gridName"
:is="loadGrid ? 'Grid' : null"
:gridName="gridName"
:parentPrgmId="parentPrgmId"
@getRowsData="getRowData"
:innerTabGridInfo="innerTabGridInfo"
/>
</div>
<div class="mt-3" ref="formParent" style="height: calc((100vh - 400px) /2);">
<component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName"
:detailList="detailReadPlcTagList" @gridEditingFinish="gridEditingFinish" />
<div ref="formParent" style="height: calc((100vh - 400px) /2);">
<component
:is="'Form'"
:parentPrgmId="parentPrgmId"
:bindingData="gridName"
:detailList="detailReadPlcTagList"
@gridEditingFinish="gridEditingFinish"
/>
</div>
</div>
</template>
@ -99,9 +110,9 @@ export default {
// bodyHeight: gridHeight,
// minBodyHeight: gridHeight,
header: {
height: 28,
height: 37,
},
rowHeight: 29,
rowHeight: 37,
minRowHeight: 29,
selectionUnit: 'row',
editingEvent: 'click',

14
pages/comm/auth/MenuMngPage.vue
View File

@ -151,6 +151,9 @@ export default {
gridInit() {
const treeGridHeight = this.$refs.treeGridParent.offsetHeight - 30;
const myOptionsTree = {
columnOptions: {
resizable: true,
},
treeColumnOptions: {
name: 'menuNm',
},
@ -171,6 +174,17 @@ export default {
this.setGridColumn({
gridKey: this.gridName,
value: [
{
header: '',
name: '',
align: 'center',
width: 20,
formatter: (props) => {
return `<label class="custom-radio">
<span class="radio-mark"></span>
</label>`;
}
},
{ header: '메뉴명', name: 'menuNm' },
{ header: 'prgmId ', name: 'prgmId', hidden: true },
{ header: 'sysDivCd ', name: 'sysDivCd', hidden: true },

17
pages/ems/base/EnrgReadPlaceMngPage.vue
View File

@ -43,8 +43,7 @@
<div ref="gridParent" class="w100 h100">
<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
:parentPrgmId="myPrgmId" @getRowsData="getRowData"
@sendSelectedRowStatInfo="getSelectedRowStatInfo" :selectedRowDataWatchFlag="true"
/>
@sendSelectedRowStatInfo="getSelectedRowStatInfo" :selectedRowDataWatchFlag="true" />
</div>
</div>
</v-card>
@ -308,12 +307,22 @@ export default {
const _this = this;
const myColumns = [
{
header: '',
name: '',
align: 'center',
formatter: (props) => {
return `<span class="custom-radio">
<span class="radio-mark"></span>
</span>`;
}
},
{ header: '회사 ID', name: 'comId', hidden: true },
{
header: '검침개소명',
name: 'readPlcNm',
align: 'left',
minWidth: 400,
minWidth: 350,
},
{
header: '검침개소 ID',
@ -493,7 +502,7 @@ export default {
if (this.tab == 2) {
this.tab = 0;
}
this.isImgTabDisabled = false;
this.isImgTabDisabled = true;
} else {
this.isImgTabDisabled = false;
}