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

update screen 33, 44, 20, fix bug Grid

Browse Source
This commit is contained in:
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
2025-07-30 14:03:41 +07:00
parent b4f8e41c7e
commit 9603353ab3
26 changed files with 199 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,19 +36,14 @@
<v-card-title>
<span class="custom-title-4">역할 리스트</span>
</v-card-title>
<div class="px-5" style="height:calc(100% - 100px)">
<div
ref="gridParent"
class="w100 h100"
>
<component
:is="loadGrid ? 'Grid' : null"
:ref="gridName + myPrgmId"
:gridName="gridName"
:parentPrgmId="myPrgmId"
@getRowsData="getRowData"
/>
</div>
<div ref="gridParent" class="px-5" style="height: 60vh;">
<component
:is="loadGrid ? 'Grid' : null"
:ref="gridName + myPrgmId"
:gridName="gridName"
:parentPrgmId="myPrgmId"
@getRowsData="getRowData"
/>
</div>
</v-card>
</v-col>
@ -69,19 +64,19 @@
:style="{ minHeight: '36px' }"
>[미배정]메뉴리스트</span
>
<div class="px-0 mt-2" style="height:calc(100% - 64px)">
<div
<div ref="treeGridParent" class="px-0 mt-2" style="height: 60vh;">
<!-- <div
ref="treeGridParent"
class="w100 h100"
>
<component
:is="loadTreeGrid ? 'Grid' : null"
:ref="gridName2 + myPrgmId"
:gridName="gridName2"
:parentPrgmId="myPrgmId"
@getRowsData="getUnAsgnRowData"
/>
</div>
</div> -->
<component
:is="loadTreeGrid ? 'Grid' : null"
:ref="gridName2 + myPrgmId"
:gridName="gridName2"
:parentPrgmId="myPrgmId"
@getRowsData="getUnAsgnRowData"
/>
</div>
</v-col>
<v-col :cols="1">
@ -112,20 +107,20 @@
/>
</v-col>
</v-row>
<div class="px-0 mt-2" style="height:calc(100% - 64px)">
<div
<div ref="treeGridParent2" class="px-0 mt-2" style="height: 60vh;">
<!-- <div
ref="treeGridParent2"
class="w100 h100"
>
<component
:is="loadTreeGrid2 ? 'Grid' : null"
:ref="gridName3 + myPrgmId"
:gridName="gridName3"
:parentPrgmId="myPrgmId"
:editorGrid="true"
@getRowsData="getAsgnRowData"
/>
</div>
</div> -->
<component
:is="loadTreeGrid2 ? 'Grid' : null"
:ref="gridName3 + myPrgmId"
:gridName="gridName3"
:parentPrgmId="myPrgmId"
:editorGrid="true"
@getRowsData="getAsgnRowData"
/>
</div>
</v-col>
</v-row>
@ -408,9 +403,9 @@ export default {
align: 'center',
width: 30,
formatter: (props) => {
return `<label class="custom-radio">
return `<span class="custom-radio">
<span class="radio-mark"></span>
</label>`;
</span>`;
}
},
{
@ -431,9 +426,9 @@ export default {
align: 'center',
width: 30,
formatter: (props) => {
return `<label class="custom-radio">
return `<span class="custom-radio">
<span class="radio-mark"></span>
</label>`;
</span>`;
}
},
{ header: '역할ID', name: 'roleId', hidden: true },
@ -573,6 +568,7 @@ export default {
});
},
async getRowData(data) {
await this.setPageData({
rowGridSelectKey: data.rowKey,
rowGridSelectData: {
@ -678,6 +674,8 @@ 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

@ -50,7 +50,7 @@
/>
</div>
</div>
<div ref="gridParent" style="height: 100vh">
<div ref="gridParent" style="height: 60vh">
<!-- <div ref="gridParent" class="px-5 h100">
</div> -->
<component

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

@ -91,7 +91,7 @@
</a-button>
</div>
</div>
<div ref="gridParent" class="px-5 w100" style="min-height: 60vh">
<div ref="gridParent" class="px-5 w100" style="height: 55vh;">
<component
:is="loadGrid ? 'Grid' : null"
:ref="gridName"
@ -242,6 +242,10 @@ export default {
columnOptions: {
resizable: true,
},
pageOptions: {
useClient: true,
perPage: 13,
},
};
this.setGridOption({
gridKey: this.gridName,

8
pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue
View File

@ -975,7 +975,7 @@ export default {
var seriesData = null;
xAxisData = this.makeChartGroup01XaxisData();
console.log("text xaxis", xAxisData);
// console.log("text xaxis", xAxisData);
for (var i = 0; i < dataKeyList.length; i++) {
seriesData = new Array(xAxisData.length).fill(10);
@ -988,12 +988,12 @@ export default {
currentChartData["data"][j]["totVal"];
}
console.log("text seri data", seriesData);
// console.log("text seri data", seriesData);
this.$store.state.pageData[myPrgmId][chartKey]["xAxis"]["data"] = xAxisData;
this.$store.state.pageData[myPrgmId][chartKey]["series"][0]["data"] = seriesData;
console.log("chart data", this.$store.state.pageData[myPrgmId][chartKey]);
// console.log("chart data", this.$store.state.pageData[myPrgmId][chartKey]);
}
},
getGroup01ChartOption() {
@ -1007,7 +1007,7 @@ export default {
};
chartOption["series"][0]["symbol"] = "none";
console.log("chartOption: ", chartOption);
// console.log("chartOption: ", chartOption);
return chartOption;
},
makeChartGroup01XaxisData() {