巴林闲侠 2 years ago
parent
commit
c5a4c8a87b
  1. 2
      web/client/src/layout/components/header/index.js
  2. 4
      web/client/src/sections/quanju/containers/footer/build/index.js
  3. 5
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js
  4. 2
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js
  5. 2
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js
  6. 6
      web/client/src/sections/quanju/containers/footer/leadership/left/echarts/lefttopecharts.js
  7. 4
      web/client/src/sections/quanju/routes.js
  8. 6468
      web/log/development.txt

2
web/client/src/layout/components/header/index.js

@ -56,7 +56,7 @@ const Header = props => {
style={{ border: 0 }}
onClick={handelClick}
>
<div style={{ display: 'inline-block', cursor: "pointer" }} onClick={() => history.push(`/quanju`)}>进入大屏</div>
<div style={{ display: 'inline-block', cursor: "pointer" }} onClick={() => history.push(`/screen/cockpit`)}>进入大屏</div>
<Menu.SubMenu key="user" title={
<div style={{
margin: '0 8px'

4
web/client/src/sections/quanju/containers/footer/build/index.js

@ -112,6 +112,8 @@ const Build = (props) => {
</div>)}
</div>)
}
const xuandata1 = undefined
console.log(localStorage.getItem("qndmn"),'七牛')
return (
<div className='bgbuild'>
<div className='bgbuild-left'>
@ -191,7 +193,7 @@ const Build = (props) => {
}} customize={true}>
<div className='build-right-top'>
{/* <img src='/assets/images/quanju/xuanchuanlan.jpg'></img> */}
<video src={xuandata?` _file-server/${xuandata[0].video[0]}`:"#"} autoplay></video>
<video src={xuandata?`${localStorage.getItem("qndmn")}/${xuandata[0].video!==null?xuandata[0].video[0]:""}`:"#"} autoPlay="autoplay" loop></video>
<h2>全面建设好农村公路切实发挥先行官作用</h2>
</div>
</Module>

5
web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js

@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react'
import Lun from "../right/lunbo"
import { getRoadmaintain, getdaolutongji } from "../../../../actions/example"
import moment from 'moment'
import { Spin } from 'antd'
const Right = (props) => {
const { dispatch } = props
@ -44,7 +45,7 @@ const Right = (props) => {
}}>
{beijing == index ? <img src='/assets/images/leadership/shezhi.png' style={{ width: "2%", height: "80%", position: "absolute", top: "12%", left: "1%" }} /> : ""}
{beijing == index ? <img src='/assets/images/leadership/lan.png' style={{ width: "100%", height: "120%", position: "absolute", right: "5%" }} /> : ""}
<p style={{ textAlign: "center", width: "25%", position: "absolute", left: "18%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
<p style={{ textAlign: "center", width: "25%", position: "absolute", left: "18%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
<p style={{ textAlign: "center", width: "10%", position: "absolute", left: "43%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >日常养护</p>
{item.user?.name ? <p style={{ textAlign: "center", width: "10%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.user.name}</p> : <p style={{ textAlign: "center", width: "10%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >--</p>}
<p style={{ textAlign: "left", width: "25%", position: "absolute", left: "5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.road ? item.road : "--"}</p>
@ -86,6 +87,7 @@ const Right = (props) => {
<p style={{ position: "absolute", color: "#D8F0FF", fontSize: "14px", right: "6%" }}><span style={{ marginLeft: "-20%" }}>道路</span><span style={{ fontSize: "18px", fontFamily: "YouSheBiaoTiHei", color: "#ffffff", marginLeft: "10%" }}>{nums ? nums[0]?.count : []}</span><span style={{ marginLeft: "10%" }}></span></p>
{/* <img src='/assets/images/leadership/zibiaoti.png' style={{ width: "95%", height: "34px", position: "absolute", top: "12px", left: "6%" }} /> */}
</div>
{/* <Spin spinning={true} style={{ height: "80%" }}> */}
<Lun
// canScroll={true}
content={renderBody()}
@ -93,6 +95,7 @@ const Right = (props) => {
divHeight={"100%"}
divId={"screen"}
/>
{/* </Spin> */}
</div>
</div>

2
web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js

@ -49,7 +49,7 @@ const Right = (props) => {
}}>
{beijing == index ? <img src='/assets/images/leadership/shezhi.png' style={{ width: "2%", height: "80%", position: "absolute", top: "12%", left: "1%" }} /> : ""}
{beijing == index ? <img src='/assets/images/leadership/lan.png' style={{ width: "100%", height: "120%", position: "absolute", right: "5%" }} /> : ""}
<p style={{ textAlign: "center", width: "25%", position: "absolute", left: "18%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
<p style={{ textAlign: "center", width: "25%", position: "absolute", left: "18%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
<p style={{ textAlign: "center", width: "10%", position: "absolute", left: "43%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >日常养护</p>
{item.user?.name ? <p style={{ textAlign: "center", width: "10%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.user.name}</p> : <p style={{ textAlign: "center", width: "10%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >--</p>}
<p style={{ textAlign: "left", width: "25%", position: "absolute", left: "5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.road ? item.road : "--"}</p>

2
web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js

@ -44,7 +44,7 @@ const Right = (props) => {
}}>
{beijing == index ? <img src='/assets/images/leadership/shezhi.png' style={{ width: "2%", height: "80%", position: "absolute", top: "12%", left: "1%" }} /> : ""}
{beijing == index ? <img src='/assets/images/leadership/lan.png' style={{ width: "100%", height: "120%", position: "absolute", right: "5%" }} /> : ""}
<p style={{ textAlign: "center", width: "25%", position: "absolute", left: "18%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
<p style={{ textAlign: "center", width: "25%", position: "absolute", left: "18%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
<p style={{ textAlign: "center", width: "10%", position: "absolute", left: "43%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >日常养护</p>
{item.user?.name ? <p style={{ textAlign: "center", width: "10%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.user.name}</p> : <p style={{ textAlign: "center", width: "10%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >--</p>}
<p style={{ textAlign: "left", width: "25%", position: "absolute", left: "5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.road ? item.road : "--"}</p>

6
web/client/src/sections/quanju/containers/footer/leadership/left/echarts/lefttopecharts.js

@ -66,7 +66,7 @@ const Lefttopecharts = (props) => {
var option = {
// backgroundColor: "#0E1327",
tooltip: {
formatter: "{a} <br/>{b} : {c}%",
formatter: "{a} <br/>{b} : {c}",
},
series: [
@ -104,8 +104,8 @@ const Lefttopecharts = (props) => {
if (value !== 0) {
// var num = Math.round(value);
return (
value.toFixed(2) +
"%" +
value +
"\n" +
"\n" +
"\n" +

4
web/client/src/sections/quanju/routes.js

@ -4,8 +4,8 @@ import { Example, Build } from './containers';
export default [{
type: 'outer',
route: {
path: '/quanju',
key: 'quanju',
path: '/screen/cockpit',
key: 'cockpit',
breadcrumb: '全局展示',
exact: false,
component: Example,

6468
web/log/development.txt

File diff suppressed because it is too large
Loading…
Cancel
Save