diff --git a/config/proxy.ts b/config/proxy.ts index 7d6f38f7e6e57a20f0608485b9b46235054bd375..d8b8bf836db9acef63823cedc5a2dce5ed4949de 100644 --- a/config/proxy.ts +++ b/config/proxy.ts @@ -5,10 +5,4 @@ export default { pathRewrite: { '^/apis': '' }, logLevel: 'debug', }, - // '/coordination': { - // target: 'http://172.23.3.193:21633', - // changeOrigin: true, - // pathRewrite: { '^/coordination': '' }, - // logLevel: 'debug', - // }, } as Record; diff --git a/src/pages/Common/Quality/Modal/index.tsx b/src/pages/Common/Quality/Modal/index.tsx index 9beb96bf4a4788ba5a2124ad7ec6025451d421ad..818324d1469cee062e4e42e188de67a754a44926 100644 --- a/src/pages/Common/Quality/Modal/index.tsx +++ b/src/pages/Common/Quality/Modal/index.tsx @@ -2,7 +2,7 @@ import { useMemo } from 'react' import { useModel } from '@umijs/max'; import Modal from '@/components/HncyModal'; import Category from '@/pages/Common/Quality/Category'; // CQI类别 -import InfluenceSign from '@/pages/Common/InfluenceSign' +import InfluenceSign from '@/pages/Common/Sign/InfluenceSign' /** * diff --git a/src/pages/Common/InfluenceSign/index.less b/src/pages/Common/Sign/InfluenceSign/index.less similarity index 100% rename from src/pages/Common/InfluenceSign/index.less rename to src/pages/Common/Sign/InfluenceSign/index.less diff --git a/src/pages/Common/InfluenceSign/index.tsx b/src/pages/Common/Sign/InfluenceSign/index.tsx similarity index 90% rename from src/pages/Common/InfluenceSign/index.tsx rename to src/pages/Common/Sign/InfluenceSign/index.tsx index c1295aa5dacd741af88f280b04982b00bb236b92..0368913a6f7e4de75dfdc2e442b7a2afece5f8f0 100644 --- a/src/pages/Common/InfluenceSign/index.tsx +++ b/src/pages/Common/Sign/InfluenceSign/index.tsx @@ -1,7 +1,5 @@ import { Divider, Space } from 'antd'; - import styles from './index.less' -import IssueDescription from '@/pages/Common/components/IssueDescription' import EventPicList from '@/pages/Common/components/EventPicList' import { eventList } from '@/mock/event' import { useState } from 'react' @@ -12,8 +10,8 @@ import { useState } from 'react' const InfluenceSign = () => { - //事件列表 - const [listData, setListData] = useState({ + //事件列表 + const [listData, setListData] = useState({ items: eventList, loading: true, total: 0, @@ -105,12 +103,12 @@ const InfluenceSign = () => { { - // setFetchParams({ ...fetchParams, page: data.page }) - }} - /> + listData={listData} + listHeight={600} + setParams={(data) => { + // setFetchParams({ ...fetchParams, page: data.page }) + }} + /> ) } diff --git a/src/pages/Common/SignModel/SignArithmetic/index.less b/src/pages/Common/Sign/SignModel/SignArithmetic/index.less similarity index 100% rename from src/pages/Common/SignModel/SignArithmetic/index.less rename to src/pages/Common/Sign/SignModel/SignArithmetic/index.less diff --git a/src/pages/Common/SignModel/SignArithmetic/index.tsx b/src/pages/Common/Sign/SignModel/SignArithmetic/index.tsx similarity index 100% rename from src/pages/Common/SignModel/SignArithmetic/index.tsx rename to src/pages/Common/Sign/SignModel/SignArithmetic/index.tsx diff --git a/src/pages/Common/SignModel/index.less b/src/pages/Common/Sign/SignModel/index.less similarity index 100% rename from src/pages/Common/SignModel/index.less rename to src/pages/Common/Sign/SignModel/index.less diff --git a/src/pages/Common/SignModel/index.tsx b/src/pages/Common/Sign/SignModel/index.tsx similarity index 100% rename from src/pages/Common/SignModel/index.tsx rename to src/pages/Common/Sign/SignModel/index.tsx diff --git a/src/pages/UrbanSituation/Quality/InfluenceIndex/index.tsx b/src/pages/UrbanSituation/Quality/InfluenceIndex/index.tsx index 948edae87de2ab927df7d51fcd3ae31627c57579..98190466fe91d7ef8a96edc9e04a9224aae71a6e 100644 --- a/src/pages/UrbanSituation/Quality/InfluenceIndex/index.tsx +++ b/src/pages/UrbanSituation/Quality/InfluenceIndex/index.tsx @@ -2,7 +2,7 @@ import { useState, useEffect } from 'react'; import { Flex, Spin } from 'antd' import styles from './index.less' import Modal from '@/components/HncyModal'; -import InfluenceSign from '@/pages/Common/InfluenceSign' +import InfluenceSign from '@/pages/Common/Sign/InfluenceSign' import services from '@/services'; const InfluenceIndex = () => { @@ -40,9 +40,8 @@ const InfluenceIndex = () => { indexType: '1', // 内评价0,外评价1,默认外评价 } services.Physicalsign.getPhysicalsignindexquestioninstanceListTop(params).then((res) => { - console.log(res) if (res.code === 200) { - setQuestionData(res.data.length ? res.data : ranks) + setQuestionData(res.data) setLoading(false) } }) @@ -59,13 +58,19 @@ const InfluenceIndex = () => { style={{ width: '100%', height: '100%' }} > { - questionData.map((item, index) => ( - setModalOpen(true)}> + questionData.map((item, index: number) => ( + setModalOpen(true)} + >
TOP{index + 1}
-
{item.fullName}
-
{item.conditionName}
+
{item.conditionName}
+
{item.fullName}
diff --git a/src/pages/UrbanSituation/Quality/LineCharts/index.tsx b/src/pages/UrbanSituation/Quality/LineCharts/index.tsx index 332ba5eca113f256dfcaf3be7001850c23435912..29215961a6ac65ca8af1a646fbb68e8fc776aa15 100644 --- a/src/pages/UrbanSituation/Quality/LineCharts/index.tsx +++ b/src/pages/UrbanSituation/Quality/LineCharts/index.tsx @@ -1,23 +1,26 @@ import { useMemo } from 'react' import ReactEcharts from 'echarts-for-react'; -const LineCharts = ({ dataSource }: { dataSource: any[]}) => { + +const LineCharts = ({ dataSource }: { dataSource: any[] }) => { const option = useMemo(() => { - const data: any = dataSource?.length ? dataSource?.map(item => item.qualitySign) : [30, 40, 50, 60, 50, 40, 30, 50, 30, 40, 50, 60, 50, 40, 30, 100] - const showXAis = false + const data: any = dataSource?.map(item => item.qualitySign) return { + tooltip: { + trigger: 'axis', + }, xAxis: { type: 'category', boundaryGap: false, - show: showXAis, - data: showXAis ? data?.map((item: any) => item.name) : [], + show: false, + data: dataSource?.map((item: any) => item.time), }, yAxis: { type: 'value', show: false, }, grid: { - left: '5%', // 左边距 + left: '2%', // 左边距 right: '0', // 右边距 top: '10%', // 上边距 bottom: '10%' // 下边距 @@ -30,7 +33,6 @@ const LineCharts = ({ dataSource }: { dataSource: any[]}) => { lineStyle: { color: "#57EF58", }, - areaStyle: { // 区域填充样式。设置后显示成区域面积图。 color: { diff --git a/src/pages/UrbanSituation/Quality/index.less b/src/pages/UrbanSituation/Quality/index.less index e4558494a341d281b005bd5f6ce7fe71f4d45c4e..a05dab2cae8d1ff609850433279ec62c835d033c 100644 --- a/src/pages/UrbanSituation/Quality/index.less +++ b/src/pages/UrbanSituation/Quality/index.less @@ -64,7 +64,7 @@ .cardSection { padding: 0 30px; - margin-top: 20px; + margin-top: 10px; height: 76px; .card { width: 122px; diff --git a/src/pages/UrbanSituation/Quality/index.tsx b/src/pages/UrbanSituation/Quality/index.tsx index 9d8d9a96d3413340d563575c774b5756e39fcebd..8c8c8015bff95f3ed1369eeea08b0bce4fee5174 100644 --- a/src/pages/UrbanSituation/Quality/index.tsx +++ b/src/pages/UrbanSituation/Quality/index.tsx @@ -2,7 +2,7 @@ import { ReactNode, useState, useMemo, useEffect } from 'react'; import { Flex, Space } from 'antd' import { useModel } from '@umijs/max' import classNames from 'classnames' -import { QuestionCircleFilled, CaretUpFilled } from '@ant-design/icons'; +import { QuestionCircleFilled, CaretUpFilled, CaretDownOutlined } from '@ant-design/icons'; import styles from './index.less' import LineCharts from './LineCharts'; import QualityModal from '@/pages/Common/Quality/Modal'; @@ -12,7 +12,7 @@ import WarningArea from './WarningArea'; import services from '@/services'; import { getCqiStatusStyle, getCqiStatusTexts } from '@/utils/ui' import Modal from '@/components/HncyModal'; -import SignModel from '@/pages/Common/SignModel'; +import SignModel from '@/pages/Common/Sign/SignModel'; /** * @@ -57,7 +57,8 @@ const Quality = () => { return comp[tabActive]; }, [tabActive]); - useEffect(() => { + // 获取CQI数据 + const getCqiData = () => { const params = { physicalSignType: '1', // 1实况指数 3周期指数 indexType: '1', // 指数体系类型 0:内评价 1:外评价 @@ -70,6 +71,10 @@ const Quality = () => { setCqiData(res.data) } }) + } + + useEffect(() => { + getCqiData() }, []) return ( @@ -100,8 +105,16 @@ const Quality = () => { {cqiData.desc} - - {cqiData.diffValue} + { + cqiData.status === 'up' && () + } + { + cqiData.status === 'down' && () + } + {cqiData.diffValue} diff --git a/src/pages/UrbanSituation/Security/index.tsx b/src/pages/UrbanSituation/Security/index.tsx index 14200dc4039e557af7453ee52774347782861eaa..c188a254c8ee8422dcf39a96a8b351f20955244f 100644 --- a/src/pages/UrbanSituation/Security/index.tsx +++ b/src/pages/UrbanSituation/Security/index.tsx @@ -1,4 +1,4 @@ -import { ReactNode, useState, useMemo } from 'react'; +import { useState } from 'react'; import { Flex, Space } from 'antd' import styles from './index.less' import risk1 from '@/assets/images/urbanSituation/risk1.png'