Merge branch 'lsf-dev'

src/models/auth/_.ts

@@ -236,7 +236,7 @@ export async function loadMenu(): Promise<MenuItem[]> {
           id: id(), title: '管理体系', redirect: '/mgr/sz/gltx/zzjgck',
           children: [
             {
-              id: id(), title: '管理体系', path: '/mgr/sz/gltx/zzjgck',
+              id: id(), title: '组织机构查看', path: '/mgr/sz/gltx/zzjgck',
             },
             {
               id: id(), title: '责任人管理', path: '/mgr/sz/gltx/zrrgl',

src/views/Home/MapCtrl/Pops/ShenYa/index.js

@@ -8,6 +8,7 @@ import moment from "moment"
 import ToolBar from './toolbar';
 import TableData from './TableData'
 import drpOption from './drpOption';
+import '../TangYanBa.less'
 
 function ShenYa({ id, data, dispatch, onCancel }) {
   console.log('SY',data);
@@ -96,7 +97,7 @@ function ShenYa({ id, data, dispatch, onCancel }) {
           <div style={{padding:'0 20px'}}>
             <ToolBar search={(tms)=>getData(tms,data.stationCode)} setTabVal={setTabVal}/>
           </div>
-          <div className='homeModal2_content'>
+          <div className='homeModal2_content' >
               {
                   tabVal==='1'?
                     tableData.length>0?

src/views/Home/MapCtrl/Pops/TangYanBa.less

@@ -103,6 +103,7 @@
         flex: 1;
         display: flex;
         flex-direction: row-reverse;
+        // float: right;
       }
     }
   }
@@ -111,3 +112,13 @@
         border-radius: 10px;
     }
   }
+  .homeModal2{
+    display: flex;
+    flex-direction: column;
+    .homeModal2_content{
+      height: 504px;
+      display: flex;
+      padding: 5px 20px 20px 20px;
+    }
+  }
+  

src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js

@@ -164,14 +164,20 @@ const Page = ({mySetTms}) => {
                     onRow={
                         (data)=>({
                             onClick:()=>{
-                                data.data = {
-                                    "type":"MultiLineString",
-                                    "coordinates":[[
-                                        [114.746, 31.479],
-                                        [114.776, 31.509]
-                                    ]]
+                                // data.data = {
+                                //     "type":"MultiLineString",
+                                //     "coordinates":[
+                                //         [
+                                //             [114.746, 31.479],
+                                //             [114.776, 31.509]
+                                //         ]
+                                //     ]
+                                // }
+                                if(!data.data){
+                                    message.error('无轨迹信息')
+                                    return
                                 }
-                                addHlLayer(data.data,'HlItem_'+data.id,'#00FFFF',data)
+                                addHlLayer(data?.data,'HlItem_'+data.id,'#00FFFF',data)
                                 const center = geometryCenter({type:"LineString",coordinates:data.data.coordinates[0]}); 
                                 dispatch.runtime.setFeaturePop({
                                     id: data.id,

src/views/fxzb/hsybjs/page1/table1.js

@@ -28,9 +28,16 @@ const Page = ({record}) => {
             return [
                 { title: '序号', key: 'inx', dataIndex: 'inx', align:"center",render: (text, rec, index) => index + 1 },
                 { title: '时间', key: 'tm', dataIndex: 'tm', align:"center", width:180,render:v=>v.slice(0, 16)},
-                { title: '预测水位', key: 'ycSwHValue', dataIndex: 'ycSwHValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
+                { title: '实测水位(m)', key: 'realSwHValue', dataIndex: 'realSwHValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
+                { title: '预测水位(m)', key: 'ycSwHValue', dataIndex: 'ycSwHValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
                 { title: '预测入库流量', key: 'ycRkQValue', dataIndex: 'ycRkQValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
                 { title: '预测出库流量', key: 'ycCkQValue', dataIndex: 'ycCkQValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)},
+                { title: '库容(万 ㎡)', key: 'nowCap', dataIndex: 'nowCap', align:"center",
+                    render:(v,row)=>{
+                        const val = v===null?'-':Number(v).toFixed(2)
+                        return <div style={{display:'flex',alignItems:'center',justifyContent:'center'}}>{val}{row.realSwHValue===null?<div style={{marginLeft:'5px',width:'20px',height:'20px',borderRadius:"10px",border:'1px solid rgb(245, 154, 35)',color:'rgb(245, 154, 35)',display:'flex',alignItems:'center',justifyContent:'center',fontSize:'12px'}}>预</div>:null}</div>
+                    }
+                },
               ];
         }
     },[record])

src/views/gcaqjc/gcaqfx/jrx/index.js

@@ -317,13 +317,13 @@ export default function Xmzlmb() {
               columns={columns1}
               key="inx"
               dataSource={dataSources}
+              pagination={{pageSize:5}}
               scroll={{ x: width, y: 250, scrollToFirstRowOnChange: true }}
               onRow={record => {
                 return {
                   onClick:() => {echartsRef.current.getEchartsInstance().setOption(jrxOption(record,dbType))}
                 }
               }}
-              pagination={false} 
           />
           </div>
       </div>

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

@@ -66,7 +66,7 @@ const Page = () => {
                 >
             <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', width:'72%',height:'98%',}}>
                
-                    <Image src={url} id="img"  preview={false} />
+                    <Image src={url} id="img" style={{margin:'auto',margin:'20px',height:'750px'}}  preview={false} />
                 
             </div>
             </Rnd>

src/views/sz/flfg/form.js

@@ -232,7 +232,6 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
                   </p>
                 </Dragger>
               }
-              {JSON.stringify(fileList)}
               <Row gutter={[16]}>
                 {
                   fileList.length > 0 && fileList.map(file => {

src/views/sz/szzf/ajtj/ldCharts.js

@@ -20,7 +20,7 @@ const Page = ({ title = '标题' }) => {
     const [inspectordata, setInspectorData] = useState([{}])
     const [plandata, setPlanData] = useState([])
     const [problemdata, setProblemData] = useState(Object())
-    const [sumTotal, setSum] = useState(0)
+    const [MaxMin, setMaxMin] = useState({max:0,min:0})
 
     const getPlanOption = useMemo((name, data) => {
         return {
@@ -39,21 +39,21 @@ const Page = ({ title = '标题' }) => {
 
             },
             radiusAxis: {
-                min: 0,
-                max: 20,
-                interval: 2,
-                // 刻度
+                min:0,
+                max:MaxMin.max,
+                interval: 1,
+                // // 刻度
                 axisTick:{
                   show:false
                 },
-                //刻度数值
+                // //刻度数值
                 axisLabel:{
                   show:false
                 },
-                // 线
-                axisLine:{
-                  show:false
-                },
+                // // 线
+                // axisLine:{
+                //   show:false
+                // },
             },
             series: [
                 {
@@ -115,10 +115,10 @@ const Page = ({ title = '标题' }) => {
                 setPlanData([])
             }else{
                 setPlanData(arr)
+                setMaxMin({max:Math.max.apply(Math,res.data.map(item => { return item.count })),min:Math.min.apply(Math,res.data.map(item => { return item.count }))})  
+                console.log({max:Math.max.apply(Math,res.data.map(item => { return item.count })),min:Math.min.apply(Math,res.data.map(item => { return item.count }))});
+                              
             }
-            
-            setSum(sum)
-
         })
     }
     useEffect(() => {