Compare commits

...

9 Commits

20 changed files with 162 additions and 137 deletions

View File

@ -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");
@ -860,7 +864,7 @@ a {
);
.day-label {
color: map-deep-get($config, #{$theme}, "non-activate");
color: map-deep-get($config, #{$theme}, "card-text-title-color");
}
}
}

View File

@ -66,6 +66,12 @@
}
}
.custom-action-btn{
height: 24px;
width: 24px;
font-size: 12px;
}
.v-btn {
background-color: map-deep-get($config,
#{$theme},

View File

@ -56,6 +56,12 @@
font-weight: 400;
}
th[data-column-name="_checked"] {
padding-left: 0;
}
}
.tui-grid-table{
@ -63,6 +69,13 @@
.tui-grid-cell-has-input .tui-grid-cell-content {
padding: 8px;
}
th[data-column-name="_checked"] {
&.tui-grid-cell-header {
padding-left: 0;
}
}
}
.treeGrid {

View File

@ -230,6 +230,10 @@
}
}
input[type="checkbox"] {
width: 16px;
height: 16px
}
@each $theme in dark, light {
@include theme($theme);
@ -242,6 +246,7 @@
background: map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
border-color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
color:map-deep-get($config, #{$theme}, "ant-btn-primary-color");
&.ant-checkbox-inner::after {
border-color: map-deep-get($config, #{$theme}, "ant-btn-primary-color");
}
@ -403,6 +408,13 @@
"v-input-textarea-border"
);
}
input[type="checkbox"] {
accent-color: map-deep-get($config,
#{$theme},
"ant-btn-primary-bg"
);
}
}
.v-radio {

View File

@ -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,
),
);

View File

@ -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',

View File

@ -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',

View File

@ -2,9 +2,9 @@
<div class="d-flex justify-center align-center"
:class="directionBtn === 'vertically'?'flex-row':'flex-column'"
style="gap: 12px">
<a-button @click="btnActionsFnc('removeRightToLeft')" type="primary" ghost :icon="icons.remove" >
<a-button @click="btnActionsFnc('removeRightToLeft')" type="primary" ghost :icon="icons.remove" class="custom-action-btn">
</a-button>
<a-button @click="btnActionsFnc('addLeftToRight')" type="primary" ghost :icon="icons.add">
<a-button @click="btnActionsFnc('addLeftToRight')" type="primary" ghost :icon="icons.add" class="custom-action-btn">
</a-button>
</div>
</template>

View File

@ -10,7 +10,7 @@ export default {
size: {
type: String,
require: false,
default: "middle", // small, middle, large
default: "default", // small, default, large
}
},
methods: {

View File

@ -119,8 +119,7 @@
/>
</div> -->
<v-card-actions>
<v-spacer></v-spacer>
<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
<a-button color="primary" type="primary" @click="closePop()">확인</a-button>
</v-card-actions>
</v-card>
@ -275,7 +274,12 @@ export default {
// const gridHeight = this.$refs.gridParent.offsetHeight - 30;
const myOptions = {
rowHeaders: ['rowNum'],
rowHeaders: [
{
type: 'rowNum',
align: 'right',
},
],
columnOptions: {
resizable: true,
minWidth: 100
@ -319,19 +323,19 @@ export default {
header: '주의',
width: 100,
name: 'careStndVal',
align: 'center'
align: 'right'
},
{
header: '경고',
width: 100,
name: 'warnStndVal',
align: 'center'
align: 'right'
},
{
header: '가이드값',
width: 100,
name: 'totVal',
align: 'center'
align: 'right'
},
{
header: '알람내용',

View File

@ -65,13 +65,10 @@
<!-- <div id="chartParent" ref="chartParent" style="height: 100px"> -->
<div :style="'height: calc(50vh)'">
<div class="d-flex align-center justify-space-between pa-4" style="height: 10%">
<v-card-title class="pa-0 custom-title-4">사용량 계획</v-card-title>
</div>
<!-- <div id="chartParent" ref="chartParent" :style="'height: 80%'"> -->
<div id="chartParent" ref="chartParent" style="height: 70%">
<div id="chartParent" ref="chartParent" style="height: 100%" class="px-6">
<component
class="w100 h100"
class="w100 h100 py-7 custom-chart"
:is="loadChart ? 'Chart' : null"
:parentPrgmId="parentPrgmId"
:modalId="modalId"
@ -130,7 +127,6 @@
/>
</div> -->
<v-divider></v-divider>
<v-card-actions class="pa-5 d-flex align-center justify-end">
<a-button color="primary" type="default" class="mr-2" dark @click="closePop()">취소</a-button>
<a-button color="primary" type="primary" dark @click="setUpdate()">확정</a-button>
@ -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)
</script>
</script>

View File

@ -8,47 +8,35 @@
</label>
</v-col>
<v-col :cols="textCols">
<v-text-field
readonly
v-model="selectValue"
append-icon="mdi-magnify"
:class="['v-input__custom', customClass]"
@click="dialogOpenCloseEvent(dialog)"
outlined
:hide-details="true"
:required="required || false"
:disabled="disabled || false"
:placeholder="placeholder"
>
<template v-slot:append>
<v-text-field readonly v-model="selectValue" append-icon="" :class="['v-input__custom', customClass]"
@click="dialogOpenCloseEvent(dialog)" outlined :hide-details="true" :required="required || false"
:disabled="disabled || false"><template v-slot:append>
<!-- Custom SVG icon -->
<v-icon>$icoSearch</v-icon>
</template>
</v-text-field>
</v-col>
<v-dialog ref="popModal" v-model="dialog" width="800" scrollable>
<v-card style="height: 90vh;">
<v-dialog ref="popModal" v-model="dialog" width="800" content-class="custom-dialog" scrollable>
<v-card style="height: 100%;">
<v-card-title class="px-5 py-4 d-flex align-center justify-space-between">
<span class="custom-title-4">설비 선택</span>
<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
</v-card-title>
<div class="pa-2 pt-0">
<div class="px-5 pt-2">
<!-- <v-card class="searchFilter">
</v-card> -->
<v-row align="end" class="searchFilter">
<v-col>
<v-row align="end">
<v-col :cols="3.5">
<!-- 설비그룹 -->
<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01"
:label="'설비그룹'" :disabled="eqpmGrpDisabled"
@update:propsValue="selectValue01 = $event" :labelCols="12" :textCols="12"
:iconShow="true" />
:label="'설비그룹'" :disabled="eqpmGrpDisabled" @update:propsValue="selectValue01 = $event"
:labelCols="12" :textCols="12" :iconShow="true" />
</v-col>
<v-col>
<!-- FAB -->
<component :is="'SelectBoxMulti'" :propsValue="selectValue02"
:itemList="selectValueList02" :label="'FAB'" :labelCols="12" :multiple="true"
:disabled="fabDisabled" @update:propsValue="selectValue02 = $event" :textCols="12"
:iconShow="true" />
<component :is="'SelectBoxMulti'" :propsValue="selectValue02" :itemList="selectValueList02"
:label="'FAB'" :labelCols="12" :multiple="true" :disabled="fabDisabled"
@update:propsValue="selectValue02 = $event" :textCols="12" :iconShow="true" />
</v-col>
<v-col >
<v-row>
@ -59,9 +47,8 @@
</label>
</v-col>
<v-col :cols="12" class="pt-0">
<v-text-field append-icon="" class="v-input__custom" outlined
:hide-details="true" v-model="searchWord" @keyup.enter="search"><template
v-slot:append>
<v-text-field append-icon="" class="v-input__custom" outlined :hide-details="true"
v-model="searchWord" @keyup.enter="search"><template v-slot:append>
<!-- Custom SVG icon -->
<v-icon>$icoSearch</v-icon>
@ -70,7 +57,11 @@
</v-row>
</v-col>
<a-button icon="search" type="primary" @click="search()" class="mb-1 mr-2">조회</a-button>
<v-col :cols="2" class="last-col mr-2">
<a-button icon="search" :ripple="false" type="primary" @click="search()"
class="search-button">조회</a-button>
</v-col>
</v-row>
<!-- <v-row align="center" no-gutters style="margin-top: 14px;">
@ -91,13 +82,13 @@
</v-row> -->
</div>
<v-card-text class="px-2 w100">
<div ref="modalGridParent" style="height: 450px;" class="h100 w100">
<div class="pa-5" style="height:calc(100% - 30px)">
<div ref="modalGridParent" class="h100 w100">
<component :ref="gridName" :is="loadGrid ? 'Grid' : null"
:dataPath="searchParam.eqpmSelectPopData.eqpmSelectPop" :gridName="gridName"
:parentPrgmId="parentPrgmId" @getRowsData="getRowData" />
</div>
</v-card-text>
</div>
<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)" class="mr-2">닫기</a-button>
@ -270,7 +261,7 @@ export default {
},
chkDialog() {
if (this.isMulti) {
this.$store.state.pageData[this.parentPrgmId][this.modalDataKey][this.myModalKey][this.gridName].option.rowHeaders = [{ type: 'checkbox' }];
this.$store.state.pageData[this.parentPrgmId][this.modalDataKey][this.myModalKey][this.gridName].option.rowHeaders = [{ type: 'checkbox', width: 72 }];
} else {
this.$store.state.pageData[this.parentPrgmId][this.modalDataKey][this.myModalKey][this.gridName].option.rowHeaders = [];
}
@ -437,18 +428,15 @@ export default {
{
header: 'FAB',
name: 'fabNm',
align: 'center'
},
{
header: '설비ID',
name: 'eqpmId',
align: 'center',
name: 'eqpmId'
// hidden:true
},
{
header: '설비명',
name: 'eqpmNm',
align: 'center'
name: 'eqpmNm'
},
{
header: 'eccId',
@ -532,11 +520,11 @@ export default {
this.loadGrid = true;
this.$nextTick(() => {
if (this.isMulti) {
this.getChecked();
}
});
// this.$nextTick(() => {
// if (this.isMulti) {
// this.getChecked();
// }
// });
},
setUpdate() {
@ -588,3 +576,16 @@ var eqpmSelectPop = {
}
</script>
<style lang="scss" scoped>
::v-deep {
.last-col {
flex-basis: content;
}
.v-dialog {
overflow-y: hidden;
}
}
</style>

View File

@ -11,7 +11,7 @@
:btnActionsFnc="btnActions"
/>
</div>
<div ref="gridParent" style="height: calc(100vh - 760px);">
<div ref="gridParent" >
<component
:ref="gridName"
:is="loadGrid ? 'Grid' : null"

View File

@ -1,8 +1,8 @@
<template>
<div>
<div
class="d-flex justify-space-between align-center"
style="height: 80px;"
class="d-flex justify-space-between"
style="height: 45px;"
>
<span class="txt custom-subtitle-tab">검침 대상 추가 정보</span>
<Buttons
@ -143,7 +143,6 @@ export default {
class CustomRenderer {
constructor(props) {
//const { min, max } = props.columnInfo.renderer.options;
//console.log('props: %o', props);
const el = document.createElement('input');
if (
@ -215,15 +214,12 @@ export default {
}
$(el).addClass('tui-grid-content-text');
}
// console.log('props: %o', props);
// console.log('el: %o', el);
this.el = el;
this.render(props);
}
change(ev) {
//console.log('props: %o', ev);
if (ev.target.checked) {
ev.target.value = 1;
} else {
@ -245,7 +241,6 @@ export default {
} else {
this.el.value = String(props.value);
}
//console.log('props: %o', props);
}
mounted() {
@ -275,7 +270,7 @@ export default {
{
header: 'Data 구분',
name: 'addInfoDataKind',
align: 'center',
align: 'left',
formatter({ value }) {
let retVal = '';
const newValue = addInfoDataKindList.filter(
@ -323,8 +318,6 @@ export default {
},
//{ header: "추가 정보 값", name: "addInfoVal", align: "center" , editor: "text",
// formatter({ value, row , column}) {
// console.log("addInfoVal row : ", row);
// console.log("addInfoVal state : ", column);
// if(row.addInfoDataKind === "NUM"){
// column.align = "right";
// }else{

View File

@ -332,7 +332,7 @@ const myReadPlcTagDetail = [
valueNm2: 'tagNm',
disabled: true,
cols: 6,
class: 'pr-4 pb-2 py-3',
class: 'pr-4 pb-2 py-2',
required: true,
labelCols: 12,
textCols: 12,
@ -345,7 +345,7 @@ const myReadPlcTagDetail = [
valueNm: 'ercId',
disabled: false,
cols: 6,
class: 'pl-4 py-3',
class: 'pl-4 pb-2 py-3',
list: 'ercNmList',
itemText: 'text',
itemValue: 'value',

View File

@ -12,8 +12,8 @@
:parentPrgmId="myPrgmId"
:sendParam="{ comId }"
customClass="select-large"
labelCols="12"
textCols="12"
:labelCols="12"
:textCols="12"
/>
<!-- <component
:is="'selectCodeList'"

View File

@ -15,25 +15,15 @@
:customClass="'input-large'" />
</v-col>
<v-col :cols="2.5">
<component
:is="'selectCodeList'"
:parentPrgmId="myPrgmId"
:label="'배치 실행 구분'"
<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'배치 실행 구분'"
:dataKey="'searchBatchExecTp'"
:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_TP', useFg: '1' }"
:addAll="true"
:customClass="'select-large'"
/>
:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_TP', useFg: '1' }" :addAll="true"
:customClass="'select-large'" />
</v-col>
<v-col :cols="2.5" class="pr-4">
<component
:is="'selectCodeList'"
:parentPrgmId="myPrgmId"
:label="'사용여부'"
:dataKey="'searchUseFg'"
:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
:customClass="'select-large'"
/>
<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'사용여부'"
:dataKey="'searchUseFg'" :sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
:customClass="'select-large'" />
</v-col>
<BtnSearch size="large" class="mr-2" />
@ -42,9 +32,9 @@
</v-col>
</v-row>
<v-row ref="contents" class="mt-4">
<v-row ref="contents" class="mt-4 h100">
<!-- 배치 리스트 -->
<v-col :cols="6" class="h100 pr-2">
<v-col :cols="6" class="pr-2">
<v-card class="pb-5">
<div class="d-flex align-center justify-space-between pa-4">
<!-- <v-card-title>
@ -56,7 +46,7 @@
:btnActionsFnc="btnActions" />
</div>
<div class="px-4">
<div ref="gridParent" class="h100 w100">
<div ref="gridParent" class="h100 w100" style="height:calc(100% - 70px)">
<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :parentPrgmId="myPrgmId"
:gridName="gridName" @getRowsData="getRowData" />
</div>
@ -65,7 +55,7 @@
</v-card>
</v-col>
<!-- 배치 상세 -->
<v-col :cols="6" class="h100 pl-3">
<v-col :cols="6" class="pl-3">
<v-card class="pd-y-20 h100">
<v-card-title class="d-flex justify-space-between align-end pa-4">
<span class="tit ft-size_20 ft-weight_600">배치 상세</span>
@ -82,14 +72,17 @@
<v-card style="height: 100%">
<v-card-title class="v-card__title d-flex align-center justify-space-between">
<span class="custom-title-4">DB 프로시져 파라메터 설정</span>
<div>
<Buttons :parentPrgmId="myPrgmId" :bindingData="gridNameParam"
:btnActionsFnc="btnActionsParam" />
</div>
<a-button icon="close" type="text" @click="dialog = false"></a-button>
</v-card-title>
<div class="pa-5">
<v-row align="center" no-gutters>
<v-col cols="12" class="text-right"> </v-col>
<v-row align="end" no-gutters>
<v-col cols="12" class="d-flex justify-end">
<Buttons :parentPrgmId="myPrgmId" :bindingData="gridNameParam"
:btnActionsFnc="btnActionsParam" />
</v-col>
</v-row>
</div>
<v-card-text style="height: 300px;">
@ -101,10 +94,9 @@
</div>
</div>
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn color="primary" dark @click="setParamChangeData()">확인</v-btn>
<v-btn color="primary" dark @click="dialog = false">닫기</v-btn>
<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
<a-button :ripple="false" @click="dialog = false" class="mr-2">닫기</a-button>
<a-button :ripple="false" type="primary" @click="setParamChangeData()">확인</a-button>
</v-card-actions>
</v-card>
</v-dialog>
@ -156,7 +148,7 @@ export default {
myPrgmId: myPrgmId,
loadGrid: false,
gridName: 'rowGrid',
// rowGridOrigin: [],
detailList: myDetail,
@ -261,7 +253,7 @@ export default {
const _this = this;
const myColumns = [
{ header: '배치ID', name: 'batchId', align: 'center', width: 100 },
{ header: '배치ID', name: 'batchId', align: 'right', width: 100 },
{ header: '배치명', name: 'batchNm', minWidth: 200 },
{
header: '배치 실행 구분',
@ -283,7 +275,6 @@ export default {
{
header: '사용여부',
name: 'useFg',
align: 'center',
width: 145,
formatter({ value }) {
let retVal = '';
@ -556,7 +547,7 @@ export default {
}
},
gridParamInit() {
const gridHeight = this.$refs.gridParent.offsetHeight - 36;
const myOptions = {
columnOptions: {
@ -567,6 +558,10 @@ export default {
selectionUnit: 'row',
editingEvent: 'click',
scrollX: false,
header: {
height: 37,
},
rowHeight: 37,
};
this.setGridOption({
gridKey: this.gridNameParam,
@ -592,7 +587,6 @@ export default {
{
header: 'MODE',
name: 'mode',
align: 'center',
formatter({ value }) {
return value == ('OUT' || 'out') ? 'OUT' : 'IN';
},
@ -642,7 +636,7 @@ export default {
},
getRowParamData() {
this.paramLoadGrid = false;
// let res = [];
let res = [];
// /* this.pageData.paramStrData 처리 */
// // console.log("this.pageData.paramStrData : ", JSON.parse(this.pageData.paramStrData));
@ -717,7 +711,6 @@ export default {
},
inputClick(event, item, valueNm) {
if (valueNm == 'refVal1') {
this.dialog = true;
const rowIdxKey = this.$refs[this.gridName].gridInstance.invoke(
'getFocusedCell',
).rowKey;

View File

@ -3,7 +3,7 @@
<v-row ref="searchFilter">
<v-col :cols="12">
<v-card class="searchFilter">
<v-row align="center" no-gutters>
<v-row align="end" no-gutters>
<v-col :cols="2.5">
<component
:is="'selectCodeList'"
@ -49,8 +49,8 @@
:parentPrgmId="myPrgmId"
label="공정명"
valueNm="eccNm"
:labelCols="2"
:textCols="9"
:labelCols="12"
:textCols="12"
:searchOption="true"
/>
</v-col>
@ -59,7 +59,13 @@
</v-col>
</v-row>
<v-row align="center" no-gutters>
<div style="display: none">
<component
:is="'SelectBlocMstr'"
ref="SelectBlocMstr"
:parentPrgmId="myPrgmId"
/>
</div>
</v-row>
</v-card>
</v-col>
@ -91,7 +97,7 @@
</div>
</v-card>
</v-col>
<v-col :cols="7" class="h100">
<v-col :cols="7" style="min-height:75vh;">
<v-card class="pb-5">
<v-card-title class="custom-title-4" style="min-height:76px;"
>공정 상세

View File

@ -67,14 +67,8 @@
</div>
<div class="px-4" style="height:calc(100% - 76px)">
<div ref="gridParent" class="w100 h100">
<component
:ref="gridName"
:is="loadGrid ? 'Grid' : null"
:gridName="gridName"
:parentPrgmId="myPrgmId"
:columnClickEventFlag="true"
@columnClick="columnClick"
/>
<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
:parentPrgmId="myPrgmId" :columnClickEventFlag="true" @columnClick="columnClick" />
</div>
</div>
</v-card>
@ -552,7 +546,12 @@ export default {
columnOptions: {
resizable: true,
},
rowHeaders: ['rowNum'],
rowHeaders: [
{
type: 'rowNum',
align: 'right',
},
],
header: {
height: 37,
},
@ -642,7 +641,7 @@ export default {
{
header: '평가',
name: 'okFg',
align: 'center',
align: 'left',
width: 80,
},
{

View File

@ -286,7 +286,7 @@ export default {
resizable: true,
},
header: {
height: 65,
height: 75,
complexColumns: myComplexColumns,
},
};