diff --git a/.env.development b/.env.development index 51af5c6..b30e172 100644 --- a/.env.development +++ b/.env.development @@ -1 +1 @@ -PUBLIC_URL= \ No newline at end of file +PUBLIC_URL=ptjs \ No newline at end of file diff --git a/src/views/Ptjs/Czdbl/index.js b/src/views/Ptjs/Czdbl/index.js index 57b0c2a..78f12b6 100644 --- a/src/views/Ptjs/Czdbl/index.js +++ b/src/views/Ptjs/Czdbl/index.js @@ -130,7 +130,7 @@ export default function Czrz() { align: "center", render: (text, record) => ( - {record[SearchBottom?.operTime]?.ontpcnt?.zz} + {record[SearchBottom?.operTime]?.ontpcnt?.zz + record[SearchBottom?.operTime]?.ontpcnt?.zp} ) }, @@ -142,7 +142,7 @@ export default function Czrz() { align: "center", render: (text, record) => ( - {record[SearchBottom?.operTime]?.offtpcnt?.zz} + {record[SearchBottom?.operTime]?.offtpcnt?.zz + record[SearchBottom?.operTime]?.ontpcnt?.zp} ) }, @@ -159,7 +159,7 @@ export default function Czrz() { align: "center", render: (text, record) => ( - {record[SearchBottom?.operTime]?.ontpcnt?.wf} + {record[SearchBottom?.operTime]?.ontpcnt?.tx} ) }, @@ -171,7 +171,7 @@ export default function Czrz() { align: "center", render: (text, record) => ( - {record[SearchBottom?.operTime]?.offtpcnt?.wf} + {record[SearchBottom?.operTime]?.offtpcnt?.tx} ) }, @@ -264,12 +264,14 @@ export default function Czrz() { offtpcnt: { pp: 0, zz: 0, - wf: 0 + zp:0, + tx: 0 }, ontpcnt: { pp: 0, zz: 0, - wf: 0 + zp:0, + tx: 0 } } } @@ -302,8 +304,8 @@ export default function Czrz() { let ciobj = hbobj[day]; - let alloff = ciobj.offtpcnt.pp + ciobj.offtpcnt.zz + ciobj.offtpcnt.wf; - let allon = ciobj.ontpcnt.pp + ciobj.ontpcnt.zz + ciobj.ontpcnt.wf; + let alloff = ciobj.offtpcnt.pp + ciobj.offtpcnt.zz + ciobj.offtpcnt.tx+ ciobj.offtpcnt.zp; + let allon = ciobj.ontpcnt.pp + ciobj.ontpcnt.zz + ciobj.ontpcnt.tx + ciobj.offtpcnt.zp; let rate = allon / (allon + alloff); hbobj[day].rate = rate;