wangyue 2 years ago
parent
commit
e9424d3e06
  1. 4
      api/.vscode/launch.json
  2. 11
      api/app/lib/controllers/data/overspeed.js
  3. 3
      weapp/src/app.config.js
  4. 7
      weapp/src/config.js
  5. 3
      weapp/src/packages/video/index.config.js
  6. 85
      weapp/src/packages/video/index.jsx
  7. 28
      weapp/src/packages/video/index.scss
  8. 4
      weapp/src/pages/home/index.jsx
  9. 4
      web/Dockerfile
  10. 44
      web/client/src/sections/fillion/actions/infor.js
  11. 2
      web/client/src/sections/fillion/components/bridgeTable.js
  12. 213
      web/client/src/sections/fillion/components/infor/videoUpload.js
  13. 8
      web/client/src/sections/fillion/components/inforTable.js
  14. 174
      web/client/src/sections/fillion/components/promotionalTable.js
  15. 2
      web/client/src/sections/fillion/components/transportationTable.js
  16. 7
      web/client/src/sections/fillion/nav-item.js
  17. 2
      web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js
  18. 2
      web/client/src/utils/webapi.js

4
api/.vscode/launch.json

@ -13,8 +13,8 @@
"NODE_ENV": "development"
},
"args": [
"-p 4000",
"-f http://localhost:4000",
"-p 14000",
"-f http://localhost:14000",
"-g postgres://postgres:123@10.8.30.32:5432/highways4good",
"--qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5",
"--qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa",

11
api/app/lib/controllers/data/overspeed.js

@ -34,6 +34,14 @@ async function overspeedGet (ctx) {
if (numberOfAxles) {
findOption.where.numberOfAxles = numberOfAxles
}
if (overrunRateUpper && overrunRateFloor) {
findOption.where['$and'] = []
findOption.where['$and'].push
({ overrunRate: { $lte: overrunRateUpper } })
findOption.where['$and'].push
({ overrunRate: { $gte: overrunRateFloor } })
} else {
if (overrunRateUpper) {
findOption.where.overrunRate = {
$lte: overrunRateUpper
@ -44,6 +52,9 @@ async function overspeedGet (ctx) {
$gte: overrunRateFloor
}
}
}
if (testTime) {
findOption.where.testTime = {
$between: [moment(testTime).startOf('day').format(), moment(testTime).endOf('day').format()]

3
weapp/src/app.config.js

@ -10,7 +10,8 @@ export default {
'patrol/index',
'patrolView/index',
'changePassword/index',
'changePassword/success/index'
'changePassword/success/index',
'video/index',
]
}],
permission: {

7
weapp/src/config.js

@ -8,9 +8,10 @@ const baseConfig = {
};
const development = {
baseUrl: 'https://c5a6-117-90-37-10.ap.ngrok.io',
webUrl: 'https://smartwater.anxinyun.cn',
pcode: 'fce4afe2-5b6a-408a-ab18-a2afa7fa027c',
baseUrl: 'http://221.230.55.29:31919',
// baseUrl: 'https://c5a6-117-90-37-10.ap.ngrok.io',
// webUrl: 'https://smartwater.anxinyun.cn',
// pcode: 'fce4afe2-5b6a-408a-ab18-a2afa7fa027c',
imgUrl: 'http://test.resources.anxinyun.cn/',
// requestCache: true, //开启异步请求缓存
...baseConfig

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

@ -0,0 +1,3 @@
export default {
navigationBarTitleText: '视频监控'
}

85
weapp/src/packages/video/index.jsx

@ -0,0 +1,85 @@
import React, { useState, useEffect } from 'react'
import Taro from '@tarojs/taro'
import { View, Image, Input, Picker, LivePlayer } from '@tarojs/components'
import request from '@/services/request'
import './index.scss'
import '../patrolView/index.scss'
import patrolIcon from '../../static/img/patrolView/patrol.svg'
import patrolActiveIcon from '../../static/img/patrolView/patrol-active.svg'
import conserveIcon from '../../static/img/patrolView/conserve.svg'
import conserveActiveIcon from '../../static/img/patrolView/conserve-active.svg'
import chevronDown from '../../static/img/patrolView/chevron-down.png'
import searchIcon from '../../static/img/patrolView/search.png'
function Index() {
const [isBus, setIsBus] = useState(true)
const [filterText, setFilterText] = useState('')
const [videoList, setVideoList] = useState([])
useEffect(() => {
getVideoList()
}, [])
const getVideoList = () => {
let nextVideoList = []
for (let i = 0; i < 10; i++) {
nextVideoList.push({ title: '视频' + i, url: '链接' + i })
}
setVideoList(nextVideoList)
}
const onTypeChange = bool => {
setIsBus(bool)
}
const handleConfirm = e => {
}
const handleInput = e => {
}
return (
<View>
<View className='type-box'>
<View className='item' onClick={() => onTypeChange(true)}>
<Image className='type-img' src={isBus ? patrolActiveIcon : patrolIcon} />
<View style={{ color: isBus ? '#346FC2' : '#999999' }}>公交</View>
</View>
<View className='line'></View>
<View className='item' onClick={() => onTypeChange(false)}>
<Image className='type-img' src={isBus ? conserveIcon : conserveActiveIcon} />
<View style={{ color: isBus ? '#999999' : '#346FC2' }}>道路</View>
</View>
</View>
<View className='filter-box'>
<View className='filter-item'>
<View style={{ float: 'left', marginLeft: '20rpx', color: '#333' }}>路段</View>
<Picker>
<View className='filter-name'>{'请选择'}</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={filterText} placeholder='请输入道路名称' onConfirm={handleConfirm} onInput={handleInput} />
</View>
</View>
<View className='video-box'>
{
videoList && videoList.map(v => {
return (
<View className='video-card'>
<View className='title'>{v.title}</View>
<LivePlayer className='video' src={v.url} mode='live' />
</View>
)
})
}
</View>
</View>
)
}
export default Index

28
weapp/src/packages/video/index.scss

@ -0,0 +1,28 @@
page {
background-color: #f6f6f6;
.video-box {
padding-top: 180px;
.video-card {
background-color: #fff;
height: 488px;
margin-bottom: 20px;
display: flex;
flex-direction: column;
align-items: left;
.title {
height: 88px;
margin-left: 30px;
display: flex;
align-items: center;
}
.video {
height: 400px;
width: 100%;
}
}
}
}

4
weapp/src/pages/home/index.jsx

@ -38,7 +38,9 @@ const Index = () => {
}
function toVideo() {
Taro.navigateTo({
url: '/packages/video/index'
})
}
return (

4
web/Dockerfile

@ -9,14 +9,14 @@ EXPOSE 8080
RUN npm config set registry=http://10.8.30.22:7000
RUN echo "{\"time\":\"$BUILD_TIMESTAMP\",\"build\": \"$BUILD_NUMBER\",\"revision\": \"$SVN_REVISION_1\",\"URL\":\"$SVN_URL_1\"}" > version.json
RUN npm cache clean -f
RUN npm install --registry http://10.8.30.22:7000
RUN rm -rf package-lock.json
RUN npm install --registry http://10.8.30.22:7000
RUN npm run build
RUN rm -rf client/src
RUN rm -rf node_modules
RUN npm install --production --registry http://10.8.30.22:7000
FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node-16:7.22-06-20
FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12
COPY --from=builder --chown=node /var/app /home/node/app

44
web/client/src/sections/fillion/actions/infor.js

@ -324,3 +324,47 @@ export function delPurchase(query) {
});
}
export function getPropagata (query) {
return dispatch => basicAction({
type: 'get',
dispatch: dispatch,
query: query,
actionType: 'GET_PROPAGATA',
url: ApiTable.getpropagata,
msg: { error: '获取宣传视频信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function putAddPropagata (query) {
return dispatch => basicAction({
type: 'put',
dispatch: dispatch,
data: query,
actionType: 'PUT_PROPAGATA',
url: ApiTable.putpropagata,
msg: { error: '新增宣传视频信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function putEditPropagata (query) {
return dispatch => basicAction({
type: 'put',
dispatch: dispatch,
data: query,
actionType: 'PUT_PROPAGATA',
url: ApiTable.putpropagata,
msg: { error: '编辑宣传视频信息失败' },
// reducer: { name: 'reportstatistic' }
});
}
export function delPropagata (query) {
return dispatch => basicAction({
type: 'del',
dispatch: dispatch,
actionType: 'DEL_PROPAGATA',
url: ApiTable.delpropagata.replace("{publicityId}", query?.publicityId),
msg: { error: '删除宣传视频信息失败' },
// reducer: { name: 'reportstatistic' }
});
}

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

@ -1815,7 +1815,7 @@ const BrideTable = (props) => {
} if (whichofits == 'gongcheng') {
const query = {
type: 'bridge',
// type:sitename
entryName:sitename
}
setRowSelected([]);
const res = await dispatch(getProject(query));

213
web/client/src/sections/fillion/components/infor/videoUpload.js

@ -0,0 +1,213 @@
import React, { useState, useEffect } from 'react';
import { connect } from 'react-redux';
import { Modal, Form, Button, Input, Card, List } from 'antd';
import Uploads from "../../../../components/Upload/index"
import { putAddPropagata } from '../../actions/infor';
import { putEditPropagata } from '../../actions/infor';
import { getPropagata } from '../../actions/infor';
const VideoUpload = (props) => {
// const [counts, setCounts] = useState()//shuju
const { dispatch, record, counts, setCounts } = props
const [success, setSuccess] = useState() //状态
const [form] = Form.useForm();
//弹窗
const [isModalVisible, setIsModalVisible] = useState(false);
const showModal = () => {
setIsModalVisible(true);
}
const showModalEdit = () => {
setIsModalVisible(true);
};
//新增
const handleOkAdd = () => {
form.validateFields().then((values) => {
const videoAddress = values.video.map((item) => {
return item.storageUrl
})
const videoname = values.videoname
const data = { name: videoname, video: videoAddress }
dispatch(putAddPropagata(data)).then(() => {
dispatch(getPropagata()).then((res) => {
setCounts(res.payload.data)
})
})
setIsModalVisible(false);
}
);
};
//编辑
const handleOkEdit = (record) => {
form.validateFields().then((values) => {
const videoAddress = values.video.map((item) => {
return item.storageUrl
})
const videoname = values.username
const id = record.id
const video = record.video
const data = { publicityId: id, name: videoname, video: video }
dispatch(putEditPropagata(data)).then(() => {
dispatch(getPropagata()).then((res) => {
setCounts(res.payload.data)
})
})
}
);
setIsModalVisible(false);
};
const handleCancel = () => {
setIsModalVisible(false);
};
const onFinish = (values) => {
console.log('Success:', values);
};
const onFinishFailed = (errorInfo) => {
console.log('Failed:', errorInfo);
};
return (
<div >
{
props.type_ys ? <div><Button type='primary' onClick={showModal}>新增</Button>
<Modal visible={isModalVisible} onOk={handleOkAdd} onCancel={handleCancel}>
<Form
form={form}
name="basic"
labelCol={{
span: 5,
}}
wrapperCol={{
span: 16,
}}
initialValues={{
remember: true,
}}
onFinish={onFinish}
onFinishFailed={onFinishFailed}
autoComplete="off"
>
<Form.Item
label="视频名称"
name="videoname"
rules={[
{
required: true,
message: '请输入视频名称!',
max: 50,
},
]}
>
<Input
placeholder="请输入视频名称" />
</Form.Item>
<Form.Item
label="选择视频"
name="video"
>
<Uploads
maxFilesNum={10}
fileTypes={['mp4']}
maxFileSize={200}
/>
</Form.Item>
</Form>
</Modal>
</div>
:
<div><Button type='link' onClick={showModalEdit} style={{ Position: "absolute", left: "-50px", top: "32px" }}>编辑</Button>
<Modal visible={isModalVisible} onOk={() => handleOkEdit(record)} onCancel={handleCancel}>
<Form
form={form}
name="basic"
labelCol={{
span: 5,
}}
wrapperCol={{
span: 16,
}}
initialValues={{
username: record.name, video: record.video.map((item) => {
return { url: item }
})
}}
onFinish={onFinish}
onFinishFailed={onFinishFailed}
autoComplete="off"
>
<Form.Item
label="视频名称"
name="username"
rules={[
{
required: false,
message: '没有做出任何修改!',
max: 50,
},
]}
>
<Input
placeholder="请输入视频名称"
/>
</Form.Item>
<Form.Item
label="选择视频"
name="video"
>
<Uploads
maxFilesNum={10}
fileTypes={['mp4']}
maxFileSize={200}
/>
</Form.Item>
</Form>
</Modal>
</div>
}
</div >
)
}
function mapStateToProps (state) {
const { depMessage } = state;
const pakData = (dep) => {
return dep.map((d) => {
return {
title: d.name,
value: d.id,
children: pakData(d.subordinate)
}
})
}
let depData = pakData(depMessage.data || [])
return {
loading: depMessage.isRequesting,
depData,
};
}
export default connect(mapStateToProps)(VideoUpload);

8
web/client/src/sections/fillion/components/inforTable.js

@ -132,16 +132,16 @@ const InForTable = (props) => {
<Col span={8}>
<Input
onChange={(value) => {
setOverrunRateUpper(value.currentTarget.value)
setOverrunRateFloor(value.currentTarget.value)
}}
placeholder='输入超限率上限' />
placeholder='超限率下限' />
</Col>
<Col span={8}>
<Input
onChange={(value) => {
setOverrunRateFloor(value.currentTarget.value)
setOverrunRateUpper(value.currentTarget.value)
}}
placeholder='输入超限率下限' />
placeholder='超限率上限' />
</Col>
</Row>
</Input.Group>

174
web/client/src/sections/fillion/components/promotionalTable.js

@ -1,63 +1,103 @@
import React, { useEffect, useState} from 'react';
import { connect } from 'react-redux';
import { Spin, Button, Popconfirm, Badge } from 'antd';
import { Spin, Button, Popconfirm, Switch } from 'antd';
import ProTable from '@ant-design/pro-table';
import './protable.less'
import moment from 'moment';
import { getReportStatistic } from "../actions/infor"
import VideoUpload from './infor/videoUpload';
import { getPropagata } from '../actions/infor';
import { putEditPropagata } from '../actions/infor';
import { delPropagata } from '../actions/infor';
const promotionalTable = (props) => {
const { dispatch, user, depData, depMessage, depLoading } = props
const { dispatch, } = props
const [rowSelected, setRowSelected] = useState([])
const [regionId, setRegionId] = useState()//区域id
const [placeType, setPlaceType] = useState()//场所
const [day, setDay] = useState([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')])//日期
const [sitename, setSitename] = useState()//场所名称
const [counts, setCounts] = useState()//shuju
const onClickEnable = (record) => {
const id = record.id
const name = record.name
const video = record.video
const enable = true ? record.enable == false : true
const data = ({ publicityId: id, name: name, video: video, enable: enable })
dispatch(putEditPropagata(data)).then((res) => {
dispatch(getPropagata()).then((res) => {
setCounts(res.payload.data)
})
})
}
const columns =
[{
title: '序号',
search: false,
dataIndex: 'containers',
fixed: 'left',
width: 120,
render: (dom, record) => {
return record.address
},
fieldProps: {
getPopupContainer: (triggerNode) => triggerNode.parentNode,
render: (dom, record, key) => {
return key + 1
}
},
{
title: '视频名称',
dataIndex: 'placeName',
dataIndex: 'videoName',
fixed: 'left',
search: false,
width: 120,
options: 1,
backgroundColor: "#ffffff",
fieldProps: {
onChange: (value, cs) => {
setSitename(value.currentTarget.value)
},
placeholder: '请输入视频名称进行搜索',
getPopupContainer: (triggerNode) => triggerNode.parentNode,
},
render: (dom, record) => {
return record.name
}
},
{
title: '修改时间',
title: '是否展示',
dataIndex: 'shuffling',
valueType: 'shufflingRange',
search: false,
dataIndex: 'time2',
valueType: 'dateRange',
// align: 'right',
width: 120,
fixed: 'right',
render: (dom, record) => {
return record.address
return <div >
<Switch checkedChildren="展示" unCheckedChildren="关闭" onClick={() => onClickEnable(record)} defaultChecked={true ? record.enable == true : false} /></div>
}
},
fieldProps: {
getPopupContainer: (triggerNode) => triggerNode.parentNode,
{
title: '操作',
dataIndex: 'creatTime',
valueType: 'dateTimeRange',
hideInSearch: true,
width: 120,
fixed: 'right',
render: (dom, record) => {
return <div style={{ position: 'relative', marginTop: '-30px' }}>
<VideoUpload record={record} counts={counts} setCounts={setCounts} />
<Popconfirm
title="是否确定删除?"
arrowPointAtCenter={true}
showArrow={true}
position="topRight"
onConfirm={
() => {
const query = {
publicityId: record.id
}
dispatch(delPropagata(query)).then(() => {
dispatch(getPropagata()).then((res) => {
setCounts(res.payload.data)
})
})
}
}
>
<Button type="link" float="right"
>删除</Button>
</Popconfirm>
</div>
}
},
{
@ -65,88 +105,60 @@ const promotionalTable = (props) => {
hideInTable: true,
dataIndex: "direction",
order: 6,
renderFormItem: (item, { type, defaultRender, ...rest }, form) => {
renderFormItem: (item, { type, defaultRender, ...rest }, form, record) => {
return (
<div> <Button
type="primary"
style={{ width: "100px" }}
onClick={() => {
dispatch(push(`article/update/post`));
}}
>
新增
</Button>
<div>
<VideoUpload type_ys={1} counts={counts} setCounts={setCounts} />
</div>
);
},
},
]
//获取数据
useEffect(() => {
const vedio = dispatch(getPropagata()).then((res) => {
setCounts(res.payload.data)
console.log(res.payload.data)
})
}, [])
return (
<Spin spinning={false}>
<div className='protable-transpor'>
<ProTable
scroll={{ x: 800 }}
options={false}
ref={c => { finishedProductTable = c; }}
style={{ width: "100% ", overflow: "auto", height: '760px' }}
rowKey='id'
onReset={(v) => {
const { id } = depMessage[0]
console.log(id)
setRegionId(id)
setPlaceType(-1)
setDay([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')])
setSitename('')
}}
rowSelection={{
selectedRowKeys: rowSelected,
onChange: (selectedRowKeys) => {
setRowSelected(selectedRowKeys);
},
}}
form={{
submitter: false,
}}
columns={columns}
dataSource={(counts || {}).rows || []}
dataSource={counts || []}
request={async (params) => {
const query = {
// startDate: day[0],
// endDate: day[1],
// placeType: placeType,
// regionId: regionId,
// placeName: sitename,
// limit: params.pageSize,
// offset: ((params.current ? params.current : 1) - 1) * params.pageSize
limit: params.pageSize,
offset: ((params.current ? params.current : 1) - 1) * params.pageSize
}
setRowSelected([]);
const res = await dispatch(getReportStatistic(query));
setCounts(res.payload.data)
return {
...res,
total: res.payload.data ? res.payload.data.count : 0
}
}}
// search={{
// defaultCollapsed: false,
// optionRender: (searchConfig, formProps, dom) => [
// ...dom.reverse(),
// <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, counts) }}>
// <Button
// >
// 导出
// </Button>
// </Popconfirm>
// ],
// }}
>
</ProTable></div>
</Spin >
)
}
function mapStateToProps (state) {
const { auth, depMessage } = state;
const pakData = (dep) => {
return dep.map((d) => {

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

@ -3827,7 +3827,7 @@ const TransporTationTable = (props) => {
if (whichofits == 'gongcheng') {
const query = {
type: 'road',
// type:sitename
entryName:sitename
}
setRowSelected([]);
const res = await dispatch(getProject(query));

7
web/client/src/sections/fillion/nav-item.js

@ -32,12 +32,9 @@ export function getNavItem(user, dispatch) {
<Menu.Item key="fillionpublic">
<Link to="/fillion/public">公交管理</Link>
</Menu.Item>
<Menu.Item key="fileCont">
<Link to="/fillion/file">档案管理</Link>
</Menu.Item>
<Menu.Item key="fillionvideois">
{/* <Menu.Item key="fillionvideois">
<Link to="/fillion/videois">视频管理</Link>
</Menu.Item>
</Menu.Item> */}
<Menu.Item key="fillionpromotional">
<Link to="/fillion/promotional">宣传视频</Link>
</Menu.Item>

2
web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js

@ -172,7 +172,7 @@ const LeftCenter = (props) => {
rich: {
a: {
backgroundColor: {
image: 'assets/images/quanju/circle2.png'
image: '/assets/images/quanju/circle2.png'
},
width: 15,
height: 15,

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

@ -94,7 +94,7 @@ export const ApiTable = {
getRoadMaintenance: 'conserve/statistic',
//获取宣传数据
getpropagata: 'publicity',
getpropagata: 'publicity',putpropagata:'publicity',delpropagata:'/publicity/{publicityId}',
// <<<<<<< HEAD
// //公交信息
// getCircuit: 'bus/line', putCircuit: 'bus/line', delCircuit: 'bus/line/{lineId}',

Loading…
Cancel
Save