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

src/utils/request.js

@@ -40,12 +40,12 @@ async function send(url, options) {
         }
 
         const { code } = res.data;
-        // if (code === 401) {
+        if (code === 405) {
-        //     // debugger;
+            // debugger;
-        //     //window.location.href = '/mgr/home';// /mgr/home    /login
+            //window.location.href = '/mgr/home';// /mgr/home    /login
-        //     window.location.href = '/tsg/#/login';
+            window.location.href = '/tsg/#/login';
-        //     // window.location.hash = '#/login';
+            // window.location.hash = '#/login';
-        // }
+        }
         return res.data;
     } catch (e) {
         //message.error(e);

src/views/Home/homePanelsLayoutPage/item_gongcheng.js

@@ -25,7 +25,7 @@ const Page = () => {
             return [
                 { title: '监测点', key: 'stationCode', dataIndex: 'stationCode',align: "center", ellipsis: true },
                 { title: '监测时间', key: 'tm', dataIndex: 'tm',align: "center",width: 150, ellipsis: true, render:(v,row)=><div style={{color:row.flag===1?'red':'#3B4859'}}>{v?.slice(5,16)}</div> },
-                { title: '渗流量(L/s)', key: 'q', dataIndex: 'q',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.status===1?'red':'#3B4859'}}>{v}</div>   },
+                { title: '渗流量(L/s)', key: 'value', dataIndex: 'value',align: "center", ellipsis: true, render:(v,row)=><div style={{color:row.status===1?'red':'#3B4859'}}>{v}</div>   },
             ]
         }else{
             return [

src/views/Home/homePanelsLayoutPage/item_yanhejuminhu.js

@@ -31,8 +31,8 @@ const Page = () => {
             if(code!==200){
                 return
             }
-            const list = data.filter(o=>o.adcd.indexOf('421181113')===0)
+            // const list = data.filter(o=>o.adcd.indexOf('421181113')===0)
-            setTableData(list)
+            setTableData(data)
         })()
     },[])
 

src/views/Home/homePanelsLayoutPage/item_yujing/index.js

@@ -58,7 +58,7 @@ const Page = ({mySetTms}) => {
                         }
                     
                     </div>
-                    <div className="content">水位告警</div>
+                    <div className="content">超汛限告警</div>
                     <div></div>
                 </div>
                 <div className="bodyBoxItem" onClick={()=>{setOpen(true);setkey('气象预警')}}>

src/views/gcaqjc/bzt/index.js

@@ -57,7 +57,7 @@ export default function Page({isHome}) {
       console.log(1111)
       // 大于0:滚轮向上滚动  小于0:滚轮向下滚动
       if (e.wheelDelta > 0) {
-      scale += 0.02;
+      scale += 0.05;
       img.style.transform = `scale(${scale})`;
       } else {
       if (scale == 1) {
@@ -66,7 +66,7 @@ export default function Page({isHome}) {
       }
       // 缩放值大于1时,可以缩小,反之亦然
       if (scale > 1) {
-          scale -= 0.02;
+          scale -= 0.05;
           img.style.transform = `scale(${scale})`;
       }
       }
@@ -130,7 +130,7 @@ export default function Page({isHome}) {
       >
         <div id='img' style={{width:'72%',height:'98%',position:'absolute',display:'flex'}}>
           <div style={{position:'relative'}}>
-            <img width={1100} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/bzt4.svg`} alt="" id="img" draggable="false" />
+            <img width={1100} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/bzt5.svg`} alt="" id="img" draggable="false" />
             {
               syList.map((item)=>
                 <div className={'gcaqjc_bzt_sy_'+item.stationCode} onClick={()=>{
@@ -138,21 +138,21 @@ export default function Page({isHome}) {
                   setModalData(item)
                 }}>
                   {item.stationCode}
-                  <img width={20} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/${item.status===1?'sy2.png':'sy.png'}`} alt="" id="img" draggable="false" />
+                  <img width={20} style={{marginTop:'-4px'}} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/${item.status===1?'sy2.png':'sy.png'}`} alt="" id="img" draggable="false" />
                 </div>
               )
             }
-            {
+            {/* {
               slList.map((item)=>
                 <div className={'gcaqjc_bzt_sl_'+item.stationCode} onClick={()=>{
                   setOpenSl(true)
                   setModalData(item)
                 }}>
                   {item.stationCode}
-                  <img width={20} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/${item.status===1?'sl2.png':'sl.png'}`} alt="" id="img" draggable="false" />
+                  <img width={20} style={{marginTop:'-4px'}} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/${item.status===1?'sl2.png':'sl.png'}`} alt="" id="img" draggable="false" />
                 </div>
               )
-            }
+            } */}
             {
               wyList.map((item)=>
                 <div className={'gcaqjc_bzt_wy_'+item.stationCode} onClick={()=>{
@@ -160,23 +160,23 @@ export default function Page({isHome}) {
                   setModalData(item)
                 }}>
                   {item.stationCode}
-                  <img width={20} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/${(item.xstatus===1||item.ystatus===1||item.hstatus===1)?'wy2.png':'wy.png'}`} alt="" id="img" draggable="false" />
+                  <img width={20} style={{marginTop:'-4px'}} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/${(item.xstatus===1||item.ystatus===1||item.hstatus===1)?'wy2.png':'wy.png'}`} alt="" id="img" draggable="false" />
                 </div>
               )
             }
             
-            {
+            {/* {
               dmList.map((item)=>
                 <div className={'gcaqjc_bzt_dm_'+item.profileCode} onClick={()=>{
                   setOpenDm(true)
                   setModalData(item)
                 }}>
                   <Tooltip title={item.profileName}>
-                    <img width={25} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/dm.png`} alt="" id="img" draggable="false" />
+                    <img width={25} style={{marginTop:'-4px'}} src={`${process.env.PUBLIC_URL}/assets/xyt/fxdd/dm.png`} alt="" id="img" draggable="false" />
                   </Tooltip>
                 </div>
               )
-            }
+            } */}
 
 
 

src/views/gcaqjc/bzt/index.less

@@ -114,113 +114,270 @@
       left: 0;
       top: 0;
     }
-    .gcaqjc_bzt_sy_SY09{
+
-      left: 544px;
-      top: 157px;
-    }
-    .gcaqjc_bzt_sy_SY10{
-      left: 544px;
-      top: 242px;
-    }
-    .gcaqjc_bzt_sy_SY13{
-      left: 444px;
-      top: 157px;
-    }
-    .gcaqjc_bzt_sy_SY14{
-      left: 444px;
-      top: 242px;
-    }
-    .gcaqjc_bzt_sy_SY05{
-      left: 644px;
-      top: 157px;
-    }
-    .gcaqjc_bzt_sy_SY06{
-      left: 644px;
-      top: 242px;
-    }
-    .gcaqjc_bzt_sy_SY15{
-      left: 444px;
-      top: 429px;
-    }
-    .gcaqjc_bzt_sy_SY16{
-      left: 444px;
-      top: 542px;
-    }
-    .gcaqjc_bzt_sy_SY11{
-      left: 544px;
-      top: 429px;
-    }
-    .gcaqjc_bzt_sy_SY12{
-      left: 544px;
-      top: 542px;
-    }
-    .gcaqjc_bzt_sy_SY07{
-      left: 644px;
-      top: 430px;
-    }
-    .gcaqjc_bzt_sy_SY08{
-      left: 644px;
-      top: 542px;
-    }
     .gcaqjc_bzt_sy_SY01{
-      left: 29px;
+      left: 336px;
-      top: 242px;
+      top: 388px;
     }
     .gcaqjc_bzt_sy_SY02{
-      left: 29px;
+      left: 604px;
-      top: 314px;
+      top: 407px;
-    }
+    } 
     .gcaqjc_bzt_sy_SY03{
-      left: 990px;
+      left: 843px;
-      top: 242px;
+      top: 384px;
-    }
+    } 
     .gcaqjc_bzt_sy_SY04{
-      left: 990px;
+      left: 336px;
-      top: 314px;
+      top: 418px;
+    }
+    .gcaqjc_bzt_sy_SY05{
+      left: 604px;
+      top: 436px;
+    }
+    .gcaqjc_bzt_sy_SY06{
+      left: 843px;
+      top: 419px;
+    }
+    .gcaqjc_bzt_sy_SY07{
+      left: 336px;
+      top: 478px;
+    }
+    .gcaqjc_bzt_sy_SY08{
+      left: 604px;
+      top: 494px;
+    }
+    .gcaqjc_bzt_sy_SY09{
+      left: 843px;
+      top: 487px;
+    }
+    .gcaqjc_bzt_sy_SY10{
+      left: 370px;
+      top: 421px;  
+    }
+    .gcaqjc_bzt_sy_SY11{
+      left: 638px;
+      top: 434px;
+    }
+    .gcaqjc_bzt_sy_SY12{
+      left: 875px;
+      top: 417px;
+    }
+    .gcaqjc_bzt_sy_SY13{
+      left: 370px;
+      top: 480px;
+    }
+    .gcaqjc_bzt_sy_SY14{
+      left: 639px;
+      top: 491px;
+    }
+    .gcaqjc_bzt_sy_SY15{
+      left: 878px;
+      top: 484px;
     }
 
 
-    .gcaqjc_bzt_sl_SL01{
+    .gcaqjc_bzt_wy_WY-01{
-      left: 479px;
+      left: 192px;
-      top: 594px;
+      top: 378px;
+    }
+    .gcaqjc_bzt_wy_WY-02{
+      left: 293px;
+      top: 385px;
+    } 
+    .gcaqjc_bzt_wy_WY-03{
+      left: 451px;
+      top: 396px;
+    }
+    .gcaqjc_bzt_wy_WY-04{
+      left: 561px;
+      top: 404px;
+    }
+    .gcaqjc_bzt_wy_WY-05{
+      left: 699px;
+      top: 400px;
+    }
+    .gcaqjc_bzt_wy_WY-07{
+      left: 943px;
+      top: 410px;
+    } 
+    .gcaqjc_bzt_wy_WY-08{
+      left: 192px;
+      top: 408px;
+    }
+    .gcaqjc_bzt_wy_WY-09{
+      left: 293px;
+      top: 415px;
+    } 
+    .gcaqjc_bzt_wy_WY-10{
+      left: 451px;
+      top: 426px;
+    }
+    .gcaqjc_bzt_wy_WY-11{
+      left: 561px;
+      top: 434px;
+    }
+    .gcaqjc_bzt_wy_WY-12{
+      left: 699px;
+      top: 433px;
+    }
+    .gcaqjc_bzt_wy_WY-14{
+      left: 943px;
+      top: 438px;
+    } 
+    .gcaqjc_bzt_wy_WY-15{
+      left: 192px;
+      top: 438px;
+    }
+    .gcaqjc_bzt_wy_WY-16{
+      left: 293px;
+      top: 445px;
+    } 
+    .gcaqjc_bzt_wy_WY-17{
+      left: 451px;
+      top: 456px;
+    }
+    .gcaqjc_bzt_wy_WY-18{
+      left: 561px;
+      top: 464px;
+    }
+    .gcaqjc_bzt_wy_WY-19{
+      left: 699px;
+      top: 460px;
+    }
+    .gcaqjc_bzt_wy_WY-21{
+      left: 943px;
+      top: 474px;
+    } 
+    .gcaqjc_bzt_wy_WY-22{
+      left: 192px;
+      top: 538px;
+    }
+    .gcaqjc_bzt_wy_WY-23{
+      left: 345px;
+      top: 551px;
+    }
+    .gcaqjc_bzt_wy_WY-24{
+      left: 449px;
+      top: 563px;
+    }
+    .gcaqjc_bzt_wy_WY-25{
+      left: 565px;
+      top: 574px;
+    }
+    .gcaqjc_bzt_wy_WY-26{
+      left: 710px;
+      top: 560px;
+    }
+    .gcaqjc_bzt_wy_WY-27{
+      left: 839px;
+      top: 555px;
     }
 
-    .gcaqjc_bzt_sl_SL02{
-      left: 679px;
-      top: 594px;
-    }
 
-    .gcaqjc_bzt_wy_WY-G100{
-      left: 394px;
-      top: 376px;
-    }
-    .gcaqjc_bzt_wy_WY-G101{
-      left: 594px;
-      top: 376px;
-    }
 
-    .gcaqjc_bzt_dm_DM0234205820000010{
-      left: 655px;
-      top: 379px;
-    }
 
-    .gcaqjc_bzt_dm_DM0234205820000011{
-      left: 555px;
-      top: 379px;
-    }
 
-    .gcaqjc_bzt_dm_DM0234205820000012{
-      left: 455px;
-      top: 379px;
-    }
 
-    .gcaqjc_bzt_dm_DM0234205820000013{
-      left: 1003px;
-      top: 379px;
-    }
 
-    .gcaqjc_bzt_dm_DM0234205820000014{
+
-      left: 42px;
+
-      top: 379px;
+
-    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    
+
+
+    // .gcaqjc_bzt_sl_SL01{
+    //   left: 479px;
+    //   top: 594px;
+    // }
+
+    // .gcaqjc_bzt_sl_SL02{
+    //   left: 679px;
+    //   top: 594px;
+    // }
+
+    // .gcaqjc_bzt_wy_WY-G100{
+    //   left: 394px;
+    //   top: 376px;
+    // }
+    // .gcaqjc_bzt_wy_WY-G101{
+    //   left: 594px;
+    //   top: 376px;
+    // }
+
+    // .gcaqjc_bzt_dm_DM0234205820000010{
+    //   left: 655px;
+    //   top: 379px;
+    // }
+
+    // .gcaqjc_bzt_dm_DM0234205820000011{
+    //   left: 555px;
+    //   top: 379px;
+    // }
+
+    // .gcaqjc_bzt_dm_DM0234205820000012{
+    //   left: 455px;
+    //   top: 379px;
+    // }
+
+    // .gcaqjc_bzt_dm_DM0234205820000013{
+    //   left: 1003px;
+    //   top: 379px;
+    // }
+
+    // .gcaqjc_bzt_dm_DM0234205820000014{
+    //   left: 42px;
+    //   top: 379px;
+    // }
 }

src/views/gcaqjc/gcaqyj/yjgzpz/form.js

@@ -137,7 +137,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
   useEffect(()=>{
     if (mode !== "save" ) {
         // getFileInfo(record)
-      // setCondition("1")
+      setCondition(record?.condition)
       setTypes(record.type)
     }
   }, [record, mode])

src/views/rcgl/aqgl/fxgkqd/index.js

@@ -49,7 +49,7 @@ const Page = () => {
       title: '可能导致的后果', key: 'result', dataIndex: 'result', width: 250, ellipsis: true,align: 'center',
       render: (value) => <span>{value ? value.map(item => item.dictNm).join():''}</span>
     },
-    {title: '主要防范措施', key: 'preventMeasure', dataIndex: 'preventMeasure', width: 200,align: 'center',},
+    {title: '主要防范措施', key: 'preventMeasure', dataIndex: 'preventMeasure', width: 300,ellipsis: true,align: 'center',},
     {title: '创建日期', key: 'createDate', dataIndex: 'createDate', width: 200,align: 'center',},
     {
       title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',

src/views/rcgl/xcxj/xjrw/form.js

@@ -59,10 +59,12 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
   } 
  
   const onfinish = (values) => {
-    const userId =  localStorage.getItem('userId')
+    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') {

src/views/sq/qzq/gcdsj/index.js

@@ -120,7 +120,7 @@ const viewPdf = (params) => {
                       <Timeline.Item key={index}>
                         <div className='time-line-item'>
                         <span style={{width:100}}>{item.eventsDate}</span>
-                          <div className='item-right'>
+                          <div className='dsj-item-right'>
                             <span>{item.eventsDesc}</span>
                             <div style={{ display: "flex"}}>
                               <span>附件：</span>

src/views/sq/qzq/gcdsj/index.less

@@ -23,7 +23,7 @@
         display: flex;
         // align-items: center;
         column-gap: 20px;
-        .item-right{
+        .dsj-item-right{
             flex:1
         }
     }

src/views/sz/pxjlgl/index.js

@@ -166,8 +166,8 @@ const Page = () => {
               callback={refresh}
             />
           </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
+          <div className="ant-card-body" style={{padding:"20px 20px 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
+            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 680px )"}}/>
           </div>
         </div>