update code
This commit is contained in:

parent
a06d2e553d
commit
71394443ac
@ -137,6 +137,11 @@
|
|||||||
color:map-deep-get($config, #{$theme}, "ant-btn-default-color");
|
color:map-deep-get($config, #{$theme}, "ant-btn-default-color");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.ant-btn-popup-default {
|
||||||
|
background:map-deep-get($config, #{$theme}, "ant-btn-popup-bg");
|
||||||
|
color:map-deep-get($config, #{$theme}, "ant-btn-popup-color");
|
||||||
|
}
|
||||||
|
|
||||||
&.ant-btn-danger {
|
&.ant-btn-danger {
|
||||||
&.ant-btn-background-ghost {
|
&.ant-btn-background-ghost {
|
||||||
color:map-deep-get($config, #{$theme}, "ant-btn-danger-color");
|
color:map-deep-get($config, #{$theme}, "ant-btn-danger-color");
|
||||||
|
@ -177,8 +177,13 @@ $config: (
|
|||||||
v-header-border: #424242,
|
v-header-border: #424242,
|
||||||
v-chart-border: #424242,
|
v-chart-border: #424242,
|
||||||
v-sidebar-border: #303030,
|
v-sidebar-border: #303030,
|
||||||
|
<<<<<<< Updated upstream
|
||||||
ant-checkbox-bg: #212224,
|
ant-checkbox-bg: #212224,
|
||||||
ant-checkbox-border: #424242,
|
ant-checkbox-border: #424242,
|
||||||
|
=======
|
||||||
|
ant-btn-popup-bg: #212224,
|
||||||
|
ant-btn-popup-color: #FFFFFFD9,
|
||||||
|
>>>>>>> Stashed changes
|
||||||
),
|
),
|
||||||
light: (w-g5: $--color-gray_555,
|
light: (w-g5: $--color-gray_555,
|
||||||
g5-w: $--color-white,
|
g5-w: $--color-white,
|
||||||
@ -319,7 +324,12 @@ $config: (
|
|||||||
v-header-border: #D9D9D9,
|
v-header-border: #D9D9D9,
|
||||||
v-chart-border: #D9D9D9,
|
v-chart-border: #D9D9D9,
|
||||||
v-sidebar-border: #F0F0F0,
|
v-sidebar-border: #F0F0F0,
|
||||||
|
<<<<<<< Updated upstream
|
||||||
ant-checkbox-bg: #FFFFFF,
|
ant-checkbox-bg: #FFFFFF,
|
||||||
ant-checkbox-border: #D9D9D9,
|
ant-checkbox-border: #D9D9D9,
|
||||||
|
=======
|
||||||
|
ant-btn-popup-bg: #FFFFFF,
|
||||||
|
ant-btn-popup-color: #000000E0,
|
||||||
|
>>>>>>> Stashed changes
|
||||||
),
|
),
|
||||||
);
|
);
|
@ -76,7 +76,7 @@
|
|||||||
<v-spacer></v-spacer>
|
<v-spacer></v-spacer>
|
||||||
<!-- <v-btn color="primary" dark @click="setUpdate()">확인</v-btn> -->
|
<!-- <v-btn color="primary" dark @click="setUpdate()">확인</v-btn> -->
|
||||||
<div class="pr-3">
|
<div class="pr-3">
|
||||||
<a-button @click="close()" class="btn-default">삭제</a-button>
|
<a-button @click="close()" class="ant-btn-popup-default">닫기</a-button>
|
||||||
<a-button type="primary" @click="setUpdate()" class="v-btn-add-text">
|
<a-button type="primary" @click="setUpdate()" class="v-btn-add-text">
|
||||||
확인
|
확인
|
||||||
</a-button>
|
</a-button>
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
:itemList="selectValueList01"
|
:itemList="selectValueList01"
|
||||||
:label="'대상월'"
|
:label="'대상월'"
|
||||||
@update:propsValue="selectValue01 = $event"
|
@update:propsValue="selectValue01 = $event"
|
||||||
|
customClass="select-large"
|
||||||
/>
|
/>
|
||||||
</v-col>
|
</v-col>
|
||||||
<v-col :cols="5.5" class="mr-2">
|
<v-col :cols="5.5" class="mr-2">
|
||||||
@ -49,9 +50,10 @@
|
|||||||
:itemList="selectValueList02"
|
:itemList="selectValueList02"
|
||||||
:label="'전년대비절감율'"
|
:label="'전년대비절감율'"
|
||||||
@update:propsValue="selectValue02 = $event"
|
@update:propsValue="selectValue02 = $event"
|
||||||
|
customClass="select-large"
|
||||||
/>
|
/>
|
||||||
</v-col>
|
</v-col>
|
||||||
<a-button color="primary" dark @click="search()" icon="clock-circle" >
|
<a-button class="ant-btn-popup-default" color="primary" dark @click="search()" icon="check-circle" size="large">
|
||||||
<!-- <template #icon>
|
<!-- <template #icon>
|
||||||
<ClockCircleOutlined />
|
<ClockCircleOutlined />
|
||||||
</template> -->
|
</template> -->
|
||||||
@ -128,7 +130,7 @@
|
|||||||
</div> -->
|
</div> -->
|
||||||
|
|
||||||
<v-card-actions class="pa-5 d-flex align-center justify-end">
|
<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" class="mr-2 ant-btn-popup-default" dark @click="closePop()">취소</a-button>
|
||||||
<a-button color="primary" type="primary" dark @click="setUpdate()">확정</a-button>
|
<a-button color="primary" type="primary" dark @click="setUpdate()">확정</a-button>
|
||||||
</v-card-actions>
|
</v-card-actions>
|
||||||
</v-card>
|
</v-card>
|
||||||
|
@ -81,6 +81,10 @@ export default {
|
|||||||
type: String,
|
type: String,
|
||||||
require: false,
|
require: false,
|
||||||
},
|
},
|
||||||
|
required: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false
|
||||||
|
},
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {};
|
return {};
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="l-layout">
|
<div class="l-layout">
|
||||||
|
<CommonPageTitle />
|
||||||
<v-row ref="searchFilter">
|
<v-row ref="searchFilter">
|
||||||
<v-col :cols="12">
|
<v-col :cols="12">
|
||||||
<v-card class="searchFilter">
|
<v-card class="searchFilter">
|
||||||
@ -205,12 +206,12 @@ export default {
|
|||||||
|
|
||||||
const _this = this;
|
const _this = this;
|
||||||
const myColumns = [
|
const myColumns = [
|
||||||
{ header: '역할ID', name: 'roleId', align: 'center' },
|
{ header: '역할ID', name: 'roleId', align: 'left' },
|
||||||
{ header: '역할명', name: 'roleNm' },
|
{ header: '역할명', name: 'roleNm' },
|
||||||
{
|
{
|
||||||
header: '사용여부',
|
header: '사용여부',
|
||||||
name: 'useFg',
|
name: 'useFg',
|
||||||
align: 'center',
|
align: 'left',
|
||||||
formatter({ value }) {
|
formatter({ value }) {
|
||||||
value = value === true ? '1' : '0';
|
value = value === true ? '1' : '0';
|
||||||
const newValue = _this.pageData.useFgList.filter(
|
const newValue = _this.pageData.useFgList.filter(
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="l-layout">
|
<div class="l-layout">
|
||||||
<!-- 조회조견 -->
|
<!-- 조회조견 -->
|
||||||
|
<CommonPageTitle />
|
||||||
<v-row ref="searchFilter">
|
<v-row ref="searchFilter">
|
||||||
<v-col :cols="12">
|
<v-col :cols="12">
|
||||||
<v-card class="searchFilter">
|
<v-card class="searchFilter">
|
||||||
@ -922,7 +923,7 @@ const unAsgnRoleByUserColumns = [
|
|||||||
</label>`;
|
</label>`;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{ header: '역할ID', name: 'roleId', align: 'center' },
|
{ header: '역할ID', name: 'roleId', align: 'left' },
|
||||||
{ header: '역할명', name: 'roleNm' },
|
{ header: '역할명', name: 'roleNm' },
|
||||||
{ header: '적용시작일', name: 'aplyStartDt', hidden: true },
|
{ header: '적용시작일', name: 'aplyStartDt', hidden: true },
|
||||||
{ header: '적용종료일', name: 'aplyEndDt', hidden: true },
|
{ header: '적용종료일', name: 'aplyEndDt', hidden: true },
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="l-layout">
|
<div class="l-layout">
|
||||||
<!-- 조회조견 -->
|
<!-- 조회조견 -->
|
||||||
|
<CommonPageTitle />
|
||||||
<v-row ref="searchFilter">
|
<v-row ref="searchFilter">
|
||||||
<v-col :cols="12">
|
<v-col :cols="12">
|
||||||
<v-card class="searchFilter">
|
<v-card class="searchFilter">
|
||||||
@ -218,14 +219,14 @@ export default {
|
|||||||
|
|
||||||
const _this = this;
|
const _this = this;
|
||||||
const myColumns = [
|
const myColumns = [
|
||||||
{ header: 'No.', name: 'batchLogSeq', align: 'center', width: 100 },
|
{ header: 'No.', name: 'batchLogSeq', align: 'right', width: 100 },
|
||||||
{ header: '배치ID', name: 'batchId', align: 'center', width: 100 },
|
{ header: '배치ID', name: 'batchId', align: 'right', width: 100 },
|
||||||
{ header: '배치명', name: 'batchNm', align: 'left', width: 150 },
|
{ header: '배치명', name: 'batchNm', align: 'left', width: 150 },
|
||||||
{ header: '실행 일자', name: 'execDt', align: 'center', width: 80 },
|
{ header: '실행 일자', name: 'execDt', align: 'right', width: 80 },
|
||||||
{
|
{
|
||||||
header: '실행 결과',
|
header: '실행 결과',
|
||||||
name: 'execRsltCd',
|
name: 'execRsltCd',
|
||||||
align: 'center',
|
align: 'left',
|
||||||
width: 80,
|
width: 80,
|
||||||
formatter({ value }) {
|
formatter({ value }) {
|
||||||
let retVal = '';
|
let retVal = '';
|
||||||
@ -242,7 +243,7 @@ export default {
|
|||||||
{
|
{
|
||||||
header: '배치 시작 일시',
|
header: '배치 시작 일시',
|
||||||
name: 'batchStrtDttm',
|
name: 'batchStrtDttm',
|
||||||
align: 'center',
|
align: 'left',
|
||||||
width: 160,
|
width: 160,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="l-layout">
|
<div class="l-layout">
|
||||||
|
<CommonPageTitle />
|
||||||
<v-row ref="searchFilter">
|
<v-row ref="searchFilter">
|
||||||
<v-col :cols="12">
|
<v-col :cols="12">
|
||||||
<v-card class="searchFilter">
|
<v-card class="searchFilter">
|
||||||
|
@ -12,7 +12,6 @@
|
|||||||
dataKey="searchAddGrp"
|
dataKey="searchAddGrp"
|
||||||
:sendParam="{ useFg: '1' }"
|
:sendParam="{ useFg: '1' }"
|
||||||
:addAll="true"
|
:addAll="true"
|
||||||
:iconShow="true"
|
|
||||||
customClass="select-large"
|
customClass="select-large"
|
||||||
/>
|
/>
|
||||||
</v-col>
|
</v-col>
|
||||||
@ -22,7 +21,6 @@
|
|||||||
label="추가 정보명"
|
label="추가 정보명"
|
||||||
valueNm="addInfoNm"
|
valueNm="addInfoNm"
|
||||||
:searchOption="true"
|
:searchOption="true"
|
||||||
:iconShow="true"
|
|
||||||
customClass="input-large"
|
customClass="input-large"
|
||||||
/>
|
/>
|
||||||
</v-col>
|
</v-col>
|
||||||
@ -336,8 +334,7 @@ export default {
|
|||||||
this.search();
|
this.search();
|
||||||
},
|
},
|
||||||
async search() {
|
async search() {
|
||||||
//process
|
this.loadGrid = false;
|
||||||
this.loadGrid = true;
|
|
||||||
await this.getRowGridData();
|
await this.getRowGridData();
|
||||||
await this.setPageData({
|
await this.setPageData({
|
||||||
isFind: false,
|
isFind: false,
|
||||||
@ -547,7 +544,7 @@ const myDetail = [
|
|||||||
labelCols: 12,
|
labelCols: 12,
|
||||||
textCols: 12,
|
textCols: 12,
|
||||||
iconShow: true,
|
iconShow: true,
|
||||||
class: 'py-2 pr-4',
|
class: 'py-2 pr-4 mt-2',
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -559,7 +556,7 @@ const myDetail = [
|
|||||||
labelCols: 12,
|
labelCols: 12,
|
||||||
textCols: 12,
|
textCols: 12,
|
||||||
iconShow: true,
|
iconShow: true,
|
||||||
class: 'py-2 pl-4',
|
class: 'py-2 pl-4 mt-2',
|
||||||
list: 'addInfoDataKindList',
|
list: 'addInfoDataKindList',
|
||||||
itemText: 'commCdNm',
|
itemText: 'commCdNm',
|
||||||
itemValue: 'commCd',
|
itemValue: 'commCd',
|
||||||
@ -574,7 +571,7 @@ const myDetail = [
|
|||||||
labelCols: 12,
|
labelCols: 12,
|
||||||
textCols: 12,
|
textCols: 12,
|
||||||
iconShow: true,
|
iconShow: true,
|
||||||
class: 'py-2 pr-4',
|
class: 'py-2 pr-4 mt-2 d-flex align-items-center',
|
||||||
value: { '1': true, '0': false },
|
value: { '1': true, '0': false },
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
@ -587,7 +584,7 @@ const myDetail = [
|
|||||||
labelCols: 12,
|
labelCols: 12,
|
||||||
textCols: 12,
|
textCols: 12,
|
||||||
iconShow: true,
|
iconShow: true,
|
||||||
class: 'py-2 pl-4',
|
class: 'py-2 pl-4 mt-2',
|
||||||
placeholder: '시스템 자동입력',
|
placeholder: '시스템 자동입력',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -599,7 +596,7 @@ const myDetail = [
|
|||||||
labelCols: 12,
|
labelCols: 12,
|
||||||
textCols: 12,
|
textCols: 12,
|
||||||
iconShow: true,
|
iconShow: true,
|
||||||
class: 'py-2 pr-4',
|
class: 'py-2 pr-4 mt-2',
|
||||||
placeholder: '시스템 자동입력',
|
placeholder: '시스템 자동입력',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -611,7 +608,7 @@ const myDetail = [
|
|||||||
labelCols: 12,
|
labelCols: 12,
|
||||||
textCols: 12,
|
textCols: 12,
|
||||||
iconShow: true,
|
iconShow: true,
|
||||||
class: 'py-2 pl-4',
|
class: 'py-2 pl-4 mt-2',
|
||||||
placeholder: '시스템 자동입력',
|
placeholder: '시스템 자동입력',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -623,8 +620,11 @@ const myDetail = [
|
|||||||
labelCols: 12,
|
labelCols: 12,
|
||||||
textCols: 12,
|
textCols: 12,
|
||||||
iconShow: true,
|
iconShow: true,
|
||||||
class: 'py-2 pr-4',
|
class: 'py-2 pr-4 mt-2',
|
||||||
placeholder: '시스템 자동입력',
|
placeholder: '시스템 자동입력',
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
</script>
|
</script>
|
||||||
|
<style lang="scss">
|
||||||
|
@import '@/assets/scss/common.scss';
|
||||||
|
</style>
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div ref="mainDiv" class="l-layout">
|
<div ref="mainDiv" class="l-layout">
|
||||||
|
<CommonPageTitle />
|
||||||
<v-row ref="searchFilter">
|
<v-row ref="searchFilter">
|
||||||
<v-col :cols="12">
|
<v-col :cols="12">
|
||||||
<v-card class="searchFilter">
|
<v-card class="searchFilter">
|
||||||
|
Reference in New Issue
Block a user