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

scripts/0.0.1/data/1_update_user_dep_data.sql

@@ -5,4 +5,4 @@ INSERT INTO "department" VALUES (1, '默认部门', NULL, false);
 -- ----------------------------
 -- Records of user
 -- ----------------------------
-INSERT INTO "user" VALUES (1, '管理员', 'SuperAdmin', 'e10adc3949ba59abbe56e057f20f883e', 1, 'f', NULL, 'SuperAdmin', NULL, TRUE);
+INSERT INTO "user" VALUES (1, '管理员', 'SuperAdmin', 'e10adc3949ba59abbe56e057f20f883e', 1, 'f', 'sp', 'SuperAdmin', NULL, TRUE);

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

@@ -1,6 +1,6 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import { connect } from 'react-redux';
-import { Modal, Form, Button, Input, Card, List } from 'antd';
+import { Modal, Form, Button, Input, Switch } from 'antd';
 import Uploads from "../../../../components/Upload/index"
 import { putAddPropagata } from '../../actions/infor';
 import { putEditPropagata } from '../../actions/infor';
@@ -8,11 +8,9 @@ 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();
 
    //弹窗
@@ -34,7 +32,8 @@ const VideoUpload = (props) => {
             return item.storageUrl
          })
          const videoname = values.videoname
-         const data = { name: videoname, video: videoAddress }
+         const enable = values.show
+         const data = { name: videoname, video: videoAddress, enable: enable }
          dispatch(putAddPropagata(data)).then(() => {
             dispatch(getPropagata()).then((res) => {
                setCounts(res.payload.data)
@@ -48,9 +47,6 @@ const VideoUpload = (props) => {
    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
@@ -68,8 +64,6 @@ const VideoUpload = (props) => {
       setIsModalVisible(false);
    };
 
-
-
    const handleCancel = () => {
       setIsModalVisible(false);
    };
@@ -82,8 +76,6 @@ const VideoUpload = (props) => {
       console.log('Failed:', errorInfo);
    };
 
-
-
    return (
       <div >
          {
@@ -99,7 +91,7 @@ const VideoUpload = (props) => {
                         span: 16,
                      }}
                      initialValues={{
-                        remember: true,
+                        show: true
                      }}
                      onFinish={onFinish}
                      onFinishFailed={onFinishFailed}
@@ -123,6 +115,12 @@ const VideoUpload = (props) => {
                      <Form.Item
                         label="选择视频"
                         name="video"
+                        rules={[
+                           {
+                              required: true,
+                              message: '必须上传视频!',
+                           },
+                        ]}
                      >
                         <Uploads
                            maxFilesNum={10}
@@ -130,6 +128,12 @@ const VideoUpload = (props) => {
                            maxFileSize={200}
                         />
                      </Form.Item>
+                     <Form.Item
+                        label="是否开启展示"
+                        name="show"
+                     >
+                        <Switch checkedChildren="展示" unCheckedChildren="关闭" defaultChecked={true} />
+                     </Form.Item>
                   </Form>
                </Modal>
             </div>
@@ -180,8 +184,6 @@ const VideoUpload = (props) => {
                               fileTypes={['mp4']}
                               maxFileSize={200}
                            />
-
-
                         </Form.Item>
                      </Form>
                   </Modal>

web/client/src/sections/fillion/components/maintenanceTable.js

@@ -18,7 +18,7 @@ const DetailForm = (props) => {
         { key: '所在路段', name: 'road' },
         { key: '具体位置', name: 'address' },
         { key: '巡查内容', name: 'content' },
-        { key: '病害照片', name: 'scenePic' },
+        // { key: '病害照片', name: 'scenePic' },
         { key: '养护前', name: 'conserveBeforePic' },
         { key: '养护中', name: 'conserveUnderwayPic' },
         { key: '养护后', name: 'conserveAfterPic' },
@@ -56,7 +56,7 @@ const DetailForm = (props) => {
             visible={visible}
             footer={null}
             onCancel={handleClose}
-            title={'巡更详细'}
+            title={'养护管理详情'}
         >
             <Spin spinning={loading}>
                 {renderContent(data)}
@@ -269,7 +269,7 @@ const MaintenanceTable = (props) => {
     useEffect(() => {
         if (record) {
             let query = { userId: record.id, reportType: 'conserve' }
-            if ((dateRange && dateRange instanceof Array)) {
+            if ((dateRange && dateRange instanceof Array && dateRange[0] != '')) {
                 query.startTime = moment(dateRange[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss')
                 query.endTime = moment(dateRange[1]).endOf('day').format('YYYY-MM-DD HH:mm:ss')
             }

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

@@ -57,7 +57,7 @@ const DetailForm = (props) => {
             visible={visible}
             footer={null}
             onCancel={handleClose}
-            title={'巡更详细'}
+            title={'巡更管理详情'}
         >
             <Spin spinning={loading}>
                 {renderContent(data)}
@@ -273,7 +273,7 @@ const PatrolTable = (props) => {
 
     const queryData = () => {
         let query = { userId: record.id, reportType: 'patrol' }
-        if ((dateRange && dateRange instanceof Array)) {
+        if ((dateRange && dateRange instanceof Array && dateRange[0] != '')) {
             query.startTime = moment(dateRange[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss')
             query.endTime = moment(dateRange[1]).endOf('day').format('YYYY-MM-DD HH:mm:ss')
         }

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

@@ -1,4 +1,4 @@
-import React, { useEffect, useState} from 'react';
+import React, { useEffect, useState } from 'react';
 import { connect } from 'react-redux';
 import { Spin, Button, Popconfirm, Switch } from 'antd';
 import ProTable from '@ant-design/pro-table';
@@ -30,96 +30,96 @@ const promotionalTable = (props) => {
 
 
    const columns =
-      [{
-         title: '序号',
-         search: false,
-         dataIndex: 'containers',
-         fixed: 'left',
-         width: 120,
-         render: (dom, record, key) => {
-            return key + 1
-         }
-      },
-      {
-         title: '视频名称',
-         dataIndex: 'videoName',
-         fixed: 'left',
-         search: false,
-         width: 120,
-         options: 1,
-         render: (dom, record) => {
-            return record.name
-         }
-      },
-      {
-         title: '是否展示',
-         dataIndex: 'shuffling',
-         valueType: 'shufflingRange',
-         search: false,
-         width: 120,
-         fixed: 'right',
-         render: (dom, record) => {
-            return <div >
-
-               <Switch checkedChildren="展示" unCheckedChildren="关闭" onClick={() => onClickEnable(record)} defaultChecked={true ? record.enable == true : false} /></div>
-         }
-      },
-      {
-         title: '操作',
-         dataIndex: 'creatTime',
-         valueType: 'dateTimeRange',
-         hideInSearch: true,
-         width: 160,
-         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)
+      [
+         {
+            title: '序号',
+            search: false,
+            dataIndex: 'containers',
+            fixed: 'left',
+            width: 120,
+            render: (dom, record, key) => {
+               return key + 1
+            }
+         },
+         {
+            title: '视频名称',
+            dataIndex: 'videoName',
+            fixed: 'left',
+            search: false,
+            width: 120,
+            options: 1,
+            render: (dom, record) => {
+               return record.name
+            }
+         },
+         {
+            title: '是否展示',
+            dataIndex: 'shuffling',
+            valueType: 'shufflingRange',
+            search: false,
+            width: 120,
+            fixed: 'right',
+            render: (dom, record) => {
+               return <div >
+                  <Switch checkedChildren="展示" unCheckedChildren="关闭" onClick={() => onClickEnable(record)} defaultChecked={true ? record.enable == true : false} />
+               </div>
+            }
+         },
+         {
+            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>
 
-         }
-      },
-      {
-         key: "direction",
-         hideInTable: true,
-         dataIndex: "direction",
-         order: 6,
-         renderFormItem: (item, { type, defaultRender, ...rest }, form, record) => {
-            return (
-               <div>
-                  <VideoUpload type_ys={1}   counts={counts} setCounts={setCounts} />
+                  >
+                     <Button type="link" float="right"
+                     >删除</Button>
+                  </Popconfirm>
                </div>
-            );
+
+            }
+         },
+         {
+            key: "direction",
+            hideInTable: true,
+            dataIndex: "direction",
+            order: 6,
+            renderFormItem: (item, { type, defaultRender, ...rest }, form, record) => {
+               return (
+                  <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)
       })
    }, [])
 
@@ -133,12 +133,6 @@ const promotionalTable = (props) => {
                options={false}
                style={{ width: "100% ", overflow: "auto", height: '760px' }}
                rowKey='id'
-               rowSelection={{
-                  selectedRowKeys: rowSelected,
-                  onChange: (selectedRowKeys) => {
-                     setRowSelected(selectedRowKeys);
-                  },
-               }}
                form={{
                   submitter: false,
                }}