Merge branch 'lsf-dev'

.env.development

@@ -1 +1 @@
-PUBLIC_URL=/xyt
+PUBLIC_URL=/tsg

.env.production

@@ -1,2 +1,2 @@
 GENERATE_SOURCEMAP=false
-PUBLIC_URL=/xyt
+PUBLIC_URL=/tsg

src/views/Home/MapCtrl/Pops/DaiChuLi.js

@@ -3,6 +3,7 @@ import { Descriptions, Modal } from 'antd';
 import {CloseOutlined} from '@ant-design/icons';
 import { httpget2 } from '../../../../utils/request';
 import apiurl from '../../../../service/apiurl';
+import ModalForm from '../../../rcgl/xcxj/xjwtcl/form';
 import moment from "moment"
 
 function Wxq({ id, data, dispatch }) {
@@ -39,7 +40,7 @@ function Wxq({ id, data, dispatch }) {
               </div>
           </div>
           <div className='homeModal2_content'>
-              daichuli
+            <ModalForm/>
           </div>
       </div>
     </>

src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js

@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react"
+import { useEffect, useState, useRef } from "react"
 import { Button, Modal, message, Table } from 'antd';
 import {useDispatch, useSelector} from "react-redux";
 
@@ -9,16 +9,18 @@ import VectorLayer from "ol/layer/Vector";
 import Style from "ol/style/Style";
 import StrokeStyle from "ol/style/Stroke";
 import { Vector as VectorSource } from "ol/source";
-
 import { httppost2 } from "../../../utils/request";
 import apiurl from "../../../service/apiurl";
 import { geometryCenter } from "../../../utils/tools";
+import BasicCrudModal from "../../../components/crud/BasicCrudModal"
+import ModalForm from "../../rcgl/xcxj/xjwtcl/form"
 import moment from "moment";
 
 
 
 const Page = ({mySetTms}) => {
     const dispatch = useDispatch();
+    const refModal = useRef();
     let mapObj = useSelector(s => s.map.map)
     const [ dataObj, setDataObj ] = useState({})
     const [ data, setData ] = useState([])
@@ -34,8 +36,8 @@ const Page = ({mySetTms}) => {
     ];
 
     const columns2 = [
-        { title: '上报时间', key: 'handleTime', dataIndex: 'handleTime',align: "center", ellipsis: true },
-        { title: '巡检问题描述', key: 'problemDesc', dataIndex: 'problemDesc',align: "center" },
+        { title: '上报时间', key: 'finishTime', dataIndex: 'finishTime',align: "center", ellipsis: true },
+        { title: '巡检问题描述', key: 'itemDesc', dataIndex: 'itemDesc',align: "center" },
     ];
 
     useEffect(()=>{
@@ -117,11 +119,11 @@ const Page = ({mySetTms}) => {
         <div className="xunchaxunjian">
             <div className="bodyBox">
                 <div className="bodyBoxItem">
-                    <div className="num" style={{color:'#04D919'}}>{data3||0}</div>
+                    <div className="num" style={{color:'#04D919'}}>{data2.length||0}</div>
                     <div className="content">本月巡查</div>
                 </div>
                 <div className="bodyBoxItem">
-                    <div className="num" style={{color:'#04D919'}}>{data2?.length||0}</div>
+                    <div className="num" style={{color:'#04D919'}}>{data3||0}</div>
                     <div className="content">本年巡查</div>
                     <div></div>
                 </div>
@@ -185,19 +187,28 @@ const Page = ({mySetTms}) => {
                     onRow={
                         (data)=>({
                             onClick:()=>{
+                                refModal.current.showView(data);
                             // dispatch.map.setLayerVisible({"HdswLayer":true});
-                            dispatch.runtime.setFeaturePop({
-                                id: data.stnm,
-                                data: data,
-                                type: 'daichuli',
-                                lgtd: data.lgtd,
-                                lttd: data.lttd,
-                            })
+                            // dispatch.runtime.setFeaturePop({
+                            //     id: data.stnm,
+                            //     data: data,
+                            //     type: 'daichuli',
+                            //     lgtd: data.lgtd,
+                            //     lttd: data.lttd,
+                            // })
                             }
                         })
                     }
                 />
             </div>
+
+            <BasicCrudModal
+                width={1000}
+                ref={refModal}
+                title=""
+                component={ModalForm}
+                title1="详情"
+            />
         </div>
     )
 }

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

@@ -3,6 +3,7 @@ import { Table, Modal, message } from 'antd';
 import {CloseOutlined} from "@ant-design/icons";
 import usePageTable from '../../../../components/crud/usePageTable2'
 import { createCrudService } from '../../../../components/crud/_';
+import AiWarn from "../../../../views/spjk/aiWarn"
 
 import { httppost2 } from "../../../../utils/request";
 import apiurl from "../../../../service/apiurl";
@@ -21,8 +22,9 @@ const Page = () => {
     }, [])
 
     return (
-            <div className="ant-card-body" style={{padding:"0 10px"}}>
-                <div>时间：{moment().format('YYYY-MM-DD HH:mm:ss')} 至 {moment().format('YYYY-MM-DD HH:mm:ss')}</div>
+            <div className="ant-card-body" style={{padding:"0 10px",height:'600px',overflowY:'auto'}}>
+                <AiWarn/>
+                {/* <div>时间：{moment().format('YYYY-MM-DD HH:mm:ss')} 至 {moment().format('YYYY-MM-DD HH:mm:ss')}</div> */}
             </div>
     )
 }

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

@@ -43,12 +43,10 @@ const Page = ({ title = '标题' }) => {
                 // hoverAnimation: true,
                 data: plandata,
                 label: {
-                    normal: {
-                        show: true,
-                        position: 'outside',
-                        formatter: '{c}',
-                      
-                    }
+                    show:false,
+                },
+                labelLine: {
+                    show: false
                 },
                 itemStyle:{
                     color: function (colors) {

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

@@ -56,12 +56,11 @@ const Page = ({ title = '标题' }) => {
                 // hoverAnimation: true,
                 data: plandata,
                 label: {
-                    normal: {
-                        show: true,
-                        position: 'outside',
-                        formatter: '{c}',
+                    show:false,
+                },
+                labelLine: {
+                    show: false
                 },
-            },
                 itemStyle:{
                     color: function (colors) {
                         var colorList = [

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

@@ -18,38 +18,57 @@ let obj =
 const Page = ({ title = '标题' }) => {
     const [echart2, setEchart2] = useState(Object())
     const [inspectordata, setInspectorData] = useState([{}])
-    const [plandata, setPlanData] = useState(Object())
+    const [plandata, setPlanData] = useState([])
     const [problemdata, setProblemData] = useState(Object())
     const [sumTotal, setSum] = useState(0)
 
     const getPlanOption = useMemo((name, data) => {
         return {
             legend: {
-                data: Object.values(obj),
+                show: true,
+                data: plandata?.map(item=>item.name),
                 type: 'scroll'
             },
             tooltip: {},
             polar: {
-                radius: [0, '80%']
-            },
-            radiusAxis: {
-                min: 0,
-                max: Math.max.apply(null, Object.values(plandata)),
-                axisLine:{
-                    show:false
-                  },
-                
+                // radius: [0, '80%']
             },
             angleAxis: {
                 type: 'category',
-                data: Object.values(obj),
-                // startAngle: 75,
+                data: plandata?.map(item=>item.name),
+            },
+            radiusAxis: {
+                min: 0,
+                max: 20,
+                interval: 2,
+                // 刻度
+                axisTick:{
+                  show:false
+                },
+                //刻度数值
+                axisLabel:{
+                  show:false
+                },
+                // 线
+                axisLine:{
+                  show:false
+                },
             },
             series: [
                 {
                     name: '案件类型',
-                    type: 'bar',
-                    coordinateSystem: 'polar',
+                    stack: 'a',
+                    type: 'pie',
+                    radius: [0, 140],
+                    center: ['50%', '50%'],
+                    roseType: 'area',
+                    stillShowZeroSum:false,
+                    label: {
+                        show:false,
+                    },
+                    labelLine: {
+                        show: false
+                    },
                     itemStyle: {
                         normal: {
                             color: function (colors) {
@@ -64,13 +83,11 @@ const Page = ({ title = '标题' }) => {
                             }
                         },
                     },
-                    data: Object.values(plandata)
+                    data: plandata
                 }
             ]
         }
     }, [plandata])
-    console.log(getPlanOption);
-
     const onOk = (event, index) => {
         if (event !== null) {
             let params = {
@@ -82,15 +99,23 @@ const Page = ({ title = '标题' }) => {
         }
     }
     const getInfo = (params) => {
-        let obj1 = []
         let sum = 0
         httppost(apiurl.szzf.ajtj.info + 1, params).then(res => {
-            res.data.map(item => {
-                obj1.push({ value: item.count, name: obj[item.type] })
-                sum = sum + item.count
+                const arr = Object.values(obj).map(item1=>{
+                    let obj1=res.data.find(item => obj[item.type] == item1)
+                    if(obj1?.count){
+                        sum =sum+1
+                        return { value: obj1?.count, name: item1 }
+                    }else{
+                        return { value: 0, name: item1 }
+                    }
             })
-            // debugger;
-            setPlanData(obj1)
+            if(sum == 0){
+                setPlanData([])
+            }else{
+                setPlanData(arr)
+            }
+            
             setSum(sum)
 
         })