From b9302fdf98b68e31010e6feaad8356e3fa68e16a Mon Sep 17 00:00:00 2001 From: wangyue Date: Wed, 27 Jul 2022 17:14:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/images/leadership/weizhis.png | Bin 0 -> 577 bytes .../assets/images/leadership/youofanye.png | Bin 0 -> 742 bytes .../assets/images/leadership/zuofanye.png | Bin 0 -> 750 bytes .../footer/leadership/centerleft/daolu.js | 18 ++++--- .../footer/leadership/centerleft/handong.js | 12 +++-- .../centerleft/lunbo/bottomlunbo.js | 6 +-- .../leadership/centerleft/lunbo/style.less | 7 ++- .../leadership/centerleft/lunbo/toplunbo.js | 7 +-- .../footer/leadership/centerleft/qiqoliang.js | 14 +++-- .../leadership/left/echarts/lefttopecharts.js | 2 +- .../footer/leadership/left/left-top.js | 8 +-- .../footer/leadership/right/hudong.js | 49 +++++++++++++----- .../footer/leadership/right/right-bottom.js | 8 +-- .../footer/leadership/right/right-top.js | 5 +- 14 files changed, 92 insertions(+), 44 deletions(-) create mode 100644 web/client/assets/images/leadership/weizhis.png create mode 100644 web/client/assets/images/leadership/youofanye.png create mode 100644 web/client/assets/images/leadership/zuofanye.png diff --git a/web/client/assets/images/leadership/weizhis.png b/web/client/assets/images/leadership/weizhis.png new file mode 100644 index 0000000000000000000000000000000000000000..2a3eaf75cecbf61e3e5c1c48e4b75a2088387869 GIT binary patch literal 577 zcmV-H0>1r;P)Px$`$$U-cX#!|CTENrJJnMq1q-RXIr9=H3vueY3f>goQ^{oQlUJ@?3eGIN{| z!g8PwSO+Wxrh!kuOZ7u;&tISr!aU#ra2SaHIeQ9RQ)lX81uCMrT13$);VIy(`mS`G z1%(ji03*PLPK28N8Q7!7v?)RRfRh=>7vLkX5?GbdpQ-0(K_P_2z;j?h&GBcf1Mo-< zMbw*si$G5TY^jqGv<*vcTJd5cQh3}gb-8it?83$D}s&y@vB>3c^jGZo+O2@BH9cLB^&Ok*E5jqz@=n; zSRIQIEdgF+Qh5N3s^3Bg@kaZBL11CxdrW;>_R(WtbwgcZ7so4~o6&y*Th#9*XaG3a zMOT-u6KdRBb@nnKKF0Z7!Uoid3RHCNIbc^8p!e$j(!c)t*8mUOjF0q;(`t1|={#xy z$NwR!SL&&{UkZxjWE5E61{TN1UiE7usHoKn;6AXZ0XC?Px%ph-kQR7gvm)lWziVHgJR=biOW?d)2CM8^s`c*7K^-DtQ~G1% zjEQ)N1uIKuN3w{_P6-i81R)X_(IqH61Q8U{p+Z7R%$%LIXlI_7wOyukb;db<%=6=Y zzweuOB(Ag8B^pG*SlW;WSjD62YzI&W7yY7Y93rsQb3}06PRU>xGuFzDu8YxJ9>{p$ zAc3kp5>as3GUQQEbX_aA{B|*%e_twESe*s>ASn5}ND*|{DH#ibE&{!fs&Nm2E&xgn z5o99@bgM^Rtb{HJdZD<+gAQ=f2mAtXHe<@`<bd2DM z%DlH03iJY-lU(!7!YvZp3#|&qtK(>Xo|J58&_gQQ7@v1=hs3r#ssLSSQy#7g+?8a> z_zxHq)cW?b&o<>=XwW|8RpW62=X_XN0U9k+CPH8An9f5k(cugJ6a}YkL*9h`^i-XD zNnBc(=m3apiQxR4DKA402k(dF00vl?-mapcJ#EOd(Bmt5fji*f27q#3IGHhJq!?E8 zlw)nIqJ!Hc)WVmbzzFhNU33qHZpA89pLTP%QsmRA(cIIw-jN Y2XYuw>A{Y+EC2ui07*qoM6N<$f`QmdQ~&?~ literal 0 HcmV?d00001 diff --git a/web/client/assets/images/leadership/zuofanye.png b/web/client/assets/images/leadership/zuofanye.png new file mode 100644 index 0000000000000000000000000000000000000000..8c082084d0ea4f3a89dbb635f8c76a78983f80b8 GIT binary patch literal 750 zcmVPx%s7XXYR7gvml}$(#aTvy*cQz$=cDGFeJ=n*gD1-=tzz#(eLJ~m*>LDsf!b1_c zJ6l2#;~@{aD|U&Bz(W{ecnCzuf~<}3P=^lH*+W5)AUZq6t}{>UwmbZhRcCf?Gyi#i z^SsadF`^s10T%-lJhd}&4K-X5gV$XbT?k=N^dy%^M2nn;2DB{PlOI8tdV&Ul;bM#c zUnQI%D*$a1TCE}Z?iUy~cm*yVEAM}*85l{h+Z8+mp_PDwye84FT*GrdU9zQD+vwaVK~Ku;@~ZTSj9Kd(3eZgsCVxd7)^4Y z3uH-bQ;J~PBQl^C(U-z_KX>H|$bx9`lmMf-5$Rjq5gP*a6r1TF3t+bg6O37D^oWSp za=udD($B3cdAuXAUr{o7stw&Qy2Pp0uWKr7GN>=RcmtqKNpogr45z=Dl3%O&s{&h1 z*3U0vn#2h&Q1CGxMf*=v?DZz8DllTO*LCqwQTC-ShGUDSEN(QGRe`#}6kQA{MVLAi z#o1X?R%!yqO~wn$m?N=QfsR{gT&PxAUwzn^;P$`32LL-1A0OBmxfueDqx9%<90?q`}T0P1>q#`g7B8B2!2ZlM{5QaKcFW$ zLc&|J0?de>-~xfhQvRFKoEwy1>rH}sMp7aMo{+d)uKc{{DPDw&J0!+e{~!E-J0}>L gp2H&modWd#1L?h9Y@>8H!vFvP07*qoM6N<$f`^nu2><{9 literal 0 HcmV?d00001 diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js index 43bbb7ba..8f1b8196 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js @@ -14,7 +14,10 @@ const Right = (props) => { setList(res.payload.data.reportList.filter((item, index) => { return item.projectType == "road" })) - setNums(res.payload.data.processed) + setNums(res.payload.data.reportCount.filter((item, index) => { + return item.projectType == "road" + })) + console.log(res.payload.data); }) }, []) useEffect(() => { @@ -24,6 +27,7 @@ const Right = (props) => { // const }) }, []) + console.log("1211", nums); const renderBody = () => { return ( @@ -59,13 +63,13 @@ const Right = (props) => {

{roads?.["县"].toFixed(3)}公里县道道路

-
- - {/*
-
*/} +
-
+ {/*
+ +
*/} +

乡村道道路{(roads?.["乡"] + roads?.["村"]).toFixed(3)}公里

@@ -77,7 +81,7 @@ const Right = (props) => { {/*

{title || []}

*/} 养护事件 -

道路{nums || []}次

+

道路{nums ? nums[0]?.count : []}次

{/* */}
{ const [beijing, setBeijing] = useState() const [list, setList] = useState([]) const [roads, setRoads] = useState() + const [nums, setNums] = useState() useEffect(() => { const daolus = dispatch(getRoadmaintain()).then((res) => { setList(res.payload.data.reportList.filter((item, index) => { return item.projectType == "culvert" })) + setNums(res.payload.data.reportCount.filter((item, index) => { + return item.projectType == "culvert" + })) }) }, []) useEffect(() => { @@ -59,16 +63,16 @@ const Right = (props) => {

{roads?.["县"].toFixed(0)}个县涵洞

-
+
{/*
*/} -
+
-

乡村涵洞{(roads?.["乡"] + roads?.["村"]).toFixed(3)}个

+

乡村涵洞{(roads?.["乡"] + roads?.["村"]).toFixed(0)}个

占比{((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100}%

@@ -77,7 +81,7 @@ const Right = (props) => { {/*

{title || []}

*/} 养护事件 -

道路187次

+

涵洞{nums ? nums[0]?.count : []}次

{/* */} { 业户信息:
-
- -

出租车

+
+ +

出租车

{ @@ -30,9 +31,9 @@ const Toplunbo = (props) => { height: "50%", }}>
-
- -

危险货运

+
+ +

危险货运

{ const [beijing, setBeijing] = useState() const [list, setList] = useState([]) const [roads, setRoads] = useState() + const [nums, setNums] = useState() useEffect(() => { const daolus = dispatch(getRoadmaintain()).then((res) => { setList(res.payload.data.reportList.filter((item, index) => { return item.projectType == "bridge" })) + setNums(res.payload.data.reportCount.filter((item, index) => { + return item.projectType == "bridge" + })) }) }, []) useEffect(() => { @@ -55,16 +59,16 @@ const Right = (props) => {

占比{(roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(4) * 100}%

-

{roads?.["大桥"]}座大桥

+

{roads?.["大桥"]}座大桥

-
+
-
+
-
+

中小桥梁{roads?.["小桥"] + roads?.["中桥"]}座

@@ -76,7 +80,7 @@ const Right = (props) => { {/*

{title || []}

*/} 养护事件 -

道路187次

+

桥梁{nums ? nums[0]?.count : []}次

{/* */}
{ offsetCenter: [0, 46], // x, y，单位px textStyle: { color: "#fff", - fontSize: 14, //表盘上的标题文字大小 + fontSize: "2vh", //表盘上的标题文字大小 fontWeight: 400, fontFamily: "PingFangSC", }, diff --git a/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js b/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js index fed0cc13..38a4aeb0 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js @@ -9,9 +9,11 @@ const Lefttop = () => { const style = { height: "68%" } useEffect(() => { // return () => { - request('GET', '/search').then((success, failure) => { - console.log(success); - }); + request('get', 'https://report.amap.com/ajax/districtRank.do?linksType=1&cityCode=360100') + // .set({ 'cookie': 'user_unique_id=a185bbc78215de5101823ec9f8455ff7; SESSION=781150e0-bd25-4431-b3ac-267bb49075fd; UM_distinctid=1823ec9ec89ce5-08fca33c64505f-76492e29-1fa400-1823ec9ec8a1447; CNZZDATA1256662931=1445129462-1658907884-https%253A%252F%252Freport.amap.com%252F%7C1658907884' }) + .then((success, failure) => { + console.log(success, failure); + }); // }; }, []) return ( diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/hudong.js b/web/client/src/sections/quanju/containers/footer/leadership/right/hudong.js index e2b47bb4..0f169f72 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/right/hudong.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/right/hudong.js @@ -61,20 +61,41 @@ class ReactCarousel extends Component { this.state.imgs.map((value, index) => { return ( -
  • -
    - {value[0]?.name} +
    +
    +
    + + {value[0]?.name} +
    +
    +
    - {value[1]?.name ?
    - {value[1]?.name} + {value[1]?.name ?
    +
    +
    + + {value[1]?.name} +
    +
    : ""} - {value[2]?.name ?
    - {value[2]?.name} + {value[2]?.name ?
    +
    +
    + + {value[2]?.name} +
    +
    : ""} - {value[3]?.name ?
    - {value[3]?.name} + {value[3]?.name ?
    +
    +
    + + {value[3]?.name} +
    +
    : ""} {/*
    {value[1].name}
    {value[2].name}
    @@ -97,8 +118,12 @@ class ReactCarousel extends Component { */}
    - { this.previous(e) }}>左 - { this.next(e) }}>右 + { this.previous(e) }}> + + + { this.next(e) }}> + +
    @@ -119,7 +144,7 @@ class ReactCarousel extends Component { let { timer } = this.state; timer = setInterval(() => { this.next(); - }, 300000); + }, 2000); this.setState({ timer }) diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js b/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js index 833f6b23..5ce2477f 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js @@ -27,10 +27,10 @@ const Rightbottom = (props) => { // console.log(beijing); }}> {beijing == index ? : ""} -
    {item.licensePlate}
    -
    {item.overrunRate ? item.overrunRate : "--"}
    -
    {item.deductPoints ? "-" + item.deductPoints + "分" : ""}{item.deductPoints && item.fine ? "和" : ""}{item.fine ? "-" + item.fine + "元" : ""}{item.deductPoints || item.fine ? "" : "--"}
    -
    {item.processingTime ? item.processingTime : "--"}
    +
    {item.licensePlate}
    +
    {item.overrunRate ? item.overrunRate : "--"}
    +
    {item.deductPoints ? "-" + item.deductPoints + "分" : ""}{item.deductPoints && item.fine ? "和" : ""}{item.fine ? "-" + item.fine + "元" : ""}{item.deductPoints || item.fine ? "" : "--"}
    +
    {item.processingTime ? item.processingTime : "--"}
    • }) diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js b/web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js index 51a657c3..d3bd3cd4 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js @@ -73,9 +73,12 @@ const Righttop = () => { return ( <> -
    +
    +

    监控总数

    129

    +

    在线率

    88.87%

    +