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

@@ -54,9 +54,7 @@ function Wxq({ id, data, dispatch }) {
               <Descriptions labelStyle={{padding:"5px 0"}}>
                 <Descriptions.Item label="巡查完成日期" span={3} contentStyle={{ padding: "5px 0" }}>{data?.finishTime || detail?.adnm}</Descriptions.Item>
                 <Descriptions.Item label="检查人" span={3} contentStyle={{padding:"5px 0"}}>{data?.inspectUserName || detail?.ptcount}</Descriptions.Item>
-                <Descriptions.Item label="任务类型" span={3} contentStyle={{padding:"5px 0"}}>
+                <Descriptions.Item label="任务类型" span={3} contentStyle={{padding:"5px 0"}}>{data?.etcount || detail?.etcount}</Descriptions.Item>
-                  {{0: "日常巡查",1: "特别检查",2: "汛前巡检"}?.[data?.taskType]}
-                  </Descriptions.Item>  
                 <Descriptions.Item label="问题数量" span={3} contentStyle={{padding:"5px 0"}}>{data.problemNum  || detail?.htcount}</Descriptions.Item>
                 <Descriptions.Item label="待处理" span={3} contentStyle={{padding:"5px 0"}}>{data.handleNum  || detail?.htcount}</Descriptions.Item>
               </Descriptions>

src/views/Home/homePanelsLayoutPage/item_gongshui.js

@@ -43,7 +43,7 @@ const Page = () => {
                 <div className="home_gongshui_item">
                     <div className="home_gongshui_item_title">
                         <img width={50} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/gongshui2.png`} alt=""/>
-                        灌溉发电
+                        生态供水
                     </div>
                     <div className="home_gongshui_item_text" style={{display:'flex',flexDirection:'column'}}>
                         <div style={{display:'flex'}}>
@@ -67,7 +67,7 @@ const Page = () => {
                 <div className="home_gongshui_item">
                     <div className="home_gongshui_item_title">
                         <img width={50} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/gongshui1.png`} alt=""/>
-                        水厂取水
+                        生活供水
                     </div>
                     <div className="home_gongshui_item_text" style={{display:'flex',flexDirection:'column'}}>
                         <div style={{display:'flex'}}>

src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js

@@ -164,15 +164,15 @@ const Page = ({mySetTms}) => {
                     onRow={
                         (data)=>({
                             onClick:()=>{
-                                data.data = {
+                                // data.data = {
-                                    "type":"MultiLineString",
+                                //     "type":"MultiLineString",
-                                    "coordinates":[
+                                //     "coordinates":[
-                                        [
+                                //         [
-                                            [114.746, 31.479],
+                                //             [114.746, 31.479],
-                                            [114.776, 31.509]
+                                //             [114.776, 31.509]
-                                        ]
+                                //         ]
-                                    ]
+                                //     ]
-                                }
+                                // }
                                 if(!data.data){
                                     message.error('无轨迹信息')
                                     return

src/views/szydd/ddjl/form.js

@@ -76,7 +76,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
     if (mode === 'edit') {
       values.files = oldFiles;
       values.id = record.id;
-      values.createTime = record.createTime;
+      // values.opUserId = record.opUserId;
       onEdit(apiurl.ddjl.edit,values)
     }
     if (mode === 'save') {