+
+
+
+ 
+
+
+
+ },
+ { title: '巡查状态', key: 'isNormal', dataIndex: 'isNormal', width: 100, align: "center",
+ render: (value) =>
+
+ 
+ },
+ { title: '巡查问题描述', key: 'problemDesc', dataIndex: 'problemDesc', width: 300,ellipsis:true },
+ { title: '巡查图片', key: 'inspectPics', dataIndex: 'inspectPics', width: 100,align: "center",
+ render: (value) => {value ? reviewPic(value)}> { value.length} : ''}
+
+ },
+ { title: '巡查视频', key: 'inspectVideos', dataIndex: 'inspectVideos', width: 100,align: "center",
+ render: (value) => {value ? reviewVideo(value)}> { value.length} : ''}
+
+ },
+ {
+ title: '是否处理', key: 'isHandle', dataIndex: 'isHandle', width: 100,align: "center",
+ render: (value) => {value? "是" : "否"}
+ },
+ { title: '处理人', key: 'handleUserName', dataIndex: 'handleUserName', width: 150 },
+ {
+ title: '操作', key: 'operator', dataIndex: 'operator', width: 150,
+ render:(value,row) => handleDetail(row)}>处理详情
+ },
+
+ ]
+ const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
+
+ const [form] = Form.useForm();
+ const [imgVisible, setImgVisible] = useState(false)
+ const [imgList, setImgList] = useState([])
+ const [videoOpen, setVideoOpen] = useState(false)
+ const [videoParams, setVideoParams] = useState({})
+ const [tabsRender, setTabsRender] = useState([])
+ const [totals, setTotals] = useState({})
+ const [handleDetailsOpen, setHandleDetailsOpen] = useState(false)
+ const [handleDetails, setHandleDetails] = useState({})
+ const [handleImgfileList, setHandleImgFileList] = useState([]) //上传文件列表
+ const [handleVideoFileList, setHandleVideoFileList] = useState([]) //上传文件列表
+ const handleDetail = (row) => {
+ setHandleDetailsOpen(true)
+ setHandleDetails(row)
+ }
+
+ const reviewPic = (arrPic) => {
+ if (arrPic.length > 0) {
+ setImgVisible(true)
+ setImgList(arrPic)
+ }
+ }
+
+ const reviewVideo = (arrVideo) => {
+ if (arrVideo.length > 0) {
+ setVideoOpen(true)
+ setVideoParams(arrVideo[0])
+ }
+ }
+ const renderItems = (items) => {
+ const result = items.map(o => ({
+ key: o.pointId,
+ label: o.name + `(${o.children.filter(r=>r.isNormal == 0).length})`,
+ children:
+
+ setVideoOpen(false)}
+ >
+
+
+
+ setHandleDetailsOpen(false)}
+ >
+ <>
+
+
+
+
+ );
+}
+
+export default ModalForm;
diff --git a/src/views/Gcyx/xcxj/xjrw/form.js b/src/views/Gcyx/xcxj/xjrw/form.js
new file mode 100644
index 0000000..16ef5b3
--- /dev/null
+++ b/src/views/Gcyx/xcxj/xjrw/form.js
@@ -0,0 +1,351 @@
+import React,{useEffect,useState,useMemo,useRef} from 'react';
+import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, TreeSelect,message,Image,Modal,Typography ,Popconfirm } from 'antd';
+import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
+import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
+import PersonTree from '../../../../components/PersonTree';
+import apiurl from '../../../../service/apiurl';
+
+import NormalSelect from '../../../../components/Form/NormalSelect';
+import { xyt_httpget2 } from '../../../../utils/request';
+import "./index.less"
+import moment from 'moment';
+import { httpget2 } from '../../../../utils/request';
+const { RangePicker } = DatePicker
+const { Dragger } = Upload;
+const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
+
+
+const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
+ const [itemList, setItemList] = useState([])
+ const [itemParams, setItemParams] = useState([])
+ const [list, setList] = useState([])
+ const taskTypes = [
+ {label:"日常巡查",value:0},
+ {label:"特别检查",value:1},
+ {label:"汛前巡检",value:2},
+ ]
+ const [form] = Form.useForm();
+
+ const handleTree = (arr) => {
+
+ const res = arr.map(item => {
+ item.value = item.id;
+ item.title = item.itemDesc;
+ if (item.children) {
+ item.children = handleTree(item.children)
+ }
+ return item;
+ })
+ return res
+ }
+
+ const getItemList = async() => {
+ try {
+ const res = await httpget2(apiurl.rcgl.xcxj.xjrw.list);
+ if (res.code === 200) {
+ const arr1 = res.data.map(item => ({
+ id: item.id,
+ itemDesc: item.name,
+ children: item.children,
+ disabled:item.children.length > 0 ? false : true
+ }));
+ const result = handleTree(arr1)
+ setList(res.data)
+ console.log(result);
+ setItemList(result)
+ }
+ } catch (error) {
+ console.log(error);
+
+ }
+ }
+
+ const onfinish = (values) => {
+ const userId = localStorage.getItem('userId')
+ const userName = localStorage.getItem('userName')
+ values.startDate = values.startDate?moment(values.startDate).format("YYYY-MM-DD 00:00:00"):''
+ values.endDate = values.endDate ? moment(values.endDate).format("YYYY-MM-DD 00:00:00") : ''
+ values.createUserId = userId
+ values.createUserName = userName;
+ values.inspectUserName = deptUserList?.find(item => item.userId == values.inspectUserId)?.nickName
+ values.items = itemParams;
+ if (mode === 'save') {
+ onSave(apiurl.rcgl.xcxj.xjrw.save,values)
+ }
+ if (mode == "edit") {
+ onEdit(apiurl.rcgl.xcxj.xjrw.edit,{...record,...values})
+ }
+ }
+
+ const itemChange = (a, b, c) => {
+ const itemArr = a.map(item => {
+ let pointId;
+ list.forEach(o => {
+ if (o.id != item && !pointId) {
+ pointId = o.children?.find(t => t.id == item)?.pointId;
+ }
+ })
+ return {
+ itemId: item,
+ pointId
+ }
+ })
+ setItemParams(itemArr)
+ }
+
+ const getXjInfo = async () => {
+ try {
+ const res = await httpget2(apiurl.rcgl.xcxj.xjrw.detail, { taskId: record?.id })
+ if (res.code === 200) {
+ const xjd = res.data.map(item => item.itemId)
+ form.setFieldValue("items", xjd)
+ setItemParams(res.data)
+ }
+ } catch (error) {
+ console.log(error);
+
+ }
+ }
+ useEffect(() => {
+ getItemList()
+ }, [])
+
+ useEffect(() => {
+ if (mode == "edit") {
+ getXjInfo()
+ }
+ }, [record,mode])
+
+
+ const [deptList, setDeptList] = useState([])
+ const [deptUserList, setDeptUserList] = useState([])
+ const buildTree = (data, parentId) => {
+ let tree = [];
+ data.forEach((node) => {
+ node.title = node.deptName;
+ node.key = node.deptId;
+
+ if (node.parentId === parentId) {
+ let children = buildTree(data, node.deptId);
+ if (children.length) {
+ node.children = children;
+ }
+ tree.push(node);
+ }
+ });
+ return tree;
+}
+
+const handleTreeList = (dept, user) => {
+ const deptArr = dept.map(item => {
+ return {
+ ...item,
+ value: item.deptId,
+ title: item.deptName,
+ disabled: item.userId ? false : true,
+ children: user.filter(u => u.deptId == item.deptId).map(u => ({
+ ...u,
+ value: u.userId,
+ title: u.nickName
+ }))
+ }
+ })
+ console.log("deptArr",deptArr);
+ const treelist = buildTree(deptArr,0)
+ return treelist
+ }
+ const treeList = useMemo(() => {
+ if (deptUserList?.length > 0 && deptList?.length > 0) {
+ return handleTreeList(deptList,deptUserList)
+ } else {
+ return []
+ }
+ }, [deptUserList, deptList])
+
+
+ // 获取部门数据
+const getDeptList = async() => {
+try {
+ const result = await xyt_httpget2(apiurl.rcgl.zbgl.zbb.deptlist);
+ if (result.code == 200) {
+ setDeptList(result.data);
+ getDeptUser(result.data[0])
+ }
+
+} catch (error) {
+ console.log(error);
+}
+}
+
+// 获取部门人员数据
+const getDeptUser = async() => {
+try {
+ const result = await xyt_httpget2(apiurl.rcgl.zbgl.zbb.userList, {pageNum:1,pageSize:9999});
+ if (result.code == 200) {
+ setDeptUserList(result.rows)
+ }
+} catch (error) {
+ console.log(error);
+}
+}
+ useEffect(() => {
+ getDeptList()
+ }, [])
+
+ return (
+ <>
+
+
+ );
+}
+
+export default ModalForm;
diff --git a/src/views/Gcyx/xcxj/xjrw/index.js b/src/views/Gcyx/xcxj/xjrw/index.js
new file mode 100644
index 0000000..d85deb5
--- /dev/null
+++ b/src/views/Gcyx/xcxj/xjrw/index.js
@@ -0,0 +1,222 @@
+import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
+import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
+import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
+import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
+import { useSelector } from 'react-redux';
+import ToolBar from './toolbar';
+import ModalForm from './form';
+import DetailModalForm from "./detailForm"
+import apiurl from '../../../../service/apiurl';
+import usePageTable from '../../../../components/crud/usePageTable2';
+import { createCrudService } from '../../../../components/crud/_';
+import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
+
+const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
+const Page = () => {
+ const role = useSelector(state => state.auth.role);
+ const editBtn = role?.rule?.find(item => item.menuName == "编辑")||true;
+ const viewBtn = role?.rule?.find(item => item.menuName == "查看")||true;
+ const delBtn = role?.rule?.find(item => item.menuName == "删除")||true;
+ const task = {
+ 0: "未完成",
+ 1: "进行中",
+ 2: "已完成"
+ }
+ const taskType = {
+ 1: "日常巡查",
+ 2: "特别检查",
+ 3: "汛前巡检"
+ }
+ const refModal = useRef();
+ const [searchVal, setSearchVal] = useState(false)
+ const [tabs, setTabsChange] = useState(0)
+ const columns = [
+ { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
+ {
+ title: '任务类型', key: 'taskType', dataIndex: 'taskType', width: 200,
+ render: (value) => {taskType[value]}
+
+ },
+ { title: '任务标题', key: 'taskTitle', dataIndex: 'taskTitle', width: 250, ellipsis: true },
+ {title: '任务内容', key: 'taskContent', dataIndex: 'taskContent', width: 200},
+ {
+ title: '任务状态', key: 'status', dataIndex: 'status', width: 200,
+ render: (value) =>
+ {task[value]}
+
+
+ },
+ {title: '巡查人', key: 'inspectUserName', dataIndex: 'inspectUserName', width: 100},
+ {title: '开始日期', key: 'startDate', dataIndex: 'startDate', width: 200},
+ {title: '结束日期', key: 'endDate', dataIndex: 'endDate', width: 200},
+ {title: '问题数量', key: 'problemNum', dataIndex: 'problemNum', width: 100,align: 'center'},
+ { title: '待处理', key: 'handleNum', dataIndex: 'handleNum', width: 100,align: 'center'},
+ { title: '创建时间', key: 'createTime', dataIndex: 'createTime', width: 200 },
+ { title: '创建人', key: 'createUserName', dataIndex: 'createUserName', width: 150 },
+
+ {
+ title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
+ render: (value, row, index) => (
+
+ 基本信息
+
+
+ setImgVisible(vis),
+ }}
+ >
+ {
+ imgList.length > 0 ? imgList.map(item => (
+
+ ))
+ : null
+ }
+
+
+
+
+
+ {refresh({addvcd:localStorage.getItem('ADCD6')})}}
+ />
+
+
+ );
+}
+
+export default Page;
diff --git a/src/views/Gcyx/xcxj/xjrw/index.less b/src/views/Gcyx/xcxj/xjrw/index.less
new file mode 100644
index 0000000..e0bd728
--- /dev/null
+++ b/src/views/Gcyx/xcxj/xjrw/index.less
@@ -0,0 +1,30 @@
+.basic-info{
+ position: relative;
+ font-size: 16px;
+ margin-bottom: 20px;
+ padding:5px 25px;
+ border-bottom: 1px solid #eee;
+ &::before{
+ position: absolute;
+ top:8px;
+ left:0;
+ content: "";
+ display: block;
+ width: 5px;
+ height: 20px;
+ background-color: #0079fe;
+ }
+}
+.time-line{
+ width: 50%;
+ margin-left: 6%;
+ margin-top: 1%;
+ .time-line-item{
+ display: flex;
+ // align-items: center;
+ column-gap: 20px;
+ .item-right{
+ flex:1
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/views/Gcyx/xcxj/xjrw/toolbar.js b/src/views/Gcyx/xcxj/xjrw/toolbar.js
new file mode 100644
index 0000000..521eb6f
--- /dev/null
+++ b/src/views/Gcyx/xcxj/xjrw/toolbar.js
@@ -0,0 +1,73 @@
+import React, { useEffect,useState } from 'react';
+import { Form, Input, Button, DatePicker } from 'antd';
+
+import moment from 'moment';
+import NormalSelect from '../../../../components/Form/NormalSelect';
+const { RangePicker } = DatePicker;
+const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
+ const addBtn = role?.rule?.find(item => item.menuName == "创建任务")||true;
+ const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
+
+ const types = [
+ {label:"日常巡查",value:1},
+ {label:"特别检查",value:2},
+ {label:"汛前巡检",value:3},
+ ]
+ const [form] = Form.useForm();
+
+ const onFinish = (values) => {
+ let dateTimeRangeSo;
+ if (values.tm) {
+ dateTimeRangeSo = {
+ start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
+ end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
+ }
+ }
+ delete values.tm
+ setSearchVal({...values, dateTimeRangeSo});
+ }
+
+ useEffect(() => {
+ let dateTimeRangeSo = {
+ start: moment().subtract(1,"years").format('YYYY-MM-DD 00:00:00'),
+ end: moment().format('YYYY-MM-DD 23:59:59')
+ }
+ form.setFieldValue("tm", [moment(dateTimeRangeSo.start), moment(dateTimeRangeSo.end)])
+ setSearchVal({ dateTimeRangeSo })
+ }, [])
+
+ return (
+ <>
+
+
+
+
+
+
+ setTabsChange(e)}
+ activeKey={tabs}
+ items={[
+ {
+ label: `未完成（${tableProps0?.pagination?.total}）`,
+ key: 0,
+ children:
+ },
+ {
+ label: `进行中（${tableProps1?.pagination?.total}）`,
+ key: 1,
+ children:
+ },
+ {
+ label: `已完成（${tableProps2?.pagination?.total}）`,
+ key: 2,
+ children:
+ }
+ ]}
+ >
+
+
+
+
+
+
+ );
+}
+
+export default ToolBar;
\ No newline at end of file
diff --git a/src/views/Gcyx/xcxj/xjwtcl/form.js b/src/views/Gcyx/xcxj/xjwtcl/form.js
new file mode 100644
index 0000000..62c9cae
--- /dev/null
+++ b/src/views/Gcyx/xcxj/xjwtcl/form.js
@@ -0,0 +1,347 @@
+import React,{useEffect,useState,useMemo,useRef} from 'react';
+import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
+import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined,VideoCameraOutlined } from '@ant-design/icons';
+import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
+
+import apiurl from '../../../../service/apiurl';
+
+import NormalSelect from '../../../../components/Form/NormalSelect';
+
+import "./index.less"
+import moment from 'moment';
+const { RangePicker } = DatePicker
+const { Dragger } = Upload;
+const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
+
+
+const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave,submit }) => {
+console.log(record);
+
+ const [form] = Form.useForm();
+ const [imgfileList, setImgFileList] = useState([]) //上传文件列表
+ const [videoFileList, setVideoFileList] = useState([]) //上传文件列表
+ const [handleImgfileList, setHandleImgFileList] = useState([]) //上传文件列表
+ const [handleVideoFileList, setHandleVideoFileList] = useState([]) //上传文件列表
+ const [videoOpen, setVideoOpen] = useState(false)
+ const [videoParams, setVideoParams] = useState({})
+
+ const onfinish = (values) => {
+ if (mode === 'edit') {
+ values.id = record.id;
+ onEdit(apiurl.rcgl.xcxj.xjrw.edit,values)
+ }
+ if (mode === 'save') {
+ onSave(apiurl.rcgl.xcxj.xjrw.save,values)
+ }
+ }
+ const handleFile = (arr=[]) => {
+ const newArr = arr?.map(item => ({
+ name: item.fileName,
+ response: {
+ data: {
+ filePath: item.filePath,
+ fileId:item.fileId
+ }
+ },
+ }))
+ return newArr
+ }
+ useEffect(() => {
+ if (mode != 'save') {
+ // const imgFile = record?.inspectPics?.map(o => ({
+ // name: o.fileName,
+ // response: {
+ // data: {
+ // filePath: o.filePath,
+ // fileId:o.fileId
+ // }
+ // },
+ // }))
+ const imgFile = handleFile(record?.inspectPics);
+ const videoFile = handleFile(record?.inspectVideos);
+ const handleImgFile = handleFile(record?.handlePics);
+ const hanldeVideoFile = handleFile(record?.handleVideos);
+ setImgFileList(imgFile)
+ setVideoFileList(videoFile)
+ setHandleImgFileList(handleImgFile)
+ setHandleVideoFileList(hanldeVideoFile)
+ form.setFieldsValue({
+ ...record,
+ handleTime: record.handleTime ? moment(record.handleTime) : '',
+ finishTime: record.finishTime? moment(record.finishTime) : ''
+ })
+ }
+ }, [record, mode])
+
+
+
+ return (
+
+ setVideoOpen(false)}
+ >
+
+
+
+ );
+}
+
+export default ModalForm;
diff --git a/src/views/Gcyx/xcxj/xjwtcl/index.js b/src/views/Gcyx/xcxj/xjwtcl/index.js
new file mode 100644
index 0000000..226a929
--- /dev/null
+++ b/src/views/Gcyx/xcxj/xjwtcl/index.js
@@ -0,0 +1,197 @@
+import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
+import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
+import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
+import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
+import { useSelector } from 'react-redux';
+import ToolBar from './toolbar';
+import ModalForm from './form';
+import apiurl from '../../../../service/apiurl';
+import usePageTable from '../../../../components/crud/usePageTable2';
+import { createCrudService } from '../../../../components/crud/_';
+import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
+
+const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
+const Page = () => {
+ const role = useSelector(state => state.auth.role);
+ const viewBtn = role?.rule?.find(item => item.menuName == "详情") || true;
+ const refModal = useRef();
+ const [searchVal, setSearchVal] = useState(false)
+ const [tabs, setTabsChange] = useState(0)
+ const [imgVisible, setImgVisible] = useState(false)
+ const [imgList, setImgList] = useState([])
+ const [videoOpen, setVideoOpen] = useState(false)
+ const [videoParams, setVideoParams] = useState({})
+ const columns = [
+ { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
+ { title: '任务标题', key: 'taskTitle', dataIndex: 'taskTitle', width: 250, ellipsis: true },
+ {title: '巡检点', key: 'name', dataIndex: 'name', width: 200},
+ {
+ title: '巡查项', key: 'itemDesc', dataIndex: 'itemDesc', width: 200,
+ },
+ {title: '巡查问题描述', key: 'problemDesc', dataIndex: 'problemDesc', width: 200},
+ {
+ title: '巡查图片', key: 'inspectPics', dataIndex: 'inspectPics', width: 100,
+ render: (value) =>
+ 巡检信息
+
+ {value ? reviewPic(value)}> { value.length} : ''}
+ },
+ {
+ title: '巡查视频', key: 'inspectVideos', dataIndex: 'inspectVideos', width: 100,
+ render: (value) => {value ? reviewVideo(value)}> { value.length} : ''}
+ },
+ {
+ title: '处理状态', key: 'isHandle', dataIndex: 'isHandle', width: 200, align: 'center',
+ render: (value) => { value == 1 ? "已处理" : value == 0 ? "待处理" : ''}
+ },
+ { title: '巡查人', key: 'inspectUserName', dataIndex: 'inspectUserName', width: 150 },
+ { title: '巡查完成时间', key: 'finishTime', dataIndex: 'finishTime', width: 200 },
+
+ {
+ title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
+ render: (value, row, index) => (
+
+
+
+
+
+
+
+
+ setTabsChange(e)} >
+
+
+
+
+
+
+
+
+
+ setImgVisible(vis),
+ }}
+ >
+ {
+ imgList.length > 0 ? imgList.map(item => (
+
+ ))
+ : null
+ }
+
+
+
+
+
+
+
+
+ );
+}
+
+export default ToolBar;
\ No newline at end of file
diff --git a/src/views/Gcyx/xcxj/xjxpz/AdcdTreeSelector/index.less b/src/views/Gcyx/xcxj/xjxpz/AdcdTreeSelector/index.less
new file mode 100644
index 0000000..ac6ad25
--- /dev/null
+++ b/src/views/Gcyx/xcxj/xjxpz/AdcdTreeSelector/index.less
@@ -0,0 +1,47 @@
+li.ant-tree-treenode-disabled > span:not(.ant-tree-switcher),
+li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper,
+li.ant-tree-treenode-disabled > .ant-tree-node-content-wrapper span{
+ color: #000 !important;
+ font-weight: bold;
+}
+
+.treeBox1{
+ .ant-tree-node-content-wrapper{
+ position: static !important;
+ }
+ .hover-ele{
+ &:hover{
+ color:#259dff
+ }
+ }
+}
+.AdcdTreeSelectorStyle{
+ .ant-input-wrapper{
+
+ .ant-input-affix-wrapper{
+ width: 98%;
+ }
+ .ant-input-group-addon{
+ .ant-btn{
+ width: 34px;
+ height: 34px;
+ }
+ }
+ }
+
+ .treeTitle {
+ display: flex;
+ justify-content: space-between;
+ .treeBtn {
+ display: none;
+ }
+}
+.treeTitle:hover {
+ .treeBtn {
+ display: flex;
+ }
+}
+}
+.no-matter{
+ opacity: 0.5;
+}
\ No newline at end of file
diff --git a/src/views/Gcyx/xcxj/xjxpz/AdcdTreeSelector/index.tsx b/src/views/Gcyx/xcxj/xjxpz/AdcdTreeSelector/index.tsx
new file mode 100644
index 0000000..ba64933
--- /dev/null
+++ b/src/views/Gcyx/xcxj/xjxpz/AdcdTreeSelector/index.tsx
@@ -0,0 +1,313 @@
+import React, { useState, useEffect } from 'react';
+import { Tree, Input, Checkbox, Spin,Modal,Form,Col,Row,message,Space } from 'antd';
+import { EditOutlined,PlusCircleOutlined, DeleteOutlined,ExclamationCircleOutlined} from '@ant-design/icons';
+import './index.less';
+import { formItemLayout, btnItemLayout } from '../../../../../components/crud/FormLayoutProps';
+import { getXjTreeData } from '../../../../../service/warn';
+import apiurl from '../../../../../service/apiurl';
+import { httppost3,httpget6 } from '../../../../../utils/request';
+
+const { Search } = Input;
+
+type IProps = {
+ onSelectFun?: any;
+ setAdcd?: any;
+ showCheckbox: any;
+ tableName?: any;
+ onChangeOpen?: any;
+ hasAlertBox?: boolean;//顶部是否有预警条
+ isFetch?: boolean;
+}
+const { confirm } = Modal;
+const AdcdTreeSelector: React.FC
+ { setJdOpen(false); form.resetFields()}}
+ onOk={onOk}
+ >
+
+
+
+ );
+};
+
+export default AdcdTreeSelector;
diff --git a/src/views/Gcyx/xcxj/xjxpz/form.js b/src/views/Gcyx/xcxj/xjxpz/form.js
new file mode 100644
index 0000000..48ca5bb
--- /dev/null
+++ b/src/views/Gcyx/xcxj/xjxpz/form.js
@@ -0,0 +1,110 @@
+import React,{useEffect,useState,useMemo,useRef} from 'react';
+import { Form, Button, Input, Row,Upload, Col, TreeSelect, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
+import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
+import { formItemLayout, btnItemLayout } from '../../../../components/crud/FormLayoutProps';
+import { httpget2, httppost2,xyt_httpget2 } from '../../../../utils/request';
+import apiurl from '../../../../service/apiurl';
+import NormalSelect from '../../../../components/Form/NormalSelect';
+import "./index.less"
+import moment from 'moment';
+const { RangePicker } = DatePicker
+const { Dragger } = Upload;
+const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
+
+
+const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
+ const [form] = Form.useForm();
+ const onfinish = (values) => {
+ values.pointId = record.code;
+ if (mode === 'edit') {
+ values.id = record.id;
+ values.status = record.status;
+ onEdit(apiurl.rcgl.xcxj.xjxpz.edit,values)
+ }
+ if (mode === 'save') {
+ onSave(apiurl.rcgl.xcxj.xjxpz.save,values)
+ }
+ }
+
+
+
+
+
+
+
+ return (
+ <>
+
+
+ );
+}
+
+export default ModalForm;
diff --git a/src/views/Gcyx/xcxj/xjxpz/index.js b/src/views/Gcyx/xcxj/xjxpz/index.js
new file mode 100644
index 0000000..c31ff4d
--- /dev/null
+++ b/src/views/Gcyx/xcxj/xjxpz/index.js
@@ -0,0 +1,141 @@
+import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
+import BasicCrudModal from '../../../../components/crud/BasicCrudModal';
+import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image,Switch } from 'antd';
+import {FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
+import { useSelector } from 'react-redux';
+import AdcdTreeSelector from "./AdcdTreeSelector";
+import ToolBar from './toolbar';
+import ModalForm from './form';
+import apiurl from '../../../../service/apiurl';
+import usePageTable from '../../../../components/crud/usePageTable2';
+import { createCrudService } from '../../../../components/crud/_';
+import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
+
+const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
+const Page = () => {
+ const role = useSelector(state => state.auth.role);
+ console.log(role);
+
+ const editBtn = role?.rule?.find(item => item.menuName == "编辑") || true;
+ const viewBtn = role?.rule?.find(item => item.menuName == "查看") || true;
+ const delBtn = role?.rule?.find(item => item.menuName == "删除") || true;
+ const checkType = {
+ 1: "低风险",
+ 2: "一般风险",
+ 3: "较大风险",
+ 4:"重大风险"
+ }
+ const risk = {
+ 1: "low",
+ 2: "yiban",
+ 3: "jiaoda",
+ 4:"zhongda"
+ }
+ const refModal = useRef();
+ const columns = [
+ { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
+ {title: '巡检项描述', key: 'itemDesc', dataIndex: 'itemDesc', width: 240},
+ {
+ title: '问题描述', key: 'problemDesc', dataIndex: 'problemDesc', width: 320,ellipsis:true},
+ {
+ title: '处理建议', key: 'handleSuggestion', dataIndex: 'handleSuggestion', width: 200 },
+ {
+ title: '排序号', key: 'orderIndex', dataIndex: 'orderIndex', width: 100,
+ },
+ {
+ title: '是否启用', key: 'status', dataIndex: 'status', width: 200,
+ render: (v, r) => 新增巡检点
+ {
+ loading?
+
+
:null
+ }
+
+
+
+
+ {
+ treeData.length > 0 &&
+ {
+ return (
+
+
+
+ {v.title}
+
+ {/* {
+ e.stopPropagation();
+ saveJd(v);
+ }}
+ className='hover-ele'
+ /> */}
+ {
+ e.stopPropagation();
+ editJd(v);
+ }}
+ className='hover-ele'
+ />
+ {
+ e.stopPropagation();
+ deleteJd(v);
+ }}
+ className='hover-ele'
+ />
+
+
+
+ )
+ }}
+ />
+ }
+
+
+
+ );
+}
+
+export default Page;
diff --git a/src/views/Gcyx/xcxj/xjxpz/index.less b/src/views/Gcyx/xcxj/xjxpz/index.less
new file mode 100644
index 0000000..e0bd728
--- /dev/null
+++ b/src/views/Gcyx/xcxj/xjxpz/index.less
@@ -0,0 +1,30 @@
+.basic-info{
+ position: relative;
+ font-size: 16px;
+ margin-bottom: 20px;
+ padding:5px 25px;
+ border-bottom: 1px solid #eee;
+ &::before{
+ position: absolute;
+ top:8px;
+ left:0;
+ content: "";
+ display: block;
+ width: 5px;
+ height: 20px;
+ background-color: #0079fe;
+ }
+}
+.time-line{
+ width: 50%;
+ margin-left: 6%;
+ margin-top: 1%;
+ .time-line-item{
+ display: flex;
+ // align-items: center;
+ column-gap: 20px;
+ .item-right{
+ flex:1
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/views/Gcyx/xcxj/xjxpz/toolbar.js b/src/views/Gcyx/xcxj/xjxpz/toolbar.js
new file mode 100644
index 0000000..47e06bd
--- /dev/null
+++ b/src/views/Gcyx/xcxj/xjxpz/toolbar.js
@@ -0,0 +1,43 @@
+import React, { useEffect,useState } from 'react';
+import { Form, Input, Button, DatePicker } from 'antd';
+
+import moment from 'moment';
+const { RangePicker } = DatePicker;
+const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
+ console.log("role",role);
+
+ const addBtn = role?.rule?.find(item => item.menuName == "新增");
+ const [form] = Form.useForm();
+
+ const onFinish = (values) => {
+ let dateSo;
+ if (values.tm) {
+ dateSo = {
+ start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
+ end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
+ }
+ }
+ delete values.tm
+ setSearchVal({...values, dateSo});
+ }
+
+
+
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+export default ToolBar;
\ No newline at end of file
diff --git a/src/views/SafeWatch/SlWatch/index.js b/src/views/SafeWatch/SlWatch/index.js
new file mode 100644
index 0000000..b91a919
--- /dev/null
+++ b/src/views/SafeWatch/SlWatch/index.js
@@ -0,0 +1,72 @@
+import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
+import BasicCrudModal from '../../../components/crud/BasicCrudModal';
+import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
+import ToolBar from './toolbar';
+import apiurl from '../../../service/apiurl';
+import usePageTable from '../../../components/crud/usePageTable2';
+import { createCrudService } from '../../../components/crud/_';
+import { httppost5 } from '../../../utils/request';
+import { exportFile } from '../../../utils/tools.js';
+const Page = () => {
+ const types = {
+ 0: "设备维修",
+ 1: '设备更换',
+ 2:"结构加固"
+ }
+ const [searchVal, setSearchVal] = useState(false)
+ const columns = [
+ { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
+ { title: '监测断面', key: 'projectName', dataIndex: 'projectName', width: 150},
+ { title: '测点编号', key: 'projectAddr', dataIndex: 'projectAddr', width: 150},
+ { title: '测压管水位(m)', key: 'projectAddr', dataIndex: 'projectAddr', width: 150},
+ { title: '渗压(KPa)', key: 'projectAddr', dataIndex: 'projectAddr', width: 150},
+ { title: '振弦(Hz)', key: 'projectAddr', dataIndex: 'projectAddr', width: 150},
+ { title: '温度(℃)', key: 'projectAddr', dataIndex: 'projectAddr', width: 150},
+ {
+ title: '监测时间', key: 'createTime', dataIndex: 'createTime', width: 140,
+ },
+
+ ];
+ const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
+ const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.sbwh.whfabz.page).find_noCode);
+
+ // 导出
+ const exportExcel = () => {
+ let params = {
+ ...searchVal,
+ }
+ httppost5(apiurl.sbwh.cgtzgl.export, params).then(res => {
+ exportFile(`渗流监测.xlsx`,res.data)
+ })
+ }
+
+ useEffect(()=>{
+ const params = {
+ search: {
+ ...searchVal,
+ }
+ };
+ search(params)
+ }, [searchVal])
+
+
+ return (
+ <>
+
+
+
+ );
+}
+
+export default Page;
diff --git a/src/views/SafeWatch/SlWatch/toolbar.js b/src/views/SafeWatch/SlWatch/toolbar.js
new file mode 100644
index 0000000..801fffe
--- /dev/null
+++ b/src/views/SafeWatch/SlWatch/toolbar.js
@@ -0,0 +1,71 @@
+import React, { useEffect, useState } from 'react';
+import { Form, Input, Button, DatePicker } from 'antd';
+import NormalSelect from '../../../components/Form/NormalSelect';
+
+import moment from 'moment';
+const { RangePicker } = DatePicker;
+const ToolBar = ({ setSearchVal, exportFile1, storeData, role }) => {
+
+ const types = [
+ {
+ label: "设备维修",
+ value: 0
+ },
+ {
+ label: "设备更换",
+ value: 1
+ }, {
+ label: "结构加固",
+ value: 2
+ },
+ ]
+ const [form] = Form.useForm();
+
+ const onFinish = (values) => {
+ let dateTimeRangeSo;
+ if (values.tm) {
+ dateTimeRangeSo = {
+ start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
+ end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
+ }
+ }
+ delete values.tm
+ setSearchVal({ ...values, dateTimeRangeSo });
+ }
+
+
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+export default ToolBar;
\ No newline at end of file
diff --git a/src/views/SafeWatch/TransformWatch/form.js b/src/views/SafeWatch/TransformWatch/form.js
new file mode 100644
index 0000000..c9e8c2d
--- /dev/null
+++ b/src/views/SafeWatch/TransformWatch/form.js
@@ -0,0 +1,97 @@
+import React, { useEffect, useState, useMemo, useRef } from 'react';
+import { Form, Button, Input, Row, Upload, Col, Table, DatePicker, InputNumber, message, Image, Modal, Typography, Popconfirm } from 'antd';
+import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
+import apiurl from '../../../service/apiurl';
+import "./index.less"
+import moment from 'moment';
+const { RangePicker } = DatePicker
+
+const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
+ const [form] = Form.useForm();
+ const onfinish = (values) => {
+ values.tm = values.tm ? moment(values.tm).format('YYYY-MM-DD 00:00:00') : undefined
+ if (mode === 'edit') {
+ onEdit(apiurl.aqjc.bxjc.wyedit, { ...record, ...values })
+ }
+ if (mode === 'save') {
+ onSave(apiurl.aqjc.bxjc.wysave, values)
+ }
+ }
+
+
+ return (
+ <>
+
+
+
+ );
+}
+
+export default ModalForm;
diff --git a/src/views/SafeWatch/TransformWatch/index.js b/src/views/SafeWatch/TransformWatch/index.js
new file mode 100644
index 0000000..6cb9836
--- /dev/null
+++ b/src/views/SafeWatch/TransformWatch/index.js
@@ -0,0 +1,143 @@
+import React, { Fragment, useRef, useMemo, useEffect, useState } from 'react';
+import BasicCrudModal from '../../../components/crud/BasicCrudModal';
+import { Table, Card, Modal, Form, Input, Button, Row, Col, Timeline, message, Tabs, Image } from 'antd';
+import ToolBar from './toolbar';
+import ModalForm from './form';
+import apiurl from '../../../service/apiurl';
+import usePageTable from '../../../components/crud/usePageTable2';
+import { createCrudService } from '../../../components/crud/_';
+import { CrudOpRender_text } from '../../../components/crud/CrudOpRender';
+import { httppost5 } from '../../../utils/request';
+import { exportFile } from '../../../utils/tools.js';
+
+const Page = () => {
+ const types = {
+ 0: "设备维修",
+ 1: '设备更换',
+ 2: "结构加固"
+ }
+ const refModal = useRef();
+ const [searchVal, setSearchVal] = useState(false)
+ const [tabsActive, setTabsActive] = useState("1")
+
+ const wColumns = [
+ { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
+ { title: '监测点', key: 'stationCode', dataIndex: 'stationCode', width: 150},
+ { title: 'X方向位移(mm)', key: 'x', dataIndex: 'x', width: 150},
+ { title: 'Y方向位移(mm)', key: 'y', dataIndex: 'y', width: 150 },
+ { title: 'H方向位移(mm)', key: 'h', dataIndex: 'h', width: 150 },
+ {
+ title: '上报时间', key: 'tm', dataIndex: 'tm', width: 140,
+ },
+ {
+ title: '操作', key: 'operation', width: 200, fixed: 'right', align: 'center',
+ render: (value, row, index) => (
+
+ {setTabsActive(e) }}
+ items={[
+ {
+ label: '水平位移',
+ key: '1',
+ },
+ {
+ label: '结构缝开度',
+ key: '2',
+
+ }
+ ]}
+ />
+
+
+ );
+}
+
+export default Page;
diff --git a/src/views/SafeWatch/TransformWatch/index.less b/src/views/SafeWatch/TransformWatch/index.less
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/SafeWatch/TransformWatch/toolbar.js b/src/views/SafeWatch/TransformWatch/toolbar.js
new file mode 100644
index 0000000..d0af804
--- /dev/null
+++ b/src/views/SafeWatch/TransformWatch/toolbar.js
@@ -0,0 +1,60 @@
+import React, { useEffect, useState } from 'react';
+import { Form, Input, Button, DatePicker } from 'antd';
+import NormalSelect from '../../../components/Form/NormalSelect';
+
+import moment from 'moment';
+const { RangePicker } = DatePicker;
+const ToolBar = ({ setSearchVal, onSave, tabsActive, exportFile1 }) => {
+ const [form] = Form.useForm();
+ const onFinish = (values) => {
+ let dateTimeRangeSo;
+ if (values.tm) {
+ dateTimeRangeSo = {
+ start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
+ end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
+ }
+ }
+ delete values.tm
+ setSearchVal({ ...values, dateTimeRangeSo });
+ }
+
+
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+export default ToolBar;
\ No newline at end of file
diff --git a/src/views/SafeWatch/WarnRecord/index.js b/src/views/SafeWatch/WarnRecord/index.js
new file mode 100644
index 0000000..4e2da78
--- /dev/null
+++ b/src/views/SafeWatch/WarnRecord/index.js
@@ -0,0 +1,83 @@
+import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
+import BasicCrudModal from '../../../components/crud/BasicCrudModal';
+import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
+import ToolBar from './toolbar';
+import apiurl from '../../../service/apiurl';
+import usePageTable from '../../../components/crud/usePageTable2';
+import { createCrudService } from '../../../components/crud/_';
+import { httppost5 } from '../../../utils/request';
+import { exportFile } from '../../../utils/tools.js';
+const Page = () => {
+ const types = {
+ 0: "水平位移",
+ 1: '结构缝开度',
+ 2: "渗流监测",
+ 3:'环境量监测'
+ }
+ const statusTypes = {
+ 0: "报警中",
+ 1: '已解除',
+ }
+ const [searchVal, setSearchVal] = useState(false)
+ const columns = [
+ { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
+ {
+ title: '监测类型', key: 'projectName', dataIndex: 'projectName', width: 150,
+ render: (v) => {types[v]}
+ },
+ { title: '监测点', key: 'projectAddr', dataIndex: 'projectAddr', width: 150},
+ { title: '监测值', key: 'projectAddr', dataIndex: 'projectAddr', width: 150},
+ {
+ title: '状态', key: 'projectAddr', dataIndex: 'projectAddr', width: 150,
+ render: (v) => {statusTypes[v]}
+ },
+ { title: '预警依据', key: 'projectAddr', dataIndex: 'projectAddr', width: 250},
+ { title: '预警时间', key: 'projectAddr', dataIndex: 'projectAddr', width: 150},
+ {
+ title: '持续时长', key: 'createTime', dataIndex: 'createTime', width: 150,
+ },
+
+ ];
+ const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
+ const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.sbwh.whfabz.page).find_noCode);
+
+ // 导出
+ const exportExcel = () => {
+ let params = {
+ ...searchVal,
+ }
+ httppost5(apiurl.sbwh.cgtzgl.export, params).then(res => {
+ exportFile(`渗流监测.xlsx`,res.data)
+ })
+ }
+
+ useEffect(()=>{
+ const params = {
+ search: {
+ ...searchVal,
+ }
+ };
+ search(params)
+ }, [searchVal])
+
+
+ return (
+ <>
+
+
+
+ );
+}
+
+export default Page;
diff --git a/src/views/SafeWatch/WarnRecord/toolbar.js b/src/views/SafeWatch/WarnRecord/toolbar.js
new file mode 100644
index 0000000..286f41d
--- /dev/null
+++ b/src/views/SafeWatch/WarnRecord/toolbar.js
@@ -0,0 +1,88 @@
+import React, { useEffect, useState } from 'react';
+import { Form, Input, Button, DatePicker } from 'antd';
+import NormalSelect from '../../../components/Form/NormalSelect';
+
+import moment from 'moment';
+const { RangePicker } = DatePicker;
+const ToolBar = ({ setSearchVal, exportFile1, storeData, role }) => {
+
+ const types = [
+ {
+ label: "水平位移",
+ value: 0
+ },
+ {
+ label: "结构缝开度",
+ value: 1
+ },
+ {
+ label: "渗流监测",
+ value: 2
+ },
+ {
+ label: "环境量监测",
+ value: 3
+ }
+ ]
+
+ const typeStatus = [
+ {
+ label: "报警中",
+ value: 0
+ },
+ {
+ label: "已解除",
+ value: 1
+ },
+
+ ]
+ const [form] = Form.useForm();
+
+ const onFinish = (values) => {
+ let dateTimeRangeSo;
+ if (values.tm) {
+ dateTimeRangeSo = {
+ start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
+ end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
+ }
+ }
+ delete values.tm
+ setSearchVal({ ...values, dateTimeRangeSo });
+ }
+
+
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+export default ToolBar;
\ No newline at end of file
diff --git a/src/views/SafeWatch/WarnRuleConfig/form.js b/src/views/SafeWatch/WarnRuleConfig/form.js
new file mode 100644
index 0000000..0bf6a8c
--- /dev/null
+++ b/src/views/SafeWatch/WarnRuleConfig/form.js
@@ -0,0 +1,106 @@
+import React,{useEffect,useState,useMemo,useRef} from 'react';
+import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
+import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
+import apiurl from '../../../service/apiurl';
+import NormalSelect from '../../../components/Form/NormalSelect';
+import moment from 'moment';
+const { RangePicker } = DatePicker
+const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
+
+const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
+ const types = [
+ {
+ label: "闸后流量",
+ value: 0,
+ },
+ {
+ label: "雨量",
+ value: 1,
+ },
+ {
+ label: "闸前水位",
+ value:2,
+ },
+ {
+ label: "闸后水位",
+ value: 3,
+ },
+
+ ]
+ const [form] = Form.useForm();
+ const onfinish = (values) => {
+ values.eventsDate = values.eventsDate?moment(values.eventsDate).format("YYYY-MM-DD 00:00:00"):''
+ if (mode === 'edit') {
+ onEdit(apiurl.jcsj.bjgl.bjgzpz.edit,{...record,...values})
+ }
+ if (mode === 'save') {
+ onSave(apiurl.jcsj.bjgl.bjgzpz.save,values)
+ }
+ }
+
+ return (
+ <>
+
+
+
+ );
+}
+
+export default ModalForm;
diff --git a/src/views/SafeWatch/WarnRuleConfig/index.js b/src/views/SafeWatch/WarnRuleConfig/index.js
new file mode 100644
index 0000000..1fdea86
--- /dev/null
+++ b/src/views/SafeWatch/WarnRuleConfig/index.js
@@ -0,0 +1,128 @@
+import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
+import BasicCrudModal from '../../../components/crud/BasicCrudModal';
+import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
+import ToolBar from './toolbar';
+import ModalForm from './form';
+import apiurl from '../../../service/apiurl';
+import usePageTable from '../../../components/crud/usePageTable2';
+import { createCrudService } from '../../../components/crud/_';
+import {CrudOpRender_text} from '../../../components/crud/CrudOpRender';
+import { httppost2 } from '../../../utils/request';
+
+const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
+const Page = () => {
+ const types = {
+ 0: "闸后流量",
+ 1: '雨量',
+ 2: "闸前水位",
+ 3:'闸后水位'
+ }
+ const refModal = useRef();
+ const [searchVal, setSearchVal] = useState(false)
+ const columns = [
+ { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
+
+ {
+ title: '监测点', key: 'type', dataIndex: 'type', width: 150,
+ render: (v) => {types[v]}
+ },
+ { title: '阈值下限', key: 'upperLimit', dataIndex: 'upperLimit', width: 150},
+ { title: '阈值上限', key: 'lowerLimit ', dataIndex: 'lowerLimit', width: 150},
+ {
+ title: '是否启用', key: 'status', dataIndex: 'status', width: 150,
+ render: (v) => { v == 1 ? '否': v==0?'是':''}
+ },
+ {
+ title: '配置时间', key: 'createTime', dataIndex: 'createTime', width: 150,
+ },
+ {
+ title: '最近报警时间', key: 'eventsDate', dataIndex: 'eventsDate', width: 140,
+ },
+ {
+ title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
+ render: (value, row, index) => (
+
+
+
+ );
+}
+
+export default Page;
diff --git a/src/views/SafeWatch/WarnRuleConfig/toolbar.js b/src/views/SafeWatch/WarnRuleConfig/toolbar.js
new file mode 100644
index 0000000..e446de7
--- /dev/null
+++ b/src/views/SafeWatch/WarnRuleConfig/toolbar.js
@@ -0,0 +1,61 @@
+import React, { useEffect,useState } from 'react';
+import { Form, Input, Button, DatePicker } from 'antd';
+import NormalSelect from '../../../components/Form/NormalSelect';
+
+import moment from 'moment';
+const { RangePicker } = DatePicker;
+const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
+
+ const types = [
+ {
+ label: "闸后流量",
+ value: 0,
+ },
+ {
+ label: "雨量",
+ value: 1,
+ },
+ {
+ label: "闸前水位",
+ value: 2,
+ },
+ {
+ label: "闸后水位",
+ value: 3,
+ },
+ ]
+ const [form] = Form.useForm();
+
+ const onFinish = (values) => {
+ setSearchVal({...values});
+ }
+
+
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+export default ToolBar;
\ No newline at end of file
diff --git a/src/views/Sbwh/Zhfxkh/form.js b/src/views/Sbwh/Zhfxkh/form.js
new file mode 100644
index 0000000..3e8717f
--- /dev/null
+++ b/src/views/Sbwh/Zhfxkh/form.js
@@ -0,0 +1,173 @@
+import React,{useEffect,useState,useMemo,useRef} from 'react';
+import { Form, Button, Input, Row,Upload, Col, Table, DatePicker, InputNumber,message,Image,Modal,Typography ,Popconfirm } from 'antd';
+import { DeleteOutlined,FileWordOutlined,FilePdfOutlined,FileZipOutlined,FileExcelOutlined } from '@ant-design/icons';
+import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps';
+import {getCurrentQuarter,getQuarterStartEndDates} from "../../../utils/tools"
+import apiurl from '../../../service/apiurl';
+import NormalSelect from '../../../components/Form/NormalSelect';
+import "./index.less"
+import moment from 'moment';
+const { RangePicker } = DatePicker
+const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
+ const types = [
+ {
+ label: "年度",
+ value: 1
+ },
+ {
+ label: "季度",
+ value: 2
+ },{
+ label: "月度",
+ value: 3
+ },
+ ]
+ const [form] = Form.useForm();
+ const [taskType, setTaskType] = useState(2)
+ const onfinish = (values) => {
+ const userId = localStorage.getItem('userId')
+ const userName = localStorage.getItem('userName')
+ values.createUserId = userId;
+ values.createUserName = userName;
+ values.startDate =values.dateRangeSo? moment(values.dateRangeSo[0]).format("YYYY-MM-DD 00:00:00") :'';
+ values.endDate = values.dateRangeSo ? moment(values.dateRangeSo[1]).format("YYYY-MM-DD 23:59:59") : '';
+ if (mode === 'edit') {
+ onEdit(apiurl.sbwh.zhfxkh.edit,{...record,...values})
+ }
+ if (mode === 'save') {
+ onSave(apiurl.sbwh.zhfxkh.save,values)
+ }
+ }
+
+ const onvaluesChange = (changedValues) => {
+ if ("assessFreq" in changedValues) {
+ setTaskType(changedValues["assessFreq"]);
+ }
+ }
+
+ useEffect(() => {
+ if (mode != 'save') {
+ let dataSo = record.startDate && record.endDate ?
+ [moment(record.startDate), moment(record.startDate)] : ''
+ form.setFieldValue("dateRangeSo", dataSo)
+ }else{
+ form.setFieldValue("assessFreq", 2)
+ }
+ }, [record,mode])
+
+
+ useEffect(() => {
+ if (mode == "save") {
+ if (taskType == 2) {
+ const { startDate, endDate } = getQuarterStartEndDates(getCurrentQuarter('').value, moment().year());
+ form.setFieldValue("assessBatch", moment())
+ form.setFieldValue("dateRangeSo",[moment(startDate), moment(endDate)])
+ } else if (taskType == 1) {
+ form.setFieldValue("assessBatch", moment())
+ form.setFieldValue("dateRangeSo",[moment().startOf('year'), moment().endOf('year')])
+ } else {
+ form.setFieldValue("assessBatch", moment().format('YYYY-MM-DD'))
+ form.setFieldValue("dateRangeSo",[moment().startOf('month'), moment().endOf('month')])
+ }
+ }
+ }, [taskType,mode])
+ return (
+ <>
+
+
+
+ );
+}
+
+export default ModalForm;
diff --git a/src/views/Sbwh/Zhfxkh/index.js b/src/views/Sbwh/Zhfxkh/index.js
new file mode 100644
index 0000000..0904f11
--- /dev/null
+++ b/src/views/Sbwh/Zhfxkh/index.js
@@ -0,0 +1,113 @@
+import React, { Fragment, useRef, useMemo,useEffect,useState } from 'react';
+import BasicCrudModal from '../../../components/crud/BasicCrudModal';
+import { Table, Card, Modal, Form, Input, Button, Row,Col, Timeline, message, Tabs,Image } from 'antd';
+import ToolBar from './toolbar';
+import ModalForm from './form';
+import apiurl from '../../../service/apiurl';
+import usePageTable from '../../../components/crud/usePageTable2';
+import { createCrudService } from '../../../components/crud/_';
+import {CrudOpRender_text} from '../../../components/crud/CrudOpRender';
+
+const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
+const Page = () => {
+ const types = {
+ 1: '年度',
+ 2: "季度",
+ 3:'月度'
+ }
+ const refModal = useRef();
+ const [searchVal, setSearchVal] = useState(false)
+ const columns = [
+ { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align:"center" },
+ { title: '考核对象', key: 'objectName', dataIndex: 'objectName', width: 150},
+ {
+ title: '考核频次', key: 'assessFreq', dataIndex: 'assessFreq', width: 140,
+ render: (value) => {types[value]},
+ },
+ // { title: '考核批次', key: 'assessBatch', dataIndex: 'assessBatch', width: 140},
+ {
+ title: '考核周期', key: 'zq', dataIndex: 'zq', width: 230,
+ render: (_,r) => {r.startDate && r.endDate ? `${r.startDate} - ${r.endDate}` : ''}
+ },
+ { title: '考核分数', key: 'assessScore', dataIndex: 'assessScore', width: 140},
+ {
+ title: '创建时间', key: 'createTime', dataIndex: 'createTime', width: 140,
+ },
+ {
+ title: '考核创建人', key: 'createUserName', dataIndex: 'createUserName', width: 140,
+ },
+ {
+ title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
+ render: (value, row, index) => (
+
+
+
+ );
+}
+
+export default Page;
diff --git a/src/views/Sbwh/Zhfxkh/index.less b/src/views/Sbwh/Zhfxkh/index.less
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/Sbwh/Zhfxkh/toolbar.js b/src/views/Sbwh/Zhfxkh/toolbar.js
new file mode 100644
index 0000000..2599954
--- /dev/null
+++ b/src/views/Sbwh/Zhfxkh/toolbar.js
@@ -0,0 +1,67 @@
+import React, { useEffect,useState } from 'react';
+import { Form, Input, Button, DatePicker } from 'antd';
+import NormalSelect from '../../../components/Form/NormalSelect';
+
+import moment from 'moment';
+const { RangePicker } = DatePicker;
+const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
+
+ const types = [
+ {
+ label: "年度",
+ value: 1
+ },
+ {
+ label: "季度",
+ value: 2
+ },{
+ label: "月度",
+ value: 3
+ },
+ ]
+ const [form] = Form.useForm();
+
+ const onFinish = (values) => {
+ let dateTimeRangeSo;
+ if (values.tm) {
+ dateTimeRangeSo = {
+ start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
+ end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
+ }
+ }
+ delete values.tm
+ setSearchVal({...values, dateTimeRangeSo});
+ }
+
+
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+export default ToolBar;
\ No newline at end of file
diff --git a/src/views/WatchData/Jcsj/index.js b/src/views/WatchData/Jcsj/index.js
index 692d518..98d5efe 100644
--- a/src/views/WatchData/Jcsj/index.js
+++ b/src/views/WatchData/Jcsj/index.js
@@ -158,12 +158,17 @@ const Page = () => {
+
+
+ {
+ historyList.length > 0 ?
+ }