From e4aa7d9ffba17eaadb98ec17364cb3bbd6bf87b4 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Thu, 15 Sep 2022 15:26:49 +0800 Subject: [PATCH] =?UTF-8?q?9.15=20=E5=A4=A7=E5=B1=8F=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/screen/content_title_bg.jpg | Bin 0 -> 13915 bytes .../ElecBidEvaluation/BidEvalAppointment.tsx | 3 +- .../MonitorScreen/Home/index.tsx | 10 +- .../MonitorScreen/Home/style.less | 12 +- .../MonitorScreen/MonitorRoom/style.less | 3 +- .../ProjectMonitorRoom/index.tsx | 41 ++-- .../ProjectMonitorRoom/style.less | 206 +++++++++++++----- 7 files changed, 189 insertions(+), 86 deletions(-) create mode 100644 src/assets/screen/content_title_bg.jpg diff --git a/src/assets/screen/content_title_bg.jpg b/src/assets/screen/content_title_bg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..67d8c3ccb6f127502ba2abe575b771e4bd3f33e3 GIT binary patch literal 13915 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 H=#&2f$Do7? literal 0 HcmV?d00001 diff --git a/src/components/ElecBidEvaluation/BidEvalAppointment.tsx b/src/components/ElecBidEvaluation/BidEvalAppointment.tsx index c075b85..f55b424 100644 --- a/src/components/ElecBidEvaluation/BidEvalAppointment.tsx +++ b/src/components/ElecBidEvaluation/BidEvalAppointment.tsx @@ -229,7 +229,8 @@ const BidEvalAppointment: React.FC = (props) => { columns={columns} actionRef={actionRef} bordered={false} - request={async (params: any) => { + params={{ areaType: "eval_room" }} + request={async (params) => { return await getBidEvalRoom(params).then(res => { if (res?.code == 200) { return { diff --git a/src/pages/ElecEvaluation/MonitorScreen/Home/index.tsx b/src/pages/ElecEvaluation/MonitorScreen/Home/index.tsx index 704c4b0..42dbeff 100644 --- a/src/pages/ElecEvaluation/MonitorScreen/Home/index.tsx +++ b/src/pages/ElecEvaluation/MonitorScreen/Home/index.tsx @@ -220,7 +220,7 @@ const GraphChart = (props: { type: string, chartData: any[] }) => { target = chartData[i].value; } } - let v = ((target / total) * 100).toFixed(0); + let v = total == 0 ? 0 : ((target / total) * 100).toFixed(0); return `${name} ${target}个，占比${v}%`; }, }, @@ -666,14 +666,14 @@ export default () => { 年 } -
-
+
+
-
+
-
+
diff --git a/src/pages/ElecEvaluation/MonitorScreen/Home/style.less b/src/pages/ElecEvaluation/MonitorScreen/Home/style.less index 6dadf8b..7fe7325 100644 --- a/src/pages/ElecEvaluation/MonitorScreen/Home/style.less +++ b/src/pages/ElecEvaluation/MonitorScreen/Home/style.less @@ -139,19 +139,25 @@ font-size: 0.875rem; line-height: 0.875rem; position: absolute; - bottom: 0.5rem; - width: 100%; + bottom: 4%; + width: 33.33333333%; // padding-top: 0.75rem; .screen-graph-title { display: inline-block; - width: 20%; + width: 60%; text-align: center; } } .screen-graph-chart { height: 100%; + + .screen-graph-layout { + display: inline-block; + width: 33.33333333%; + height: 100%; + } } // .screen-graph-end { diff --git a/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/style.less b/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/style.less index c18ba1d..0b143c0 100644 --- a/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/style.less +++ b/src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/style.less @@ -413,7 +413,8 @@ // border: none; background: none; border: 1px solid #8de3f3; - margin-right: 0.5rem; + // margin-right: 0.5rem; + margin: 0 0.5rem 0 0; &>a { color: #8de3f3; diff --git a/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/index.tsx b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/index.tsx index f44d02d..d546cad 100644 --- a/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/index.tsx +++ b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/index.tsx @@ -332,15 +332,16 @@ export default (props: any) => {
-

{bidMethodObj?.[basicInfo?.procurementMode]}

-

项目名称：{basicInfo?.projectName}

-

项目编号：{basicInfo?.projectNum}

-

标段名称：{basicInfo?.sectionName}

-

评标时间：{basicInfo?.startDate} —— {basicInfo?.endDate}

-

代理机构业务经理：{basicInfo?.appManagerName}

-

评标室人数：{basicInfo?.peopleNumber}人

+ {/*

{bidMethodObj?.[basicInfo?.procurementMode]}

*/} +

{bidMethodObj?.[basicInfo?.procurementMode]}

+

项目名称：{basicInfo?.projectName}

+

项目编号：{basicInfo?.projectNum}

+

标段名称：{basicInfo?.sectionName}

+

评标时间：{basicInfo?.startDate} —— {basicInfo?.endDate}

+

代理机构业务经理：{basicInfo?.appManagerName}

+

评标室人数：{basicInfo?.peopleNumber}人

- 人员信息业务经理：{basicInfo?.manager}人 招标人代表：{basicInfo?.purchaseExpert}人 专家：{basicInfo?.expert}人 + 人员信息   业务经理：{basicInfo?.manager}人   招标人代表：{basicInfo?.purchaseExpert}人   专家：{basicInfo?.expert}人
@@ -349,7 +350,7 @@ export default (props: any) => {
{basicInfo?.areaName}
-
{bidStatusMap[basicInfo?.status]}
+
{bidStatusMap[basicInfo?.status]}
@@ -376,14 +377,16 @@ export default (props: any) => {
-
-
监控画面：
-
- {caremaList.map(item =>
onCaremaPlay(item)} key={item.id}>{item.deviceName}
)} +
监控画面
+
+
+
+ {caremaList.map(item =>
onCaremaPlay(item)} key={item.id}>{item.deviceName}
)} +
+
+
+ {cameraParams && }
-
-
- {cameraParams && }
@@ -400,7 +403,7 @@ export default (props: any) => { ? backStrangerList.slice(0, 5).map((item: any, index: any) => (
-

时间：{item.createDate}

+

时间：{item.createDate}

drawerClick(item.details[0].filePath)} /> @@ -410,8 +413,8 @@ export default (props: any) => { : earlyWarnData?.strangerDetails?.map((item: any, index: any) => (
-

时间：{item.eventTime}

-

描述：{item.describeStranger}

+

时间：{item.eventTime}

+

描述：{item.describeStranger}

drawerClick(item.filePath)} /> diff --git a/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/style.less b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/style.less index a3e044a..cc47a1b 100644 --- a/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/style.less +++ b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/style.less @@ -14,21 +14,41 @@ width: 100%; &>p { - color: #94edf7; + color: #99f6ff; margin-bottom: 0; + line-height: 1.6; width: 100%; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; &:first-child { - color: #F59A23; + color: #FFCC00; + margin-bottom: 2px; } } - .left-content-people { + .left-content-title { + background-image: url('@{screen-img-url}/content_title_bg.jpg'); + background-repeat: no-repeat; + background-size: 100% 100%; + width: 7.5rem; + padding-left: 0.75rem; + line-height: 1.625rem; + font-size: 0.9rem; + } + + .left-content-label { color: #fff; - margin-top: 8px; + } + + .left-content-people { + color: #99f6ff; + + // margin-top: 8px; + .people-title { + color: #FFCC00; + } } } @@ -48,24 +68,44 @@ &>span { font-size: 22px; - line-height: 22px; + line-height: 24px; } } .top-title-right { .screen-flex-center; flex: 1; - color: #facd91; justify-content: center; + + &>div { + border-radius: 2px; + padding: 0.2rem 0.7rem; + line-height: 1.375rem; + } + + .ing-status { + border: 1px solid #FFCC00; + color: #FFCC00; + } + + .end-status { + border: 1px solid #ee6666; + color: #ee6666; + } } } .right-warn-title { - font-size: 20px; - line-height: 20px; - color: #ee6766; - padding-bottom: 1rem; + background-image: url('@{screen-img-url}/content_title_bg.jpg'); + background-repeat: no-repeat; + background-size: 100% 100%; + width: 7.8rem; + line-height: 1.725rem; + text-align: center; + color: #FFCC00; + font-size: 1rem; + margin-bottom: 1rem; } .right-warn-content { @@ -78,18 +118,18 @@ } .answer-supplier { - margin: 8px 0; + margin: 10px 0 8px; &>span { color: #fff; margin-bottom: 0; &:first-child { - color: #81d3f8; + color: #FFCC00; } &>a { - color: #00e1ff; + color: #99f6ff; margin-left: 8px; } } @@ -107,7 +147,7 @@ .left-monitor, .right-warn-list { - height: 83vh; + height: 82.6vh; } } @@ -115,7 +155,7 @@ .left-monitor, .right-warn-list { - height: 80.2vh; + height: 79.6vh; } } @@ -123,7 +163,7 @@ .left-monitor, .right-warn-list { - height: 76vh; + height: 75.6vh; } } @@ -131,7 +171,7 @@ .left-monitor, .right-warn-list { - height: 70vh; + height: 69.6vh; } } @@ -144,61 +184,97 @@ } .left-monitor { - border: 1px solid #fff; - margin-right: 4px; - padding: 12px; - display: flex; - justify-content: flex-start; + border: 1px solid #5c6aa2; + border-radius: 4px; + margin-right: 8px; - .left-menu { - color: #fff; - width: 15%; + .left-monitor-title { + display: flex; + justify-content: center; - .left-menu-title { - font-size: 18px; - padding-bottom: 16px; + &>div { + width: 375px; + height: 36px; + background-image: url('@{screen-img-url}/title_bg.png'); + background-repeat: no-repeat; + background-size: 100% 100%; + text-align: center; } - .left-menu-content { - .left-menu-btn { - height: 40px; - width: 100%; - line-height: 40px; - text-align: center; - cursor: pointer; - background: none; - } - - .left-menu-btn-select { - background-color: #81d3f8; - } + &>div>span { + color: #ffcd00; + line-height: 36px; + font-size: 1rem; } } - .right-content-c { - width: 100%; - height: 100%; - border: 1px solid #fff; + .left-monitor-content { + padding: 8px 12px; + display: flex; + justify-content: flex-start; + height: calc(100% - 36px); + + .left-menu { + color: #72c1dd; + width: 12%; + + .left-menu-content { + .left-menu-btn { + height: 36px; + width: 100%; + line-height: 36px; + text-align: center; + cursor: pointer; + background: none; + border-top-left-radius: 2px; + border-bottom-left-radius: 2px; + border: 1px solid #72c1dd; + border-right: none; + margin-bottom: 1rem; + transition: color 0.3s, background 0.3s, border-color 0.3s, box-shadow 0.3s + } + + .left-menu-btn-select { + background-color: #72c1dd; + color: #fff; + } + } + } + + .right-content-c { + width: 100%; + height: 100%; + position: relative; + left: -1px; + top: -1px; + } } } .right-warn-list { - border: 1px solid #fff; - margin-left: 4px; + border: 1px solid #5c6aa2; + border-radius: 4px; + margin-left: 8px; padding: 12px; + text-align: center; .stranger-list { height: calc(100% - 76px); .stranger-list-card { - border: 1px solid #2B5093; - background-color: #051666; + // border: 1px solid #2B5093; + // background-color: #051666; + border-bottom: 1px solid #5c6aa2; height: 20%; margin-top: 8px; padding: 8px; - color: #fff; + color: #99f6ff; display: flex; justify-content: space-between; + + &>div>p>span { + color: #fff; + } } } @@ -241,25 +317,41 @@ } .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) { - background: #02A7F0; - border-color: #02A7F0; + background: #72c1dd; + border-color: #72c1dd; &:hover { - background: #02A7F0; - border-color: #02A7F0; + background: #72c1dd; + border-color: #72c1dd; } } .ant-radio-button-wrapper-checked:not([class*=' ant-radio-button-wrapper-disabled']).ant-radio-button-wrapper:first-child { - border-right-color: #02A7F0; + border-right-color: #72c1dd; } .ant-radio-button-wrapper:hover { - color: #02A7F0; + color: #72c1dd; + } + + .ant-radio-button-wrapper { + color: #72c1dd; + border: 1px solid #72c1dd; + border-left-width: 0; + border-top-width: 1.02px; + background: none; + } + + .ant-radio-button-wrapper:first-child { + border-left: 1px solid #72c1dd; + } + + .ant-radio-button-wrapper:not(:first-child)::before { + background-color: #72c1dd; } .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled)::before, .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled):hover::before { - background-color: #02A7F0; + background-color: #72c1dd; } } \ No newline at end of file