From be3e002cda92e40f99e17f20db735504d024347e Mon Sep 17 00:00:00 2001 From: xielei Date: Fri, 27 Sep 2024 14:38:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DashboardLayout/index.tsx | 4 +- src/models/auth/menu.ts | 2 - src/views/sq/qys/xyys/index.js | 2 +- src/views/sq/qys/xyys/index.module.less | 2 +- src/views/sq/qzq/gcdsj/toolbar.js | 10 +- src/views/sq/qzq/qzqda/toolbar.js | 6 +- src/views/sz/flfg/index.js | 35 ++++-- src/views/sz/flfg/toolbar.js | 144 ++++++++++++----------- src/views/sz/szzf/ajdj/editTabs.js | 27 +++-- src/views/sz/szzf/ajdj/index.js | 16 +-- src/views/sz/szzf/form/index.js | 3 + src/views/sz/zdgl/index.js | 31 +++-- src/views/sz/zdgl/toolbar.js | 10 +- 13 files changed, 170 insertions(+), 122 deletions(-) diff --git a/src/components/DashboardLayout/index.tsx b/src/components/DashboardLayout/index.tsx index 2b62b91ba..b33127319 100644 --- a/src/components/DashboardLayout/index.tsx +++ b/src/components/DashboardLayout/index.tsx @@ -74,7 +74,9 @@ const DashboardLayout: React.FC = () => { const location = useLocation(); const navigate = useNavigate(); - + // debugger; + console.log(location.pathname); + const pathname = location.pathname; const dispatch = useDispatch(); const myUser = localStorage.getItem('userName') diff --git a/src/models/auth/menu.ts b/src/models/auth/menu.ts index 411ae337c..60b110b36 100644 --- a/src/models/auth/menu.ts +++ b/src/models/auth/menu.ts @@ -1,8 +1,6 @@ import { MenuItem } from "../_"; export function findMenu(menus: MenuItem[], pathname: string) { - //document.title = TITLE; - if (!menus) { return []; } diff --git a/src/views/sq/qys/xyys/index.js b/src/views/sq/qys/xyys/index.js index cacb80755..e57603759 100644 --- a/src/views/sq/qys/xyys/index.js +++ b/src/views/sq/qys/xyys/index.js @@ -20,7 +20,7 @@ const Page = () => {
转移路线示意图
-
+
diff --git a/src/views/sq/qys/xyys/index.module.less b/src/views/sq/qys/xyys/index.module.less index ac94b1246..a40672f86 100644 --- a/src/views/sq/qys/xyys/index.module.less +++ b/src/views/sq/qys/xyys/index.module.less @@ -1,7 +1,7 @@ .title{ font-size: 16px; color: #000000; - width: 112px; + // width: 112px; height: 32px } .content{ diff --git a/src/views/sq/qzq/gcdsj/toolbar.js b/src/views/sq/qzq/gcdsj/toolbar.js index e8f1fd24d..e102498c9 100644 --- a/src/views/sq/qzq/gcdsj/toolbar.js +++ b/src/views/sq/qzq/gcdsj/toolbar.js @@ -9,15 +9,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { 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, dataSo}); + setSearchVal({...values, dateSo}); } @@ -36,9 +36,9 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { format="YYYY-MM-DD HH:mm:ss" /> - {searchBtn ? + - : null } + diff --git a/src/views/sq/qzq/qzqda/toolbar.js b/src/views/sq/qzq/qzqda/toolbar.js index 36bb68b62..f9a978838 100644 --- a/src/views/sq/qzq/qzqda/toolbar.js +++ b/src/views/sq/qzq/qzqda/toolbar.js @@ -9,15 +9,15 @@ const ToolBar = ({ setSearchVal, onExport, storeData, role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { 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, dataSo }); + setSearchVal({ ...values, dateSo }); } diff --git a/src/views/sz/flfg/index.js b/src/views/sz/flfg/index.js index 81857b1b5..98efb74d8 100644 --- a/src/views/sz/flfg/index.js +++ b/src/views/sz/flfg/index.js @@ -1,7 +1,7 @@ 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 { FileWordOutlined, FilePdfOutlined, FileZipOutlined, PaperClipOutlined } from '@ant-design/icons'; import { useSelector } from 'react-redux'; import ToolBar from './toolbar'; import ModalForm from './form'; @@ -10,6 +10,8 @@ import usePageTable from '../../../components/crud/usePageTable2'; import { createCrudService } from '../../../components/crud/_'; import { CrudOpRender_text } from '../../../components/crud/CrudOpRender'; import { render } from 'react-dom'; +import { httpgetExport } from '../../../utils/request'; +import { exportFile } from '../../../utils/tools'; const url = "http://223.75.53.141:9102/test.by-lyf.tmp" const typeOb={0:'宪法',1:'法律',2:'行政法规',3:'督察法规',4:'司法解释',5:'地方性法规'} @@ -26,33 +28,33 @@ const Page = () => { const [isFetch, setIsFetch] = useState(false) const columns = [ { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" }, - { title: '标题', key: 'name', dataIndex: 'name', width: 250, ellipsis: true }, + { title: '标题', key: 'name', dataIndex: 'name', ellipsis: true }, { - title: '制定机关', key: 'fillUnit', dataIndex: 'fillUnit', width: 140, + title: '制定机关', key: 'fillUnit', dataIndex: 'fillUnit', }, { - title: '法律性质', key: 'type', dataIndex: 'type', width: 140, + title: '法律性质', key: 'type', dataIndex: 'type', render: (value) => {typeOb[value]}, }, { - title: '时效性', key: 'timeliness', dataIndex: 'timeliness', width: 300,render:(v)=><> + title: '时效性', key: 'timeliness', dataIndex: 'timeliness', render:(v)=><> {timelinessOb[v]} }, { - title: '公布日期', key: 'announcementDate', dataIndex: 'announcementDate', width: 300 + title: '公布日期', key: 'announcementDate', dataIndex: 'announcementDate' }, { - title: '施行日期', key: 'implementationDate', dataIndex: 'implementationDate', width: 300 + title: '施行日期', key: 'implementationDate', dataIndex: 'implementationDate' }, { - title: '上传时间', key: 'eventsDesc', dataIndex: 'eventsDesc', width: 300 + title: '上传时间', key: 'eventsDesc', dataIndex: 'eventsDesc' }, { - title: '附件', key: 'files', dataIndex: 'files', width: 300,render:(v,r)=>viewPdf(v[0].fileId)}>{v[0]?.fileName} + title: '附件', key: 'files', dataIndex: 'files',render:(v,r)=>download(v[0].fileId,v[0]?.fileName)}>{v[0]?.fileName} }, { - title: '操作', key: 'operation', width: 240, fixed: 'right', align: 'center', + title: '操作', key: 'operation', render: (value, row, index) => ( { refresh() setIsFetch(!isFetch) } - + /** + * @description 文件下载 + * @param {String} params 文件fileId + */ + const download = async(id, name) => { + var extension = name?.split('.').pop().toLowerCase(); + httpgetExport(apiurl.zdgl.download+id).then(res => { + exportFile(name,res.data) + }) + } const viewPdf = (params) => { setIframeSrc(params) setPdfViewOPen(true) @@ -114,7 +125,7 @@ const Page = () => { />
- +
diff --git a/src/views/sz/flfg/toolbar.js b/src/views/sz/flfg/toolbar.js index c533bac57..e9dbbbe8c 100644 --- a/src/views/sz/flfg/toolbar.js +++ b/src/views/sz/flfg/toolbar.js @@ -1,41 +1,53 @@ -import React, { useEffect,useState } from 'react'; +import React, { useEffect, useState } from 'react'; import { Form, Input, Button, DatePicker, Select } from 'antd'; import { DownOutlined, UpOutlined } from '@ant-design/icons' import moment from 'moment'; const { RangePicker } = DatePicker; -const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { +const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { const addBtn = role?.rule?.find(item => item.menuName == "新增"); const searchBtn = role?.rule?.find(item => item.menuName == "查询"); const [form] = Form.useForm(); - const [showGj , setShowGj] =useState(false) + const [showGj, setShowGj] = useState(false) const onFinish = (values) => { - let dataSo; - if (values.tm) { - dataSo = { - start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'), - end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss') - } + if (values.announcementDate) { + // 公布时间 + values.stmAd= values.announcementDate[0].format('YYYY-MM-DD HH:mm:ss') + values.etmAd= values.announcementDate[1].format('YYYY-MM-DD HH:mm:ss') } - delete values.tm - setSearchVal({...values}); + if (values.implementationDate) { + // 施行日期 + values.stmIm= values.implementationDate[0].format('YYYY-MM-DD HH:mm:ss') + values.etmIm= values.implementationDate[0].format('YYYY-MM-DD HH:mm:ss') + } + if (values.uploadTime) { + // 上传日期 + values.stmUd= values.uploadTime[0].format('YYYY-MM-DD HH:mm:ss') + values.etmUd= values.uploadTime[0].format('YYYY-MM-DD HH:mm:ss') + } + + delete values.announcementDate + delete values.implementationDate + delete values.uploadTime + + setSearchVal({ ...values }); } - const opntios=[ - {label:'宪法',value:0}, - {label:'法律',value:1}, - {label:'行政法规',value:2}, - {label:'督察法规',value:3}, - {label:'司法解释',value:4}, - {label:'地方性法规',value:5}, + const opntios = [ + { label: '宪法', value: 0 }, + { label: '法律', value: 1 }, + { label: '行政法规', value: 2 }, + { label: '督察法规', value: 3 }, + { label: '司法解释', value: 4 }, + { label: '地方性法规', value: 5 }, ] - const opntios1=[ - {label:'尚未生效',value:0}, - {label:'有效',value:1}, - {label:'已修改',value:2}, - {label:'已废止',value:3}, + const opntios1 = [ + { label: '尚未生效', value: 0 }, + { label: '有效', value: 1 }, + { label: '已修改', value: 2 }, + { label: '已废止', value: 3 }, ] - const styles={ + const styles = { fontFamily: '微软雅黑 Bold", "微软雅黑 Regular", 微软雅黑, sans-serif', fontWeight: '700', fontStyle: 'normal', @@ -43,50 +55,50 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { } return ( <> -
+
-
- - - - - - - - + + + + + + - - - - - - - - - - + {showGj &&
+ +
+
diff --git a/src/views/sz/szzf/form/index.js b/src/views/sz/szzf/form/index.js index 85a9ee283..8560649c9 100644 --- a/src/views/sz/szzf/form/index.js +++ b/src/views/sz/szzf/form/index.js @@ -129,9 +129,12 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for formType = 1 } if (type == 'save') { + form.setFieldsValue(formJsonData) formType = 0 } if (formType == 1 || formType == 2 || formType == 3) { + console.log(formJsonData,'456778'); + form.setFieldsValue(formJsonData) if (formJsonData?.[fileKey]) { setFileList(formJsonData[fileKey]) diff --git a/src/views/sz/zdgl/index.js b/src/views/sz/zdgl/index.js index 2f3b05a7d..d9be2d45e 100644 --- a/src/views/sz/zdgl/index.js +++ b/src/views/sz/zdgl/index.js @@ -1,7 +1,7 @@ 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 { FileWordOutlined, FilePdfOutlined, FileZipOutlined, PaperClipOutlined } from '@ant-design/icons'; import { useSelector } from 'react-redux'; import ToolBar from './toolbar'; import ModalForm from './form'; @@ -9,6 +9,8 @@ import apiurl from '../../../service/apiurl'; import usePageTable from '../../../components/crud/usePageTable2'; import { createCrudService } from '../../../components/crud/_'; import { CrudOpRender_text } from '../../../components/crud/CrudOpRender'; +import { httpgetExport } from '../../../utils/request'; +import { exportFile } from '../../../utils/tools'; const url = "http://223.75.53.141:9102/test.by-lyf.tmp" const obj={0:"党支部工作制度",1:"行政工作制度",2:"部门工作制度",3:"安全管理制度",4:"工程管理制度",5:"技术规程",6:"岗位责任制"} @@ -24,24 +26,24 @@ const Page = () => { const [isFetch, setIsFetch] = useState(false) const columns = [ { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" }, - { title: '标题', key: 'name', dataIndex: 'name', width: 250, ellipsis: true }, + { title: '标题', key: 'name', dataIndex: 'name', ellipsis: true }, { - title: '制度类型', key: 'type', dataIndex: 'type', width: 140,render:(v)=><>{obj[v]} + title: '制度类型', key: 'type', dataIndex: 'type',render:(v)=><>{obj[v]} }, { - title: '发布日期', key: 'releaseDate', dataIndex: 'releaseDate', width: 300 + title: '发布日期', key: 'releaseDate', dataIndex: 'releaseDate' }, { - title: '发布单位', key: 'fillUnit', dataIndex: 'fillUnit', width: 300 + title: '发布单位', key: 'fillUnit', dataIndex: 'fillUnit' }, { - title: '上传时间', key: 'uploadDate', dataIndex: 'uploadDate', width: 300 + title: '上传时间', key: 'uploadDate', dataIndex: 'uploadDate' }, { - title: '附件', key: 'files', dataIndex: 'files', width: 300,render:(v,r)=>viewPdf(v[0].fileId)}>{v[0]?.fileName} + title: '附件', key: 'files', dataIndex: 'files', render:(v,r)=>download(v[0].fileId,v[0]?.fileName)}>{v[0]?.fileName} }, { - title: '操作', key: 'operation', width: 240, fixed: 'right', align: 'center', + title: '操作', key: 'operation', fixed: 'right', align: 'center', render: (value, row, index) => ( { refresh() setIsFetch(!isFetch) } - + /** + * @description 文件下载 + * @param {String} params 文件fileId + */ + const download = async(id, name) => { + var extension = name?.split('.').pop().toLowerCase(); + httpgetExport(apiurl.zdgl.download+id).then(res => { + exportFile(name,res.data) + }) + } const viewPdf = (params) => { setIframeSrc(params) setPdfViewOPen(true) @@ -103,7 +114,7 @@ const Page = () => { />
-
+
diff --git a/src/views/sz/zdgl/toolbar.js b/src/views/sz/zdgl/toolbar.js index 71e19f4be..dccdad91c 100644 --- a/src/views/sz/zdgl/toolbar.js +++ b/src/views/sz/zdgl/toolbar.js @@ -11,14 +11,14 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { const [showGj, setShowGj] = useState(false) const onFinish = (values) => { let dataSo; - if (values.tm) { + if (values.releaseDate) { dataSo = { - start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'), - end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss') + stm: moment(values.releaseDate[0]).format('YYYY-MM-DD HH:mm:ss'), + etm: moment(values.releaseDate[1]).format('YYYY-MM-DD HH:mm:ss') } } - delete values.tm - setSearchVal({ ...values, dataSo }); + delete values.releaseDate + setSearchVal({ ...values, ...dataSo }); } const opntios = [