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

conflic

Browse Source
This commit is contained in:
Hoang Xuan Mai/(Hoang Xuan Mai)/현장대리인/SK
2025-08-04 16:41:29 +07:00
parent 41095098e2 f180f22324
commit 2253ddef0a
16 changed files with 1242 additions and 1232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pages/comm/base/NoticeMngPage.vue
View File

@ -10,8 +10,8 @@
<v-card-title class="pa-0 custom-title-4">공지사항</v-card-title>
<div class="d-flex align-center">
<!-- <v-btn @click="listPageButtonGroupClickEvent('view')" :ripple="false" class="mr-1">상세보기</v-btn> -->
<a-button type="primary" size="large" @click="listPageButtonGroupClickEvent('write')"
:ripple="false" icon="edit" class="mr-1">작성</a-button>
<a-button type="primary" @click="listPageButtonGroupClickEvent('write')" :ripple="false"
icon="edit" class="mr-1">작성</a-button>
<!-- <v-btn @click="listPageButtonGroupClickEvent('delete')" :ripple="false">삭제</v-btn> -->
</div>
</v-col>
@ -1053,16 +1053,16 @@ const defaultData = {
}
}
.toastui-editor-mode-switch{
.toastui-editor-mode-switch {
font-family: Inter !important;
font-size: 1.0rem !important;
}
.toastui-editor-mode-switch .tab-item.active{
.toastui-editor-mode-switch .tab-item.active {
color: #1677FF
}
.toastui-editor-mode-switch .tab-item{
.toastui-editor-mode-switch .tab-item {
color: #000000E0
}
}

2
pages/ems/base/EquipmentMasterMngPage.vue
View File

@ -53,7 +53,7 @@
</v-col>
<v-col :cols="7" >
<v-card class="pb-5">
<v-card-title class="custom-title-4" style="min-height:76px;">설비 상세</v-card-title>
<v-card-title class="custom-title-4 pb-1" >설비 상세</v-card-title>
<div class="px-5" style="min-height:calc(100% - 76px)">
<v-tabs v-model="tab">
<v-tab v-for="item in items" :key="item.id" :disabled="item.disabledFlag">

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

@ -43,6 +43,7 @@
:is="'Datepicker'"
:parentPrgmId="myPrgmId"
:label="'조회기간'"
customClass="datepicker-large"
/>
</v-col>
<div class="d-flex">

2
pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue
View File

@ -49,7 +49,7 @@
<v-col :cols="3">
<!-- 대상일 -->
<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="12"
:textCols="12" :customClass="'input-large'" />
:textCols="12" :customClass="'datepicker-large'" />
</v-col>
<v-col :cols="3" class="text-right">
<!-- 조회버튼 -->

9
pages/ems/effc/EnrgEffcTotSummPage.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="l-layout">
<CommonPageTitle />
<v-row ref="searchFilter">
<v-col :cols="12">
<v-card class="searchFilter">
@ -25,7 +26,7 @@
<component
:is="'Datepicker'"
:parentPrgmId="myPrgmId"
:customClass="'select-large'"
:customClass="'datepicker-large'"
:label="'대상일'"
:labelCols="3"
/>
@ -99,7 +100,6 @@ export default {
async asyncData(context) {
const myState = context.store.state;
myPrgmId = context.route.query.prgmId;
console.log("active menu:", myState.menuData);
await context.store.commit("setActiveMenuInfo", myState.menuData[myPrgmId]);
myTitle = await myState.activeMenuInfo.menuNm;
},
@ -319,8 +319,7 @@ export default {
},
};
console.log("data : ", data);
data.map((item) => {
data.map((item) => {
xAxisData.push(item.fabNm);
});
@ -374,8 +373,6 @@ export default {
];
}
// console.log("xAxisData : ", xAxisData);
console.log("seriesData : ", seriesData);
var chartOption = {
legend: {
top: xAxisData.length > 7 ? "top" : "bottom",

6
pages/ems/effc/EnrgMapPage.vue
View File

@ -5,14 +5,14 @@
<v-col :cols="12">
<v-card class="searchFilter">
<v-row align="end" no-gutters>
<v-col :cols="4">
<v-col :cols="3">
<!-- 차트목록 -->
<component :is="'SelectBox'" ref="SelectBox" :propsValue="selectValue01" :itemList="selectValueList01"
:label="'차트'" @update:propsValue="selectValue01 = $event" :textCols="12" customClass="select-large" />
</v-col>
<v-col :cols="4">
<v-col :cols="3">
<!-- 대상일 -->
<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="3" />
<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="3" customClass="datepicker-large" />
</v-col>
<v-col :cols="4" class="text-right">
<BtnSearch @click="search" size="large" />

47
pages/ems/effc/EnrgReptMngPage.vue
View File

@ -32,7 +32,7 @@
</v-col>
<v-col :cols="3">
<!-- 대상일 -->
<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="3" />
<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="3" customClass="datepicker-large" />
</v-col>
<v-col :cols="6" class="text-right d-flex align-end justify-end align-self-end">
<!-- 조회버튼 -->
@ -99,6 +99,8 @@ import EqpmSelectPop from '~/components/common/modal/EqpmSelectPop';
import DateUtility from '~/plugins/dateUtility';
import XLSX from 'xlsx';
import getLineChartOption from "~/components/common/chartoptions/LineChart";
let myTitle;
let myPrgmId;
@ -764,22 +766,14 @@ export default {
];
}
var chartOption = {
legend: {
top: 'top',
},
grid: {
top: '10%',
bottom: '20%',
},
yAxis: {},
xAxis: {
data: xAxisData,
},
series: seriesData,
tooltip: {},
const chartOption = getLineChartOption({
xAxisData: xAxisData,
seriesData: seriesData,
dataZoom: dataZoom,
};
// legendData: legendData,
// isDarkMode: this.isDarkMode,
});
this.setChartOption({ chartKey: this.chartName01, value: chartOption });
// this.setChartYAxisData({ chartKey: this.chartName01, value: yAxisData });
// this.setChartXAxisData({ chartKey: this.chartName01, value: xAxisData });
@ -864,22 +858,13 @@ export default {
];
}
var chartOption = {
legend: {
top: 'top',
},
grid: {
top: '10%',
bottom: '20%',
},
yAxis: {},
xAxis: {
data: xAxisData,
},
series: seriesData,
tooltip: {},
const chartOption = getLineChartOption({
xAxisData: xAxisData,
seriesData: seriesData,
dataZoom: dataZoom,
};
// legendData: legendData,
// isDarkMode: this.isDarkMode,
});
this.setChartOption({ chartKey: this.chartName02, value: chartOption });
// this.setChartDataZoom({chartKey : this.chartName02,value: dataZoom});

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

@ -97,7 +97,7 @@
</v-row>
<v-row ref="contents" style="height: calc(100vh - 230px)">
<v-col :cols="12" style="height: 100%">
<v-row class="pa-1" style="height: 37%; width: 100%">
<v-row class="pa-1" style="height: 50%; width: 100%">
<div style="width: 100%; height: 100%; overflow: hidden">
<div style="height: 15%">
<v-card-title
@ -117,7 +117,7 @@
v-for="(value, key, index) in contentData01"
:key="'key1' + index"
>
<v-card>
<v-card style="position: relative; overflow: hidden;" >
<!-- Card header -->
<div
style="
@ -133,23 +133,9 @@
<v-card-title style="padding-left: 10px">{{
value["gdIdxNm"]
}}</v-card-title>
<div class="v-box" style="height: 80%; padding: 3px; margin: 2px">
<v-col :cols="12" style="height: 100%">
<!-- <div style="height: 20%">
<div
style="
position: absolute;
left: 0;
top: 10px;
width: 4px;
height: 50px;
background-color: #91caff;
border-radius: 2px;
"
></div>
<v-card-title>{{ value["gdIdxNm"] }}</v-card-title>
</div> -->
<div style="height: 95%">
<div class="v-box" style="height: 80%; padding: 3px; margin: 10px;">
<v-col :cols="12" style="height: 100%;">
<div style="height: 85%;">
<component
class="w100 h100"
:is="loadChart ? 'Chart' : null"
@ -166,7 +152,7 @@
</div>
</div>
</v-row>
<v-row class="pa-1" style="height: 33%; width: 100%">
<v-row class="pa-1" style="height: 40%; width: 100%">
<v-card class="pa-1" style="height: 100%; width: 100%; overflow: hidden">
<div style="height: 25%">
<v-card-title class="d-flex align-center justify-space-between pa-5">
@ -746,10 +732,12 @@ export default {
{
type: "line",
data: seriesData,
symbol: "none",
itemStyle: {
color: "#D32029",
},
// symbol: "circle",
showSymbol: true,
connectNulls: true,
},
// {
// type: "line",

4
pages/ems/effc/EnrgUseTotSummPage.vue
View File

@ -24,6 +24,7 @@
:is="'DatePicker'"
:label="'대상연월'"
:parentPrgmId="myPrgmId"
:customClass="'datepicker-large'"
/>
</v-col>
<v-col :cols="3"> </v-col>
@ -429,9 +430,6 @@ export default {
var chartKey = null;
var chartOption = null;
console.log("data key:", dataKeyList);
console.log("data test:", data);
for (var i = 0; i < dataKeyList.length; i++) {
for (var j = 0; j < data[dataKeyList[i]].chartData.length; j++) {
currentChartData = data[dataKeyList[i]].chartData[j];

1
pages/ems/effc/EqpmIndMntrPage.vue
View File

@ -71,6 +71,7 @@
:label="'대상년월'"
:parentPrgmId="myPrgmId"
:isRangeOption="false"
:customClass="'datepicker-large'"
/>
</v-col>
<v-col :cols="6"> </v-col>

1642
pages/ems/effc/TagTrndPage.vue
View File

File diff suppressed because it is too large Load Diff