From 08ae2b8ceaac48586ba9fcec2c6c8ef6bd77a14e Mon Sep 17 00:00:00 2001 From: liujiangyong Date: Tue, 14 Mar 2023 17:07:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=20=E7=82=B9=E4=BD=8D=E5=88=86=E9=A1=B5b?= =?UTF-8?q?ug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/projectRegime/containers/point.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/client/src/sections/projectRegime/containers/point.js b/web/client/src/sections/projectRegime/containers/point.js index 3cab35f..deaee14 100644 --- a/web/client/src/sections/projectRegime/containers/point.js +++ b/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 => { From dbb6fbcd9c5831ffaec28b8da0991ee9fb2a7e14 Mon Sep 17 00:00:00 2001 From: liujiangyong Date: Tue, 14 Mar 2023 17:28:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0191=E5=8F=B7=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/organization/components/userModal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/client/src/sections/organization/components/userModal.js b/web/client/src/sections/organization/components/userModal.js index 1feddd6..d048aa8 100644 --- a/web/client/src/sections/organization/components/userModal.js +++ b/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: "请输入正确的手机号" } ]} /> From 43f08a96842116153e0be0d05c84f2fcede8bd5c Mon Sep 17 00:00:00 2001 From: liujiangyong Date: Tue, 14 Mar 2023 17:34:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=209308=20=E5=B0=8F=E7=A8=8B=E5=BA=8F-?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=BF=9B=E5=85=A5=E7=82=B9=E4=BD=8D=EF=BC=8C?= =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E5=B7=A1=E6=A3=80=E6=97=A5=E6=9C=9F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- weapp/package/startInspection/startInspection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weapp/package/startInspection/startInspection.js b/weapp/package/startInspection/startInspection.js index ee0cd63..53fd816 100644 --- a/weapp/package/startInspection/startInspection.js +++ b/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'); } }) From f9648cfb1b7d7f15c7cefed0077bb8254c1971a6 Mon Sep 17 00:00:00 2001 From: dengyinhuan Date: Wed, 15 Mar 2023 09:21:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=8A=E6=97=A5=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/shouye/containers/shouye.js | 25 +------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/web/client/src/sections/shouye/containers/shouye.js b/web/client/src/sections/shouye/containers/shouye.js index 04b2c5a..d1c0b01 100644 --- a/web/client/src/sections/shouye/containers/shouye.js +++ b/web/client/src/sections/shouye/containers/shouye.js @@ -139,28 +139,6 @@ const Information = (props) => {
未处理：{shijiandata.filter(i => i?.alarm === true && (i?.patrolRecordIssueHandles[0]?.state === 1 ||i?.patrolRecordIssueHandles.length==0)).length}个
-
-
-
今日预警
-
{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() -
-
-
已下发：{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}个
-
-
@@ -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()