diff --git a/assets/scss/common.scss b/assets/scss/common.scss
index 30bbcb5..5f1f1f2 100644
--- a/assets/scss/common.scss
+++ b/assets/scss/common.scss
@@ -484,6 +484,10 @@ a {
border-bottom: 1px solid map-deep-get($config, #{$theme}, "v-header-border");
}
+ .custom-chart{
+ border: 1px solid map-deep-get($config, #{$theme}, "v-chart-border");
+ }
+
.btn-header {
background-color: map-deep-get($config, #{$theme}, "v-btn-header-background");
border:1px solid map-deep-get($config, #{$theme}, "v-btn-header-border");
diff --git a/assets/scss/common/button.scss b/assets/scss/common/button.scss
index 505da79..5836aae 100644
--- a/assets/scss/common/button.scss
+++ b/assets/scss/common/button.scss
@@ -66,6 +66,12 @@
}
}
+ .custom-action-btn{
+ height: 24px;
+ width: 24px;
+ font-size: 12px;
+ }
+
.v-btn {
background-color: map-deep-get($config,
#{$theme},
diff --git a/assets/scss/var.scss b/assets/scss/var.scss
index b4b3846..6bbd9f4 100644
--- a/assets/scss/var.scss
+++ b/assets/scss/var.scss
@@ -175,6 +175,7 @@ $config: (
btn-header-select-color:#FFFFFFD9,
subtitle-tab: #FFFFFFA6,
v-header-border: #424242,
+ v-chart-border: #424242,
v-sidebar-border: #303030,
),
light: (w-g5: $--color-gray_555,
@@ -314,6 +315,7 @@ $config: (
btn-header-select-bg:#FFFFFF,
subtitle-tab: #000000A6,
v-header-border: #D9D9D9,
+ v-chart-border: #D9D9D9,
v-sidebar-border: #F0F0F0,
),
);
\ No newline at end of file
diff --git a/components/common/Chart.vue b/components/common/Chart.vue
index 4dcc7c1..3aacaf6 100644
--- a/components/common/Chart.vue
+++ b/components/common/Chart.vue
@@ -61,7 +61,8 @@ export default {
isDarkMode: 'isDarkMode',
chartOption(state) {
var dark_Col = [
- '#01AE6A',
+ '#79B100',
+ // '#01AE6A',
'#FFB046',
'#F6637B',
'#944FE9',
@@ -194,7 +195,8 @@ export default {
var lightCol_dashReadplcStatus = ['#3cc380', '#ffb13b', '#f98694'];
var light_Col = [
- '#3CC380',
+ '#3BAD43',
+ // '#3CC380',
'#FFB13B',
'#F98694',
'#CF74E5',
diff --git a/components/common/Grid.vue b/components/common/Grid.vue
index cdaad76..8eb4417 100644
--- a/components/common/Grid.vue
+++ b/components/common/Grid.vue
@@ -299,7 +299,6 @@ export default {
startEditing(e) {
// console.log('startEditing1...')
if (this.preventFocusChangeEvent(e)) {
- // console.log('prevent startEditing')
return;
}
@@ -311,7 +310,6 @@ export default {
// console.log('startEditing2...')
if (this.editorGrid && e.rowKey >= 0) {
this.editorStartKey = e.rowKey;
- // console.log("E::", this.gridInstance.invoke("getRow", e.rowKey));
this.gridInstance.invoke('startEditing', e.rowKey, e.columnName);
this.$emit(
'getRowsData',
diff --git a/components/common/button/ActionButtons.vue b/components/common/button/ActionButtons.vue
index 4d6a7f3..ecf39ce 100644
--- a/components/common/button/ActionButtons.vue
+++ b/components/common/button/ActionButtons.vue
@@ -2,9 +2,9 @@
diff --git a/components/common/button/BtnSearch.vue b/components/common/button/BtnSearch.vue
index a1d3f67..1346b92 100644
--- a/components/common/button/BtnSearch.vue
+++ b/components/common/button/BtnSearch.vue
@@ -10,7 +10,7 @@ export default {
size: {
type: String,
require: false,
- default: "middle", // small, middle, large
+ default: "default", // small, default, large
}
},
methods: {
diff --git a/components/common/modal/EnrgUsePlanModiPop.vue b/components/common/modal/EnrgUsePlanModiPop.vue
index 4fa2137..db7478e 100644
--- a/components/common/modal/EnrgUsePlanModiPop.vue
+++ b/components/common/modal/EnrgUsePlanModiPop.vue
@@ -65,13 +65,10 @@
-
- 사용량 계획
-
-
+
-->
-
취소
확정
@@ -533,7 +529,7 @@ export default {
seriesData = data.map(item => ({
name: item.gubun == '2PLAN' ? '계획' : '전년실적',
type: item.gubun == '2PLAN' ? 'line' : 'bar',
- data: targetMonthList.map(obj => item[obj] || null)
+ data: targetMonthList.map(obj => item[obj] || null),
// data: targetMonthList.map(obj => item[obj] || 0)
}));
this.nowSeriesData = seriesData;
@@ -558,7 +554,6 @@ export default {
series: seriesData,
tooltip: tooltipData
};
- // console.log('option', option);
await this.$nextTick(() => {
});
@@ -601,7 +596,6 @@ export default {
sData2 = nowSeriesData.filter(item => {
return item.name == '계획';
})[0]['data'];
- // console.log('sData1', sData);
if(targetMonth.includes('qty')){
targetMonth = parseInt(targetMonth.slice(-2));
}
@@ -610,13 +604,11 @@ export default {
sData2[i] = sData[i] * targetRatio;
}
}
- // console.log('sData2', sData2);
seriesData = nowSeriesData.map(item => ({
...item,
data: item.name == '계획' ? sData2 : item.data
}));
- // console.log('seriesData', seriesData);
await this.$nextTick(() => {
});
@@ -643,4 +635,4 @@ let modifyEnrgUsePlanModalDataKey =
modifyEnrgUsePlanChart: Utility.defaultChartOption(true)
};
// 전력량 요금(원/kWh)
-
+
\ No newline at end of file
diff --git a/components/pages/ems/EccInfo/EccIaoTab.vue b/components/pages/ems/EccInfo/EccIaoTab.vue
index 9153f96..a96c9e8 100644
--- a/components/pages/ems/EccInfo/EccIaoTab.vue
+++ b/components/pages/ems/EccInfo/EccIaoTab.vue
@@ -11,7 +11,7 @@
:btnActionsFnc="btnActions"
/>
-