From 94d3a4c3243e46c6184b194a6ebf2f5dc089f098 Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Thu, 28 Jul 2022 23:20:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BB=BA=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containers/footer/build/Rightbottom.js    |  6 ++--
 .../quanju/containers/footer/build/index.js   | 29 +++++++++++--------
 .../quanju/containers/footer/build/style.less |  2 +-
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js b/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js
index 17788224..ef527284 100644
--- a/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js
+++ b/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js
@@ -11,13 +11,15 @@ function Rightbottom(props) {
     "rgba(7,185,254,1)",
     "rgba(28,96,254,1)",
     "rgba(4,251,240,1)",
-    "rgba(255,194,20,1)"
+    "rgba(255,194,20,1)",
+    'rgba(255,255,255,1)'
   ]
   let underColorList = [
     "rgba(7,185,254,0.5)",
     "rgba(28,96,254,0.5)",
     "rgba(4,251,240,0.5)",
-    "rgba(255,194,20,0.5)"
+    "rgba(255,194,20,0.5)",
+    'rgba(255,255,255,0.5)',
   ]
   let name = [], emptyName = []
   // const name = data?.map(d)
diff --git a/web/client/src/sections/quanju/containers/footer/build/index.js b/web/client/src/sections/quanju/containers/footer/build/index.js
index 66f67e1b..a65a7157 100644
--- a/web/client/src/sections/quanju/containers/footer/build/index.js
+++ b/web/client/src/sections/quanju/containers/footer/build/index.js
@@ -12,7 +12,8 @@ import RightBottom from './Rightbottom'
 import AutoRollComponent from './AutoRollComponent'
 import './style.less'
 import {getdaolutongji,getxuanchuan} from '../../../actions/example'
-import { number } from 'echarts';
+import { Carousel } from 'antd';
+// import { number } from 'echarts';
 const Build = (props) => {
     const { dispatch } = props
     let data1 = [
@@ -89,20 +90,11 @@ const Build = (props) => {
        let safetyData = alldengji?.filter(item=>item.name==='一级公路'||item.name==='二级公路'||item.name==='三级公路'||item.name==='四级公路'||item.name==='等外公路')
        let sundata = data?.reduce((x,y)=>x+y.value,0)
        let sunsafetyData = safetyData?.reduce((x,y)=>x+y.value,0)
-    //   console.log(safetyData,'好凶猛')
-    //   console.log(data1,'对比')
-      // console.log(totalgongli,"好好的")
-    // console.log(keepThreeNum(totalgongli),'jjjjj')
+
     useEffect(()=>{
         requestbuildingnumber();
         requestxuanchuanlan()
     },[])
-    // const datas = new Array(15)
-    // datas.fill({
-    //     name:"东乡镇",
-    //     number:"11111",
-    //     gongli:'9999'
-    // },0,15)
     const rendercontent = ()=>{
         return (<div className='build-left-center-content'>
         {list.map(({name,number,gongli},index)=><div className='build-left-center-item' key={index}>
@@ -201,7 +193,20 @@ const Build = (props) => {
             }} customize={true}>
                <div className='build-right-top'>
                {/* <img src='/assets/images/quanju/xuanchuanlan.jpg'></img> */}
-               <video src={xuandata&&xuandata!==null&&xuandata.length!==0?`${localStorage.getItem("qndmn")}/${xuandata[0].video!==null&&xuandata[0].video?xuandata[0].video[0]:""}`:"#"} autoPlay="autoplay" loop></video>
+              <Carousel autoplay={true} dots={false} autoplaySpeed={180000}>
+              {xuandata&&xuandata!==null&&xuandata.length!==0?xuandata.map((item,index)=>{
+                if(item.enable){
+                    if(item.video&&item.video!==null&&item.video.length!==0){
+                        return item.video.map((i,index)=>{
+                            // console.log(i,'视频')
+                            return <video src={`${localStorage.getItem("qndmn")}/${i}`} autoPlay="autoplay" loop></video>
+                        })
+                    }
+                    // return <video src={`${localStorage.getItem("qndmn")}/${item.video!==null&&item.video.length!==0?item.video[0]:""}`} autoPlay="autoplay" loop></video>
+                }
+              }):""}
+              {/* <video src={xuandata&&xuandata!==null&&xuandata.length!==0?`${localStorage.getItem("qndmn")}/${xuandata[0].video!==null&&xuandata[0].video?xuandata[0].video[0]:""}`:"#"} autoPlay="autoplay" loop></video> */}
+              </Carousel>
                <h2>全面建设好农村公路，切实发挥先行官作用</h2>
                </div>
             </Module>
diff --git a/web/client/src/sections/quanju/containers/footer/build/style.less b/web/client/src/sections/quanju/containers/footer/build/style.less
index 7af5871d..436f2e8c 100644
--- a/web/client/src/sections/quanju/containers/footer/build/style.less
+++ b/web/client/src/sections/quanju/containers/footer/build/style.less
@@ -214,7 +214,7 @@
            padding: 0 10px;
            video{
             width: 100%;
-            height: 65%;
+            height: 17vh;
             // margin-bottom: 5%;
  
            }

From e959c27497da215e7cc4578d7eec552e2f3c4e6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98lijianhao=E2=80=99?= <li.jianhao@free-sun.com.cn>
Date: Fri, 29 Jul 2022 08:59:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quanju/containers/footer/conserve/left/left-center.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js b/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js
index 9aa8b9ea..07350e7e 100644
--- a/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js
+++ b/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js
@@ -172,7 +172,7 @@ const LeftCenter = (props) => {
                         rich: {
                             a: {
                                 backgroundColor: {
-                                    image: 'assets/images/quanju/circle2.png'
+                                    image: '/assets/images/quanju/circle2.png'
                                 },
                                 width: 15,
                                 height: 15,