feat：1.6漏交

weapp/pages/home/home.js

@@ -29,47 +29,47 @@ Page({
         markers: [],
         pageHeight:0,//屏幕高度
         isShowCallout: false,
-        itemList:[{
+        itemList:[
-            picPath:'/images/conduct.png',
+            {
-            itemName:'指挥中心'
+                picPath:'/images/gas.png',
+                itemName:'燃气仓'
             },
             {
                 picPath:'/images/waterSupply.png',
                 itemName:'给水仓'
             },
+            {
+                picPath:'/images/electricalStorageRoom.png',
+                itemName:'电气仓'
+            },
+            {
+                picPath:'/images/highTension.png',
+                itemName:'高压电力仓'
+            },
             {
                 picPath:'/images/pipeGallery.png',
                 itemName:'管廊本体'
             },
             {
-            picPath:'/images/elevator.png',
+                picPath:'/images/conduct.png',
-            itemName:'电梯系统'
+                itemName:'指挥中心'
             },
             {
                 picPath:'/images/power.png',
                 itemName:'供配电系统'
             },
             {
-            picPath:'/images/gas.png',
+                picPath:'/images/elevator.png',
-            itemName:'燃气仓'
+                itemName:'电梯系统'
             },
         {
             picPath:'/images/security.png',
             itemName:'安防系统'
         },
-        {
-            picPath:'/images/highTension.png',
-            itemName:'高压电力仓'
-        },
-        {
-            picPath:'/images/electricalStorageRoom.png',
-            itemName:'电气仓'
-        },
         {
             picPath:'/images/lightningProtection.png',
             itemName:'防雷与接地'
         }
-    
     ],
     },
 
@@ -96,13 +96,13 @@ Page({
           };
         wx.showLoading({ title: '加载中' })
         const date1 = new Date('1970-01-01 00:00:00');
-        promiseArr.push(Request.get(getPatrolRecord('all', moment(date1).format('YYYY-MM-DD') + ' 00:00:00', moment('2099-12-31').format('YYYY-MM-DD') + ' 23:59:59', 'null', 'null')));
+        promiseArr.push(Request.get(getPatrolRecord('all', moment(date1).format('YYYY-MM-DD') + ' 00:00:00', moment('2099-12-31').format('YYYY-MM-DD') + ' 23:59:59', 'null', 'null',{home:true})));
         Promise.all(promiseArr).then(res => {
             wx.hideLoading()
             //与自己相关的所有巡检记录
             let list=res[0]
             if(userInfo.username!=='SuperAdmin'){
-                list=res[0]?.filter(item=> userInfo.structure.find((x) => x === item.points.project.id))||[]
+                list=res[0]?.filter(item=> userInfo.structure.find((x) => x === item.project_id))||[]
             }
             //过去七天的所有巡检记录
             const sevenDaysList=list?.filter(item=>

weapp/pages/home/home.wxml

@@ -61,7 +61,7 @@
             </view>
         </view>
         <view style="display: flex; justify-content: space-around;">
-            <view class="flex">
+            <view class="flex"  bindtap="jumpToRiskCalendar">
                 <view style="margin:10px 0px;" class="only">发现问题个数</view>
                 <view style="margin:10px 0px;"><text class="fontStyle">{{allQuestionCount}}</text></view>
                 <view style="margin:10px 0px;" class="only"> 个</view>

weapp/pages/index/index.js

@@ -47,7 +47,7 @@ Page({
         wx.showLoading({ title: '加载中' })
         const promiseArr = [];
         promiseArr.push(Request.get(getProjectList(), {}));
-        promiseArr.push(Request.get(getPatrolRecord('all', moment().format('YYYY-MM-DD') + ' 00:00:00', moment().format('YYYY-MM-DD') + ' 23:59:59', 'null', 'null')));
+        promiseArr.push(Request.get(getPatrolRecord('all', moment().format('YYYY-MM-DD') + ' 00:00:00', moment().format('YYYY-MM-DD') + ' 23:59:59', 'null', 'null',{home:false})));
         Promise.all(promiseArr).then(res => {
             wx.hideLoading()
             that.setData({

weapp/pages/workbench/workbench.js

@@ -33,7 +33,7 @@ Page({
       },
       {
         iconPath: '/images/workbench/issues.png',
-        text: '发现问题',
+        text: '巡检指派',
         page: '/package/report/report'
       },
       {

weapp/utils/getApiUrl.js

@@ -40,8 +40,9 @@ exports.reportQuest = () => {
 
 
 // 获取巡检记录
-exports.getPatrolRecord = (patrolPlanId, startTime, endTime, alarm, pointId) => {
+exports.getPatrolRecord = (patrolPlanId, startTime, endTime, alarm, pointId,query) => {
-    return `/patrolRecord/${patrolPlanId}/${startTime}/${endTime}/${alarm}/${pointId}`
+    const {home  } = query
+    return `/patrolRecord/${patrolPlanId}/${startTime}/${endTime}/${alarm}/${pointId}?home=${home}`
 }
 //设备
 exports.getDevices = () => {

web/client/src/sections/patrolManage/actions/report.js

@@ -13,3 +13,14 @@ export function getPatrolReport (query) {
         msg: { error: '获取巡检报告失败' },
     });
 }
+
+
+export function delpatrolRecord (id) {
+    return dispatch => basicAction({
+        type: 'delete',
+        dispatch: dispatch,
+        actionType: 'DEL_PATROL_RECORD',
+        url: ApiTable.delpatrolRecord.replace('{id}', id),
+        msg: { error: '删除巡检报告失败' },
+    })
+}

web/client/src/sections/patrolManage/containers/patrolReport.js

@@ -92,6 +92,12 @@ function patrolReport(props) {
             }
         })
     }
+    //删除巡检记录
+    const delReport = (id) => {
+
+    }
+
+
     const columns = [{
         title: '结构物名称',
         dataIndex: 'projectName',
@@ -104,8 +110,7 @@ function patrolReport(props) {
         },
         ellipsis: true,
         width: 150,
-        render: (_, record) => 
+        render: (_, record) => {
-        {
             const rslt = structAll?.filter(p => record.structure?.some(q => q == p.id))
             return <>
                 <div>{record?.project ? record?.project?.name : record.structure?.length > 1 ? <Tooltip title={rslt?.map(item => item.name)?.join(',')}>
@@ -129,7 +134,7 @@ function patrolReport(props) {
             return <div>{fileName}</div>
         }
     }, {
-        title: '巡检日期',
+        title: '生成日期',
         dataIndex: 'date',
         key: 'date',
         valueType: 'dateRange',
@@ -155,6 +160,19 @@ function patrolReport(props) {
                 }}>预览</Button>
                 {/* onClick={() => { window.open() }} */}
                 <a href={'/_file-server' + '/' + record?.excelPath}>下载</a>
+                <Popconfirm
+                    placement='left'
+                    title={`确定删除？`}
+                    onConfirm={() => {
+                        dispatch(patrolManage.delpatrolRecord(record?.id)).then(res=>{
+                            if(res.success){
+                                tableRef.current.reload();
+                            }
+                        })
+                    }}
+                >
+                    <Button type="link">删除</Button>
+                </Popconfirm>
             </>
         },
     }];

web/client/src/sections/projectRegime/containers/information.js

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { connect } from 'react-redux';
-import { Form, Input, Button, Table, Modal, Popconfirm } from 'antd';
+import { Form, Input, Button, Table, Modal, Popconfirm, Tooltip } from 'antd';
 import '../style.less';
 import { push } from 'react-router-redux';
 import ProjectAddModel from '../components/projectAddModel'
@@ -83,7 +83,10 @@ const Information = (props) => {
          title: '描述',
          dataIndex: 'describe',
          key: 'describe',
-         render: (text, record, index) => record.describe || '--'
+         render: (text, record, index) => record.describe?.length>10?<Tooltip title={record.describe}><span>
+            {record?.describe.substring(0,10)}...
+         </span>
+       </Tooltip>: record.describe || '--'
       }, {
          title: '操作',
          dataIndex: 'operation',
@@ -199,7 +202,7 @@ const Information = (props) => {
                if (index % 2 === 1) className = 'global-dark-row';
                return className;
             }}
-            scroll={{ y: 590 }}
+            // scroll={{ y: 590 }}
          />
          {
             <Modal

web/client/src/utils/webapi.js

@@ -29,6 +29,7 @@ export const ApiTable = {
 
    // 巡检记录
    patrolRecord: 'patrolRecord/:patrolPlanId/:startTime/:endTime/:alarm/:pointId',
+   delpatrolRecord: 'patrolReport/{id}',
 
    // 巡检报告
    patrolReport: 'patrolReport',