diff --git a/src/views/gcaqjc/gcaqfx/jrx/index.js b/src/views/gcaqjc/gcaqfx/jrx/index.js index 4068f1b65..08b6f3604 100644 --- a/src/views/gcaqjc/gcaqfx/jrx/index.js +++ b/src/views/gcaqjc/gcaqfx/jrx/index.js @@ -317,7 +317,8 @@ export default function Xmzlmb() { columns={columns1} key="inx" dataSource={dataSources} - pagination={{pageSize:5}} + pagination={false} + virtual={true} scroll={{ x: width, y: 250, scrollToFirstRowOnChange: true }} onRow={record => { return { diff --git a/src/views/sq/qys/kqys/index.js b/src/views/sq/qys/kqys/index.js index eeea3d4a9..41342f305 100644 --- a/src/views/sq/qys/kqys/index.js +++ b/src/views/sq/qys/kqys/index.js @@ -20,35 +20,35 @@ const Page = () => { setUrl(item.img) } useEffect(() => { - let scale = 1 - const img = document.getElementById("img"); - const fun = (e) => { - console.log(1111) - // 大于0:滚轮向上滚动 小于0:滚轮向下滚动 - if (e.wheelDelta > 0) { - scale += 0.05; - img.style.transform = `scale(${scale})`; - } else { - if (scale == 1) { - img.style.left = 0 + "px"; - img.style.top = 0 + "px"; - } - // 缩放值大于1时,可以缩小,反之亦然 - if (scale > 1) { - scale -= 0.05; - img.style.transform = `scale(${scale})`; - } - } - } - img.addEventListener("wheel", fun) + // let scale = 1 + // const img = document.getElementById("img"); + // const fun = (e) => { + // console.log(1111) + // // 大于0:滚轮向上滚动 小于0:滚轮向下滚动 + // if (e.wheelDelta > 0) { + // scale += 0.05; + // img.style.transform = `scale(${scale})`; + // } else { + // if (scale == 1) { + // img.style.left = 0 + "px"; + // img.style.top = 0 + "px"; + // } + // // 缩放值大于1时,可以缩小,反之亦然 + // if (scale > 1) { + // scale -= 0.05; + // img.style.transform = `scale(${scale})`; + // } + // } + // } + // img.addEventListener("wheel", fun) - // getSyData() - // getSlData() - // getWyData() - // getDmData() - return () => { - img.removeEventListener("wheel", fun) - } + // // getSyData() + // // getSlData() + // // getWyData() + // // getDmData() + // return () => { + // img.removeEventListener("wheel", fun) + // } }, []) return ( @@ -56,20 +56,9 @@ const Page = () => {
{list.map(item =>
tabClick(item)}>{item.name}
)}
- -
- - - -
- +
+ +
) } diff --git a/src/views/sq/qys/xyys/index.js b/src/views/sq/qys/xyys/index.js index 0066551c8..0d996af7d 100644 --- a/src/views/sq/qys/xyys/index.js +++ b/src/views/sq/qys/xyys/index.js @@ -25,7 +25,7 @@ const Page = () => {
转移路线示意图
-
+
diff --git a/src/views/sq/qys/xyys/index.module.less b/src/views/sq/qys/xyys/index.module.less index 024ac9dff..806855d0a 100644 --- a/src/views/sq/qys/xyys/index.module.less +++ b/src/views/sq/qys/xyys/index.module.less @@ -2,7 +2,8 @@ font-size: 16px; color: #000000; // width: 112px; - height: 32px + height: 32px; + margin-bottom:20px; } .content{ font-size: 17px; diff --git a/src/views/sz/flfg/index.js b/src/views/sz/flfg/index.js index caf73444a..54e3250ed 100644 --- a/src/views/sz/flfg/index.js +++ b/src/views/sz/flfg/index.js @@ -12,6 +12,7 @@ import { CrudOpRender_text } from '../../../components/crud/CrudOpRender'; import { render } from 'react-dom'; import { httpgetExport } from '../../../utils/request'; import { exportFile } from '../../../utils/tools'; +import dayjs from 'dayjs'; const url = "http://223.75.53.141:9102/test.by-lyf.tmp" const typeOb={0:'宪法',1:'法律',2:'行政法规',3:'督察法规',4:'司法解释',5:'地方性法规'} @@ -42,7 +43,8 @@ const Page = () => { }, { - title: '公布日期', key: 'announcementDate', dataIndex: 'announcementDate' + title: '公布日期', key: 'announcementDate', dataIndex: 'announcementDate', + render: (value) => {dayjs(value).format('YYYY-MM-DD')}, }, { title: '施行日期', key: 'implementationDate', dataIndex: 'implementationDate' diff --git a/src/views/sz/szzf/ajdj/index.js b/src/views/sz/szzf/ajdj/index.js index c097ea4a6..27da4a53b 100644 --- a/src/views/sz/szzf/ajdj/index.js +++ b/src/views/sz/szzf/ajdj/index.js @@ -30,7 +30,7 @@ const Page = () => { const [isFetch, setIsFetch] = useState(false) const columns = [ { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" }, - { title: '填报时间', key: 'createTime', dataIndex: 'createTime', ellipsis: true }, + { title: '填报时间', key: 'createTime', dataIndex: 'createTime', ellipsis: true,render: (value) => {dayjs(value).format('YYYY-MM-DD HH:mm')}, }, { title: '案件名称', key: 'caseName', dataIndex: 'caseName', }, @@ -40,6 +40,7 @@ const Page = () => { }, { title: '发现时间', key: 'caseDate', dataIndex: 'caseDate', + render: (value) => {dayjs(value).format('YYYY-MM-DD')}, }, { diff --git a/src/views/sz/szzf/ajtj/ldCharts.js b/src/views/sz/szzf/ajtj/ldCharts.js index ce4dcb64d..ba5e8ad54 100644 --- a/src/views/sz/szzf/ajtj/ldCharts.js +++ b/src/views/sz/szzf/ajtj/ldCharts.js @@ -39,7 +39,7 @@ const Page = ({ title = '标题' }) => { }, radiusAxis: { - min:0, + min:MaxMin.min-1, max:MaxMin.max, interval: 1, // // 刻度 diff --git a/src/views/sz/zdgl/index.js b/src/views/sz/zdgl/index.js index d9be2d45e..d8df70474 100644 --- a/src/views/sz/zdgl/index.js +++ b/src/views/sz/zdgl/index.js @@ -11,6 +11,7 @@ import { createCrudService } from '../../../components/crud/_'; import { CrudOpRender_text } from '../../../components/crud/CrudOpRender'; import { httpgetExport } from '../../../utils/request'; import { exportFile } from '../../../utils/tools'; +import dayjs from 'dayjs'; const url = "http://223.75.53.141:9102/test.by-lyf.tmp" const obj={0:"党支部工作制度",1:"行政工作制度",2:"部门工作制度",3:"安全管理制度",4:"工程管理制度",5:"技术规程",6:"岗位责任制"} @@ -31,7 +32,8 @@ const Page = () => { title: '制度类型', key: 'type', dataIndex: 'type',render:(v)=><>{obj[v]} }, { - title: '发布日期', key: 'releaseDate', dataIndex: 'releaseDate' + title: '发布日期', key: 'releaseDate', dataIndex: 'releaseDate', + render: (value) => {dayjs(value).format('YYYY-MM-DD')}, }, { title: '发布单位', key: 'fillUnit', dataIndex: 'fillUnit'