宣传视频模块

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' }
+   });
+}

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);

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 VideoUpload from './infor/videoUpload';
-import { getReportStatistic } from "../actions/infor"
+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) => {
+         render: (dom, record, key) => {
-                return record.address
+            return key + 1
-            },
-            fieldProps: {
-                getPopupContainer: (triggerNode) => triggerNode.parentNode,
          }
       },
       {
          title: '视频名称',
-                dataIndex: 'placeName',
+         dataIndex: 'videoName',
          fixed: 'left',
+         search: false,
          width: 120,
          options: 1,
-                backgroundColor: "#ffffff",
+         render: (dom, record) => {
-                fieldProps: {
+            return record.name
-                    onChange: (value, cs) => {
+         }
-                        setSitename(value.currentTarget.value)
-                    },
-                    placeholder: '请输入视频名称进行搜索',
-                    getPopupContainer: (triggerNode) => triggerNode.parentNode,
-                },
       },
-            
       {
-                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
+               <div>
-                            type="primary"
+                  <VideoUpload type_ys={1}   counts={counts} setCounts={setCounts} />
-                            style={{ width: "100px" }}
-                            onClick={() => {
-                                dispatch(push(`article/update/post`));
-                            }}
-                        >
-                            新增
-                        </Button>
                </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 || []}
-                    dataSource={(counts || {}).rows || []}
                request={async (params) => {
                   const query = {
-                            // startDate: day[0],
+                     limit: params.pageSize,
-                            // endDate: day[1],
+                     offset: ((params.current ? params.current : 1) - 1) * params.pageSize
-                            // placeType: placeType,
-                            // regionId: regionId,
-                            // placeName: sitename,
-                            // 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) => {

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}',