+
-
-
-
-
-
-
- 
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
{
+ return ``;
+ }
+ },
{
header: '메뉴명',
name: 'menuNm',
@@ -415,6 +425,17 @@ export default {
},
];
const myTreeColumns2 = [
+ {
+ header: '',
+ name: '',
+ align: 'center',
+ width: 30,
+ formatter: (props) => {
+ return ``;
+ }
+ },
{ header: '역할ID', name: 'roleId', hidden: true },
{ header: '메뉴ID', name: 'menuId', hidden: true },
{ header: '메뉴명', name: 'menuNm', minWidth: '235' },
diff --git a/pages/comm/base/NoticeMngPage.vue b/pages/comm/base/NoticeMngPage.vue
index 4b80a90..e0956bd 100644
--- a/pages/comm/base/NoticeMngPage.vue
+++ b/pages/comm/base/NoticeMngPage.vue
@@ -1,5 +1,6 @@
+
@@ -14,10 +15,12 @@
-
+
@@ -266,7 +269,8 @@ export default {
myPrgmId: myPrgmId,
//comId: "SEMPIO",
//comId: this.userInfo.comId,
- comId: this.$store.state.userInfo.comId,
+ // comId: this.$store.state.userInfo.comId,
+
bordNo: null,
pageActionFlag: 'list',
gridName: 'noticeMngGrid',
@@ -467,12 +471,12 @@ export default {
value: columnList,
});
- // -----------------------TEST------------------
- this.dataPathMock[this.gridName] = {
- column: columnList,
- data: dataPathDataExample,
- }
- // -----------------------END TEST--------------
+ // // -----------------------TEST------------------
+ // this.dataPathMock[this.gridName] = {
+ // column: columnList,
+ // data: dataPathDataExample,
+ // }
+ // // -----------------------END TEST--------------
this.getGridData();
},
async getGridData() {
@@ -481,31 +485,32 @@ export default {
};
this.loadGrid = false;
- let res = null;
- try {
- res = await this.postApiReturn({
- apiKey: 'selectPostList',
- resKey: 'postData',
- sendParam: params,
- });
- }
- catch (err) { }
- finally {
- // -----Test mock data-------------
- if (null === res) {
- res = dataPathDataExample;
- }
- // -----End test
- }
+
+ const res = await this.postApiReturn({
+ apiKey: 'selectPostList',
+ resKey: 'postData',
+ sendParam: params,
+ });
+
+ // console.log('----------DEBUG--------res: ', res);
+ const newRes = res.map(item => {
+ const newObj = {
+ ...item,
+ rowStat: null,
+ dataSetId: item.dataSetId,
+ dataSetNm: item.dataSetNm,
+ useFg: item.useFg === '1' ? true : false, // 화면 개발 편의를 위해 boolean 타입으로 교체, 저장시 "1", "0" 으로 바꿔 보내야 함
+ };
+ return newObj;
+ });
this.setGridData({
gridKey: this.gridName,
- value: res,
- });
- this.$nextTick(() => {
- this.loadGrid = true;
+ value: newRes,
});
+
this.setPageData({ isFind: false });
+ this.loadGrid = true;
},
getRowData(data) {
this.selectedRowKey = data.rowKey;
diff --git a/pages/comm/base/PrgmMngPage.vue b/pages/comm/base/PrgmMngPage.vue
index ed2ac39..52bc1fe 100644
--- a/pages/comm/base/PrgmMngPage.vue
+++ b/pages/comm/base/PrgmMngPage.vue
@@ -37,7 +37,7 @@
-
+
프로그램 리스트
@@ -50,7 +50,7 @@
/>
-
-
+
-
+
프로그램 상세
diff --git a/pages/ems/base/ReadResultCloseMngPage.vue b/pages/ems/base/ReadResultCloseMngPage.vue
index f9c42fa..478328a 100644
--- a/pages/ems/base/ReadResultCloseMngPage.vue
+++ b/pages/ems/base/ReadResultCloseMngPage.vue
@@ -1,11 +1,6 @@
-
-
@@ -75,8 +70,8 @@
-
-
+
+
일일검침정보
-
@@ -91,20 +86,18 @@
type="primary"
:ripple="false"
@click="saveReadResultCloseMng('N')"
- >일마감
+ 일마감
+
-
+
@@ -123,7 +116,6 @@ import selectCodeList from "@/components/common/select/selectCodeList";
import SelectMttList from "@/components/common/select/SelectMttList";
import Datepicker from "~/components/common/Datepicker";
import BtnExcelDownload from "~/components/common/button/BtnExcelDownload";
-import PageTitle from "~/components/common/PageTitle";
let myTitle;
// const myPrgmId = "PRG0018";
@@ -151,13 +143,12 @@ export default {
Datepicker,
Search,
Grid,
- PageTitle,
},
data() {
return {
myPrgmId: myPrgmId,
gridName: "rowGrid",
- loadGrid: true,
+ loadGrid: false,
dataPathMock: {
rowGrid: {
column: [
@@ -260,7 +251,6 @@ export default {
gridKey: this.gridName,
value: myColumns,
});
- this.loadGrid = true;
},
async search() {
await this.getRowGridData();
@@ -288,8 +278,12 @@ export default {
mgnf: item.mgnf || 0,
})),
});
+ // console.log('--------------DEBUG-----res-------', res);
}
this.setPageData({ isFind: false });
+ this.$nextTick(() => {
+ this.loadGrid = true;
+ })
},
//전월 or 일 마감--------------------------------------------------------------------------------------------
async saveReadResultCloseMng(mnthYn) {
diff --git a/pages/ems/effc/DataSetMngPage.vue b/pages/ems/effc/DataSetMngPage.vue
index 4fa7940..cf3e12c 100644
--- a/pages/ems/effc/DataSetMngPage.vue
+++ b/pages/ems/effc/DataSetMngPage.vue
@@ -1,5 +1,6 @@
+
@@ -34,23 +35,23 @@
-
+
Data Set 리스트
-
+
Data Set 상세
diff --git a/pages/ems/effc/EnrgMapPage.vue b/pages/ems/effc/EnrgMapPage.vue
index 910a6dc..a764adb 100644
--- a/pages/ems/effc/EnrgMapPage.vue
+++ b/pages/ems/effc/EnrgMapPage.vue
@@ -1,5 +1,6 @@
-
+
+
-
+
@@ -158,8 +159,8 @@ export default {
},
async created() { },
async mounted() {
- this.initTest();
- return;
+ // this.initTest();
+ // return;
this.init();
// document.querySelector('.icon_arrow').style.width = document.querySelector('.iconArrowCols').clientWidth-20 + "px";
diff --git a/pages/ems/effc/EnrgReptMngPage.vue b/pages/ems/effc/EnrgReptMngPage.vue
index f168e6e..b88ff91 100644
--- a/pages/ems/effc/EnrgReptMngPage.vue
+++ b/pages/ems/effc/EnrgReptMngPage.vue
@@ -1,6 +1,6 @@
-
@@ -98,7 +98,6 @@ import Chart from '~/components/common/Chart';
import EqpmSelectPop from '~/components/common/modal/EqpmSelectPop';
import DateUtility from '~/plugins/dateUtility';
import XLSX from 'xlsx';
-import PageTitle from "~/components/common/PageTitle";
let myTitle;
let myPrgmId;
@@ -130,7 +129,6 @@ export default {
EqpmSelectPop,
DateUtility,
XLSX,
- PageTitle,
},
data() {
return {
diff --git a/pages/ems/effc/EnrgUsePlanPage.vue b/pages/ems/effc/EnrgUsePlanPage.vue
index 2a6f039..a017f33 100644
--- a/pages/ems/effc/EnrgUsePlanPage.vue
+++ b/pages/ems/effc/EnrgUsePlanPage.vue
@@ -1,5 +1,6 @@
+
@@ -9,20 +10,20 @@
-
-
+
@@ -30,18 +31,15 @@
-
-
+
+
설비별 에너지 계획 리스트
-
-
+
+
@@ -171,8 +169,8 @@ export default {
created() { },
async mounted() {
// -------
- this.initTest();
- return;
+ // this.initTest();
+ // return;
// ========End test===========
await this.init();
this.initedFlag = true;
@@ -420,53 +418,25 @@ export default {
class CustumButton {
constructor(props) {
- // v-btn v-btn--is-elevated v-btn--has-bg theme--dark v-size--default
- const el = document.createElement('button');
const { grid, rowKey, columnInfo } = props;
- $(el).addClass('tui-grid-cell-content');
- // $(el).css('text-align', 'center');
- el.classList.add('v-btn');
- // el.style.width = '80%';
- // el.style.height = '80%';
- // el.style.boxShadow = '0px 0px 0px 2px #cbced6';
- // el.style.background = 'linear-gradient(to bottom, #242940 5%, #476e9e 100%)';
- // el.style.backgroundColor = '#144985';
- el.style.borderRadius = '7px';
- el.style.border = '1px solid #4e6096';
- // el.style.display = 'inline-block';
- // el.style.cursor = 'pointer';
- el.style.color = '#ffffff';
- // el.style.fontFamily = 'Arial';
- el.style.padding = '6% 3%';
+ const gridData = grid.store.data.rawData;
+ const value = gridData[rowKey][columnInfo.name];
- // el.style.textDecoration = 'none';
- // el.style.textShadow = '0px 1px 0px #283966';
-
- el.innerText = columnInfo.renderer.options.value;
- this.el = el;
this.disabled = columnInfo.renderer.options.disabled || false;
+ const elDiv = document.createElement('div');
+ elDiv.innerHTML = `${value}`;
+ $(elDiv).addClass('tui-grid-cell-content d-flex justify-space-between');
+ const el2 = document.createElement('button');
+ $(el2).addClass('edit-btn blue--text');
+ el2.innerText = 'Edit';
+ elDiv.appendChild(el2);
+
+ this.el = elDiv;
if (!this.disabled) {
- // hover 기능 구현
- this.el.addEventListener('mouseover', function (event) {
- // console.log('darkModeFg', _this.darkModeFg);
- // console.log('event',event.fromElement);
- // console.log('event',document.defaultView.getComputedStyle(el).getPropertyValue('background-color'));
- // rgb(85, 130, 220) // light
- // el.style.backgroundColor = '#26578F'; // rgb(20, 73, 133) // dark
- // let btnColor = _this.darkModeFg? {mouseOver: '#26578F', mouseOut: '#144985'} : {mouseOver: 'rgb(85, 130, 220)', mouseOut: 'rgb(71, 119, 217)'};
- // el.style.backgroundColor = btnColor['mouseOver'];
- });
- this.el.addEventListener('mouseout', function (event) {
- // rgb(71, 119, 217) // light
- // el.style.backgroundColor = '#144985'; // dark
- // console.log('event',event.fromElement);
- // let btnColor = _this.darkModeFg? {mouseOver: '#26578F', mouseOut: '#144985'} : {mouseOver: 'rgb(85, 130, 220)', mouseOut: 'rgb(71, 119, 217)'};
- // el.style.backgroundColor = btnColor['mouseOut'];
- });
// click 이벤트
- this.el.addEventListener('click', function (event) {
+ el2.addEventListener('click', function (event) {
let gridData = grid.store.data.rawData;
let rowNum = gridData[rowKey].rowNum;
let selectedGridData = gridData.filter(item => {
@@ -537,18 +507,25 @@ export default {
minWidth: 200,
align: 'left',
// hidden: true,
- formatter: ({ value, row }) => {
- return `
- ${value}
-
- `;
- }
+ // formatter: ({ value, row }) => {
+ // return `
+ // ${value}
+ //
+ // `;
+ // }
+ renderer: {
+ type: CustumButton,
+ options: {
+ value: '계획수정',
+ },
+ },
},
{
header: '',
name: 'btnCol',
width: 70,
align: 'center',
+ hidden: true,
renderer: {
type: CustumButton,
options: {
diff --git a/plugins/eChart.js b/plugins/eChart.js
index 03a5cc5..7ebc410 100644
--- a/plugins/eChart.js
+++ b/plugins/eChart.js
@@ -52,5 +52,4 @@ use([
// ToolboxComponent, // 그래프 이미지 save
]);
-console.log('echart plugin', echarts)
Vue.component('VChart', VChart);
diff --git a/store/index.js b/store/index.js
index 3758a09..d88baf9 100644
--- a/store/index.js
+++ b/store/index.js
@@ -197,8 +197,8 @@ export const mutations = {
// 페이지 그리드 데이터 set
setGridData: (state, payload) => {
- console.log('check:', state.pageData)
- console.log('payload:', payload)
+ // console.log('check:', state.pageData)
+ // console.log('payload:', payload)
// state.pageData['PRG0001']['dashBoard_grid_01'] = {
// ...state.pageData['PRG0001']['dashBoard_grid_01'],
// data: payload.value,