update screen 33, 44, 20, fix bug Grid

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

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,

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() {