Merge branch 'master' of https://gitea.anxinyun.cn/free-sun/Inspection

weapp/package/startInspection/startInspection.js

@@ -348,7 +348,7 @@ Page({
             e.lastInspectionTime = moment().format('YYYY-MM-DD');
             e.inspectionTime = moment().format('YYYY-MM-DD');
           } else {
-            e.lastInspectionTime = moment(i.lastInspectionTime).format('YYYY-MM-DD');
+            e.lastInspectionTime = i.lastInspectionTime ? moment(i.lastInspectionTime).format('YYYY-MM-DD') : '--';
             e.inspectionTime = moment(i.inspectionTime).format('YYYY-MM-DD');
           }
         })

web/client/src/sections/organization/components/userModal.js

@@ -60,7 +60,7 @@ const UserModal = (props) => {
                         }}
                         placeholder="请输入用户名(手机号)"
                         rules={[
-                            { required: true, valueType: Number, max: 11 }, { pattern: /^1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$/, message: "请输入正确的手机号" }
+                            { required: true, valueType: Number, max: 11 }, { pattern: /^1([358][0-9]|4[579]|66|7[0135678]|9[189])[0-9]{8}$/, message: "请输入正确的手机号" }
                         ]}
                     />
                 </ProForm.Group>

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

@@ -26,7 +26,7 @@ const Information = (props) => {
 
    const projectList = (obj) => {
       const { limit, page } = obj
-      dispatch(projectRegime.positionList({ limit, page, projectId: qrCodeId })).then(res => {
+      dispatch(projectRegime.positionList({ limit, page: 0, projectId: qrCodeId })).then(res => {
          if (res.success) {
             let data = []
             res.payload.data?.rows?.map(v => {

web/client/src/sections/shouye/containers/shouye.js

@@ -139,28 +139,6 @@ const Information = (props) => {
                   <div>未处理：{shijiandata.filter(i => i?.alarm === true && (i?.patrolRecordIssueHandles[0]?.state === 1 ||i?.patrolRecordIssueHandles.length==0)).length}个</div>
                </div>
             </div>
-            <div className='shouyetopitem'>
-               <div className='shouyetopitem-left' >
-                  <div>今日预警</div>
-                  <div>{shijiandata.filter(i=>{           
-                return i?.patrolRecordIssueHandles[0]?.yanshoucishu>2&&i?.patrolRecordIssueHandles[0]?.isgaojing!==true
-                    &&shijiandata?.filter(j=>j?.pointId===i?.pointId&&j?.points?.project?.id===i?.points?.project?.id
-                        &&j?.patrolRecordIssueHandles[0]?.yujingshijian
-                        &&i?.patrolRecordIssueHandles[0]?.yujingshijian&&moment(i?.patrolRecordIssueHandles[0]?.yujingshijian).format
-                        ('YYYYMMDD') === moment().format('YYYYMMDD')
-                        &&moment(i?.patrolRecordIssueHandles[0].yanshoushijian).valueOf()<moment(j?.patrolRecordIssueHandles[0]?.yanshoushijian).valueOf()
-                    ).length===0   
-            }).length}</div>
-               </div>
-               <div className='shouyetopitem-right'>
-                  <div>已下发：{shijiandata.filter(i=>{
-                return i?.patrolRecordIssueHandles[0]?.isgaojing===true&&i?.patrolRecordIssueHandles[0]?.yujingafchishu===null
-                &&i?.patrolRecordIssueHandles[0]?.yujingshijian
-                &&moment(i?.patrolRecordIssueHandles[0]?.yujingshijian).format
-                ('YYYYMMDD') === moment().format('YYYYMMDD')   
-            }).length}个</div>
-               </div>
-            </div>
 
             <div className='shouyetopitem'>
                <div className='shouyetopitem-left' >
@@ -169,8 +147,7 @@ const Information = (props) => {
                
                return i?.patrolRecordIssueHandles[0]?.yanshoucishu>2&&moment(i?.patrolRecordIssueHandles[0]?.yujingshijian).format('YYYYMMDD') === moment().format('YYYYMMDD')
                    &&res?.payload?.data?.filter(j=>j?.pointId===i?.pointId&&j?.points?.project?.id===i?.points?.project?.id
-                       &&j?.patrolRecordIssueHandles[0]?.yujingshijian
-                       &&i?.patrolRecordIssueHandles[0]?.yujingshijian
+                     
                         &&moment(i?.patrolRecordIssueHandles[0].yanshoushijian).valueOf()<moment(j?.patrolRecordIssueHandles[0]?.yanshoushijian).valueOf()
                    ).length===0   
            }).length  }</div>