diff --git a/assets/scss/common.scss b/assets/scss/common.scss
index 37e5055..0fac17b 100644
--- a/assets/scss/common.scss
+++ b/assets/scss/common.scss
@@ -434,7 +434,7 @@ a {
.v-application.#{$theme}-mode {
min-width: 1000px;
- .head-logo{
+ .head-logo {
gap: 8px;
}
@@ -485,6 +485,7 @@ a {
.container--fluid {
background-color: map-deep-get($config, #{$theme}, "container-fluid");
+
.menu-container {
height:calc(100vh - 60px);
overflow-y: auto;
@@ -950,15 +951,24 @@ a {
"v-calendar-weekday-backgroundColor"
);
border-right: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
+ border-bottom: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
+ border-top: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
color: map-deep-get($config, #{$theme}, "v-calendar-weekday-color");
&:nth-of-type(1) {
- color: map-deep-get($color, "week", "sun");
+ // color: map-deep-get($config,
+ // #{$theme},
+ // "v-calendar-is-sun"
+ // );
+ border-left: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
}
- &:nth-of-type(7) {
- color: map-deep-get($color, "week", "sat");
- }
+ // &:nth-of-type(7) {
+ // color: map-deep-get($config,
+ // #{$theme},
+ // "v-calendar-is-sat"
+ // );
+ // }
}
>.vc-day {
@@ -967,22 +977,33 @@ a {
.day-hldyNm,
.day-label.is-holiday {
- color: map-deep-get($color, "week", "sun");
+ color: map-deep-get($config,
+ #{$theme},
+ "v-calendar-is-sun"
+ );
}
&.weekday-1 {
.day-label,
.day-hldyNm {
- color: map-deep-get($color, "week", "sun");
+ color: map-deep-get($config,
+ #{$theme},
+ "v-calendar-is-sun"
+ );
}
+
+ border-left: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
}
&.weekday-7 {
.day-label,
.day-hldyNm {
- color: map-deep-get($color, "week", "sat");
+ color: map-deep-get($config,
+ #{$theme},
+ "v-calendar-is-sat"
+ );
}
}
@@ -1184,11 +1205,17 @@ a {
}
th.tui-sun {
- color: map-deep-get($color, "week", "sun");
+ color: map-deep-get($config,
+ #{$theme},
+ "v-calendar-is-sun"
+ );
}
th.tui-sat {
- color: map-deep-get($color, "week", "sat");
+ color: map-deep-get($config,
+ #{$theme},
+ "v-calendar-is-sat"
+ );
}
}
@@ -1204,11 +1231,17 @@ a {
}
td.tui-calendar-sun {
- color: map-deep-get($color, "week", "sun");
+ color: map-deep-get($config,
+ #{$theme},
+ "v-calendar-is-sun"
+ );
}
td.tui-calendar-sat {
- color: map-deep-get($color, "week", "sat");
+ color: map-deep-get($config,
+ #{$theme},
+ "v-calendar-is-sat"
+ );
}
}
}
@@ -1322,11 +1355,12 @@ a {
color: #46c0ff;
}
}
+
.v-btn {
background-color: transparent !important;
color: map-deep-get($config, #{$theme}, "btn-header-select-color") !important;
}
-
+
}
[hover-tooltip] {
diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss
index 351fc58..9c8e864 100644
--- a/assets/scss/common/grid.scss
+++ b/assets/scss/common/grid.scss
@@ -278,8 +278,8 @@
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
- height: 11px;
- width: 11px;
+ height: 8px;
+ width: 8px;
border-radius: 50%;
background-color: map-deep-get($config,
#{$theme},
diff --git a/assets/scss/common/input.scss b/assets/scss/common/input.scss
index 659effe..0dd59ab 100644
--- a/assets/scss/common/input.scss
+++ b/assets/scss/common/input.scss
@@ -171,8 +171,8 @@
align-items: center;
cursor: pointer;
position: relative;
- padding-left: 28px;
- margin: 10px;
+ padding-left: 0;
+ margin: 5px;
font-size: 16px;
}
.custom-radio input[type="radio"] {
@@ -183,13 +183,13 @@
/* Custom radio appearance */
.radio-mark {
position: absolute;
- left: 0;
+ left: -8px;
top: 50%;
transform: translateY(-50%);
- height: 18px;
- width: 18px;
+ height: 14px;
+ width: 14px;
// background-color: white;
- border: 2px solid #ccc;
+ border: 1px solid #ccc;
border-radius: 50%;
transition: all 0.2s ease;
}
diff --git a/assets/scss/var.scss b/assets/scss/var.scss
index c1a4bc7..11d3973 100644
--- a/assets/scss/var.scss
+++ b/assets/scss/var.scss
@@ -32,8 +32,8 @@ $color: (
"black": ("0": #000,
"1": #111),
"white": ("0": #fff),
- "week": ("sun": #fb5a83,
- "sat": #2d8cf6)
+ "week": ("sun": #FF4D4F,
+ "sat": #597EF7)
);
$config: (
@@ -96,12 +96,14 @@ $config: (
v-input-disabled-backgroundColor:rgba(255, 255, 255, 0.08),
v-input-disabled-color: rgba(255, 255, 255, 0.5),
v-select-label-color: rgba(255, 255, 255, 0.85),
- v-calendar-weekday-backgroundColor: #383f5d,
- v-calendar-weekday-color: #fff,
- v-calendar-weekday-border-color: rgba(255, 255, 255, 0.1),
- v-calendar-day-color: #fff,
- v-calendar-day-in-not-month-color: rgba(255, 255, 255, 0.05),
- v-calendar-is-today-background-color: #2d4571,
+ v-calendar-weekday-backgroundColor: #FFFFFF0A,
+ v-calendar-weekday-color: #FFFFFFD9,
+ v-calendar-weekday-border-color: #FFFFFF0F,
+ v-calendar-day-color: #FFFFFFD9,
+ v-calendar-day-in-not-month-color: #FFFFFF14,
+ v-calendar-is-today-background-color: #0A224F,
+ v-calendar-is-sat: #263EA0,
+ v-calendar-is-sun:#A61D24,
tui-grid-title-color: #FFFFFFD9,
tui-grid-header-backgroundColor: #2a2b2d,
tui-grid-header-color: #FFFFFFD9,
@@ -234,12 +236,14 @@ $config: (
v-input-disabled-backgroundColor: rgba(0, 0, 0, 0.04),
v-input-disabled-color: rgba(0, 0, 0, 0.25),
v-select-label-color: rgba(0, 0, 0, 0.88),
- v-calendar-weekday-backgroundColor: #e0e0e0,
- v-calendar-weekday-color: #111,
- v-calendar-weekday-border-color: #d4d4d4,
- v-calendar-day-color: #111,
- v-calendar-day-in-not-month-color: #f8f8f8,
- v-calendar-is-today-background-color: #e3eaf3,
+ v-calendar-weekday-backgroundColor: #00000005,
+ v-calendar-weekday-color: #000000E0,
+ v-calendar-weekday-border-color: #0000000F,
+ v-calendar-day-color: #000000E0,
+ v-calendar-day-in-not-month-color: #0000000A,
+ v-calendar-is-today-background-color: #E6F4FF,
+ v-calendar-is-sat: #597EF7,
+ v-calendar-is-sun:#FF4D4F,
tui-grid-title-color: #000000E0,
tui-grid-header-backgroundColor: #fafafa, //#e0e0e0,
tui-grid-header-color: rgba(0, 0, 0, 0.88),
diff --git a/components/common/Calendar.vue b/components/common/Calendar.vue
index 9c0f096..00681b4 100644
--- a/components/common/Calendar.vue
+++ b/components/common/Calendar.vue
@@ -3,45 +3,28 @@
{{ selectedYear }}년 {{ selectedMonth }}월
-
+
-
+
@@ -196,36 +182,44 @@ const myDetail = [];
diff --git a/pages/ems/base/EnrgReadPlaceMngPage.vue b/pages/ems/base/EnrgReadPlaceMngPage.vue
index ede9560..cb81227 100644
--- a/pages/ems/base/EnrgReadPlaceMngPage.vue
+++ b/pages/ems/base/EnrgReadPlaceMngPage.vue
@@ -25,7 +25,7 @@
:textCols="12" :searchOption="true" :customClass="'input-large'" :iconShow="true" />
-
+
@@ -43,8 +43,7 @@
+ @sendSelectedRowStatInfo="getSelectedRowStatInfo" :selectedRowDataWatchFlag="true" />
@@ -308,12 +307,22 @@ export default {
const _this = this;
const myColumns = [
+ {
+ header: '',
+ name: '',
+ align: 'center',
+ formatter: (props) => {
+ return `
+
+ `;
+ }
+ },
{ header: '회사 ID', name: 'comId', hidden: true },
{
header: '검침개소명',
name: 'readPlcNm',
align: 'left',
- minWidth: 400,
+ minWidth: 350,
},
{
header: '검침개소 ID',
@@ -470,12 +479,12 @@ export default {
this.$refs[this.gridName].focus({
rowKey:
this.pageData.rowGridSelectKey == '' ||
- this.pageData.rowGridSelectKey == null
+ this.pageData.rowGridSelectKey == null
? 0
: this.pageData.rowGridSelectKey ==
- this.$refs[this.gridName].getData().length - 1
- ? this.pageData.rowGridSelectKey
- : 0,
+ this.$refs[this.gridName].getData().length - 1
+ ? this.pageData.rowGridSelectKey
+ : 0,
columnName: 'readPlcNm',
setScroll: true,
});
@@ -493,7 +502,7 @@ export default {
if (this.tab == 2) {
this.tab = 0;
}
- this.isImgTabDisabled = false;
+ this.isImgTabDisabled = true;
} else {
this.isImgTabDisabled = false;
}
@@ -917,47 +926,47 @@ const defaultData = {
};
const sampleData = [
- {
- readPlcNm: '서울 본사',
- plcKind: '본사',
- useFg: '사용',
- _children: [
- {
- readPlcNm: '서울 본사 - 1층',
- plcKind: '층',
- useFg: '사용',
- },
- {
- readPlcNm: '서울 본사 - 2층',
- plcKind: '층',
- useFg: '미사용',
- },
- ],
- },
- {
- readPlcNm: '부산 지사',
- plcKind: '지사',
- useFg: '사용',
- _children: [
- {
- readPlcNm: '부산 지사 - A동',
- plcKind: '건물',
- useFg: '사용',
- _children: [
- {
- readPlcNm: '부산 지사 - A동 1층',
- plcKind: '층',
- useFg: '사용',
- },
- ],
- },
- ],
- },
- {
- readPlcNm: '대전 창고',
- plcKind: '창고',
- useFg: '미사용',
- },
+ {
+ readPlcNm: '서울 본사',
+ plcKind: '본사',
+ useFg: '사용',
+ _children: [
+ {
+ readPlcNm: '서울 본사 - 1층',
+ plcKind: '층',
+ useFg: '사용',
+ },
+ {
+ readPlcNm: '서울 본사 - 2층',
+ plcKind: '층',
+ useFg: '미사용',
+ },
+ ],
+ },
+ {
+ readPlcNm: '부산 지사',
+ plcKind: '지사',
+ useFg: '사용',
+ _children: [
+ {
+ readPlcNm: '부산 지사 - A동',
+ plcKind: '건물',
+ useFg: '사용',
+ _children: [
+ {
+ readPlcNm: '부산 지사 - A동 1층',
+ plcKind: '층',
+ useFg: '사용',
+ },
+ ],
+ },
+ ],
+ },
+ {
+ readPlcNm: '대전 창고',
+ plcKind: '창고',
+ useFg: '미사용',
+ },
];
diff --git a/pages/ems/base/EqpmGrpPysclQtyMngPage.vue b/pages/ems/base/EqpmGrpPysclQtyMngPage.vue
index b26eb74..db162df 100644
--- a/pages/ems/base/EqpmGrpPysclQtyMngPage.vue
+++ b/pages/ems/base/EqpmGrpPysclQtyMngPage.vue
@@ -31,7 +31,7 @@
-
+
물리량 리스트
@@ -50,7 +50,7 @@
-
+
물리량 상세
@@ -114,7 +114,7 @@
-
+
-
+
-
-
+
+
추가
삭제
@@ -225,61 +225,6 @@ export default {
formatterSelectList02: [],
loadGrid: false,
- dataPathExample: {
- "rowGrid": {
- data: [
- {
- "pysclQtyId": "001",
- "pysclQtyCd": "TEMP001",
- "pysclQtyNm": "온도",
- "pysclQtyTp": "실수"
- },
- {
- "pysclQtyId": "002",
- "pysclQtyCd": "PRESS001",
- "pysclQtyNm": "압력",
- "pysclQtyTp": "실수"
- },
- {
- "pysclQtyId": "003",
- "pysclQtyCd": "FLOW001",
- "pysclQtyNm": "유량",
- "pysclQtyTp": "정수"
- },
- {
- "pysclQtyId": "004",
- "pysclQtyCd": "HUMID001",
- "pysclQtyNm": "습도",
- "pysclQtyTp": "실수"
- },
- {
- "pysclQtyId": "005",
- "pysclQtyCd": "VOLT001",
- "pysclQtyNm": "전압",
- "pysclQtyTp": "실수"
- }
- ]
-
- ,
- column: [
- {
- header: '물리량 ID',
- name: 'pysclQtyId',
- width: 100,
- align: 'center',
- },
- { header: '물리량코드', name: 'pysclQtyCd', minWidth: 255 },
- { header: '물리량명', name: 'pysclQtyNm', width: 150 },
- {
- header: '물리량타입',
- name: 'pysclQtyTp',
- width: 80,
- },
-
- ],
-
- }
- },
loadGrid2: false,
detailList: myDetail,
@@ -954,6 +899,8 @@ export default {
height: 37,
},
rowHeight: 'auto',
+ scrollX: true,
+ scrollY: true,
};
this.setGridOption({
@@ -967,7 +914,7 @@ export default {
header: '물리량 ID',
name: 'pysclQtyId',
width: 100,
- align: 'center',
+ align: 'left',
},
{ header: '설비그룹 ID', name: 'eqpmGrpId', hidden: true },
{ header: 'argCnt', name: 'argCnt', hidden: true },
diff --git a/pages/ems/base/GdIdxMngPage.vue b/pages/ems/base/GdIdxMngPage.vue
index 85f177d..bca7aa5 100644
--- a/pages/ems/base/GdIdxMngPage.vue
+++ b/pages/ems/base/GdIdxMngPage.vue
@@ -119,109 +119,6 @@ export default {
selectValueList01: [],
selectValue02: null,
selectValueList02: [],
- // pyscPopupValueChkList: 'pyscPopupValueChkList',
- // pyscListChk: {
- // pysclQtyId1 : null,
- // pysclQtyId2 : null,
- // pysclQtyId3 : null,
- // pysclQtyId4 : null
- // }
- // dataPathExample: {
- // "rowGrid": {
- // data: [
-
- // {
- // gdIdxId: 'GD001',
- // gdIdxNm: '온도 가이드',
- // eqpmGrpId: 'EQ001',
- // upTotMeth: 'AVG',
- // careStndVal: 50,
- // warnStndVal: 70,
- // alrmMsg: '온도가 기준치를 초과했습니다.',
- // },
- // {
- // gdIdxId: 'GD002',
- // gdIdxNm: '습도 가이드',
- // eqpmGrpId: 'EQ002',
- // upTotMeth: 'MAX',
- // careStndVal: 30,
- // warnStndVal: 60,
- // alrmMsg: '습도가 기준치를 초과했습니다.',
- // },
- // {
- // gdIdxId: 'GD003',
- // gdIdxNm: '압력 가이드',
- // eqpmGrpId: 'EQ003',
- // upTotMeth: 'SUM',
- // careStndVal: 100,
- // warnStndVal: 150,
- // alrmMsg: '압력이 기준치를 초과했습니다.',
- // }
-
- // ],
- // column: [
- // {
- // header: '가이드',
- // name: 'gdIdxId',
- // width: 100,
- // align: 'center',
- // },
- // {
- // header: '가이드명',
- // name: 'gdIdxNm',
- // width: 210,
- // align: 'left',
- // },
- // {
- // header: '설비그룹ID',
- // name: 'eqpmGrpId',
- // width: 100,
- // align: 'center',
- // // formatter({ value }) {
- // // let retVal = '';
- // // const newValue = _this.pageData.eqpmGrpList.filter(item => item.value == value);
- // // if (newValue.length > 0) {
- // // retVal = newValue[0].text;
- // // }
- // // return retVal;
- // // },
- // },
- // {
- // header: '상위집계방법',
- // name: 'upTotMeth',
- // width: 100,
- // align: 'center',
- // // formatter({ value }) {
- // // let retVal = '';
- // // const newValue = _this.pageData.upTotMethList.filter(item => item.commCd == value);
- // // if (newValue.length > 0) {
- // // retVal = newValue[0].commCdNm;
- // // }
- // // return retVal;
- // // },
- // },
- // {
- // header: '주의기준',
- // name: 'careStndVal',
- // width: 100,
- // align: 'right',
- // },
- // {
- // header: '경고기준',
- // name: 'warnStndVal',
- // width: 100,
- // align: 'right',
- // },
- // {
- // header: '알람메세지',
- // name: 'alrmMsg',
- // minWidth: 860,
- // align: 'left',
- // }
- // ]
-
- // }
- // }
};
},
computed: {
@@ -627,59 +524,7 @@ export default {
async getRowGridData() {
this.loadGrid = false;
let res = [];
- // const newRes = [
- // {
- // comId: 'COM001',
- // gdIdxId: 'GD001',
- // gdIdxNm: '온도 가이드',
- // eqpmGrpId: 'EQ001',
- // upTotMeth: 'AVG',
- // sortSeq: 1,
- // pysclQtyId1: 'TEMP',
- // pysclQtyId2: null,
- // pysclQtyId3: null,
- // pysclQtyId4: null,
- // ctgr1: '환경',
- // ctgr2: '내부',
- // careStndVal: 50,
- // warnStndVal: 70,
- // gdMeth: '자동',
- // useFg: '1',
- // alrmMsg: '온도가 기준치를 초과했습니다.',
- // calcProc: 'PROC001',
- // calcDesc: '평균 계산',
- // calcMeth: '(A+B)/2',
- // unit: 'C',
- // argCnt: 2,
- // rowStat: null,
- // },
- // {
- // comId: 'COM002',
- // gdIdxId: 'GD002',
- // gdIdxNm: '습도 가이드',
- // eqpmGrpId: 'EQ002',
- // upTotMeth: 'MAX',
- // sortSeq: 2,
- // pysclQtyId1: 'HUMID',
- // pysclQtyId2: null,
- // pysclQtyId3: null,
- // pysclQtyId4: null,
- // ctgr1: '환경',
- // ctgr2: '외부',
- // careStndVal: 30,
- // warnStndVal: 60,
- // gdMeth: '수동',
- // useFg: '0',
- // alrmMsg: '습도가 기준치를 초과했습니다.',
- // calcProc: 'PROC002',
- // calcDesc: '최대값 계산',
- // calcMeth: 'MAX(A,B)',
- // unit: '%',
- // argCnt: 2,
- // rowStat: null,
- // },
- // ];
-
+
res = await this.postApiReturn({
apiKey: 'selectEqpmGdIdxDataList',
resKey: 'eqpmGdIdxDataList',
@@ -1453,7 +1298,7 @@ const myDetail = [
class: 'pa-3',
// required: true,
openMode: 'ALL',
- disabled: false,
+ disabled: true,
eqpmKindId: '',
eqpmGrpId: '',
closeBtnFg: true,
diff --git a/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue b/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue
index 8fb2a32..351da39 100644
--- a/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue
+++ b/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue
@@ -1,6 +1,7 @@
-
+
+
@@ -555,7 +556,7 @@ export default {
header: {
height: 37,
},
- rowHeight: 'auto',
+ rowHeight: 37,
// pageOptions: {