qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'qcast-pub' into dev

Browse Source
This commit is contained in:
minsik 2024-11-04 17:37:34 +09:00
commit f42207dfad
10 changed files with 70 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
View File

@ -50,7 +50,11 @@ export default function CircuitTrestleSetting({ id }) {
Next
</button>
)}
{tabNum === 3 && <button className="btn-frame modal act">保存 (仮割り当て)</button>}
{tabNum === 3 && (
<button className="btn-frame modal act">
{`${getMessage('modal.common.save')} (${getMessage('modal.circuit.trestle.setting.alloc.trestle')})`}
</button>
)}
</div>
</div>
</div>

6
src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
View File

@ -114,7 +114,7 @@ export default function PowerConditionalSelect({ setTabNum }) {
</div>
</div>
<div className="circuit-right-wrap mb10">
<button className="btn-frame self mr5">追加</button>
<button className="btn-frame self mr5">{getMessage('modal.common.add')}</button>
</div>
<div className="circuit-data-form">
<span className="normal-font">
@ -132,12 +132,12 @@ export default function PowerConditionalSelect({ setTabNum }) {
<div className="slope-wrap">
<div className="d-check-box pop mb15">
<input type="checkbox" id="ch03" />
<label htmlFor="ch03">同一傾斜同一方面の面積の場合、同じ面として回路を分ける。</label>
<label htmlFor="ch03"> {getMessage('modal.circuit.trestle.setting.power.conditional.select.check1')}</label>
</div>
<div className="d-check-box pop">
<input type="checkbox" id="ch04" />
<label className="red" htmlFor="ch04">
MAX接続（過積）で回路を分ける。
{getMessage('modal.circuit.trestle.setting.power.conditional.select.check2')}
</label>
</div>
</div>

26
src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
View File

@ -18,8 +18,8 @@ export default function StepUp({}) {
<table>
<thead>
<tr>
<th>シリアル枚数</th>
<th>総回路数</th>
<th>{getMessage('modal.circuit.trestle.setting.step.up.allocation.serial.amount')}</th>
<th>{getMessage('modal.circuit.trestle.setting.step.up.allocation.total.amount')}</th>
</tr>
</thead>
<tbody>
@ -49,14 +49,14 @@ export default function StepUp({}) {
</div>
<div className="circuit-table-flx-wrap">
<div className="circuit-table-flx-box">
<div className="bold-font mb10">接続する</div>
<div className="bold-font mb10">{getMessage('modal.circuit.trestle.setting.step.up.allocation.connected')}</div>
<div className="roof-module-table mb10">
<table>
<thead>
<tr>
<th style={{ width: '140px' }}>名称</th>
<th>回路数</th>
<th>昇圧回路数</th>
<th style={{ width: '140px' }}>{getMessage('modal.circuit.trestle.setting.power.conditional.select.name')}</th>
<th>{getMessage('modal.circuit.trestle.setting.power.conditional.select.circuit.amount')}</th>
<th>{getMessage('modal.circuit.trestle.setting.step.up.allocation.circuit.amount')}</th>
</tr>
</thead>
<tbody>
@ -80,7 +80,7 @@ export default function StepUp({}) {
</div>
<div className="bottom-wrap">
<div className="circuit-right-wrap mb10">
<button className="btn-frame self mr5">追加</button>
<button className="btn-frame self mr5">{getMessage('modal.common.add')}</button>
</div>
<div className="circuit-data-form">
<span className="normal-font">
@ -90,13 +90,13 @@ export default function StepUp({}) {
</div>
</div>
<div className="circuit-table-flx-box">
<div className="bold-font mb10">昇圧オプション</div>
<div className="bold-font mb10">{getMessage('modal.circuit.trestle.setting.step.up.allocation.option')}</div>
<div className="roof-module-table mb10">
<table>
<thead>
<tr>
<th>名称</th>
<th>昇圧回路数</th>
<th>{getMessage('modal.circuit.trestle.setting.power.conditional.select.name')}</th>
<th>{getMessage('modal.circuit.trestle.setting.step.up.allocation.circuit.amount')}</th>
</tr>
</thead>
<tbody>
@ -113,7 +113,7 @@ export default function StepUp({}) {
</div>
<div className="bottom-wrap">
<div className="circuit-right-wrap mb10">
<button className="btn-frame self mr5">追加</button>
<button className="btn-frame self mr5">{getMessage('modal.common.add')}</button>
</div>
<div className="circuit-data-form">
<span className="normal-font">
@ -124,7 +124,7 @@ export default function StepUp({}) {
</div>
</div>
<div className="circuit-count-input">
<span className="normal-font">綿調道区分</span>
<span className="normal-font">{getMessage('modal.module.basic.setting.module.cotton.classification')}</span>
<div className="input-grid mr5" style={{ width: '40px' }}>
<input type="text" className="input-origin block" />
</div>
@ -395,7 +395,7 @@ export default function StepUp({}) {
<div className="slope-wrap">
<div className="outline-form">
<span className="mr10" style={{ width: 'auto' }}>
モニターの選択
{getMessage('modal.circuit.trestle.setting.step.up.allocation.select.monitor')}
</span>
<div className="grid-select mr10">
<QSelectBox title={'電力検出ユニット (モニター付き)'} option={SelectOption01} />

4
src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
View File

@ -4,13 +4,13 @@ export default function PassivityCircuitAllocation() {
const { getMessage } = useMessage()
const moduleData = {
header: [
{ name: getMessage('屋根面'), prop: 'roofShape' },
{ name: getMessage('modal.panel.batch.statistic.roof.shape'), prop: 'roofShape' },
{
name: getMessage('Q.TRON M-G2'),
prop: 'moduleName',
},
{
name: getMessage('発電量 (kW)'),
name: `${getMessage('modal.panel.batch.statistic.power.generation.amount')}(kW)`,
prop: 'powerGeneration',
},
],

9
src/locales/ja.json
View File

@ -123,6 +123,7 @@
"modal.module.basic.setting.auto.placement": "設定値に自動配置",
"plan.menu.module.circuit.setting.circuit.trestle.setting": "回路と架台の設定",
"modal.circuit.trestle.setting": "回路と架台設定",
"modal.circuit.trestle.setting.alloc.trestle": "仮割り当て",
"modal.circuit.trestle.setting.power.conditional.select": "パワーコンディショナーを選択",
"modal.circuit.trestle.setting.power.conditional.select.name": "名称",
"modal.circuit.trestle.setting.power.conditional.select.rated.output": "定格出力",
@ -130,6 +131,8 @@
"modal.circuit.trestle.setting.power.conditional.select.max.connection": "最大接続枚数",
"modal.circuit.trestle.setting.power.conditional.select.max.overload": "過積最大枚数",
"modal.circuit.trestle.setting.power.conditional.select.output.current": "出力電流",
"modal.circuit.trestle.setting.power.conditional.select.check1": "同一傾斜同一方面の面積の場合、同じ面として回路を分ける。",
"modal.circuit.trestle.setting.power.conditional.select.check2": "MAX接続（過積）で回路を分ける。",
"modal.circuit.trestle.setting.circuit.allocation": "回路割り当て",
"modal.circuit.trestle.setting.circuit.allocation.auto": "自動回路割り当て",
"modal.circuit.trestle.setting.circuit.allocation.passivity": "手動回路割当",
@ -140,6 +143,12 @@
"modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.reset": "すべての回路番号の初期化",
"modal.circuit.trestle.setting.circuit.allocation.passivity.circuit.num.fix": "番号確定",
"modal.circuit.trestle.setting.step.up.allocation": "昇圧設定",
"modal.circuit.trestle.setting.step.up.allocation.serial.amount": "シリアル枚数",
"modal.circuit.trestle.setting.step.up.allocation.total.amount": "総回路数",
"modal.circuit.trestle.setting.step.up.allocation.connected": "接続する",
"modal.circuit.trestle.setting.step.up.allocation.circuit.amount": "昇圧回路数",
"modal.circuit.trestle.setting.step.up.allocation.option": "昇圧オプション",
"modal.circuit.trestle.setting.step.up.allocation.select.monitor": "モニターの選択",
"plan.menu.module.circuit.setting.plan.orientation": "図面方位の適用",
"plan.menu.estimate": "見積",
"plan.menu.estimate.roof.alloc": "屋根面の割り当て",

9
src/locales/ko.json
View File

@ -127,6 +127,7 @@
"modal.module.basic.setting.auto.placement": "설정값으로 자동 배치",
"plan.menu.module.circuit.setting.circuit.trestle.setting": "회로 및 가대 설정",
"modal.circuit.trestle.setting": "회로 및 가대설정",
"modal.circuit.trestle.setting.alloc.trestle": "가대할당",
"modal.circuit.trestle.setting.power.conditional.select": "파워컨디셔너 선택",
"modal.circuit.trestle.setting.power.conditional.select.name": "명칭",
"modal.circuit.trestle.setting.power.conditional.select.rated.output": "정격출력",
@ -134,6 +135,8 @@
"modal.circuit.trestle.setting.power.conditional.select.max.connection": "최대접속매수",
"modal.circuit.trestle.setting.power.conditional.select.max.overload": "과적최대매수",
"modal.circuit.trestle.setting.power.conditional.select.output.current": "출력전류",
"modal.circuit.trestle.setting.power.conditional.select.check1": "동일경사 동일 방면의 면적인 경우, 같은 면으로서 회로를 나눈다.",
"modal.circuit.trestle.setting.power.conditional.select.check2": "MAX 접속(과적)으로 회로를 나눈다.",
"modal.circuit.trestle.setting.circuit.allocation": "회로 할당",
"modal.circuit.trestle.setting.circuit.allocation.auto": "자동 회로 할당",
"modal.circuit.trestle.setting.circuit.allocation.passivity": "수동 회로 할당",
@ -144,6 +147,12 @@
"modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.reset": "모든 회로번호 초기화",
"modal.circuit.trestle.setting.circuit.allocation.passivity.circuit.num.fix": "번호 확정",
"modal.circuit.trestle.setting.step.up.allocation": "승압 설정",
"modal.circuit.trestle.setting.step.up.allocation.serial.amount": "직렬매수",
"modal.circuit.trestle.setting.step.up.allocation.total.amount": "총 회로수",
"modal.circuit.trestle.setting.step.up.allocation.connected": "연결함",
"modal.circuit.trestle.setting.step.up.allocation.circuit.amount": "승압회로수",
"modal.circuit.trestle.setting.step.up.allocation.option": "승압옵션",
"modal.circuit.trestle.setting.step.up.allocation.select.monitor": "모니터 선택",
"plan.menu.module.circuit.setting.plan.orientation": "도면 방위 적용",
"plan.menu.estimate": "견적서",
"plan.menu.estimate.roof.alloc": "지붕면 할당",

1
src/styles/_contents.scss
View File

@ -1312,6 +1312,7 @@
font-weight: 400;
color: #999999;
padding: 0;
width: 100%;
height: 100%;
flex: 1 ;
background-color: inherit;

1
src/styles/_layout.scss
View File

@ -239,6 +239,7 @@ footer{
nav{
.nav-list{
.nav-item{
a,
button{
font-size: 13px;
}

5
src/styles/_main.scss
View File

@ -37,9 +37,10 @@
top: 50%;
left: 0;
transform: translateY(-50%);
width: 20px;
height: 20px;
width: 22px;
height: 22px;
background: url(../../public/static/images/main/id_icon.svg)no-repeat center;
background-size: cover;
}
}
.store-arr{

27
src/styles/_modal.scss
View File

@ -391,19 +391,22 @@ $alert-color: #101010;
table-layout: fixed;
tr{
th{
display: flex;
align-items: center;
font-size: $pop-normal-size;
color: $pop-color;
font-weight: $pop-bold-weight;
padding: 18px 0;
border-bottom: 1px solid #424242;
vertical-align: middle;
.tip-wrap{
display: flex;
align-items: center;
}
}
td{
font-size: $pop-normal-size;
color: $pop-color;
border-bottom: 1px solid #424242;
padding-left: 20px;
padding: 18px 0 18px 20px;
vertical-align: middle;
.flex-box{
display: flex;
@ -479,6 +482,7 @@ $alert-color: #101010;
color: $pop-color;
font-weight: $pop-normal-weight;
}
}
.img-edit-wrap{
@ -528,6 +532,23 @@ $alert-color: #101010;
}
}
.for-address{
input{
flex: 1;
}
.check-address{
flex: none;
width: 18px;
height: 18px;
margin-left: 5px;
background-repeat: no-repeat;
background-position: center;
background-size: cover;
&.fail{background-image: url(../../public/static/images/canvas/img_check_fail.svg);}
&.success{background-image: url(../../public/static/images/canvas/img_check_success.svg);}
}
}
// 외벽선 그리기
.outline-wrap{
padding: 24px 0;