Merge branch 'master' of http://10.0.41.100:3000/lishenfeng/tsg-web

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 {

src/views/sq/qys/gcys/xlLine/drpOption.js

@@ -7,14 +7,12 @@ export default function drpOption({data}) {
   const maxValX = Math.max(...data.map(obj => obj.z))
   const minValX = Math.min(...data.map(obj => obj.z))
   
-
-
   let arr =[]
   data.forEach(item=>{
-    console.log(data);
+    arr.push([item.z,item.q])
-    arr.push([item.q,item.z])
   })
-  // console.log(GetInterval(minValX,maxValX),'jhsdjkashdjkahjk');
+  console.log(arr,data.map(o => o.z),'jhsdjkashdjkahjk');
+  // debugger;
   return {
     toolbox: {
       show: true,
@@ -89,7 +87,7 @@ export default function drpOption({data}) {
       {
         type: 'line',
         color: "#007AFD",
-        data: arr,
+        data:  arr,
         smooth: true
       },
     ]

src/views/sq/qys/kqys/index.js

@@ -20,35 +20,35 @@ const Page = () => {
         setUrl(item.img)
     }
     useEffect(() => {
-        let scale = 1
+        // let scale = 1
-        const img = document.getElementById("img");
+        // const img = document.getElementById("img");
-        const fun = (e) => {
+        // const fun = (e) => {
-            console.log(1111)
+        //     console.log(1111)
-            // 大于0:滚轮向上滚动  小于0:滚轮向下滚动
+        //     // 大于0:滚轮向上滚动  小于0:滚轮向下滚动
-            if (e.wheelDelta > 0) {
+        //     if (e.wheelDelta > 0) {
-                scale += 0.05;
+        //         scale += 0.05;
-                img.style.transform = `scale(${scale})`;
+        //         img.style.transform = `scale(${scale})`;
-            } else {
+        //     } else {
-                if (scale == 1) {
+        //         if (scale == 1) {
-                    img.style.left = 0 + "px";
+        //             img.style.left = 0 + "px";
-                    img.style.top = 0 + "px";
+        //             img.style.top = 0 + "px";
-                }
+        //         }
-                // 缩放值大于1时,可以缩小,反之亦然
+        //         // 缩放值大于1时,可以缩小,反之亦然
-                if (scale > 1) {
+        //         if (scale > 1) {
-                    scale -= 0.05;
+        //             scale -= 0.05;
-                    img.style.transform = `scale(${scale})`;
+        //             img.style.transform = `scale(${scale})`;
-                }
+        //         }
-            }
+        //     }
-        }
+        // }
-        img.addEventListener("wheel", fun)
+        // img.addEventListener("wheel", fun)
 
-        // getSyData()
+        // // getSyData()
-        // getSlData()
+        // // getSlData()
-        // getWyData()
+        // // getWyData()
-        // getDmData()
+        // // getDmData()
-        return () => {
+        // return () => {
-            img.removeEventListener("wheel", fun)
+        //     img.removeEventListener("wheel", fun)
-        }
+        // }
 
     }, [])
     return (
@@ -56,20 +56,9 @@ const Page = () => {
             <div style={{ display: 'flex', justifyContent: 'start', alignItems: 'center', padding: 10 }}>
                 {list.map(item => <div className={url == item.img ? stylesCss.active : stylesCss.tabCheck} onClick={() => tabClick(item)}>{item.name}</div>)}
             </div>
-            <Rnd
+            <div style={{height: 'calc(100% - 60px)',textAlign:'center',padding:20,overflow:'auto'}}>
-                    default={{
+                <Image src={url} width='80%' preview={false} />
-                        x: 200,
+                </div>
-                        y: 60,
-                        width: '80%',
-                        height: 'calc(100% - 200px)'
-                    }}
-                >
-            <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', width:'72%',height:'98%',}}>
-               
-                    <Image src={url} id="img" style={{margin:'auto',margin:'20px',height:'750px'}}  preview={false} />
-                
-            </div>
-            </Rnd>
         </div>
     )
 }

src/views/sq/qys/xyys/index.js

@@ -25,7 +25,7 @@ const Page = () => {
                 <div className={styles.title}>
                     <Image src={title} />转移路线示意图
                 </div>
-                <div style={{display:'flex',justifyContent:'center',height: 'calc(100% - 40px)',alignItems:'center'}}>
+                <div style={{height: 'calc(100% - 40px)',textAlign:'center'}}>
                 <Image src={zd} width='80%' preview={false} />
                 </div>
                 

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;

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) => <span>{dayjs(value).format('YYYY-MM-DD')}</span>, 
         },
         {
             title: '施行日期', key: 'implementationDate', dataIndex: 'implementationDate'

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) => <span>{dayjs(value).format('YYYY-MM-DD HH:mm')}</span>, },
         {
             title: '案件名称', key: 'caseName', dataIndex: 'caseName', 
         },
@@ -40,6 +40,7 @@ const Page = () => {
         },
         {
             title: '发现时间', key: 'caseDate', dataIndex: 'caseDate', 
+            render: (value) => <span>{dayjs(value).format('YYYY-MM-DD')}</span>, 
 
         },
         {

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,
                 // // 刻度

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) => <span>{dayjs(value).format('YYYY-MM-DD')}</span>, 
         },
         {
             title: '发布单位', key: 'fillUnit', dataIndex: 'fillUnit'