12.30 第六版

src/pages/ElecEvaluation/Monitor/Home/index.tsx

@@ -309,9 +309,9 @@ export const ProgressItem = (props: { title: string, progress: number, leftTitle
     )
 }
 //下拉框封装
-export const SelectItem = (props: { onSelectChange: (value: string | number) => void, options: ({ label: string, value: string | number })[] }) => {
+export const SelectItem = (props: { onSelectChange: (value: string | number) => void, options: ({ label: string, value: string | number })[], defaultText?: string }) => {
-    const { onSelectChange, options } = props;
+    const { onSelectChange, options, defaultText = "全部" } = props;
-    const [selectedItem, setSelectItem] = useState<string | number>("全部");
+    const [selectedItem, setSelectItem] = useState<string | number>(defaultText);
     const menu = (
         <Menu>
             {options?.map(item => (
@@ -1446,7 +1446,7 @@ const MonitorHome: React.FC<{}> = () => {
                             <ScreenLabel title="招标代理实施项目统计" />
                         </div>
                         <div className="tender-agent">
-                            <StatisticTable columns={tjColumns} dataSource={ymChange == "year" ? annualAndTenderAgentData?.agencyProjectYear : annualAndTenderAgentData?.agencyProjectMonth} ynum={340} />
+                            <StatisticTable columns={tjColumns} dataSource={annualAndTenderAgentData?.agencyProjectYear} ynum={340} />
                         </div>
                     </div>
                 </Col>

src/pages/ElecEvaluation/Monitor/Supplier/index.tsx

@@ -192,7 +192,7 @@ const Supplier: React.FC<{}> = () => {
                 </Col>
                 <Col span={16}>
                     <div className="monitor-right-main">
-                        <ScreenLabel title="省分活跃供应商排名" extra={<span><span className='monitor-extra-pointer' onClick={() => { monthOrYear.current = "yearData"; chartDataChange(); }}>本年</span> | <span className='monitor-extra-pointer' onClick={() => { monthOrYear.current = "monthData"; chartDataChange(); }}>本月</span>&nbsp;&nbsp;&nbsp;&nbsp;<span className='monitor-extra-pointer' onClick={() => { metric.current = "tenderCount"; chartDataChange(); }}>投标次数</span> | <span className='monitor-extra-pointer' onClick={() => { metric.current = "selectCount"; chartDataChange(); }}>中选次数</span> | <span className='monitor-extra-pointer' onClick={() => { metric.current = "bidCost"; chartDataChange(); }}>中选金额</span>&nbsp;&nbsp;&nbsp;&nbsp;{province.current}</span>} />
+                        <ScreenLabel title="省分活跃供应商排名" extra={<span><span className={monthOrYear.current == "yearData" ? 'monitor-extra-pointer monitor-extra-pointer-select' : 'monitor-extra-pointer'} onClick={() => { monthOrYear.current = "yearData"; chartDataChange(); }}>本年</span> | <span className={monthOrYear.current == "monthData" ? 'monitor-extra-pointer monitor-extra-pointer-select' : 'monitor-extra-pointer'} onClick={() => { monthOrYear.current = "monthData"; chartDataChange(); }}>本月</span>&nbsp;&nbsp;&nbsp;&nbsp;<span className={metric.current == "tenderCount" ? 'monitor-extra-pointer monitor-extra-pointer-select' : 'monitor-extra-pointer'} onClick={() => { metric.current = "tenderCount"; chartDataChange(); }}>投标次数</span> | <span className={metric.current == "selectCount" ? 'monitor-extra-pointer monitor-extra-pointer-select' : 'monitor-extra-pointer'} onClick={() => { metric.current = "selectCount"; chartDataChange(); }}>中选次数</span> | <span className={metric.current == "bidCost" ? 'monitor-extra-pointer monitor-extra-pointer-select' : 'monitor-extra-pointer'} onClick={() => { metric.current = "bidCost"; chartDataChange(); }}>中选金额</span>&nbsp;&nbsp;&nbsp;&nbsp;{province.current}</span>} />
                         <Row>
                             <Col span={14}>
                                 <div className="monitor-supplier-rank">

src/pages/ElecEvaluation/Monitor/TenderAgent/index.tsx

@@ -195,7 +195,7 @@ const TenderAgent: React.FC<{}> = () => {
                             <Radio.Button value="0">代理分布省分</Radio.Button>
                             <Radio.Button value="1">省分代理分布</Radio.Button>
                         </Radio.Group>
-                        <SelectItem options={selectData} onSelectChange={onSelectChange} />
+                        <SelectItem options={selectData} onSelectChange={onSelectChange} defaultText="请选择" />
                     </div>
                     <div className="monitor-tender-map">
                         {mapChart}

src/pages/ElecEvaluation/Monitor/style.less

@@ -9,7 +9,7 @@
 .screen-global {
     width: 100%;
     height: 100%;
-    background: url("~@/assets/monitor/background-2.jpg") left top no-repeat;
+    background: url("~@/assets/monitor/background-3.gif") left top no-repeat;
     background-size: cover;
     // background-color: #0a0c11;
 
@@ -50,7 +50,7 @@
 .monitor-main {
     height: 100%;
     // background-color: #0a0c11;
-    background: url("~@/assets/monitor/background-3.jpg") left top no-repeat;
+    background: url("~@/assets/monitor/background-3.gif") left top no-repeat;
     background-size: cover;
 
     .monitor-title {
@@ -485,6 +485,10 @@
                 text-decoration: underline;
             }
         }
+
+        .monitor-extra-pointer-select {
+            color: #1B7EF2;
+        }
     }
 }
 

src/pages/ElecEvaluation/MonitorScreen/MonitorRoom/index.tsx

@@ -147,7 +147,7 @@ const provinceList = [{
 //     return originalElement;
 // };
 export const homeClick = () => {
-    history.push("/ElecMonitorScreen/Home");
+    history.push("/ElecMonitor/Home");
 }
 export const previousClick = () => {
     history.goBack();