Browse Source

Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/Highways4Good into dev

release_0.0.4
巴林闲侠 3 years ago
parent
commit
a3113ed822
  1. 2
      api/app/lib/controllers/report/index.js
  2. 4
      weapp/src/app.config.js
  3. 3
      weapp/src/packages/changePassword/index.config.js
  4. 64
      weapp/src/packages/changePassword/index.jsx
  5. 35
      weapp/src/packages/changePassword/index.scss
  6. 3
      weapp/src/packages/changePassword/success/index.config.js
  7. 24
      weapp/src/packages/changePassword/success/index.jsx
  8. 26
      weapp/src/packages/changePassword/success/index.scss
  9. 51
      weapp/src/packages/patrol/index.jsx
  10. 75
      weapp/src/packages/patrolView/index.jsx
  11. 4
      weapp/src/pages/auth/login/login.jsx
  12. 46
      weapp/src/pages/user/index.jsx
  13. 6
      weapp/src/services/api.js
  14. 15
      weapp/src/static/img/changePassword/success.svg
  15. 136
      web/client/assets/color.less
  16. BIN
      web/client/assets/images/leadership/bei.png
  17. BIN
      web/client/assets/images/leadership/center.png
  18. BIN
      web/client/assets/images/leadership/you.png
  19. BIN
      web/client/assets/images/leadership/zuo.png
  20. BIN
      web/client/assets/images/worker.png
  21. 70
      web/client/index.html
  22. 188
      web/client/src/sections/fillion/components/gis/bounds.js
  23. 59
      web/client/src/sections/fillion/components/gis/mock_data.js
  24. 131
      web/client/src/sections/fillion/components/gis/patrolGis.js
  25. 2
      web/client/src/sections/fillion/components/patrolTable.js
  26. 2
      web/client/src/sections/organization/components/depModal.js
  27. 4
      web/client/src/sections/organization/components/userModal.js
  28. 36
      web/client/src/sections/quanju/actions/example.js
  29. 91
      web/client/src/sections/quanju/containers/example.js
  30. 2
      web/client/src/sections/quanju/containers/footer/build/Leftbottom.js
  31. 9
      web/client/src/sections/quanju/containers/footer/build/index.js
  32. 8
      web/client/src/sections/quanju/containers/footer/build/style.less
  33. 16
      web/client/src/sections/quanju/containers/footer/conserve/right/right-bottom.js
  34. 12
      web/client/src/sections/quanju/containers/footer/guanli/LeftItem.js
  35. 4
      web/client/src/sections/quanju/containers/footer/index.js
  36. 7
      web/client/src/sections/quanju/containers/footer/leadership/centerLeft.js
  37. 7
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/bottom.js
  38. 9
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/center-left-bottom.js
  39. 5
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/center-left-top.js
  40. 91
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js
  41. 24
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/echarts/centerleftecharts.js
  42. 91
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js
  43. 32
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/bottomlunbo.js
  44. 182
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/lunbo.js
  45. 36
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/toplunbo.js
  46. 90
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js
  47. 24
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/top.js
  48. 9
      web/client/src/sections/quanju/containers/footer/leadership/index.js
  49. 7
      web/client/src/sections/quanju/containers/footer/leadership/left.js
  50. 43
      web/client/src/sections/quanju/containers/footer/leadership/left/echarts/leftbottomecharts.js
  51. 5
      web/client/src/sections/quanju/containers/footer/leadership/left/left-bottom.js
  52. 10
      web/client/src/sections/quanju/containers/footer/leadership/left/left-center.js
  53. 11
      web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js
  54. 7
      web/client/src/sections/quanju/containers/footer/leadership/right.js
  55. 36
      web/client/src/sections/quanju/containers/footer/leadership/right/hudong.js
  56. 11
      web/client/src/sections/quanju/containers/footer/leadership/right/left.less
  57. 9
      web/client/src/sections/quanju/containers/footer/leadership/right/lunbo copy.js
  58. 62
      web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js
  59. 10
      web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js
  60. 2
      web/client/src/sections/quanju/containers/footer/operation/index.js
  61. 2
      web/client/src/themes/light.json
  62. 28
      web/client/src/utils/webapi.js
  63. 15692
      web/log/development.txt
  64. 4321
      web/package-lock.json
  65. 2
      web/package.json

2
api/app/lib/controllers/report/index.js

@ -9,7 +9,7 @@ async function reportList (ctx) {
where: {
},
attributes: ['id', 'road', 'time', 'projectType', 'roadSectionStart', 'roadSectionEnd', 'reportType', 'content'],
attributes: ['id', 'road', 'time', 'projectType', 'roadSectionStart', 'roadSectionEnd', 'reportType', 'content', 'longitude','latitude'],
include: [{
model: models.User,
attributes: ['name']

4
weapp/src/app.config.js

@ -8,7 +8,9 @@ export default {
'root': 'packages/',
'pages': [
'patrol/index',
'patrolView/index'
'patrolView/index',
'changePassword/index',
'changePassword/success/index'
]
}],
permission: {

3
weapp/src/packages/changePassword/index.config.js

@ -0,0 +1,3 @@
export default {
navigationBarTitleText: '修改密码'
}

64
weapp/src/packages/changePassword/index.jsx

@ -0,0 +1,64 @@
import React, { useState } from 'react'
import Taro from '@tarojs/taro'
import { View, Input } from '@tarojs/components'
import { AtButton } from 'taro-ui'
import request from '@/services/request'
import { putPassword } from '@/services/api'
import './index.scss'
function Index() {
const userInfo = Taro.getStorageSync('userInfo') || null;
const [phone, setPhone] = useState(userInfo.phone)
const [password, setPassword] = useState('')
const [password2, setPassword2] = useState('')
function confirm() {
if (!password) {
Taro.showToast({ title: '请输入密码' })
return
} else if (password !== password2) {
Taro.showToast({ title: '两次输入的密码不一致' })
return
} else {
Taro.showModal({
title: '提示',
content: '确定修改吗',
success: function (res) {
if (res.confirm) {
Taro.showLoading({
title: '修改中'
})
request.put(putPassword(userInfo.id), { password }).then(res => {
Taro.hideLoading()
if (res.statusCode == 200 || res.statusCode == 204) {
Taro.removeStorageSync('token')
Taro.removeStorageSync('userInfo')
Taro.reLaunch({ url: '/packages/changePassword/success/index' })
}
})
}
}
})
}
}
return (
<View className='page'>
<View className='phone'>
<View className='title'>手机号码</View>
<Input value={phone} disabled={true} />
</View>
<View className='pswd'>
<View className='title'>新的密码</View>
<Input value={password} onInput={e => setPassword(e.detail.value)} />
</View>
<View className='pswd'>
<View className='title'>再次输入新的密码</View>
<Input value={password2} onInput={e => setPassword2(e.detail.value)} />
</View>
<AtButton className='btn' type='primary' onClick={confirm}>确认</AtButton>
</View>
)
}
export default Index

35
weapp/src/packages/changePassword/index.scss

@ -0,0 +1,35 @@
page {
background-color: #f6f6f6;
font-size: 28px;
.phone {
height: 96px;
background-color: #fff;
margin: 20px auto;
display: flex;
justify-content: left;
align-items: center;
.title {
margin-left: 30px;
}
}
.pswd {
height: 96px;
background-color: #fff;
margin-bottom: 5px;
display: flex;
justify-content: left;
align-items: center;
.title {
margin-left: 30px;
}
}
.btn {
width: 70%;
margin: 80px auto;
}
}

3
weapp/src/packages/changePassword/success/index.config.js

@ -0,0 +1,3 @@
export default {
navigationBarTitleText: '修改密码'
}

24
weapp/src/packages/changePassword/success/index.jsx

@ -0,0 +1,24 @@
import React from 'react'
import Taro from '@tarojs/taro'
import { View, Image } from '@tarojs/components'
import { AtButton } from 'taro-ui'
import './index.scss'
import successIcon from '../../../static/img/changePassword/success.svg'
function Index() {
function handleClick() {
Taro.reLaunch({ url: '/pages/auth/login/login' })
}
return (
<View>
<View className='box'>
<Image className='img' src={successIcon} />
<View className='text'>修改成功</View>
</View>
<AtButton className='btn' type='primary' onClick={handleClick}>返回登录</AtButton>
</View>
)
}
export default Index

26
weapp/src/packages/changePassword/success/index.scss

@ -0,0 +1,26 @@
page {
background-color: #f6f6f6;
.box {
background-color: #fff;
height: 360px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
.img {
width: 160px;
height: 160px;
}
.text {
margin-top: 32px;
}
}
.btn {
width: 70%;
margin: 80px auto;
}
}

51
weapp/src/packages/patrol/index.jsx

@ -9,6 +9,9 @@ import './index.scss';
import arrowIcon from '../../static/img/patrol/arrow-down.svg';
const Index = () => {
const userInfo = Taro.getStorageSync('userInfo') || {};
const isSuperAdmin = userInfo && userInfo.username === 'SuperAdmin' ? true : false
const router = useRouter()
const { params: { type } } = router
const isView = type === 'view' ? true : false
@ -281,28 +284,30 @@ const Index = () => {
return (
<View className='patrol'>
<View className='report-type'>
<View className='text'>上报类型</View>
<RadioGroup onChange={handleTypeChange}>
{
typeList.map((item, i) => {
return (
<Radio
key={i}
value={item.value}
checked={item.checked}
className='radio'
color='#346FC2'
disabled={isView}
>
{item.text}
</Radio>
)
})
}
</RadioGroup>
</View>
{
!isSuperAdmin &&
<View className='report-type'>
<View className='text'>上报类型</View>
<RadioGroup onChange={handleTypeChange}>
{
typeList.map((item, i) => {
return (
<Radio
key={i}
value={item.value}
checked={item.checked}
className='radio'
color='#346FC2'
disabled={isView}
>
{item.text}
</Radio>
)
})
}
</RadioGroup>
</View>
}
<InputPicker
title='工程类型:'
placeholder='请选择工程类型'
@ -377,12 +382,12 @@ const Index = () => {
</View>
<AtTextarea
count={false}
title='巡查内容:'
placeholder={isView ? '' : '请输入巡查内容'}
value={content}
onChange={(v, e) => handleInput(e, 'content')}
disabled={isView}
maxLength={50}
/>
{
reportType === 'patrol' ?

75
weapp/src/packages/patrolView/index.jsx

@ -1,5 +1,5 @@
import React, { useState, useEffect } from 'react'
import Taro, { useDidShow } from '@tarojs/taro'
import Taro, { useDidShow, useRouter } from '@tarojs/taro'
import { View, Picker, Input, Image } from '@tarojs/components'
import moment from 'moment'
import './index.scss'
@ -15,16 +15,24 @@ import conserveIcon from '../../static/img/patrolView/conserve.svg'
import conserveActiveIcon from '../../static/img/patrolView/conserve-active.svg'
function Index() {
const userInfo = Taro.getStorageSync('userInfo') || {};
const router = useRouter()
const { params: { limit } } = router
const [isPatrol, setIsPatrol] = useState(true)
const [datePicker, setDatePicker] = useState(moment().format('YYYY-MM-DD'))
const [listData, setListData] = useState([])
const [inputSite, setInputSite] = useState('')
const [page, setPage] = useState(0)
const [total, setTotal] = useState(0)
const [num, setNum] = useState(Math.random())
const [showListData, setShowListData] = useState([])
const [filterText, setFilterText] = useState('')
const [systemInfo, setSystemInfo] = useState('')
const userInfo = Taro.getStorageSync('userInfo') || {};
useEffect(() => {
getList()
}, [datePicker])
useEffect(() => {
setShowListData(listData.filter(item => isPatrol ? item.reportType === 'patrol' : item.reportType === 'conserve'))
}, [isPatrol])
function dealError(error) {
Taro.showToast({
@ -34,25 +42,32 @@ function Index() {
});
throw new Error(error);
}
useEffect(() => {
request.get(getReportList(), {}, { hideErrorToast: true, hideLoading: true }).then(res => {
const getList = () => {
Taro.showLoading({ title: '加载中' })
request.get(
getReportList(),
{ startTime: datePicker + ' 00:00:00', endTime: datePicker + ' 23:59:59' }
).then(res => {
Taro.hideLoading()
if (res.statusCode == 200) {
// console.log(res);
setListData(res.data)
return res.data;
let { data } = res
if (limit === 'my') {
data = data.filter(item => item.user.name === userInfo.name)
}
setListData(data)
setShowListData(data.filter(item => isPatrol ? item.reportType === 'patrol' : item.reportType === 'conserve'))
return data;
} else {
dealError(res.data.message || '请求出错');
}
}, err => {
dealError(err.message || '请求出错');
});
}, [])
}
useDidShow(() => {
let refresh = Taro.getStorageSync('refresh'); //
if (refresh) {
setPage(0)
setNum(Math.random())
Taro.removeStorageSync('refresh'); //
}
Taro.getSystemInfo({
@ -72,25 +87,21 @@ function Index() {
setDatePicker(e.detail.value);
}
const handleConfirm = () => {
setPage(0)
setListData([]);
setTotal(0);
setNum(Math.random())
const handleConfirm = e => {
let nextList = listData.filter(item => isPatrol ? item.reportType === 'patrol' : item.reportType === 'conserve')
nextList = nextList.filter(item => item.road.includes(e.detail.value))
setShowListData(nextList)
}
const handleInput = e => {
setInputSite(e.detail.value);
setFilterText(e.detail.value);
if (!e.detail.value) {
setPage(0)
setListData([]);
setTotal(0);
setNum(Math.random())
setShowListData(listData.filter(item => isPatrol ? item.reportType === 'patrol' : item.reportType === 'conserve'));
}
}
const handleDetail = index => {
Taro.navigateTo({ url: `/packages/patrol/index?type=view&id=${listData[index].id}` })
Taro.navigateTo({ url: `/packages/patrol/index?type=view&id=${showListData[index].id}` })
}
return (
@ -109,20 +120,27 @@ function Index() {
<View className='filter-box'>
<View className='filter-item'>
<View style={{ float: 'left', marginLeft: '20rpx', color: '#333' }}>日期</View>
<Picker className='picker' style={{ overflow: 'hidden', float: 'left' }} mode='date' end={(systemInfo == 'windows' || systemInfo == 'mac') ? moment().add(1, 'd').format('YYYY-MM-DD') : moment().format('YYYY-MM-DD')} onChange={onDateChange}>
<Picker
className='picker'
style={{ overflow: 'hidden', float: 'left' }}
mode='date'
end={(systemInfo == 'windows' || systemInfo == 'mac')
? moment().add(1, 'd').format('YYYY-MM-DD')
: moment().format('YYYY-MM-DD')} onChange={onDateChange}
>
<View className='filter-name'>{datePicker || '请选择'}</View>
<Image className='filter-img' src={chevronDown} />
</Picker>
</View>
<View class='head-search'>
<Image className='search-img' src={searchIcon} />
<Input class='heard-search-input' value={inputSite} placeholder='请输入场所名称' onConfirm={handleConfirm} onInput={handleInput} />
<Input class='heard-search-input' value={filterText} placeholder='请输入道路名称' onConfirm={handleConfirm} onInput={handleInput} />
</View>
</View>
<View style={{ marginTop: '110px' }}>
{
listData && listData.length > 0 ? listData && listData.map((e, index) => {
showListData && showListData.length > 0 ? showListData && showListData.map((e, index) => {
return (
<View className='cardBox' key={index} onClick={() => handleDetail(index)}>
<View className='card-item' >
@ -144,5 +162,4 @@ function Index() {
</View>
)
}
export default Index

4
weapp/src/pages/auth/login/login.jsx

@ -18,6 +18,10 @@ const LoginPage = (props) => {
const [password, setPassword] = useState('');
const doLogin = () => {
if (!username || !password) {
Taro.showToast({ title: '请输入账号和密码', icon: 'none' })
return
}
login(getLoginUrl(), { phone: username, password }).then(res => {
Taro.reLaunch({
url: '/pages/home/index'

46
weapp/src/pages/user/index.jsx

@ -16,20 +16,40 @@ const { webUrl } = cfg;
const Index = ({ ...props }) => {
const userInfo = Taro.getStorageSync('userInfo') || {};
const isSuperAdmin = userInfo && userInfo.username === 'SuperAdmin' ? true : false
const goRedirect = () => {
const changePassword = () => {
Taro.navigateTo({ url: '/packages/changePassword/index' })
}
const toMyReport = () => {
Taro.navigateTo({
url: '/packages/patrolView/index?limit=my'
})
}
const onLogout = () => {
logout(getLogoutUrl()).then(() => {
Taro.reLaunch({
url: '/pages/auth/login/login'
});
});
const toPatrolReport = () => {
Taro.navigateTo({
url: '/packages/patrol/index?type=edit'
})
}
const onLogout = () => {
Taro.showModal({
title: '提示',
content: '确定退出登录吗',
success: function (res) {
if (res.confirm) {
logout(getLogoutUrl()).then(() => {
Taro.reLaunch({
url: '/pages/auth/login/login'
});
});
}
}
})
}
return (
<View className='page'>
<View className='myBox'>
@ -42,18 +62,20 @@ const Index = ({ ...props }) => {
</View>
</View>
<View className='box' onClick={() => goRedirect(1)}>
<View className='box' onClick={isSuperAdmin ? toPatrolReport : toMyReport}>
<Image className='box-img' src={reportImg} />
<View className='box-txt'>我的填报</View>
<View className='box-txt'>
{isSuperAdmin ? '巡查上报' : '我的上报'}
</View>
<Image className='img' src={moreImg} />
</View>
<View className='box' onClick={() => goRedirect(2)} style={{ marginTop: '2rpx' }}>
<View className='box' onClick={changePassword} style={{ marginTop: '2rpx' }}>
<Image className='box-img' src={pswdImg} />
<View className='box-txt'>修改密码</View>
<Image className='img' src={moreImg} />
</View>
<View className='logout' onClick={onLogout}>退出登录</View>
</View>

6
weapp/src/services/api.js

@ -24,10 +24,14 @@ export const getReportDetail = id => {
// 删除上报
export const delReport = id => {
console.log(id)
return `/report/${id}`;
};
// 修改密码
export const putPassword = id => {
return `/department/user/${id}/password`;
};
// 获取道路路段
export const getRoadSection = () => {
return `/road/section`;

15
weapp/src/static/img/changePassword/success.svg

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>切片</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="首页_我的修改密码-1" transform="translate(-148.000000, -99.000000)">
<g id="5.反馈/6.Progress进度条/进度圈/成功" transform="translate(148.000000, 99.000000)">
<path d="M40,0 C62.09139,0 80,17.90861 80,40 C80,62.09139 62.09139,80 40,80 C17.90861,80 0,62.09139 0,40 C0,17.90861 17.90861,0 40,0 Z M40,4 C20.117749,4 4,20.117749 4,40 C4,59.882251 20.117749,76 40,76 C59.882251,76 76,59.882251 76,40 C76,20.117749 59.882251,4 40,4 Z" id="Progress" fill="#52C41A"></path>
<g id="check" transform="translate(14.000000, 15.000000)">
<rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="48" height="48"></rect>
<path d="M42.75,8.90625 L39.4734375,8.90625 C39.0140625,8.90625 38.578125,9.1171875 38.296875,9.478125 L18.9703125,33.9609375 L9.703125,22.21875 C9.4171875,21.8578125 8.9859375,21.646875 8.5265625,21.646875 L5.25,21.646875 C4.9359375,21.646875 4.7625,22.0078125 4.9546875,22.2515625 L17.79375,38.5171875 C18.39375,39.2765625 19.546875,39.2765625 20.1515625,38.5171875 L43.0453125,9.50625 C43.2375,9.2671875 43.0640625,8.90625 42.75,8.90625 Z" id="路径" fill="#52C41A"></path>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.6 KiB

136
web/client/assets/color.less

@ -174,7 +174,7 @@ button::-moz-focus-inner,
[type='submit']::-moz-focus-inner {border-style: none;}
fieldset {border: 0;}
legend {color: inherit;}
mark {background-color: #feffe6;}
mark {background-color: color(~`colorPalette("@{modal-footer-border-color-split}", 1)`);}
::selection {color: #fff;background: @primary-color;}
.anticon {color: inherit;}
.ant-fade-enter, .ant-fade-appear {animation-fill-mode: both;}
@ -555,6 +555,18 @@ html {--antd-wave-shadow-color: @primary-color;}
.ant-btn-background-ghost.ant-btn-dangerous.ant-btn-link[disabled], .ant-btn-background-ghost.ant-btn-dangerous.ant-btn-link[disabled]:hover, .ant-btn-background-ghost.ant-btn-dangerous.ant-btn-link[disabled]:focus, .ant-btn-background-ghost.ant-btn-dangerous.ant-btn-link[disabled]:active {color: @disabled-color;border-color: @border-color-base;background: @disabled-bg;box-shadow: none;}
.ant-btn-background-ghost.ant-btn-dangerous.ant-btn-link[disabled] > a:only-child, .ant-btn-background-ghost.ant-btn-dangerous.ant-btn-link[disabled]:hover > a:only-child, .ant-btn-background-ghost.ant-btn-dangerous.ant-btn-link[disabled]:focus > a:only-child, .ant-btn-background-ghost.ant-btn-dangerous.ant-btn-link[disabled]:active > a:only-child {color: currentcolor;}
.ant-btn-background-ghost.ant-btn-dangerous.ant-btn-link[disabled] > a:only-child::after, .ant-btn-background-ghost.ant-btn-dangerous.ant-btn-link[disabled]:hover > a:only-child::after, .ant-btn-background-ghost.ant-btn-dangerous.ant-btn-link[disabled]:focus > a:only-child::after, .ant-btn-background-ghost.ant-btn-dangerous.ant-btn-link[disabled]:active > a:only-child::after {background: transparent;}
a.ant-btn-disabled,
a.ant-btn-disabled:hover,
a.ant-btn-disabled:focus,
a.ant-btn-disabled:active {color: @disabled-color;border-color: transparent;background: transparent;box-shadow: none;}
a.ant-btn-disabled > a:only-child,
a.ant-btn-disabled:hover > a:only-child,
a.ant-btn-disabled:focus > a:only-child,
a.ant-btn-disabled:active > a:only-child {color: currentcolor;}
a.ant-btn-disabled > a:only-child::after,
a.ant-btn-disabled:hover > a:only-child::after,
a.ant-btn-disabled:focus > a:only-child::after,
a.ant-btn-disabled:active > a:only-child::after {background: transparent;}
.ant-btn-group-rtl.ant-btn-group .ant-btn-primary:last-child:not(:first-child), .ant-btn-group-rtl.ant-btn-group .ant-btn-primary + .ant-btn-primary {border-right-color: color(~`colorPalette("@{primary-color}", 5)`);border-left-color: @border-color-base;}
.ant-btn-group-rtl.ant-btn-group .ant-btn-primary:last-child:not(:first-child)[disabled], .ant-btn-group-rtl.ant-btn-group .ant-btn-primary + .ant-btn-primary[disabled] {border-right-color: @border-color-base;border-left-color: color(~`colorPalette("@{primary-color}", 5)`);}
.ant-picker-calendar {color: @text-color;background: @calendar-full-bg;}
@ -589,7 +601,6 @@ html {--antd-wave-shadow-color: @primary-color;}
.ant-card-type-inner .ant-card-head {background: @background-color-light;}
.ant-card-meta-title {color: @heading-color;}
.ant-card-meta-description {color: @text-color-secondary;}
.ant-card-loading-block {background: linear-gradient(90deg, fade(@card-skeleton-bg, 20%), fade(@card-skeleton-bg, 40%), fade(@card-skeleton-bg, 20%));background-size: 600% 600%;border-radius: 2px;}
.ant-carousel {color: @text-color;}
.ant-carousel .slick-slider {-webkit-tap-highlight-color: transparent;}
.ant-carousel .slick-prev, .ant-carousel .slick-next {color: transparent;background: transparent;border: 0;}
@ -663,8 +674,10 @@ html {--antd-wave-shadow-color: @primary-color;}
.ant-comment-actions > li > span:hover {color: @comment-action-hover-color;}
.ant-picker-status-error.ant-picker, .ant-picker-status-error.ant-picker:not([disabled]):hover {background-color: @input-bg;border-color: #ff4d4f;}
.ant-picker-status-error.ant-picker-focused, .ant-picker-status-error.ant-picker:focus {border-color: #ff7875;box-shadow: 0 0 0 2px rgba(255, 77, 79, 0.2);border-right-width: 1px;}
.ant-picker-status-error.ant-picker .ant-picker-active-bar {background: #ff7875;}
.ant-picker-status-warning.ant-picker, .ant-picker-status-warning.ant-picker:not([disabled]):hover {background-color: @input-bg;border-color: #faad14;}
.ant-picker-status-warning.ant-picker-focused, .ant-picker-status-warning.ant-picker:focus {border-color: #ffc53d;box-shadow: 0 0 0 2px rgba(250, 173, 20, 0.2);border-right-width: 1px;}
.ant-picker-status-warning.ant-picker .ant-picker-active-bar {background: #ffc53d;}
.ant-picker {color: @text-color;background: @picker-bg;border: 1px solid @border-color-base;border-radius: 2px;}
.ant-picker:hover, .ant-picker-focused {border-color: color(~`colorPalette("@{primary-color}", 5)`);border-right-width: 1px;}
.ant-input-rtl .ant-picker:hover, .ant-input-rtl .ant-picker-focused {border-right-width: 0;border-left-width: 1px !important;}
@ -695,7 +708,7 @@ html {--antd-wave-shadow-color: @primary-color;}
.ant-picker-range .ant-picker-active-bar {background: @primary-color;}
.ant-picker-dropdown {color: @text-color;}
.ant-picker-ranges .ant-picker-preset > .ant-tag-blue {color: @primary-color;background: color(~`colorPalette("@{primary-color}", 1)`);border-color: color(~`colorPalette("@{primary-color}", 3)`);}
.ant-picker-range-arrow {background: linear-gradient(135deg, transparent 40%, @calendar-bg 40%);box-shadow: 2px 2px 6px -2px rgba(0, 0, 0, 0.1);border-radius: 0 0 2px;}
.ant-picker-range-arrow {box-shadow: 2px 2px 6px -2px rgba(0, 0, 0, 0.1);border-radius: 0 0 2px;}
.ant-picker-range-arrow::before {background: @calendar-bg;background-repeat: no-repeat;background-position: -10px -10px;}
.ant-picker-panel-container {background: @calendar-bg;border-radius: 2px;box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);}
.ant-picker-panel-container .ant-picker-panel {background: transparent;border-width: 0 0 1px 0;border-radius: 0;}
@ -801,7 +814,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-dropdown-menu-item.ant-dropdown-menu-item-danger {color: #ff4d4f;}
.ant-dropdown-menu-item.ant-dropdown-menu-item-danger:hover {color: #fff;background-color: #ff4d4f;}
.ant-dropdown {color: @text-color;}
.ant-dropdown-arrow {background: linear-gradient(135deg, transparent 40%, @popover-bg 40%);border-radius: 0 0 2px;}
.ant-dropdown-arrow {border-radius: 0 0 2px;}
.ant-dropdown-arrow::before {background: @popover-bg;background-repeat: no-repeat;background-position: -10px -10px;}
.ant-dropdown-placement-top > .ant-dropdown-arrow, .ant-dropdown-placement-topLeft > .ant-dropdown-arrow, .ant-dropdown-placement-topRight > .ant-dropdown-arrow {box-shadow: 3px 3px 7px -3px rgba(0, 0, 0, 0.1);}
.ant-dropdown-placement-bottom > .ant-dropdown-arrow, .ant-dropdown-placement-bottomLeft > .ant-dropdown-arrow, .ant-dropdown-placement-bottomRight > .ant-dropdown-arrow {box-shadow: 2px 2px 5px -2px rgba(0, 0, 0, 0.1);}
@ -936,7 +949,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-input-group.ant-input-group-compact .ant-input-group-wrapper:not(:last-child).ant-input-search > .ant-input-group > .ant-input {border-radius: 2px 0 0 2px;}
.ant-input-group > .ant-input-rtl:first-child, .ant-input-group-rtl .ant-input-group-addon:first-child {border-radius: 0 2px 2px 0;}
.ant-input-group-rtl .ant-input-group-addon:first-child {border-right: 1px solid @border-color-base;border-left: 0;}
.ant-input-group-rtl .ant-input-group-addon:last-child {border-right: 0;border-left: 1px solid @border-color-base;}
.ant-input-group-rtl .ant-input-group-addon:last-child {border-right: 0;border-left: 1px solid @border-color-base;border-radius: 2px 0 0 2px;}
.ant-input-group-rtl.ant-input-group > .ant-input:last-child, .ant-input-group-rtl.ant-input-group-addon:last-child {border-radius: 2px 0 0 2px;}
.ant-input-group-rtl.ant-input-group .ant-input-affix-wrapper:not(:first-child) {border-radius: 2px 0 0 2px;}
.ant-input-group-rtl.ant-input-group .ant-input-affix-wrapper:not(:last-child) {border-radius: 0 2px 2px 0;}
@ -944,6 +957,10 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-input-group-rtl.ant-input-group.ant-input-group-compact > *:first-child, .ant-input-group-rtl.ant-input-group.ant-input-group-compact > .ant-select:first-child > .ant-select-selector, .ant-input-group-rtl.ant-input-group.ant-input-group-compact > .ant-select-auto-complete:first-child .ant-input, .ant-input-group-rtl.ant-input-group.ant-input-group-compact > .ant-cascader-picker:first-child .ant-input {border-radius: 0 2px 2px 0;}
.ant-input-group-rtl.ant-input-group.ant-input-group-compact > *:last-child, .ant-input-group-rtl.ant-input-group.ant-input-group-compact > .ant-select:last-child > .ant-select-selector, .ant-input-group-rtl.ant-input-group.ant-input-group-compact > .ant-select-auto-complete:last-child .ant-input, .ant-input-group-rtl.ant-input-group.ant-input-group-compact > .ant-cascader-picker:last-child .ant-input, .ant-input-group-rtl.ant-input-group.ant-input-group-compact > .ant-cascader-picker-focused:last-child .ant-input {border-left-width: 1px;border-radius: 2px 0 0 2px;}
.ant-input-group.ant-input-group-compact .ant-input-group-wrapper-rtl:not(:last-child).ant-input-search > .ant-input-group > .ant-input {border-radius: 0 2px 2px 0;}
.ant-input-group > .ant-input-rtl:first-child {border-radius: 0 2px 2px 0;}
.ant-input-group > .ant-input-rtl:last-child {border-radius: 2px 0 0 2px;}
.ant-input-group-rtl .ant-input-group-addon:first-child {border-right: 1px solid @border-color-base;border-left: 0;border-radius: 0 2px 2px 0;}
.ant-input-group-rtl .ant-input-group-addon:last-child {border-right: 0;border-left: 1px solid @border-color-base;border-radius: 2px 0 0 2px;}
.ant-input-password-icon.anticon {color: @text-color-secondary;}
.ant-input-password-icon.anticon:hover {color: @input-icon-hover-color;}
.ant-input-textarea-show-count::after {color: @text-color-secondary;}
@ -1029,7 +1046,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-input-number-group.ant-input-number-group-compact .ant-input-group-wrapper:not(:last-child).ant-input-search > .ant-input-group > .ant-input {border-radius: 2px 0 0 2px;}
.ant-input-number-group > .ant-input-number-rtl:first-child, .ant-input-number-group-rtl .ant-input-number-group-addon:first-child {border-radius: 0 2px 2px 0;}
.ant-input-number-group-rtl .ant-input-number-group-addon:first-child {border-right: 1px solid @border-color-base;border-left: 0;}
.ant-input-number-group-rtl .ant-input-number-group-addon:last-child {border-right: 0;border-left: 1px solid @border-color-base;}
.ant-input-number-group-rtl .ant-input-number-group-addon:last-child {border-right: 0;border-left: 1px solid @border-color-base;border-radius: 2px 0 0 2px;}
.ant-input-number-group-rtl.ant-input-number-group > .ant-input-number:last-child, .ant-input-number-group-rtl.ant-input-number-group-addon:last-child {border-radius: 2px 0 0 2px;}
.ant-input-number-group-rtl.ant-input-number-group .ant-input-number-affix-wrapper:not(:first-child) {border-radius: 2px 0 0 2px;}
.ant-input-number-group-rtl.ant-input-number-group .ant-input-number-affix-wrapper:not(:last-child) {border-radius: 0 2px 2px 0;}
@ -1037,6 +1054,10 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-input-number-group-rtl.ant-input-number-group.ant-input-number-group-compact > *:first-child, .ant-input-number-group-rtl.ant-input-number-group.ant-input-number-group-compact > .ant-select:first-child > .ant-select-selector, .ant-input-number-group-rtl.ant-input-number-group.ant-input-number-group-compact > .ant-select-auto-complete:first-child .ant-input, .ant-input-number-group-rtl.ant-input-number-group.ant-input-number-group-compact > .ant-cascader-picker:first-child .ant-input {border-radius: 0 2px 2px 0;}
.ant-input-number-group-rtl.ant-input-number-group.ant-input-number-group-compact > *:last-child, .ant-input-number-group-rtl.ant-input-number-group.ant-input-number-group-compact > .ant-select:last-child > .ant-select-selector, .ant-input-number-group-rtl.ant-input-number-group.ant-input-number-group-compact > .ant-select-auto-complete:last-child .ant-input, .ant-input-number-group-rtl.ant-input-number-group.ant-input-number-group-compact > .ant-cascader-picker:last-child .ant-input, .ant-input-number-group-rtl.ant-input-number-group.ant-input-number-group-compact > .ant-cascader-picker-focused:last-child .ant-input {border-left-width: 1px;border-radius: 2px 0 0 2px;}
.ant-input-number-group.ant-input-number-group-compact .ant-input-group-wrapper-rtl:not(:last-child).ant-input-search > .ant-input-group > .ant-input {border-radius: 0 2px 2px 0;}
.ant-input-number-group > .ant-input-number-rtl:first-child {border-radius: 0 2px 2px 0;}
.ant-input-number-group > .ant-input-number-rtl:last-child {border-radius: 2px 0 0 2px;}
.ant-input-number-group-rtl .ant-input-number-group-addon:first-child {border-right: 1px solid @border-color-base;border-left: 0;border-radius: 0 2px 2px 0;}
.ant-input-number-group-rtl .ant-input-number-group-addon:last-child {border-right: 0;border-left: 1px solid @border-color-base;border-radius: 2px 0 0 2px;}
.ant-input-number-handler {color: @text-color-secondary;border-left: 1px solid @border-color-base;}
.ant-input-number-handler:active {background: @input-number-handler-active-bg;}
.ant-input-number-handler:hover .ant-input-number-handler-up-inner, .ant-input-number-handler:hover .ant-input-number-handler-down-inner {color: color(~`colorPalette("@{primary-color}", 5)`);}
@ -1129,15 +1150,16 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-menu-item-danger.ant-menu-item {color: #ff4d4f;}
.ant-menu-item-danger.ant-menu-item:hover, .ant-menu-item-danger.ant-menu-item-active {color: #ff4d4f;}
<<<<<<< Updated upstream
.ant-menu-item-danger.ant-menu-item:active {background: #fff1f0;}
.ant-menu-item-danger.ant-menu-item:active {background: color(~`colorPalette("@{modal-header-border-color-split}", 1)`);}
.ant-menu-item-danger.ant-menu-item-selected {color: #ff4d4f;}
.ant-menu-item-danger.ant-menu-item-selected > a, .ant-menu-item-danger.ant-menu-item-selected > a:hover {color: #ff4d4f;}
.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: #fff1f0;}
.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: color(~`colorPalette("@{modal-header-border-color-split}", 1)`);}
=======
.ant-menu-item-danger.ant-menu-item:active {background: color(~`colorPalette("@{modal-header-border-color-split}", 1)`);}
.ant-menu-item-danger.ant-menu-item:active {background: color(~`colorPalette("@{segmented-label-hover-color}", 1)`);}
.ant-menu-item-danger.ant-menu-item-selected {color: #ff4d4f;}
.ant-menu-item-danger.ant-menu-item-selected > a, .ant-menu-item-danger.ant-menu-item-selected > a:hover {color: #ff4d4f;}
.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: color(~`colorPalette("@{modal-header-border-color-split}", 1)`);}
.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: color(~`colorPalette("@{segmented-label-hover-color}", 1)`);}
>>>>>>> Stashed changes
.ant-menu-inline .ant-menu-item-danger.ant-menu-item::after {border-right-color: #ff4d4f;}
.ant-menu-dark .ant-menu-item-danger.ant-menu-item, .ant-menu-dark .ant-menu-item-danger.ant-menu-item:hover, .ant-menu-dark .ant-menu-item-danger.ant-menu-item > a {color: #ff4d4f;}
@ -1299,8 +1321,8 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-pagination-simple .ant-pagination-simple-pager input:hover {border-color: @primary-color;}
.ant-pagination-simple .ant-pagination-simple-pager input:focus {border-color: color(~`colorPalette("@{primary-color}", 5)`);box-shadow: 0 0 0 2px fade(@primary-color, 20%);}
.ant-pagination-simple .ant-pagination-simple-pager input[disabled] {color: @disabled-color;background: @disabled-bg;border-color: @border-color-base;}
.ant-pagination.mini .ant-pagination-item:not(.ant-pagination-item-active) {background: transparent;border-color: transparent;}
.ant-pagination.mini .ant-pagination-prev .ant-pagination-item-link, .ant-pagination.mini .ant-pagination-next .ant-pagination-item-link {background: transparent;border-color: transparent;}
.ant-pagination.ant-pagination-mini .ant-pagination-item:not(.ant-pagination-item-active) {background: transparent;border-color: transparent;}
.ant-pagination.ant-pagination-mini .ant-pagination-prev .ant-pagination-item-link, .ant-pagination.ant-pagination-mini .ant-pagination-next .ant-pagination-item-link {background: transparent;border-color: transparent;}
.ant-pagination.ant-pagination-disabled .ant-pagination-item {background: @disabled-bg;border-color: @border-color-base;}
.ant-pagination.ant-pagination-disabled .ant-pagination-item a {color: @disabled-color;background: transparent;border: none;}
.ant-pagination.ant-pagination-disabled .ant-pagination-item-active {background: @pagination-item-disabled-bg-active;}
@ -1316,8 +1338,8 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-popover-message {color: @text-color;}
.ant-popover-message > .anticon {color: #faad14;}
.ant-popover-arrow {background: transparent;}
.ant-popover-arrow-content {background-color: @popover-bg;border-radius: 0 0 2px;}
.ant-popover-arrow-content::before {background: @popover-bg;background-repeat: no-repeat;background-position: -10px -10px;}
.ant-popover-arrow-content {--antd-arrow-background-color: @popover-bg;border-radius: 0 0 2px;}
.ant-popover-arrow-content::before {background: var(--antd-arrow-background-color);background-repeat: no-repeat;background-position: -10px -10px;}
.ant-popover-placement-top .ant-popover-arrow-content, .ant-popover-placement-topLeft .ant-popover-arrow-content, .ant-popover-placement-topRight .ant-popover-arrow-content {box-shadow: 3px 3px 7px rgba(0, 0, 0, 0.07);}
.ant-popover-placement-right .ant-popover-arrow-content, .ant-popover-placement-rightTop .ant-popover-arrow-content, .ant-popover-placement-rightBottom .ant-popover-arrow-content {box-shadow: 3px 3px 7px rgba(0, 0, 0, 0.07);}
.ant-popover-placement-bottom .ant-popover-arrow-content, .ant-popover-placement-bottomLeft .ant-popover-arrow-content, .ant-popover-placement-bottomRight .ant-popover-arrow-content {box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.06);}
@ -1373,12 +1395,13 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-radio-wrapper {color: @text-color;}
.ant-radio {color: @text-color;}
.ant-radio-wrapper:hover .ant-radio, .ant-radio:hover .ant-radio-inner, .ant-radio-input:focus + .ant-radio-inner {border-color: @primary-color;}
.ant-radio-input:focus + .ant-radio-inner {box-shadow: 0 0 0 3px color(~`colorPalette("@{primary-color}", 1)`);}
.ant-radio-input:focus + .ant-radio-inner {box-shadow: 0 0 0 3px fade(@primary-color, 12%);}
.ant-radio-checked::after {border: 1px solid @primary-color;border-radius: 50%;animation-fill-mode: both;}
.ant-radio-inner {background-color: @btn-default-bg;border-color: @border-color-base;border-style: solid;border-width: 1px;border-radius: 50%;}
.ant-radio-inner::after {background-color: @primary-color;border-top: 0;border-left: 0;border-radius: 16px;}
.ant-radio.ant-radio-disabled .ant-radio-inner {border-color: @border-color-base;}
.ant-radio-checked .ant-radio-inner {border-color: @primary-color;}
.ant-radio-disabled .ant-radio-inner {background-color: @disabled-bg;border-color: @border-color-base !important;}
.ant-radio-disabled .ant-radio-inner {background-color: @disabled-bg;}
.ant-radio-disabled .ant-radio-inner::after {background-color: @radio-dot-disabled-color;}
.ant-radio-disabled + span {color: @disabled-color;}
.ant-radio-button-wrapper {color: @text-color;background: @btn-default-bg;border: 1px solid @border-color-base;border-top-width: 1.02px;border-left-width: 0;}
@ -1388,7 +1411,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-radio-button-wrapper:last-child {border-radius: 0 2px 2px 0;}
.ant-radio-button-wrapper:first-child:last-child {border-radius: 2px;}
.ant-radio-button-wrapper:hover {color: @primary-color;}
.ant-radio-button-wrapper:focus-within {box-shadow: 0 0 0 3px color(~`colorPalette("@{primary-color}", 1)`);}
.ant-radio-button-wrapper:focus-within {box-shadow: 0 0 0 3px fade(@primary-color, 12%);}
.ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {color: @primary-color;background: @btn-default-bg;border-color: @primary-color;}
.ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled)::before {background-color: @primary-color;}
.ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled):first-child {border-color: @primary-color;}
@ -1396,11 +1419,11 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled):hover::before {background-color: color(~`colorPalette("@{primary-color}", 5)`);}
.ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled):active {color: color(~`colorPalette("@{primary-color}", 7)`);border-color: color(~`colorPalette("@{primary-color}", 7)`);}
.ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled):active::before {background-color: color(~`colorPalette("@{primary-color}", 7)`);}
.ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled):focus-within {box-shadow: 0 0 0 3px color(~`colorPalette("@{primary-color}", 1)`);}
.ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled):focus-within {box-shadow: 0 0 0 3px fade(@primary-color, 12%);}
.ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {color: @radio-solid-checked-color;background: @primary-color;border-color: @primary-color;}
.ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled):hover {color: @radio-solid-checked-color;background: color(~`colorPalette("@{primary-color}", 5)`);border-color: color(~`colorPalette("@{primary-color}", 5)`);}
.ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled):active {color: @radio-solid-checked-color;background: color(~`colorPalette("@{primary-color}", 7)`);border-color: color(~`colorPalette("@{primary-color}", 7)`);}
.ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled):focus-within {box-shadow: 0 0 0 3px color(~`colorPalette("@{primary-color}", 1)`);}
.ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled):focus-within {box-shadow: 0 0 0 3px fade(@primary-color, 12%);}
.ant-radio-button-wrapper-disabled {color: @disabled-color;background-color: @disabled-bg;border-color: @border-color-base;}
.ant-radio-button-wrapper-disabled:first-child, .ant-radio-button-wrapper-disabled:hover {color: @disabled-color;background-color: @disabled-bg;border-color: @border-color-base;}
.ant-radio-button-wrapper-disabled:first-child {border-left-color: @border-color-base;}
@ -1467,14 +1490,11 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-skeleton-header .ant-skeleton-avatar.ant-skeleton-avatar-circle {border-radius: 50%;}
.ant-skeleton-header .ant-skeleton-avatar-lg.ant-skeleton-avatar-circle {border-radius: 50%;}
.ant-skeleton-header .ant-skeleton-avatar-sm.ant-skeleton-avatar-circle {border-radius: 50%;}
.ant-skeleton-content .ant-skeleton-title {background: @skeleton-color;border-radius: 4px;}
.ant-skeleton-content .ant-skeleton-paragraph > li {background: @skeleton-color;border-radius: 4px;}
.ant-skeleton-content .ant-skeleton-title {background: @skeleton-color;border-radius: 2px;}
.ant-skeleton-content .ant-skeleton-paragraph > li {background: @skeleton-color;border-radius: 2px;}
.ant-skeleton-round .ant-skeleton-content .ant-skeleton-title, .ant-skeleton-round .ant-skeleton-content .ant-skeleton-paragraph > li {border-radius: 100px;}
.ant-skeleton.ant-skeleton-active .ant-skeleton-content .ant-skeleton-title, .ant-skeleton.ant-skeleton-active .ant-skeleton-content .ant-skeleton-paragraph > li {background: linear-gradient(90deg, @skeleton-color 25%, @skeleton-to-color 37%, @skeleton-color 63%);background-size: 400% 100%;}
.ant-skeleton.ant-skeleton-active .ant-skeleton-avatar {background: linear-gradient(90deg, @skeleton-color 25%, @skeleton-to-color 37%, @skeleton-color 63%);background-size: 400% 100%;}
.ant-skeleton.ant-skeleton-active .ant-skeleton-button {background: linear-gradient(90deg, @skeleton-color 25%, @skeleton-to-color 37%, @skeleton-color 63%);background-size: 400% 100%;}
.ant-skeleton.ant-skeleton-active .ant-skeleton-input {background: linear-gradient(90deg, @skeleton-color 25%, @skeleton-to-color 37%, @skeleton-color 63%);background-size: 400% 100%;}
.ant-skeleton.ant-skeleton-active .ant-skeleton-image {background: linear-gradient(90deg, @skeleton-color 25%, @skeleton-to-color 37%, @skeleton-color 63%);background-size: 400% 100%;}
.ant-skeleton-active .ant-skeleton-title, .ant-skeleton-active .ant-skeleton-paragraph > li, .ant-skeleton-active .ant-skeleton-avatar, .ant-skeleton-active .ant-skeleton-button, .ant-skeleton-active .ant-skeleton-input, .ant-skeleton-active .ant-skeleton-image {background: transparent;}
.ant-skeleton-active .ant-skeleton-title::after, .ant-skeleton-active .ant-skeleton-paragraph > li::after, .ant-skeleton-active .ant-skeleton-avatar::after, .ant-skeleton-active .ant-skeleton-button::after, .ant-skeleton-active .ant-skeleton-input::after, .ant-skeleton-active .ant-skeleton-image::after {background: linear-gradient(90deg, @skeleton-color 25%, @skeleton-to-color 37%, @skeleton-color 63%);}
.ant-skeleton-element .ant-skeleton-button {background: @skeleton-color;border-radius: 2px;}
.ant-skeleton-element .ant-skeleton-button.ant-skeleton-button-circle {border-radius: 50%;}
.ant-skeleton-element .ant-skeleton-button.ant-skeleton-button-round {border-radius: 32px;}
@ -1591,7 +1611,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
.ant-table.ant-table-bordered.ant-table-scroll-horizontal > .ant-table-container > .ant-table-body > table > tbody > tr.ant-table-expanded-row > td, .ant-table.ant-table-bordered.ant-table-scroll-horizontal > .ant-table-container > .ant-table-body > table > tbody > tr.ant-table-placeholder > td {border-right: 0;}
.ant-table.ant-table-bordered > .ant-table-footer {border: 1px solid @border-color-split;border-top: 0;}
.ant-table-cell .ant-table-container:first-child {border-top: 0;}
.ant-table-cell-scrollbar {box-shadow: 0 1px 0 1px @table-header-bg;}
.ant-table-cell-scrollbar:not([rowspan]) {box-shadow: 0 1px 0 1px @table-header-bg;}
.ant-table {color: @text-color;background: @component-background;border-radius: 2px;}
.ant-table table {border-radius: 2px 2px 0 0;border-collapse: separate;border-spacing: 0;}
.ant-table-footer {color: @heading-color;background: @background-color-light;}
@ -1642,10 +1662,10 @@ tr.ant-table-expanded-row:hover > td {background: @table-expanded-row-bg;}
.ant-table-empty .ant-table-tbody > tr.ant-table-placeholder {color: @disabled-color;}
.ant-table-tbody > tr.ant-table-placeholder:hover > td {background: @component-background;}
.ant-table-cell-fix-left, .ant-table-cell-fix-right {background: @component-background;}
.ant-table-ping-left:not(.ant-table-has-fix-left) .ant-table-container::before {box-shadow: inset 10px 0 8px -8px darken(@shadow-color, 5%);}
.ant-table-ping-left:not(.ant-table-has-fix-left) > .ant-table-container::before {box-shadow: inset 10px 0 8px -8px darken(@shadow-color, 5%);}
.ant-table-ping-left .ant-table-cell-fix-left-first::after, .ant-table-ping-left .ant-table-cell-fix-left-last::after {box-shadow: inset 10px 0 8px -8px darken(@shadow-color, 5%);}
.ant-table-ping-left .ant-table-cell-fix-left-last::before {background-color: transparent !important;}
.ant-table-ping-right:not(.ant-table-has-fix-right) .ant-table-container::after {box-shadow: inset -10px 0 8px -8px darken(@shadow-color, 5%);}
.ant-table-ping-right:not(.ant-table-has-fix-right) > .ant-table-container::after {box-shadow: inset -10px 0 8px -8px darken(@shadow-color, 5%);}
.ant-table-ping-right .ant-table-cell-fix-right-first::after, .ant-table-ping-right .ant-table-cell-fix-right-last::after {box-shadow: inset -10px 0 8px -8px darken(@shadow-color, 5%);}
.ant-table-sticky-holder {background: @component-background;}
.ant-table-sticky-scroll {background: lighten(@table-border-color, 80%);border-top: 1px solid @border-color-split;}
@ -1654,6 +1674,7 @@ tr.ant-table-expanded-row:hover > td {background: @table-expanded-row-bg;}
.ant-table-sticky-scroll-bar-active {background-color: fade(@table-sticky-scroll-bar-bg, 80%);}
.ant-table-title {border-radius: 2px 2px 0 0;}
.ant-table-title + .ant-table-container {border-top-left-radius: 0;border-top-right-radius: 0;}
.ant-table-title + .ant-table-container table {border-radius: 0;}
.ant-table-title + .ant-table-container table > thead > tr:first-child th:first-child {border-radius: 0;}
.ant-table-title + .ant-table-container table > thead > tr:first-child th:last-child {border-radius: 0;}
.ant-table-container {border-top-left-radius: 2px;border-top-right-radius: 2px;}
@ -1710,44 +1731,63 @@ tr.ant-table-expanded-row:hover > td {background: @table-expanded-row-bg;}
.ant-tag-checkable-checked {background-color: @primary-color;}
.ant-tag-checkable:active {background-color: color(~`colorPalette("@{primary-color}", 7)`);}
<<<<<<< Updated upstream
.ant-tag-pink {color: #c41d7f;background: color(~`colorPalette("@{component-background}", 1)`);border-color: #ffadd2;}
=======
>>>>>>> Stashed changes
.ant-tag-pink {color: #c41d7f;background: #fff0f6;border-color: #ffadd2;}
.ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
.ant-tag-magenta {color: #c41d7f;background: #fff0f6;border-color: #ffadd2;}
.ant-tag-magenta {color: #c41d7f;background: color(~`colorPalette("@{component-background}", 1)`);border-color: #ffadd2;}
.ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
<<<<<<< Updated upstream
.ant-tag-red {color: #cf1322;background: #fff1f0;border-color: #ffa39e;}
=======
.ant-tag-pink {color: #c41d7f;background: color(~`colorPalette("@{success-color-deprecated-bg}", 1)`);border-color: #ffadd2;}
.ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
.ant-tag-magenta {color: #c41d7f;background: color(~`colorPalette("@{success-color-deprecated-bg}", 1)`);border-color: #ffadd2;}
.ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
.ant-tag-red {color: #cf1322;background: color(~`colorPalette("@{modal-header-border-color-split}", 1)`);border-color: #ffa39e;}
=======
.ant-tag-red {color: #cf1322;background: color(~`colorPalette("@{segmented-label-hover-color}", 1)`);border-color: #ffa39e;}
>>>>>>> Stashed changes
.ant-tag-red-inverse {color: #fff;background: #f5222d;border-color: #f5222d;}
.ant-tag-volcano {color: #d4380d;background: #fff2e8;border-color: #ffbb96;}
.ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;}
.ant-tag-orange {color: #d46b08;background: #fff7e6;border-color: #ffd591;}
.ant-tag-orange {color: #d46b08;background: color(~`colorPalette("@{alert-warning-border-color}", 1)`);border-color: #ffd591;}
.ant-tag-orange-inverse {color: #fff;background: #fa8c16;border-color: #fa8c16;}
.ant-tag-yellow {color: #d4b106;background: #feffe6;border-color: #fffb8f;}
.ant-tag-yellow {color: #d4b106;background: color(~`colorPalette("@{modal-footer-border-color-split}", 1)`);border-color: #fffb8f;}
.ant-tag-yellow-inverse {color: #fff;background: #fadb14;border-color: #fadb14;}
.ant-tag-gold {color: #d48806;background: #fffbe6;border-color: #ffe58f;}
.ant-tag-gold-inverse {color: #fff;background: #faad14;border-color: #faad14;}
.ant-tag-cyan {color: #08979c;background: #e6fffb;border-color: #87e8de;}
.ant-tag-cyan-inverse {color: #fff;background: #13c2c2;border-color: #13c2c2;}
.ant-tag-lime {color: #7cb305;background: #fcffe6;border-color: #eaff8f;}
.ant-tag-lime {color: #7cb305;background: color(~`colorPalette("@{text-color-secondary}", 1)`);border-color: #eaff8f;}
.ant-tag-lime-inverse {color: #fff;background: #a0d911;border-color: #a0d911;}
.ant-tag-green {color: #389e0d;background: #f6ffed;border-color: #b7eb8f;}
.ant-tag-green-inverse {color: #fff;background: #52c41a;border-color: #52c41a;}
<<<<<<< Updated upstream
.ant-tag-blue {color: #096dd9;background: color(~`colorPalette("@{pagination-item-input-bg}", 1)`);border-color: #91d5ff;}
.ant-tag-blue {color: #096dd9;background: #e6f7ff;border-color: #91d5ff;}
.ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;}
.ant-tag-geekblue {color: #1d39c4;background: color(~`colorPalette("@{avatar-bg}", 4)`);border-color: #adc6ff;}
=======
.ant-tag-geekblue {color: #1d39c4;background: color(~`colorPalette("@{btn-primary-bg}", 1)`);border-color: #adc6ff;}
.ant-tag-blue {color: #096dd9;background: #e6f7ff;border-color: color(~`colorPalette("@{alert-info-border-color}", 5)`);}
.ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;}
.ant-tag-geekblue {color: #1d39c4;background: color(~`colorPalette("@{tree-bg}", 1)`);border-color: #adc6ff;}
>>>>>>> Stashed changes
.ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;}
.ant-tag-purple {color: #531dab;background: #f9f0ff;border-color: #d3adf7;}
=======
.ant-tag-blue {color: #096dd9;background: #e6f7ff;border-color: #91d5ff;}
.ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;}
.ant-tag-geekblue {color: #1d39c4;background: color(~`colorPalette("@{dropdown-menu-submenu-disabled-bg}", 3)`);border-color: #adc6ff;}
.ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;}
.ant-tag-purple {color: #531dab;background: color(~`colorPalette("@{calendar-bg}", 1)`);border-color: #d3adf7;}
.ant-tag-purple {color: #531dab;background: color(~`colorPalette("@{alert-error-bg-color}", 1)`);border-color: #d3adf7;}
>>>>>>> Stashed changes
.ant-tag-purple-inverse {color: #fff;background: #722ed1;border-color: #722ed1;}
.ant-tag-success {color: #52c41a;background: @success-color-deprecated-bg;border-color: @success-color-deprecated-border;}
.ant-tag-processing {color: @primary-color;background: @info-color-deprecated-bg;border-color: @info-color-deprecated-border;}
@ -1770,7 +1810,7 @@ tr.ant-table-expanded-row:hover > td {background: @table-expanded-row-bg;}
.ant-tooltip {color: @text-color;}
.ant-tooltip-inner {color: #fff;background-color: @tooltip-bg;border-radius: 2px;box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);}
.ant-tooltip-arrow {background: transparent;}
.ant-tooltip-arrow-content {--antd-arrow-background-color: linear-gradient(to right bottom, fadeout(@tooltip-bg, 10%), @tooltip-bg);background-color: transparent;border-radius: 0 0 2px;}
.ant-tooltip-arrow-content {--antd-arrow-background-color: linear-gradient(to right bottom, fadeout(@tooltip-bg, 10%), @tooltip-bg);border-radius: 0 0 2px;}
.ant-tooltip-arrow-content::before {background: var(--antd-arrow-background-color);background-repeat: no-repeat;background-position: -10px -10px;}
.ant-tooltip-placement-top .ant-tooltip-arrow-content, .ant-tooltip-placement-topLeft .ant-tooltip-arrow-content, .ant-tooltip-placement-topRight .ant-tooltip-arrow-content {box-shadow: 3px 3px 7px rgba(0, 0, 0, 0.07);}
.ant-tooltip-placement-right .ant-tooltip-arrow-content, .ant-tooltip-placement-rightTop .ant-tooltip-arrow-content, .ant-tooltip-placement-rightBottom .ant-tooltip-arrow-content {box-shadow: -3px 3px 7px rgba(0, 0, 0, 0.07);}
@ -1960,6 +2000,7 @@ a.ant-typography.ant-typography-disabled:hover, .ant-typography a.ant-typography
.ant-typography pre code {background: transparent;border: 0;}
.ant-typography blockquote {border-left: 4px solid rgba(100, 100, 100, 0.2);}
.ant-upload {color: @text-color;}
.ant-upload.ant-upload-disabled {color: @disabled-color;}
.ant-upload.ant-upload-select-picture-card {background-color: @background-color-light;border: 1px dashed @border-color-base;border-radius: 2px;}
.ant-upload.ant-upload-select-picture-card:hover {border-color: @primary-color;}
.ant-upload-disabled.ant-upload.ant-upload-select-picture-card:hover {border-color: @border-color-base;}
@ -1985,7 +2026,11 @@ a.ant-typography.ant-typography-disabled:hover, .ant-typography a.ant-typography
.ant-upload-list-picture .ant-upload-list-item:hover .ant-upload-list-item-info, .ant-upload-list-picture-card .ant-upload-list-item:hover .ant-upload-list-item-info {background: transparent;}
.ant-upload-list-picture .ant-upload-list-item-uploading, .ant-upload-list-picture-card .ant-upload-list-item-uploading {border-style: dashed;}
<<<<<<< Updated upstream
.ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='color(~`colorPalette("@{pagination-item-input-bg}", 1)`)'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='color(~`colorPalette("@{pagination-item-input-bg}", 1)`)'] {fill: @error-color-deprecated-bg;}
.ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'] {fill: @error-color-deprecated-bg;}
.ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'] {fill: @error-color-deprecated-bg;}
=======
.ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'] {fill: @error-color-deprecated-bg;}
>>>>>>> Stashed changes
@ -1994,7 +2039,6 @@ a.ant-typography.ant-typography-disabled:hover, .ant-typography a.ant-typography
.ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-eye, .ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-download, .ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-delete {color: rgba(255, 255, 255, 0.85);}
.ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-eye:hover, .ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-download:hover, .ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-delete:hover {color: #fff;}
.ant-upload-list-picture-card .ant-upload-list-item-uploading.ant-upload-list-item {background-color: @background-color-light;}
.ant-upload-list .ant-upload-animate-inline-appear, .ant-upload-list .ant-upload-animate-inline-enter, .ant-upload-list .ant-upload-animate-inline-leave {animation-fill-mode: cubic-bezier(0.78, 0.14, 0.15, 0.86);}
.ant-pro-table-search {background-color: @component-background !important;}
.bezierEasingMixin() {
@functions: ~`(function() {var NEWTON_ITERATIONS = 4;var NEWTON_MIN_SLOPE = 0.001;var SUBDIVISION_PRECISION = 0.0000001;var SUBDIVISION_MAX_ITERATIONS = 10;var kSplineTableSize = 11;var kSampleStepSize = 1.0 / (kSplineTableSize - 1.0);var float32ArraySupported = typeof Float32Array === 'function';function A (aA1, aA2) { return 1.0 - 3.0 * aA2 + 3.0 * aA1; }
@ -2444,7 +2488,8 @@ this.tinycolor = tinycolor;})()`;}
.colorPaletteMixin() {
@functions: ~`(function() {var hueStep = 2;var saturationStep = 0.16;var saturationStep2 = 0.05;var brightnessStep1 = 0.05;var brightnessStep2 = 0.15;var lightColorCount = 5;var darkColorCount = 4;var getHue = function(hsv, i, isLight) {var hue;if (hsv.h >= 60 && hsv.h <= 240) {hue = isLight ? hsv.h - hueStep * i : hsv.h + hueStep * i;} else {hue = isLight ? hsv.h + hueStep * i : hsv.h - hueStep * i;}
if (hue < 0) {hue += 360;} else if (hue >= 360) {hue -= 360;}
return Math.round(hue);};var getSaturation = function(hsv, i, isLight) {var saturation;if (isLight) {saturation = hsv.s - saturationStep * i;} else if (i === darkColorCount) {saturation = hsv.s + saturationStep;} else {saturation = hsv.s + saturationStep2 * i;}
return Math.round(hue);};var getSaturation = function(hsv, i, isLight) {if (hsv.h === 0 && hsv.s === 0) {return hsv.s;}
var saturation;if (isLight) {saturation = hsv.s - saturationStep * i;} else if (i === darkColorCount) {saturation = hsv.s + saturationStep;} else {saturation = hsv.s + saturationStep2 * i;}
if (saturation > 1) {saturation = 1;}
if (isLight && i === lightColorCount && saturation > 0.1) {saturation = 0.1;}
if (saturation < 0.06) {saturation = 0.06;}
@ -2901,7 +2946,7 @@ this.tinycolor = tinycolor;})()`;}
@cascader-dropdown-line-height: @dropdown-line-height;
@anchor-bg: transparent;
@anchor-border-color: @border-color-split;
@anchor-link-top: 7px;
@anchor-link-top: 4px;
@anchor-link-left: 16px;
@anchor-link-padding: @anchor-link-top 0 @anchor-link-top @anchor-link-left;
@tooltip-max-width: 250px;
@ -2926,7 +2971,7 @@ this.tinycolor = tinycolor;})()`;}
@modal-header-border-style: @border-style-base;
@modal-header-title-line-height: 22px;
@modal-header-title-font-size: @font-size-lg;
@modal-header-close-size: 56px;
@modal-header-close-size: @modal-header-title-line-height + 2 * @modal-header-padding-vertical;
@modal-heading-color: @heading-color;
@modal-close-color: @text-color-secondary;
@modal-footer-bg: transparent;
@ -2937,6 +2982,7 @@ this.tinycolor = tinycolor;})()`;}
@modal-mask-bg: fade(@black, 45%);
@modal-confirm-body-padding: 32px 32px 24px;
@modal-confirm-title-font-size: @font-size-lg;
@modal-border-radius: @border-radius-base;
@progress-default-color: @processing-color;
@progress-remaining-color: @background-color-base;
@progress-info-text-color: @progress-text-color;

BIN
web/client/assets/images/leadership/bei.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

BIN
web/client/assets/images/leadership/center.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
web/client/assets/images/leadership/you.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

BIN
web/client/assets/images/leadership/zuo.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

BIN
web/client/assets/images/worker.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

70
web/client/index.html

@ -1,43 +1,33 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title></title>
<link rel="shortcut icon" href="/assets/images/favicon.ico" />
<link
rel="stylesheet"
type="text/css"
href="/assets/font_sc/iconfont.css"
/>
<link rel="stylesheet" href="/assets/fontziti/font.css" />
<script type="text/javascript">
window._AMapSecurityConfig = {
securityJsCode: 'e955cd5ddfc3a752aa27d1e1c67d182d',
}
<head>
<meta charset="UTF-8" />
<title></title>
<link rel="shortcut icon" href="/assets/images/favicon.ico" />
<link rel="stylesheet" type="text/css" href="/assets/font_sc/iconfont.css" />
<link rel="stylesheet" href="/assets/fontziti/font.css" />
<script type="text/javascript">
window._AMapSecurityConfig = {
securityJsCode: 'e955cd5ddfc3a752aa27d1e1c67d182d',
}
</script>
<script src="https://webapi.amap.com/maps?v=2.0&key=00f9a29dedcdbd8befec3dfe0cef5003&plugin=AMap.Adaptor,AMap.Scale,AMap.ToolBar,AMap.DistrictSearch,AMap.Geocoder,AMap.CustomLayer,Map3D,ElasticMarker"></script>
</head>
<body>
<link
rel="stylesheet/less"
type="text/css"
href="/assets/color.less"
rel="external nofollow"
/>
<script>
window.less = {
async: false,
env: "production",
};
</script>
<script
type="text/javascript"
src="https://cdnjs.cloudflare.com/ajax/libs/less.js/2.7.2/less.min.js"
></script>
<div id="App"></div>
<script
type="text/javascript"
src="http://localhost:5001/client/build/app.js"
></script>
</body>
</html>
<script
src="https://webapi.amap.com/maps?v=2.0&key=00f9a29dedcdbd8befec3dfe0cef5003&plugin=AMap.Adaptor,AMap.Scale,AMap.ToolBar,AMap.DistrictSearch,AMap.Geocoder,AMap.CustomLayer,Map3D,ElasticMarker"></script>
<script src="https://webapi.amap.com/loca?v=2.0.0&key=00f9a29dedcdbd8befec3dfe0cef5003"></script>
</head>
<body>
<link rel="stylesheet/less" type="text/css" href="/assets/color.less" rel="external nofollow" />
<script>
window.less = {
async: false,
env: "production",
};
</script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/less.js/2.7.2/less.min.js"></script>
<div id="App"></div>
<script type="text/javascript" src="http://localhost:5001/client/build/app.js"></script>
</body>
</html>

188
web/client/src/sections/fillion/components/gis/bounds.js

@ -0,0 +1,188 @@
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { geoJson } from './mock_data';
export default class Bounds extends Component {
constructor(props) {
super(props);
this.map = props.map;
this.pl = {};
this.textMarker = {};
}
static propTypes = {
prop: PropTypes
}
componentDidMount() {
if (!window.BoundPl) {
this.drawBounds();
}
}
componentWillUnmount() {
if (window.local_)
window.local_.remove(this.pl);
this.textMarker = null;
window.BoundPl = null;
}
drawBounds = () => {
var map = this.map;
var loca = window.local_;
loca.ambLight = {
intensity: 0.3,
color: '#fff',
};
loca.dirLight = {
intensity: 0.6,
color: '#fff',
target: [0, 0, 0],
position: [0, -1, 1],
};
loca.pointLight = {
color: 'rgb(100,100,100)',
position: [120.24289, 30.341335, 20000],
intensity: 3,
// 距离表示从光源到光照强度为 0 的位置,0 就是光不会消失。
distance: 50000,
};
var geo = new Loca.GeoJSONSource({
data: geoJson
});
var colors = ['#04398c', '#04398c', '#0542a5'].reverse();
var height = [500];
var pl = new Loca.PolygonLayer({
// loca,
zIndex: 1,
opacity: 0.6,
// cullface: 'none',
shininess: 10,
hasSide: true,
});
pl.setSource(geo);
pl.setStyle({
topColor: function (index, feature) {
var i = index % 3;
return colors[i];
},
sideColor: function (index, feature) {
return '#023890';
},
borderColor: function () {
return '#24dcf7'
},
height: function (index, feature) {
return index == 0 ? height[0] : height[0] + index * 50;
},
altitude: 0,
});
loca.add(pl);
// 创建纯文本标记
var text = new AMap.Text({
text: '纯文本标记',
anchor: 'center', // 设置文本标记锚点
draggable: true,
cursor: 'pointer',
angle: 0,
visible: false,
offset: [60, 60],
extData: 'bounds_text',
style: {
'padding': '5px 10px',
'margin-bottom': '1rem',
'border-radius': '.25rem',
'background-color': 'rgba(0,0,0,0.5)',
// 'width': '12rem',
'border-width': 0,
'box-shadow': '0 2px 6px 0 rgba(255, 255, 255, .3)',
'text-align': 'center',
'font-size': '16px',
'color': '#fff',
},
});
// text.setMap(map);
if (!this.textMarker)
map.add(text);
this.textMarker = text;
console.log(text)
// 拾取
map.on('mousemove', (e) => {
var feat = pl.queryFeature(e.pixel.toArray());
// if (!text) {
map.add(text);
// text = this.textMarker;
// }
if (feat) {
text.show();
text.setText(feat.properties.NAME);
text.setPosition(e.lnglat);
pl.setStyle({
topColor: (index, feature) => {
if (feature === feat) {
return [19, 43, 77, 1];
}
// var v = feature.properties.health * 100;
var i = index % 3;
return colors[i];
},
sideColor: (index, feature) => {
if (feature === feat) {
return '#023890';
}
return '#023890';
},
borderColor: function () {
return '#24dcf7'
},
height: function (index, feature) {
return index == 0 ? height[0] : height[0] + index * 50;
},
});
} else {
pl.setStyle({
topColor: function (index, feature) {
var i = index % 3;
return colors[i];
},
sideColor: function (index, feature) {
return '#023890';
},
borderColor: function () {
return '#24dcf7'
},
height: function (index, feature) {
return index == 0 ? height[0] : height[0] + index * 50;
},
altitude: 0,
});
text.hide();
map.remove(text);
}
});
map.setZoom(12.88)
map.setCenter([115.888149, 28.549851]);
map.setRotation(-68.7);
map.setPitch(42);
this.pl = pl;
window.BoundPl = pl;
}
render() {
return (
<div>
</div>
)
}
}

59
web/client/src/sections/fillion/components/gis/mock_data.js

File diff suppressed because one or more lines are too long

131
web/client/src/sections/fillion/components/gis/patrolGis.js

@ -1,10 +1,133 @@
import React from 'react'
import PropTypes from 'prop-types'
import { useEffect } from 'react';
import { useState } from 'react';
import { DatePicker } from 'antd';
import Bounds from './bounds';
import moment from 'moment';
const { RangePicker } = DatePicker;
function PatrolGis(props) {
return (
<div>PatrolGis</div>
)
const { reportList, userId, dispatch } = props;
const [mapComplete, setMapComplete] = useState(false);
const [mapObj, setMapObj] = useState();
const [dateRange, setDateRange] = useState();
useEffect(() => {
if (AMap) loadMap();
return () => {
if (window.local_) {
window.local_ = null
}
if (mapObj)
mapObj.clearMap();
}
}, [true])
useEffect(() => {
if (userId) {
}
}, [userId, dateRange])
useEffect(() => {
if (reportList && mapObj) {
mapObj.clearMap();
renderMarkers();
renderPath();
}
}, [reportList, mapObj])
const loadMap = () => {
const map = new AMap.Map("amapId", {
resizeEnable: true,
center: [115.99255, 28.503617],//地图中心点,初始定位加载显示楼块
zoom: 8,//地图显示的缩放级别
zooms: [8, 18],
pitch: 0, // 地图俯仰角度,有效范围 0 度- 83 度
viewMode: '3D', // 地图模式
mapStyle: 'amap://styles/light',
});
//主题样式
// var styleName = defaultStyleName;
// map.setMapStyle(styleName);
let windowOnload = false;
map.on('complete', function () {
console.log("map-complete")
if (!window.local_) {
window.local_ = new Loca.Container({ map });
setMapObj(map);
}
});
window.onload = function () {
console.log("window.onload")
windowOnload = true;
}
};
const renderMarkers = () => {
const map = mapObj;
if (reportList && reportList instanceof Array) {
reportList.map(item => {
const { longitude, latitude, user } = item;
if (!longitude || !latitude) {
return;
}
const imageURL = '/assets/images/worker.png'
let icon = new AMap.Icon({
size: new AMap.Size(24, 24), // 图标尺寸
image: imageURL, // Icon的图像
rotation: 270,
// imageOffset: new AMap.Pixel(-14, -14), // 图像相对展示区域的偏移量,适于雪碧图等
imageSize: new AMap.Size(24, 24) // 根据所设置的大小拉伸或压缩图片
});
let marker = new AMap.Marker({
position: new AMap.LngLat(longitude, latitude),
icon: icon,
offset: new AMap.Pixel(-12, -12),
extData: {
name: user.name || '',
}
});
// marker.setTitle(s.name);
map.add(marker);
})
}
}
const renderPath = () => {
const map = mapObj;
if (reportList && reportList instanceof Array) {
let list = reportList
list.sort((a, b) => {
const timeA = moment(a.time).valueOf();
const timeB = moment(b.time).valueOf();
return timeA - timeB;
})
let path = []
list.map(item => {
const { longitude, latitude, } = item;
if (longitude && latitude)
path.push([item.longitude, item.latitude])
});
var polyline1 = new AMap.Polyline({
map: map,
path: path, // 设置线覆盖物路径
showDir: true,
strokeColor: '#3366bb', // 线颜色
strokeWeight: 7 // 线宽
});
}
}
return (
<div style={{ width: '100%', backgroundColor: '#101824', height: '100%', minHeight: 700 }}>
<div id='amapId' style={{ width: '100%', height: '100%', background: "#101824", minHeight: 700 }} />
<RangePicker onChange={(date, dateString) => { setDateRange(dateString) }} />
{mapObj ? <Bounds map={mapObj} /> : ''}
</div >
)
}
PatrolGis.propTypes = {}

2
web/client/src/sections/fillion/components/patrolTable.js

@ -301,7 +301,7 @@ const PatrolTable = (props) => {
<DetailList reportList={reportList} record={record} loading={reportListLoading} dispatch={dispatch} handleOpen={handleOpen} handelRefresh={handelRefresh} />
</Card>
</div>],
tab2: <PatrolGis />
tab2: <PatrolGis userId={(record ||{}).id} dispatch={dispatch} />
};
const [activeTabKey1, setActiveTabKey1] = useState('tab1');
const onTab1Change = (key) => {

2
web/client/src/sections/organization/components/depModal.js

@ -43,7 +43,7 @@ const DepModal = (props) => {
autocomplete: 'new-password'
}}
rules={[
{ required: true, message: '请输入部门名称' }, { max: 20, message: '请输入10个字以内的名称' }
{ required: true, message: '请输入部门名称' }, { max: 10, message: '请输入10个字以内的名称' }
]}
/>
<ProFormTreeSelect

4
web/client/src/sections/organization/components/userModal.js

@ -41,12 +41,11 @@ const UserModal = (props) => {
<ProForm.Group>
<ProFormText
name={['contract', 'name']}
maxLength={10}
width="md"
label="姓名"
required
placeholder="请输入姓名"
rules={[{ required: true, message: '请输入姓名' }]}
rules={[{ required: true, message: '请输入姓名' },{ max: 10, message: '请输入10个字以内的名称' }]}
/>
< ProFormText
name={['contract', 'phone']}
@ -156,7 +155,6 @@ const UserModal = (props) => {
function mapStateToProps(state) {
const { depMessage } = state;
console.log('depMessage:', depMessage);
const pakData = (dep) => {
// console.log(dep);
return dep.map((d) => {

36
web/client/src/sections/quanju/actions/example.js

@ -51,6 +51,41 @@ export function getjiandetail() {
// reducer: { name: 'members' }
});
}
// <<<<<<< HEAD
// 获取运政数据统计
export function getyunzheng() {
return dispatch => basicAction({
type: 'get',
dispatch: dispatch,
actionType: 'GET_YUNZHENG',
url: ApiTable.getYunZheng,
msg: { error: '获取运政统计数据信息' },
// reducer: { name: 'members' }
});
}
// 获取道路养护数据统计及列表
export function getRoadmaintain() {
return dispatch => basicAction({
type: 'get',
dispatch: dispatch,
actionType: 'GET_ROADMAINTAIN',
url: ApiTable.getroadmaintain,
msg: { error: '获取道路养护数据信息' },
// reducer: { name: 'members' }
});
}
// 获取治超详情列
export function getZhichaolist() {
return dispatch => basicAction({
type: 'get',
dispatch: dispatch,
actionType: 'GET_ZHICHAOLIST',
url: ApiTable.getzhichaoList,
msg: { error: '获取治超详情列表数据' },
// reducer: { name: 'members' }
// =======
});
}
//获取宣传数据
export function getxuanchuan() {
@ -73,5 +108,6 @@ export function getBusTierList() {
url: ApiTable.getBusTier,
msg: { error: '获取公交车辆层级信息失败' },
reducer: { name: 'busTier' }
// >>>>>>> 385f017aeac33adc39a31e75faf6254a1a881d16
});
}

91
web/client/src/sections/quanju/containers/example.js

@ -24,43 +24,52 @@ const Example = (props) => {
}
useEffect(() => {
const timer = setTimeout(() => {
const map = new AMap.Map(MAPID, {
//resizeEnable: true,
center: [115.912663, 28.543149],//地图中心点,初始定位加载显示楼块
// center: [115.857952, 28.683003],//地图中心点
zoom: 13,//地图显示的缩放级别
zooms: [8, 18],
pitch: 65, // 地图俯仰角度,有效范围 0 度- 83 度
viewMode: '3D', // 地图模式
// rotation: 60
// showLabel: false
});
let styleName = 'amap://styles/fb26776387242721c2fc32e2cb1daccc';
map.setMapStyle(styleName);
let mapComplete = false;
let windowOnload = false;
window.onload = function () {
windowOnload = true;
}
}, 100);
//主题样式
return () => {
const amapKeys = Object.keys(localStorage).filter(key => key.match(/^_AMap_/)) // 销毁地图
amapKeys.forEach(key => {
localStorage.removeItem(key)
})
map.clearMap();
if (map) map.destroy();
map = null;
clearTimeout(timer)
}
}, [])
// useEffect(() => {
// const map = new AMap.Map(MAPID, {
// //resizeEnable: true,
// center: [115.912663, 28.543149],//地图中心点,初始定位加载显示楼块
// // center: [115.857952, 28.683003],//地图中心点
// zoom: 13,//地图显示的缩放级别
// zooms: [8, 18],
// pitch: 65, // 地图俯仰角度,有效范围 0 度- 83 度
// viewMode: '3D', // 地图模式
// // rotation: 60
// // showLabel: false
// });
// let styleName = 'amap://styles/fb26776387242721c2fc32e2cb1daccc';
// map.setMapStyle(styleName);
// let mapComplete = false;
// let windowOnload = false;
// window.onload = function () {
// windowOnload = true;
// }
// //主题样式
// //主题样式
// return () => {
// const amapKeys = Object.keys(localStorage).filter(key => key.match(/^_AMap_/)) // 销毁地图
// amapKeys.forEach(key => {
// localStorage.removeItem(key)
// })
// map.clearMap();
// if (map) map.destroy();
// clearTimeout(timer)
// }
// }, [])
return (
@ -71,15 +80,13 @@ const Example = (props) => {
document.body.clientHeight / 1080
)})`, */
}}>
<div id={MAPID} style={{ position: 'absolute', width: "100%", height: "100%" }}></div>
{/* <div id={MAPID} style={{ position: 'absolute', width: "100%", height: "100%" }}></div> */}
<div style={{ width: "100%", height: "10%" }}>
<Header tabChange={tabChange} tabKey={tabKey} dispatch={dispatch} />
</div>
<div style={{ position: 'absolute', width: "100%", height: "90%" }}>
<Footer tabKey={tabKey} />
<div style={{ width: "100%", height: "90%" }}>
<Footer tabKey={tabKey} dispatch={dispatch} />
</div>
{/* </div> */}
</div>
</Spin>

2
web/client/src/sections/quanju/containers/footer/build/Leftbottom.js

@ -190,7 +190,7 @@ legend: {
fontSize: 16,
fontFamily: 'YouSheBiaoTiHei',
color: '#fff',
padding:[0,0,0,15]
padding:[0,0,0,12]
},
}
}

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

@ -118,7 +118,7 @@ const Build = (props) => {
<Module title={"各种状态公路数量统计"} style={{ width: "100%",
height:" 33%"
}} customize = {true}>
<div className='build-left-top'>
{buildingnumber&&buildingnumber.buildedRoad!==0&&totalgongli!==0?<div className='build-left-top'>
<div className='build-left-top-item'>
<div>
{/* <i>&#9658;</i> */}
@ -136,7 +136,7 @@ const Build = (props) => {
</div>
<div>{buildingnumber?.buildedRoad || 0}</div>
</div>
</div>
</div>:<NoData/>}
</Module>
<Module title={"各乡镇道路分布统计"} style={{ width: "100%",
height:" 33%",marginTop:'3%'
@ -185,9 +185,10 @@ const Build = (props) => {
<div className='bgbuild-right'>
<Module title={"宣传栏"} style={{ width: "100%",
height:" 33%"
}}>
}} customize={true}>
<div className='build-right-top'>
<img src='/assets/images/quanju/xuanchuanlan.jpg'></img>
{/* <img src='/assets/images/quanju/xuanchuanlan.jpg'></img> */}
<video src='#' autoplay controls></video>
<h2>全面建设好农村公路切实发挥先行官作用</h2>
</div>
</Module>

8
web/client/src/sections/quanju/containers/footer/build/style.less

@ -211,15 +211,15 @@
.build-right-top{
width: 100%;
height: 100%;
padding: 0 10px 10px;
img{
padding: 0 10px;
video{
width: 100%;
height: 65%;
margin-bottom: 5%;
// margin-bottom: 5%;
}
h2{
height: 30%;
height: 25%;
width: 100%;
padding-left: 0.9375rem;
font-size: 1.5rem;

16
web/client/src/sections/quanju/containers/footer/conserve/right/right-bottom.js

@ -15,7 +15,7 @@ let underColorList = [
"rgba(255,194,20,0.5)"
]
const type = ['culvert','', 'road', 'bridge']
const type = ['culvert', '', 'road', 'bridge']
const RightBottom = (props) => {
const { roadMaintenances } = props
@ -23,7 +23,7 @@ const RightBottom = (props) => {
let typesNum = null
const list = roadMaintenances?.reportCount?.map((r, index) => {
totalData += Number(r.count)
if (r.projectType === type[index]) {
if (r.projectType === 'culvert' || 'road' || 'bridge') {
typesNum += Number(r.count)
}
switch (r.projectType) {
@ -41,12 +41,16 @@ const RightBottom = (props) => {
return {
name: '桥梁',
value: r.count
}
};
case '其他':
return {
name: '其他',
value: r.count
};
}
}).filter(f => f !== undefined)
const otherNum = totalData - typesNum
console.log();
otherNum !== null && list?.push({ name: '其他', value: otherNum })
// const otherNum = totalData - typesNum
// otherNum !== null && list?.push({ name: '其他', value: otherNum })
const style = { height: "31%", marginTop: "3%" }
return (
<>

12
web/client/src/sections/quanju/containers/footer/guanli/LeftItem.js

@ -7,6 +7,16 @@ export default function LeftItem({datas}) {
useEffect(() => {
let chartInstance = echarts.init(seasonChartRef.current);
const option = {
tooltip: {
show: true,
trigger: 'item',
position: 'right',
backgroundColor: 'rgba(0,0,0,0.7)',
textStyle: {
color: '#fff',
},
formatter: (values) => ` ${values.name}<b>${datas.processed}个</b>`,
},
title: {
text: `${(datas.processed*100/datas.total).toFixed(2)}%`,
top:'35%',
@ -70,7 +80,7 @@ export default function LeftItem({datas}) {
type: 'bar',
data: [{
name: '已处理',
value: (datas.processed/datas.total).toFixed(2)*100,
value: (datas.processed*100/datas.total).toFixed(2),
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [ {

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

@ -4,7 +4,7 @@ import Conserve from './conserve'
import Guanli from './guanli'
import Leadership from './leadership'
import Operation from './operation'
const Footer = ({ tabKey }) => {
const Footer = ({ tabKey, dispatch }) => {
return (
<>
{
@ -15,7 +15,7 @@ const Footer = ({ tabKey }) => {
case 'conserve':
return <Conserve />
case "leadership":
return <Leadership />
return <Leadership dispatch={dispatch} />
case "guanli":
return <Guanli />
case "operation":

7
web/client/src/sections/quanju/containers/footer/leadership/centerLeft.js

@ -4,12 +4,13 @@ import Centerleftcenter from "./centerleft/top"
import Centerleftcentertop from "./centerleft/bottom"
import Centerleftbottom from "./centerleft/center-left-bottom"
const CenterLeft = () => {
const CenterLeft = (props) => {
const { dispatch } = props
return (
<>
<div style={{ width: "48%", height: "100%", float: "left", marginLeft: "1%" }}>
<Centerlefttop />
<Centerleftbottom />
<Centerlefttop dispatch={dispatch} />
<Centerleftbottom dispatch={dispatch} />
</div>
</>
)

7
web/client/src/sections/quanju/containers/footer/leadership/centerleft/bottom.js

@ -6,6 +6,7 @@ import Qiaoliang from "./qiqoliang"
const Leftcentertop = (props) => {
const { dispatch } = props
const style = { height: "23%" }
const { tabKey } = props
return (
@ -14,11 +15,11 @@ const Leftcentertop = (props) => {
(() => {
switch (tabKey) {
case 'daolu':
return <Daolu />
return <Daolu dispatch={dispatch} />
case 'handong':
return <Handong />
return <Handong dispatch={dispatch} />
case "qiaoliang":
return <Qiaoliang />
return <Qiaoliang dispatch={dispatch} />
}
})()
}

9
web/client/src/sections/quanju/containers/footer/leadership/centerleft/center-left-bottom.js

@ -4,21 +4,22 @@ import Centerleftecharts from "./echarts/centerleftecharts"
import Bottomlunbo from './lunbo/bottomlunbo'
import Leftlunbo from './lunbo/toplunbo'
const Leftbottom = () => {
const Leftbottom = (props) => {
const style = { height: "28%", marginTop: "2%" }
const { dispatch } = props
return (
<>
<Module style={style} title={"运政管理"}>
<div style={{ width: "100%", height: "100%" }}>
<div style={{ width: "50%", height: "100%", float: "left" }}>
<Centerleftecharts />
<Centerleftecharts dispatch={dispatch} />
</div>
<div style={{ width: "50%", height: "100%", float: "right", }}>
<div style={{ width: "100%", height: "60%" }}>
<Bottomlunbo />
<Bottomlunbo dispatch={dispatch} />
</div>
<div style={{ width: "100%", height: "50%" }}>
<Leftlunbo />
<Leftlunbo dispatch={dispatch} />
</div>
</div>
</div>

5
web/client/src/sections/quanju/containers/footer/leadership/centerleft/center-left-top.js

@ -4,6 +4,7 @@ import Top from "./top"
import Bottom from "./bottom"
const Lefttop = (props) => {
const { dispatch } = props
const style = { height: "68%" }
const [tabKey, setTabKey] = useState('daolu')
@ -20,10 +21,10 @@ const Lefttop = (props) => {
<>
<Module style={style}>
<div style={{ width: "100%", height: "33%" }}>
<Top tabChange={tabChange} tabKey={tabKey} />
<Top tabChange={tabChange} tabKey={tabKey} dispatch={dispatch} />
</div>
<div style={{ width: "100%", height: "70%" }}>
<Bottom tabKey={tabKey} />
<Bottom tabKey={tabKey} dispatch={dispatch} />
</div>
</Module>
</>

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

@ -1,41 +1,29 @@
import React, { useState, useEffect } from 'react'
import Lun from "./lunbo/lunbo"
import Lun from "../right/lunbo"
import { getRoadmaintain, getdaolutongji } from "../../../../actions/example"
import moment from 'moment'
const Right = () => {
const Right = (props) => {
const { dispatch } = props
const [beijing, setBeijing] = useState()
const [list, setList] = useState([{ name: "苏LD1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD11121", chaoxian: "30%", penalty: "-6分和扣200元", days: "2022年5月4日" },
{ name: "苏LD112512121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏L1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD1151121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD11912121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD16112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏L2D111221", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "62", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD11152121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏L1D1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD11512121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD13112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD111612121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD111216221", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏L63D1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD163112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD651112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" }])
const [nums, setNums] = useState()
const [list, setList] = useState([])
const [roads, setRoads] = useState()
useEffect(() => {
const daolus = dispatch(getRoadmaintain()).then((res) => {
setList(res.payload.data.reportList.filter((item, index) => {
return item.projectType == "road"
}))
setNums(res.payload.data.processed)
})
}, [])
useEffect(() => {
const daolus = dispatch(getdaolutongji()).then((res) => {
// console.log("[roads]", res.payload.data.roadType);
setRoads(res.payload.data.roadType)
// const
})
}, [])
const renderBody = () => {
return (
@ -51,10 +39,10 @@ const Right = () => {
}}>
{beijing == index ? <img src='/assets/images/leadership/shezhi.png' style={{ width: "2%", height: "80%", position: "absolute", top: "12%", left: "6%" }} /> : ""}
{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: "25%" }} >{item.name}</p>
<p style={{ textAlign: "center", width: "25%", position: "absolute", right: "25%" }} >{item.name}</p>
<p style={{ textAlign: "center", width: "25%", position: "absolute", left: "5%" }} >{item.name}</p>
<p style={{ textAlign: "center", width: "25%", position: "absolute", right: "5%" }}>{item.name}</p></li>
<p style={{ textAlign: "center", width: "20%", position: "absolute", left: "25%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >日常养护</p>
{item.user?.name ? <p style={{ textAlign: "center", width: "25%", position: "absolute", right: "35%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.user.name}</p> : <p style={{ textAlign: "center", width: "25%", position: "absolute", right: "35%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >--</p>}
<p style={{ textAlign: "center", width: "25%", position: "absolute", left: "5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.road ? item.road : "--"}</p>
<p style={{ textAlign: "center", width: "30%", position: "absolute", right: "5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }}>{moment(item.time).format("YYYY-MM-Do HH:mm:ss") ? moment(item.time).format("YYYY-MM-Do HH:mm:ss") : "--"}</p></li>
)
})
}
@ -65,16 +53,35 @@ const Right = () => {
<>
<div style={{ width: "100%", height: "100%", float: "right", marginRight: "1%", position: "relative" }}>
<div style={{ width: "100%", height: "43%", position: "relative", left: "1%" }}>
<div style={{ width: "96%", position: "relative", left: "2%" }}>
<p style={{ position: "absolute", color: "rgba(216,240,255,0.8)" }}>占比<span style={{ fontFamily: " PingFangSC-Regular, PingFang SC" }}>{(roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100}</span>%</p>
<p style={{ width: "50%", position: "absolute", right: "0%", fontFamily: "YouSheBiaoTiHei", textAlign: "right", fontSize: "24px", color: "#F5FCFF", marginLeft: "10%" }}>{roads?.["县"].toFixed(3)}<span style={{ color: "#F5FCFF", fontSize: "16px", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>公里</span><span style={{ fontSize: "18px", color: "rgba(216,240,255,0.8)", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}></span></p>
</div>
<div style={{ width: "96%", position: "relative", left: "2%", height: "50%" }}>
<div style={{ width: (roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100 + "%" || "", height: "40%", background: "url(/assets/images/leadership/zuo.png)", backgroundSize: "100% 100%", position: "absolute", top: "50%" }}>
{/* </div>
<div style={{ width: "15%", height: "20%", background: "url(/assets/images/leadership/center.png)", backgroundSize: "100% 100%", position: "absolute", top: "67%", left: "34%" }}> */}
<div style={{ height: "70%", width: "100%", position: "relative", left: "5%", top: "45%" }}>
</div>
<div style={{ width: ((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100 + "%" || "", height: "20%", background: "url(/assets/images/leadership/you.png)", backgroundSize: "100% 100%", position: "absolute", right: "-1%", top: "70%" }}></div>
</div>
<div style={{ width: "96%", position: "relative", left: "2%" }}>
<p style={{ width: "50%", position: "absolute", color: "rgba(216,240,255,0.8)", fontSize: "18px" }}>乡村道道路<span style={{ marginLeft: "4%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF" }}>{(roads?.["乡"] + roads?.["村"]).toFixed(3)}</span><span style={{ marginLeft: "4%" }}></span></p>
<p style={{ position: "absolute", right: "0", color: "rgba(216,240,255,0.8)" }}>占比<span>{((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100}</span><span>%</span></p>
</div>
</div>
<div style={{ height: "80%", width: "100%", position: "relative", left: "5%", top: "-8%" }}>
<div style={{ width: "100%", height: "40px"/* , backgroundColor: "#fff" */, position: "relative" }}>
{/* <p>{title || []}</p> */}
<img src='/assets/images/quanju/icon.png' style={{ width: "24px", position: "absolute", left: "-1%", top: "23%" }} />
<span style={{ position: "absolute", color: "#FFFFFF", fontSize: "24px", fontFamily: "YouSheBiaoTiHei", left: "3%" }}>离线详情</span>
<span style={{ position: "absolute", color: "#FFFFFF", fontSize: "24px", fontFamily: "YouSheBiaoTiHei", left: "3%" }}>养护事件</span>
<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 || []}</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>
<Lun
canScroll={true}
// canScroll={true}
content={renderBody()}
containerStyle={{ position: "absolute", height: "80%", width: "90%" }}
divHeight={"100%"}

24
web/client/src/sections/quanju/containers/footer/leadership/centerleft/echarts/centerleftecharts.js

@ -1,8 +1,20 @@
import React, { useEffect, useRef } from 'react'
import React, { useEffect, useRef, useState } from 'react'
import * as echarts from 'echarts';
import { getyunzheng } from '../../../../../actions/example';
const Leftbottomecharts = () => {
const Leftbottomecharts = (props) => {
const chartRef = useRef(null);
const { dispatch } = props
const [list, setList] = useState([])
const [max, setMax] = useState()
useEffect(() => {
const yunzheng = dispatch(getyunzheng()).then((res) => {
// console.log(res.payload);
setMax(Math.max.apply(null, [res.payload.data.passengerTransport, res.payload.data.hazardousGoods, res.payload.data.taxi, res.payload.data.bus]));
setList([res.payload.data.passengerTransport, res.payload.data.hazardousGoods, res.payload.data.taxi, res.payload.data.bus])
})
}, [])
useEffect(() => {
var chartInstance = echarts.init(chartRef.current);
var colorArray = [
@ -35,7 +47,7 @@ const Leftbottomecharts = () => {
grid: {
left: "5%",
top: "12%",
right: "1%",
right: "4%",
bottom: "8%",
containLabel: true,
},
@ -99,7 +111,7 @@ const Leftbottomecharts = () => {
// zlevel: 1,
barCategoryGap: "50%",
color: "#042B7F",
data: [150, 150, 150, 150],
data: [max + 20, max + 20, max + 20, max + 20],
tooltip: {
show: false,
},
@ -111,7 +123,7 @@ const Leftbottomecharts = () => {
barWidth: 10,
barGap: "-100%",
barCategoryGap: "50%",
data: [60, 132, 89, 134],
data: list || [],
markPoint: {
Symbol: "",/* 可以通过’image: *///url’设置为图片,其中url为图片的链接
data: [{ type: "max", name: "最大值" }],
@ -188,7 +200,7 @@ const Leftbottomecharts = () => {
window.onresize = function () {
chartInstance.resize();
}
}, []);
}, [list]);
return (

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

@ -1,41 +1,29 @@
import React, { useState, useEffect } from 'react'
import Lun from "./lunbo/lunbo"
import Lun from "../right/lunbo"
import { getRoadmaintain, getdaolutongji } from "../../../../actions/example"
import moment from 'moment'
const Right = () => {
const Right = (props) => {
const { dispatch } = props
const [beijing, setBeijing] = useState()
const [list, setList] = useState([{ name: "苏LD1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD11121", chaoxian: "30%", penalty: "-6分和扣200元", days: "2022年5月4日" },
{ name: "苏LD112512121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏L1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD1151121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD11912121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD16112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏L2D111221", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "62", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD11152121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏L1D1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD11512121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD13112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD111612121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD111216221", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏L63D1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD163112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD651112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" }])
const [list, setList] = useState([])
const [roads, setRoads] = useState()
useEffect(() => {
const daolus = dispatch(getRoadmaintain()).then((res) => {
setList(res.payload.data.reportList.filter((item, index) => {
return item.projectType == "culvert"
}))
})
}, [])
useEffect(() => {
const daolus = dispatch(getdaolutongji()).then((res) => {
// console.log("[roads]", res.payload.data.roadType);
setRoads(res.payload.data.townCulvert)
console.log(res.payload.data.townCulvert);
// const
})
}, [])
const renderBody = () => {
return (
@ -51,10 +39,10 @@ const Right = () => {
}}>
{beijing == index ? <img src='/assets/images/leadership/shezhi.png' style={{ width: "2%", height: "80%", position: "absolute", top: "12%", left: "6%" }} /> : ""}
{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: "25%" }} >{item.name}</p>
<p style={{ textAlign: "center", width: "25%", position: "absolute", right: "25%" }} >{item.name}</p>
<p style={{ textAlign: "center", width: "25%", position: "absolute", left: "5%" }} >{item.name}</p>
<p style={{ textAlign: "center", width: "25%", position: "absolute", right: "5%" }}>{item.name}</p></li>
<p style={{ textAlign: "center", width: "20%", position: "absolute", left: "25%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >日常养护</p>
{item.user?.name ? <p style={{ textAlign: "center", width: "25%", position: "absolute", right: "35%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.user.name}</p> : <p style={{ textAlign: "center", width: "25%", position: "absolute", right: "35%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >--</p>}
<p style={{ textAlign: "center", width: "25%", position: "absolute", left: "5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.road ? item.road : "--"}</p>
<p style={{ textAlign: "center", width: "30%", position: "absolute", right: "5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }}>{moment(item.time).format("YYYY-MM-Do HH:mm:ss") ? moment(item.time).format("YYYY-MM-Do HH:mm:ss") : "--"}</p></li>
)
})
}
@ -65,16 +53,35 @@ const Right = () => {
<>
<div style={{ width: "100%", height: "100%", float: "right", marginRight: "1%", position: "relative" }}>
<div style={{ width: "100%", height: "43%", position: "relative", left: "1%" }}>
<div style={{ width: "96%", position: "relative", left: "2%" }}>
<p style={{ position: "absolute", color: "rgba(216,240,255,0.8)" }}>占比<span style={{ fontFamily: " PingFangSC-Regular, PingFang SC" }}>{(roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100}</span>%</p>
<p style={{ width: "50%", position: "absolute", right: "0%", textAlign: "right", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF", marginLeft: "10%" }}>{roads?.["县"].toFixed(0)}<span style={{ color: "#F5FCFF", fontSize: "16px", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}></span><span style={{ fontSize: "18px", color: "rgba(216,240,255,0.8)", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}></span></p>
</div>
<div style={{ width: "96%", position: "relative", left: "2%", height: "50%" }}>
<div style={{ width: (roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100 + "%" || "", height: "40%", backgroundColor: "#fff", float: "left", marginTop: "4%" }}>
</div>
{/* <div style={{ width: "15%", height: "20%", backgroundColor: "#df0001", float: "left", marginTop: "5.6%" }}>
<div style={{ height: "70%", width: "100%", position: "relative", left: "5%", top: "45%" }}>
</div> */}
<div style={{ width: ((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100 + "%" || "", height: "20%", backgroundColor: "#18ABFF", float: "left", marginTop: "5.6%" }}></div>
</div>
<div style={{ width: "96%", position: "relative", left: "2%" }}>
<p style={{ width: "50%", position: "absolute", color: "rgba(216,240,255,0.8)", fontSize: "18px" }}>乡村涵洞<span style={{ marginLeft: "4%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF" }}>{(roads?.["乡"] + roads?.["村"]).toFixed(3)}</span><span style={{ marginLeft: "4%" }}></span></p>
<p style={{ position: "absolute", right: "0", color: "rgba(216,240,255,0.8)" }}>占比<span>{((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100}</span><span>%</span></p>
</div>
</div>
<div style={{ height: "80%", width: "100%", position: "relative", left: "5%", top: "-8%" }}>
<div style={{ width: "100%", height: "40px"/* , backgroundColor: "#fff" */, position: "relative" }}>
{/* <p>{title || []}</p> */}
<img src='/assets/images/quanju/icon.png' style={{ width: "24px", position: "absolute", left: "-1%", top: "23%" }} />
<span style={{ position: "absolute", color: "#FFFFFF", fontSize: "24px", fontFamily: "YouSheBiaoTiHei", left: "3%" }}>离线详情</span>
<span style={{ position: "absolute", color: "#FFFFFF", fontSize: "24px", fontFamily: "YouSheBiaoTiHei", left: "3%" }}>养护事件</span>
<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%" }}>187</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>
<Lun
canScroll={true}
// canScroll={true}
content={renderBody()}
containerStyle={{ position: "absolute", height: "80%", width: "90%" }}
divHeight={"100%"}

32
web/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/bottomlunbo.js

@ -1,31 +1,21 @@
import React, { useState, useEffect } from 'react'
import Lunbotop from "./lunbo"
import Lunbotop from "../../right/lunbo"
import { getyunzheng } from "../../../../../actions/example"
const Bottomlunbo = () => {
const [list, setList] = useState([
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
])
const Bottomlunbo = (props) => {
const { dispatch } = props
const [list, setList] = useState([])
useEffect(() => {
const car = dispatch(getyunzheng()).then((res) => {
setList(res.payload.data.taxiBusiness);
})
}, [])
const renderBody = () => {
return (
<div style={{ width: "100%", height: "100%" }}>
{
list.map((item, index) => {
return <div style={{ fontSize: "14px", color: "#FFFFFF" }}>{item.name}</div>
return <div style={{ fontSize: "14px", color: "rgba(216,240,255,0.8000)" }}>{item.nameOfBusinessOwner}</div>
})
}
</div>

182
web/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/lunbo.js

@ -1,182 +0,0 @@
'use strict'
import React, { Component } from 'react';
// import { Col, Row, Tag, Tooltip } from '@douyinfe/semi-ui';
import { Col, Row, Tag, Toolip } from 'antd';
import './style.less';
export default class AutoRollComponent extends Component {
constructor(props) {
super(props);
this.scrollElem = null;
this.stopscroll = false;
this.preTop = 0;
this.cloneEle = null;
this.currentTop = 0;
this.marqueesHeight = 0;
this.interval = null;
}
marque = (height) => {
try {
this.scrollElem = document.getElementById(this.props.divId);
this.marqueesHeight = height;
if (this.scrollElem) {
this.scrollElem.style.height = this.marqueesHeight;
this.scrollElem.style.overflow = 'hidden';
}
if (!this.props.closeroll) {
this.repeat()
}
} catch (e) { console.log(e) }
}
repeat = () => {
this.scrollElem.scrollTop = 0;
this.interval = setInterval(() => {
if (this.stopscroll) return;
this.currentTop = this.currentTop + 1;
this.preTop = this.scrollElem.scrollTop;
this.scrollElem.scrollTop = this.scrollElem.scrollTop + 1;
// console.log(this.scrollElem.scrollTop);
if (this.preTop === this.scrollElem.scrollTop) {
this.scrollElem.scrollTop = this.marqueesHeight;
this.scrollElem.scrollTop = this.scrollElem.scrollTop + 1;
// console.log(this.scrollElem.scrollTop);
}
}, 80);
}
componentWillUnmount() {
clearInterval(this.interval);
}
componentDidMount() {
this.marque(10);
}
onMouseOver = () => {
this.stopscroll = true;
}
onMouseOut = () => {
this.stopscroll = false;
}
loadDataColumn = (c, index, q) => {
const { changeStyleCol, heads, spans, data, showWord, color, dataTextAlign, customColorBox, } = this.props;
if (c === changeStyleCol) {
if (color) {
<span style={{ color: q.changeColor }}>{q.data[index]}</span>
} else {
if (['时间'].indexOf(c) != -1) {
return <span style={{ fontFamily: 'liquidCrystal' }}>{q.data[index]}</span>
}
// if (c.indexOf("时间") == -1) {
// if (customColorBox) {
// return <DashBorder boxStyle={{ textAlign: 'center', background: q.boxColor, width: 58, height: 18, display: 'inline-block', fontSize: 12 }} content={q.data[index]} borderStyle={{ borderColor: q.changeColor, width: 4, height: 4 }} />
// }
// if (q.data[index].length > showWord) {
// return <Tooltip key={index} position="top" content={q.data[index]}>{q.data[index].substring(0, showWord) + '...'}</Tooltip>
// } else {
// return <span className='margin-left-5' style={{ fontFamily: 'liquidCrystal' }}>{q.data[index]}</span>
// }
// }
}
} else {
if (c.indexOf("时间") == -1)
if (q.data[index].length > showWord) {
return <Tooltip key={index} position="top" content={q.data[index]}>{q.data[index].substring(0, showWord) + '...'}</Tooltip>
}
return <span className='margin-left-5'>{q.data[index]}</span>
}
// c === changeStyleCol ?
// color ?
// <span style={{ color: q.changeColor }}>{q.data[index]}</span>
// : q.levelbg ?
// q.isSiteAlermListMock ? <span style={extraStyle}>已处理</span> :
// <span style={{ color: q.changeColor, background: `url('/assets/images/ui/${q.levelbg}.png') no-repeat`, backgroundSize: '100% 100%', textAlign: 'left', fontFamily: 'liquidCrystal', padding: '3px 10px' }}>{q.data[index]}</span>
// : <Tag color={q.changeColor}>{q.data[index]}</Tag>
// : ['时间'].indexOf(c) != -1 ? !customColorBox ? <span style={{ fontFamily: 'liquidCrystal' }}>{q.data[index]}</span> :
// <DashBorder boxStyle={{ textAlign: 'center', background: q.boxColor }} content={q.data[index]} borderStyle={{ borderColor: color }} />
// : c.indexOf("时间") == -1 && q.data[index].length > showWord ?
// <Tooltip placement="top" title={q.data[index]} className='margin-left-5'>{q.data[index].substring(0, showWord) + '...'}</Tooltip>
// : <span className='margin-left-5' style={{ fontFamily: 'liquidCrystal' }}>{q.data[index]}</span>
}
getContent = () => {
const { changeStyleCol, heads, spans, data, showWord, color, dataTextAlign, customColorBox, } = this.props;
let result = <div></div>;
if (data) {
result = data.map((q, idx) => {
return (
<div key={idx}>
<Row gutter={16} style={{
height: 40,
//background: idx % 2 == 0 ? 'url(/assets/images/ui/roll1.png) no-repeat' : 'url(/assets/images/ui/roll2.png) no-repeat',
background: idx % 2 == 0 ? 'rgba(22,70,116,0.32)' : '',
backgroundSize: '100% 100%',
whiteSpace: 'nowrap',
fontSize: 16
}}>
{q.data[1] == -1 ? null : heads.map((c, index) => {
let extraStyle = {}
if (q.isSiteAlermListMock && c == "状态") {
extraStyle = { color: "green" }
}
return <Col span={spans[index]} key={index} style={{
// padding: `8px 0px 0px ${titleLeft && c != changeStyleCol ? 12 : index == 0 ? 8 : 0}px`,
paddingLeft: index == 0 ? 20 : c != changeStyleCol ? 10 : 'auto', paddingTop: 8, paddingRight: 0,
textAlign: dataTextAlign ? dataTextAlign : 'left', textOverflow: 'ellipsis', overflow: 'hidden',
color: `${c === changeStyleCol ? q.changeColor : ''}`
}}>
{
this.loadDataColumn(c, index, q)
}
</Col>
})
}
</Row>
</div>
)
})
} else {
result = <div style={{ textAlign: 'center', padding: 20, color: '#fff', height: '100%', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
<span></span>
</div>
}
return result;
}
render() {
const { heads, spans, divId, divHeight, content, color, titleLeft, containerStyle = {} } = this.props;
return (
<div style={{ ...containerStyle, textAlign: 'left', }}>
{heads ?
<Row className={'bg-row'} style={{ lineHeight: '40px', height: 40, fontSize: 16, wordBreak: 'keep-all', whiteSpace: 'nowrap', textAlign: titleLeft ? 'left' : 'center', paddingLeft: titleLeft ? 5 : 0 }}>
{heads.map((c, index) => {
return <Col style={{ color: color ? color : '#fff', paddingLeft: titleLeft ? 10 : 'auto' }} span={spans[index]} key={index}>{c}</Col>
})
}
</Row>
: ''}
<div id={divId} className={'hidden-scroll-bar-y'} style={{ overflow: 'hidden', height: divHeight }} onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut}>
<div style={{ height: '100%' }}>
{content ? content : ''}
{this.getContent()}
</div>
</div>
</div >
)
}
}

36
web/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/toplunbo.js

@ -1,31 +1,23 @@
import React, { useState, useEffect } from 'react'
import Lunbotop from "./lunbo"
import Lunbotop from "../../right/lunbo"
import { getyunzheng } from "../../../../../actions/example"
const Toplunbo = () => {
const [list, setList] = useState([
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
{ name: "南昌宁昌物流运输有限公司" },
])
const Toplunbo = (props) => {
const { dispatch } = props
const [list, setList] = useState([])
useEffect(() => {
const cars = dispatch(getyunzheng()).then((res) => {
setList(res.payload.data.hazardousGoodsBusiness)
// console.log(res.payload.data.hazardousGoodsBusiness);
})
}, [])
const renderBody = () => {
return (
<div style={{ width: "100%", height: "100%" }}>
{
list.map((item, index) => {
return <div style={{ fontSize: "14px", color: "#FFFFFF" }}>{item.name}</div>
return <div style={{ fontSize: "14px", color: "rgba(216,240,255,0.8000)" }}>{item.nameOfBusinessOwner}</div>
})
}
</div>
@ -44,7 +36,7 @@ const Toplunbo = () => {
</div>
</div>
<Lunbotop
canScroll={true}
// canScroll={true}
content={renderBody()}
containerStyle={{ position: "relative", height: "100%", width: "60%", top: "8%", float: "right" }}
divHeight={"100%"}

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

@ -1,41 +1,28 @@
import React, { useState, useEffect } from 'react'
import Lun from "./lunbo/lunbo"
import Lun from "../right/lunbo"
import { getRoadmaintain, getdaolutongji } from "../../../../actions/example"
import moment from 'moment'
const Right = () => {
const Right = (props) => {
const { dispatch } = props
const [beijing, setBeijing] = useState()
const [list, setList] = useState([{ name: "苏LD1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD11121", chaoxian: "30%", penalty: "-6分和扣200元", days: "2022年5月4日" },
{ name: "苏LD112512121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏L1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD1151121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD11912121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD16112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏L2D111221", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "62", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD11152121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏L1D1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD11512121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD13112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD111612121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD111216221", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏L63D1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD163112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD651112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" }])
const [list, setList] = useState([])
const [roads, setRoads] = useState()
useEffect(() => {
const daolus = dispatch(getRoadmaintain()).then((res) => {
setList(res.payload.data.reportList.filter((item, index) => {
return item.projectType == "bridge"
}))
})
}, [])
useEffect(() => {
const daolus = dispatch(getdaolutongji()).then((res) => {
// console.log("[roads]", res.payload.data.roadType);
setRoads(res.payload.data.bridgeSize)
console.log(res.payload.data.bridgeSize);
// const
})
}, [])
const renderBody = () => {
return (
@ -51,10 +38,10 @@ const Right = () => {
}}>
{beijing == index ? <img src='/assets/images/leadership/shezhi.png' style={{ width: "2%", height: "80%", position: "absolute", top: "12%", left: "6%" }} /> : ""}
{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: "25%" }} >{item.name}</p>
<p style={{ textAlign: "center", width: "25%", position: "absolute", right: "25%" }} >{item.name}</p>
<p style={{ textAlign: "center", width: "25%", position: "absolute", left: "5%" }} >{item.name}</p>
<p style={{ textAlign: "center", width: "25%", position: "absolute", right: "5%" }}>{item.name}</p></li>
<p style={{ textAlign: "center", width: "20%", position: "absolute", left: "25%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >日常养护</p>
{item.user?.name ? <p style={{ textAlign: "center", width: "25%", position: "absolute", right: "35%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.user.name}</p> : <p style={{ textAlign: "center", width: "25%", position: "absolute", right: "35%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >--</p>}
<p style={{ textAlign: "center", width: "25%", position: "absolute", left: "5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.road ? item.road : "--"}</p>
<p style={{ textAlign: "center", width: "30%", position: "absolute", right: "5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }}>{moment(item.time).format("YYYY-MM-Do HH:mm:ss") ? moment(item.time).format("YYYY-MM-Do HH:mm:ss") : "--"}</p></li>
)
})
}
@ -65,16 +52,35 @@ const Right = () => {
<>
<div style={{ width: "100%", height: "100%", float: "right", marginRight: "1%", position: "relative" }}>
<div style={{ width: "100%", height: "43%", position: "relative", left: "1%" }}>
<div style={{ width: "96%", position: "relative", left: "2%" }}>
<p style={{ position: "absolute", color: "rgba(216,240,255,0.8)" }}>占比<span style={{ fontFamily: " PingFangSC-Regular, PingFang SC" }}>{(roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(4) * 100}</span>%</p>
<p style={{ width: "25%", position: "absolute", right: "1%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF", marginLeft: "10%" }}>{roads?.["大桥"]}<span style={{ color: "#F5FCFF", fontSize: "16px", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}></span><span style={{ fontSize: "18px", color: "rgba(216,240,255,0.8)", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}></span></p>
</div>
<div style={{ width: "96%", position: "relative", left: "2%", height: "50%" }}>
<div style={{ width: (roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(2) * 100 + "%" || "", height: "40%", backgroundColor: "#fff", float: "left", marginTop: "4%" }}>
</div>
<div style={{ width: (roads?.["中桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(2) * 100 + "%" || "", height: "20%", backgroundColor: "#df0001", float: "left", marginTop: "5.6%" }}>
<div style={{ height: "70%", width: "100%", position: "relative", left: "5%", top: "45%" }}>
</div>
<div style={{ width: (roads?.["小桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(2) * 100 + "%" || "", height: "20%", backgroundColor: "#18ABFF", float: "left", marginTop: "5.6%" }}></div>
</div>
<div style={{ width: "96%", position: "relative", left: "2%" }}>
<p style={{ width: "50%", position: "absolute", color: "rgba(216,240,255,0.8)", fontSize: "18px" }}>中小桥梁<span style={{ marginLeft: "4%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF" }}>{roads?.["小桥"] + roads?.["中桥"]}</span><span style={{ marginLeft: "4%" }}></span></p>
<p style={{ position: "absolute", right: "0", color: "rgba(216,240,255,0.8)" }}>占比<span>{((roads?.["小桥"] + roads?.["中桥"]) / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(4) * 100}</span><span>%</span></p>
</div>
</div>
<div style={{ height: "80%", width: "100%", position: "relative", left: "5%", top: "-8%" }}>
<div style={{ width: "100%", height: "40px"/* , backgroundColor: "#fff" */, position: "relative" }}>
{/* <p>{title || []}</p> */}
<img src='/assets/images/quanju/icon.png' style={{ width: "24px", position: "absolute", left: "-1%", top: "23%" }} />
<span style={{ position: "absolute", color: "#FFFFFF", fontSize: "24px", fontFamily: "YouSheBiaoTiHei", left: "3%" }}>离线详情</span>
<span style={{ position: "absolute", color: "#FFFFFF", fontSize: "24px", fontFamily: "YouSheBiaoTiHei", left: "3%" }}>养护事件</span>
<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%" }}>187</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>
<Lun
canScroll={true}
// canScroll={true}
content={renderBody()}
containerStyle={{ position: "absolute", height: "80%", width: "90%" }}
divHeight={"100%"}

24
web/client/src/sections/quanju/containers/footer/leadership/centerleft/top.js

@ -1,13 +1,27 @@
import React, { useState, useEFFect } from 'react'
import React, { useState, useEffect } from 'react'
// import Module from '../../../public/module'
import { getdaolutongji } from "../../../../actions/example"
const Leftcenter = (props) => {
const { tabChange, tabKey } = props
const { tabChange, tabKey, dispatch } = props
const [list, setList] = useState()
const [culvert, setCulvert] = useState()
const [bridge, setBridge] = useState()
// const [tab, setTad] = useState("base")
const onClick = (tab) => {
// setTad({ tab })
tabChange(tab)
}
useEffect(() => {
const daolus = dispatch(getdaolutongji()).then((res) => {
// console.log("[roads]", res.payload.data.roadType);
setList(res.payload.data.roadType)
// const
setCulvert(res.payload.data.townCulvert)
setBridge(res.payload.data.bridgeSize)
})
}, [])
return (
<>
<div style={{ position: "relative", width: "100%", height: "30%" }}>
@ -25,7 +39,7 @@ const Leftcenter = (props) => {
</div>
<div style={{ width: "50%", height: "100%", position: "absolute", left: "50%", top: "11%" }}>
<p style={{ fontSize: "2vh", color: "#D8F0FF", fontFamily: "PingFangSC-Regular, PingFang SC", marginTop: "3%" }}>道路统计<span style={{ marginLeft: "10px", color: "rgba(216,240,255,0.8000)" }}>公里</span></p>
<p style={{ fontFamily: "YouSheBiaoTiHei", color: "#ffffff", fontSize: "2.5vh", marginTop: "-2%" }}>2333.4</p>
<p style={{ fontFamily: "YouSheBiaoTiHei", color: "#ffffff", fontSize: "2.5vh", marginTop: "-2%" }}>{(list?.["县"] + list?.["乡"] + list?.["村"]).toFixed(3)}</p>
</div>
</div>
<div style={{ width: "30%", height: "10vh", backgroundColor: "", position: "relative", left: "35%", top: "-105%" }} onClick={() => {
@ -39,7 +53,7 @@ const Leftcenter = (props) => {
</div>
<div style={{ width: "50%", height: "100%", position: "absolute", left: "50%", top: "8%" }}>
<p style={{ fontSize: "2vh", color: "#D8F0FF", fontFamily: "PingFangSC-Regular, PingFang SC", marginTop: "3%" }}>涵洞统计<span style={{ fontSize: "14px", marginLeft: "10px", color: "rgba(216,240,255,0.8000)" }}></span></p>
<p style={{ fontFamily: "YouSheBiaoTiHei", color: "#ffffff", fontSize: "2.5vh" }}>2333.4</p>
<p style={{ fontFamily: "YouSheBiaoTiHei", color: "#ffffff", fontSize: "2.5vh" }}>{(culvert?.["县"] + culvert?.["乡"] + culvert?.["村"]).toFixed(0)}</p>
</div>
</div>
<div style={{ width: "30%", height: "10vh", backgroundColor: "", position: "relative", left: "68%", top: "-315%" }} onClick={() => {
@ -53,7 +67,7 @@ const Leftcenter = (props) => {
</div>
<div style={{ width: "50%", height: "100%", position: "absolute", left: "50%", top: "8%" }}>
<p style={{ fontSize: "2vh", color: "#D8F0FF", fontFamily: "PingFangSC-Regular, PingFang SC", marginTop: "3%" }}>桥梁统计<span style={{ fontSize: "14px", marginLeft: "10px", color: "rgba(216,240,255,0.8000)" }}></span></p>
<p style={{ fontFamily: "YouSheBiaoTiHei", color: "#ffffff", fontSize: "2.5vh", marginTop: "-2%" }}>2333.4</p>
<p style={{ fontFamily: "YouSheBiaoTiHei", color: "#ffffff", fontSize: "2.5vh", marginTop: "-2%" }}>{(bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])}</p>
</div>
</div>
</div>

9
web/client/src/sections/quanju/containers/footer/leadership/index.js

@ -4,12 +4,13 @@ import Right from './right'
import CenterLeft from "./centerLeft"
import Centerright from "./centerRight"
const Leadership = () => {
const Leadership = (props) => {
const { dispatch } = props
return (
<>
<Left />
<CenterLeft />
<Right />
<Left dispatch={dispatch} />
<CenterLeft dispatch={dispatch} />
<Right dispatch={dispatch} />
{/* <Centerright /> */}
</>

7
web/client/src/sections/quanju/containers/footer/leadership/left.js

@ -3,13 +3,14 @@ import Lefttop from './left/left-top'
// import Leftcenter from "./left/left-center"
import Leftbottom from './left/left-bottom'
const Left = () => {
const Left = (props) => {
const { dispatch } = props
return (
<>
<div style={{ width: "23%", height: "100%", float: "left", marginLeft: "1%" }}>
<Lefttop />
<Lefttop dispatch={dispatch} />
<Leftbottom />
<Leftbottom dispatch={dispatch} />
</div>
</>
)

43
web/client/src/sections/quanju/containers/footer/leadership/left/echarts/leftbottomecharts.js

@ -1,7 +1,22 @@
import React, { useEffect, useRef } from 'react'
import React, { useEffect, useRef, useState } from 'react'
import * as echarts from 'echarts';
import { getdaolutongji } from "../../../../../actions/example"
const Leftbottomecharts = () => {
const Leftbottomecharts = (props) => {
const { dispatch } = props
const [list, setList] = useState([])
const [count, setCount] = useState([])
useEffect(() => {
const res = dispatch(getdaolutongji()).then((res) => {
setList(res.payload.data.construction.map((item, index) => {
return item.year
}));
setCount(res.payload.data.construction.map((item, index) => {
return item.count.toFixed(3)
}))
});
}, [])
console.log(list, count);
const chartRef = useRef(null);
useEffect(() => {
var chartInstance = echarts.init(chartRef.current);
@ -9,7 +24,7 @@ const Leftbottomecharts = () => {
title: {
},
tooltip: {
formatter: " {b}年<br/> 施工了{c}公里",
formatter: " {b}年<br/> {c}公里",
trigger: "axis",
axisPointer: {
lineStyle: {
@ -46,15 +61,13 @@ const Leftbottomecharts = () => {
},
axisLine: {
lineStyle: {
color: "rgba(176,215,255,0.4)",
color: /* "rgba(176,215,255,0.4)" */"rgba(216,240,255,0.8)",
},
},
data: [
"13:00",
"13:05",
"13:10",
"13:15",
],
axisLabel: {
color: "rgba(216,240,255,0.8)",
},
data: list,
normal: {
lineStyle: {
color: "rgba(226,240,255,0.4)"//折线的颜色
@ -77,9 +90,9 @@ const Leftbottomecharts = () => {
// nameTextStyle: {
// color: "#abb8ce",
// },
// axisLabel: {
// color: "#abb8ce",
// },
axisLabel: {
color: "rgba(216,240,255,0.8)",
},
axisTick: {
//y轴刻度线
show: false,
@ -121,7 +134,7 @@ const Leftbottomecharts = () => {
shadowBlur: 10,
},
},
data: [220, 182, 191, 134],
data: count,
},
],
};
@ -129,7 +142,7 @@ const Leftbottomecharts = () => {
window.addEventListener('resize', function () {
chartInstance.resize();
})
}, []);
}, [list, count]);
return (

5
web/client/src/sections/quanju/containers/footer/leadership/left/left-bottom.js

@ -2,12 +2,13 @@ import React from 'react'
import Module from '../../../public/module'
import Echartes from "./echarts/leftbottomecharts"
const Leftbottom = () => {
const Leftbottom = (props) => {
const { dispatch } = props
const style = { height: "28%", marginTop: "5%" }
return (
<>
<Module style={style} title={"道路施工统计"}>
<Echartes />
<Echartes dispatch={dispatch} />
</Module>
</>
)

10
web/client/src/sections/quanju/containers/footer/leadership/left/left-center.js

@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react'
import Module from '../../../public/module'
import Lunbo from "../centerleft/lunbo/lunbo"
import Lunbo from "../right/lunbo"
// import "./left.less"
const Leftcenter = () => {
@ -25,7 +25,7 @@ const Leftcenter = () => {
])
useEffect(() => {
const timer = setInterval(() => {
if (num == 12) {
if (num == list.length) {
setNum(1);
setTu(list[0].img);
} else {
@ -42,13 +42,13 @@ const Leftcenter = () => {
return (
// <div style={{ width: "100%", height: "100%" }} >
// {/* <div style={{ width: "100%", height: "100%", }}> */}
<li style={{ height: "20px", position: "relative", width: "100%", marginTop: index == 0 ? "4px" : "5px", listStyle: "none", borderLeft: "2px solid #1C60FE", backgroundColor: "linear-gradient(to right, rgba(0,70,200,0.3000) , rgba(0,124,230,0))" }} onMouseEnter={() => {
<li style={{ height: "20px", position: "relative", width: "100%", marginTop: index == 0 ? "4px" : "5px", listStyle: "none", borderLeft: num - 1 == index ? "2px solid #1C60FE" : "2px solid #113892", backgroundColor: "linear-gradient(to right, rgba(0,70,200,0.3000) , rgba(0,124,230,0))" }} onMouseEnter={() => {
setTu(item.img);
setNum(index + 1);
setName(item.name)
// console.log(list);
}}>
<p style={{ position: "absolute", color: num - 1 == index ? "#fff" : "rgba(216,240,255,0.8)" }}>{item.name}</p>
<p style={{ position: "absolute", color: num - 1 == index ? "#fff" : "rgba(216,240,255,0.8)", left: "10%" }}>{item.name}</p>
<img src='/assets/images/leadership/juxing.png' style={{ width: "100%", height: "100%", position: "absolute" }} />
</li>
// {/* </div> */}
@ -86,7 +86,7 @@ const Leftcenter = () => {
}
</div>
<Lunbo
canScroll={true}
// canScroll={true}
content={renderBody()}
containerStyle={{ position: "relative", height: "100%", width: "35%", float: "right", marginRight: "2%", marginTop: "1%" }}
divHeight={"100%"}

11
web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js

@ -1,10 +1,19 @@
import React from 'react'
import React, { useEffect, useState } from 'react'
import Module from '../../../public/module'
import Leftcenter from './left-center'
import Lefttopecharts from "./echarts/lefttopecharts"
import { GodTransRequest } from "../../../../../../utils/webapi"
import request from 'superagent'
const Lefttop = () => {
const style = { height: "68%" }
useEffect(() => {
// return () => {
request('GET', '/search').then((success, failure) => {
console.log(success);
});
// };
}, [])
return (
<>
<Module style={style} title={"道路拥堵指数"} >

7
web/client/src/sections/quanju/containers/footer/leadership/right.js

@ -3,12 +3,13 @@ import Righttop from './right/right-top'
import Rightcenter from './right/right-center'
import Rightbottom from './right/right-bottom'
const Right = () => {
const Right = (props) => {
const { dispatch } = props
return (
<>
<div style={{ width: "25%", height: "100%", float: "right", marginRight: "1%" }}>
<Righttop />
<Rightbottom />
<Righttop dispatch={dispatch} />
<Rightbottom dispatch={dispatch} />
</div>
</>
)

36
web/client/src/sections/quanju/containers/footer/leadership/right/hudong.js

@ -40,14 +40,15 @@ class ReactCarousel extends Component {
imgs: [],
showIndex: 0, //显示第几个图片
timer: null, // 定时器
show: false // 前后按钮显示
show: false, // 前后按钮显示
// arr1: ""
}
this.setState({
imgs: this.chunk((this.state.shuzu), 4)
})
console.log(this.chunk((this.state.shuzu), 4));
// console.log(this.state.imgs);
this.state.imgs = this.chunk((this.state.shuzu), 4)
}
render() {
return (
<div className="ReactCarousel" style={{ width: "100%", height: "100%" }}>
@ -57,15 +58,27 @@ class ReactCarousel extends Component {
>
<ul className="ul">
{
this.state.imgs.map((value, index) => {
return (
<li className={index === this.state.showIndex ? 'show' : ''}
<li style={{ position: "relative", left: "8%", width: "100%", height: "100%" }} className={index === this.state.showIndex ? 'show' : ''}
key={index}
>
<div>{value[0].name}</div>
<div>{value[1].name}</div>
<div style={{ width: "40%", height: "40%", backgroundColor: "red", position: "absolute", left: "-3%", top: "3%" }}>
{value[0]?.name}
</div>
{value[1]?.name ? <div style={{ width: "40%", height: "40%", backgroundColor: "#fff", position: "absolute", left: "45%", top: "3%" }}>
{value[1]?.name}
</div> : ""}
{value[2]?.name ? <div style={{ width: "40%", height: "40%", backgroundColor: "bule", position: "absolute", left: "-3%", top: "50%" }}>
{value[2]?.name}
</div> : ""}
{value[3]?.name ? <div style={{ width: "40%", height: "40%", backgroundColor: "pink", position: "absolute", left: "45%", top: "50%" }}>
{value[3]?.name}
</div> : ""}
{/* <div>{value[1].name}</div>
<div>{value[2].name}</div>
<div>{value[3].name}</div>
<div>{value[3].name}</div> */}
</li>
)
})
@ -83,7 +96,7 @@ class ReactCarousel extends Component {
}
</ul> */}
<div className="control" style={{ width: "100%", height: "10%", backgroundColor: "red" }}>
<div className="control" style={{ width: "100%", height: "10%" }}>
<span className="left" onClick={(e) => { this.previous(e) }}></span>
<span className="right" onClick={(e) => { this.next(e) }}></span>
</div>
@ -94,6 +107,7 @@ class ReactCarousel extends Component {
componentDidMount() { //一开始自动播放
this.start();
}
componentWillUnmount() { //销毁前清除定时器
this.stop();
}
@ -105,7 +119,7 @@ class ReactCarousel extends Component {
let { timer } = this.state;
timer = setInterval(() => {
this.next();
}, 2000);
}, 300000);
this.setState({
timer
})

11
web/client/src/sections/quanju/containers/footer/leadership/right/left.less

@ -2,26 +2,29 @@ li{
list-style-type:none
}
.ant-select-selector, .ant-select-selection-placeholder{
.wy-rightTop{
.ant-select-selector, .ant-select-selection-placeholder{
background-color:#011f59 !important;
border:#1E7BD6 1px solid !important;
font-family: PingFangSC-Regular, PingFang SC !important;
height: 25px !important;
// line-height: 25px !important;
}
.ant-select-selection-item{
}.ant-select-selection-item{
line-height: 25px !important;
}
.anticon{
color: #fff !important;
}
}
.contain {
position: relative;
top: 5%;
left: 45%;
width: 100%;
height: 100%;
transition: all 2s;
transition: all 30s;
transform: translateX(-50%);
color: #fff;
overflow: hidden;

9
web/client/src/sections/quanju/containers/footer/leadership/right/lunbo copy.js

@ -1,9 +0,0 @@
import React from 'react'
function lunbo() {
return (
<div>lunbo copy</div>
)
}
export default lunbo

62
web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js

@ -2,54 +2,36 @@ import React, { useState, useEffect } from 'react'
import Module from '../../../public/module'
import Lun from "./lunbo"
import "./left.less"
import { getZhichaolist } from "../../../../actions/example"
const Rightbottom = () => {
const Rightbottom = (props) => {
const { dispatch } = props
const style = { height: "28%", marginTop: "4%" }
const [beijing, setBeijing] = useState()
const [list, setList] = useState([{ name: "苏LD1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD11121", chaoxian: "30%", penalty: "-6分和扣200元", days: "2022年5月4日" },
{ name: "苏LD112512121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏L1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD1151121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD11912121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD16112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏L2D111221", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "62", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD11152121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏L1D1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD11512121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD13112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD111612121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD111216221", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏L63D1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD163112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
{ name: "苏LD651112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" }])
const [list, setList] = useState([])
const [nums, setNums] = useState([])
useEffect(() => {
const zhichaolist = dispatch(getZhichaolist()).then((res) => {
setList(res.payload?.data?.overSpeedList)
// console.log(res);
setNums(res.payload?.data?.processed)
})
})
// console.log(list);
const renderBody = () => {
return (
// <div style={{ width: "100%", height: "100%" }}>{
// lists.map((item, index) => {
// return (<div >
// <div style={{ width: "100%", height: "100%", }}>
// <li style={{ height: "20px", width: "100%", marginTop: index == 0 ? "4px" : "5px", listStyle: "none", backgroundColor: "pink" }} onMouseEnter={() => {
// }}>{item.name}</li>
// </div>
// </div>)
// })
// }
// </div >
<div style={{ width: "100%", height: "50%" }}>
{list.map((item, index) => {
return <li style={{ width: "100%", height: "3vh", marginTop: "5px", backgroundColor: beijing == index ? "rgba(0,124,230,1) " : "" }} onMouseEnter={() => {
{list?.map((item, index) => {
return <li style={{ width: "100%", height: "3vh", marginTop: "5px", position: "relative", }} onMouseEnter={() => {
setBeijing(index)
// console.log(beijing);
}}>
<div style={{ width: "30%", height: "100%", float: "left", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == item.name ? "#FFFFFF" : "rgba(216,240,255,0.8000)" }}>{item.name}</div>
<div style={{ width: "10%", height: "100%", float: "left", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == item.name ? "#FFFFFF" : "rgba(216,240,255,0.8000)" }}>{item.chaoxian}</div>
<div style={{ width: "30%", height: "100%", float: "left", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == item.name ? "#FFFFFF" : "rgba(216,240,255,0.8000)" }}>{item.penalty}</div>
<div style={{ width: "30%", height: "100%", float: "left", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == item.name ? "#FFFFFF" : "rgba(216,240,255,0.8000)" }}>{item.days}</div></li>
{beijing == index ? <img src='/assets/images/leadership/bei.png' style={{ width: "100%", height: "100%", position: "absolute" }} /> : ""}
<div style={{ width: "30%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == item.name ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute" }}>{item.licensePlate}</div>
<div style={{ width: "10%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == item.name ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "30%" }}>{item.overrunRate ? item.overrunRate : "--"}</div>
<div style={{ width: "30%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == item.name ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "40%" }}>{item.deductPoints ? "-" + item.deductPoints + "分" : ""}{item.deductPoints && item.fine ? "和" : ""}{item.fine ? "-" + item.fine + "元" : ""}{item.deductPoints || item.fine ? "" : "--"}</div>
<div style={{ width: "30%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == item.name ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "70%" }}>{item.processingTime ? item.processingTime : "--"}</div>
</li>
})
}
@ -61,7 +43,7 @@ const Rightbottom = () => {
<Module style={style} title={"治超详情"}>
<div style={{ position: "relative", width: "90%", height: "5%", left: "5%", textAlign: "right", fontSize: "16px", top: "-3%", color: "rgba(216,240,255,0.8)" }}>
<img src='/assets/images/leadership/jiejue.png' style={{ width: "4.5%", height: "2vh", marginTop: "-1%" }} />
已处理<span>192</span>
已处理<span style={{ color: "#FFFFFF", fontSize: "18px", paddingLeft: "2%", paddingRight: "2%" }}>{nums}</span>
</div>
<div style={{ width: "90%", height: "3vh", backgroundColor: "rgba(21,77,160,0.2)", position: "relative", left: "5%", top: "5%" }}>
<p style={{ width: "30%", fontSize: "12px", color: "#FFFFFF", height: "100%", textAlign: "center", position: "absolute", lineHeight: "3vh" }}>车牌号</p>

10
web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js

@ -1,7 +1,7 @@
import React, { useState, useEffect } from 'react';
import Module from '../../../public/module'
import { Radio, Select } from 'antd';
import Lunbo from "../centerleft/lunbo/lunbo"
import Lunbo from "./lunbo"
import Huadong from './hudong';
import "./left.less"
@ -60,7 +60,7 @@ const Righttop = () => {
{num == index ? <img src='/assets/images/leadership/red.png' style={{ width: "100%", height: "120%", position: "absolute", }} /> : ""}
{num == index ? <img src='/assets/images/leadership/wangluo.png' style={{ width: "5%", height: "100%", position: "absolute", left: "-0.5%", top: "20%" }} /> : ""}
<p style={{ position: "absolute", left: "5%" }} >{item.name}</p><p style={{ position: "absolute", right: "5%" }}>{item.name}</p></li>
<p style={{ position: "absolute", left: "5%", color: num == index ? "#FFFFFF" : "rgba(216,240,255,0.8)" }} >{item.name}</p><p style={{ position: "absolute", right: "5%", color: num == index ? "#FFFFFF" : "rgba(216,240,255,0.8)" }}>{item.name}</p></li>
// {/* </div> */}
// </div>
)
@ -76,7 +76,7 @@ const Righttop = () => {
<div style={{ width: "100%", height: "65%" }}>
<div style={{ width: "100%", height: "10%", position: "relative" }}>
<img src='/assets/images/leadership/head.png' style={{ width: "15%", marginLeft: "5%" }} />
<div style={{ position: "absolute", right: "5%", top: "130%" }}>
<div className='wy-rightTop' style={{ position: "absolute", right: "5%", top: "130%" }}>
<Select
size={size}
defaultValue="选择路段"
@ -94,7 +94,7 @@ const Righttop = () => {
</div>
</div>
<div style={{ width: "100%", height: "80%", position: "relative", backgroundColor: "red", top: "10%" }}>
<div style={{ width: "100%", height: "80%", position: "relative", top: "10%" }}>
<Huadong />
</div>
</div>
@ -106,7 +106,7 @@ const Righttop = () => {
<img src='/assets/images/leadership/zibiaoti.png' style={{ width: "95%", height: "34px", position: "absolute", top: "12px", left: "6%" }} />
</div>
<Lunbo
canScroll={true}
// canScroll={true}
content={renderBody()}
containerStyle={{ position: "relative", height: "100%", width: "90%", left: "5%", top: "5%" }}
divHeight={"100%"}

2
web/client/src/sections/quanju/containers/footer/operation/index.js

@ -17,7 +17,7 @@ const Operation = (props) => {
}, [])
return (
<div style={{ display: 'flex', width: '100%',height: '100%',justifyContent: 'space-between' }}>
<div style={{ display: 'flex', width: '100%', height: '100%', justifyContent: 'space-between' }}>
<Left roadData={roadData} loading={loading} />
<Right roadData={roadData} loading={loading} />
</div>

2
web/client/src/themes/light.json

File diff suppressed because one or more lines are too long

28
web/client/src/utils/webapi.js

@ -49,12 +49,18 @@ export const ApiTable = {
getSpecificVehicle: 'vehicle/specific',
getHouseholds: 'vehicle/business',
getRoadway: 'road',
//桥梁管理
getBridge:'bridge',
putBridge:'bridge',
//工程数据
getProject:'project',
putProject:'project',
// 获取运政统计
getYunZheng: "transportation/statistic",
//桥梁管理
getBridge: 'bridge',
//工程数据
getProject: 'project',
//桥梁管理
getBridge: 'bridge',
putBridge: 'bridge',
//工程数据
getProject: 'project',
putProject: 'project',
//道路统计
getBgroadstatistics: "build/road_state",
@ -64,9 +70,13 @@ putProject:'project',
//获取治超详情数据
getzhichaodetail: '/manage/overspeed',
// 获取道路养护统计及列表
getroadmaintain: "conserve/statistic",
// 获取治超详情列
getzhichaoList: "manage/overspeed",
//大屏运营 —— 公交车辆层级信息
getBusTier:'/operation/car_level',
getBusTier: '/operation/car_level',
//获取路政列表
getHighways: 'road_manage',
@ -75,9 +85,7 @@ putProject:'project',
getRoadMaintenance: 'conserve/statistic',
//获取宣传数据
getpropagata:'publicity',
getpropagata: 'publicity',
};

15692
web/log/development.txt

File diff suppressed because it is too large

4321
web/package-lock.json

File diff suppressed because it is too large

2
web/package.json

@ -84,7 +84,7 @@
"koa-view": "^2.1.4",
"lodash": "^4.17.21",
"mini-dynamic-antd-theme": "^0.5.3",
"moment": "^2.22.0",
"moment": "^2.29.4",
"react-color": "^2.19.3",
"react-router-breadcrumbs-hoc": "^4.0.1",
"react-sortable-hoc": "^2.0.0",

Loading…
Cancel
Save