diff --git a/src/assets/screen/content_title_bg.jpg b/src/assets/screen/content_title_bg.jpg new file mode 100644 index 0000000..67d8c3c Binary files /dev/null and b/src/assets/screen/content_title_bg.jpg differ 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