From b0291b23279d67f5d04977c1594f7f260be3a51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E7=BA=A2=E6=A2=85?= <1924913374@qq.com> Date: Thu, 26 May 2022 16:24:48 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E4=BD=9C=E5=BA=9F=E6=95=B0=E9=87=8F?= =?UTF-8?q?-invalid=EF=BC=8C=E4=BD=9C=E5=BA=9F=E6=80=BB=E4=BB=B7-invalid?= =?UTF-8?q?=5Ftotal=20key=E6=89=B9=E6=AC=A1=E5=88=97=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=EF=BC=9A=E4=BD=9C=E5=BA=9F=E6=95=B0=E9=87=8F-invalid?= =?UTF-8?q?=EF=BC=8C=E4=BD=9C=E5=BA=9F=E6=80=BB=E4=BB=B7-invalid=5Ftotal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/plan/key/list.js | 13 +++++++++++++ src/pages/plan/list/list.js | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/pages/plan/key/list.js b/src/pages/plan/key/list.js index cad73c1a..b9721905 100644 --- a/src/pages/plan/key/list.js +++ b/src/pages/plan/key/list.js @@ -115,6 +115,13 @@ const Column = [ prop: "usage", width: "120px", }, + { + title: "已作废key总数", + name: "invalid", + type: "normal", + prop: "invalid", + width: "120px", + }, { title: "沉默总数", name: "silent", @@ -142,6 +149,12 @@ const Column = [ type: "normal", prop: "usage_total", width: "140px", + },{ + title: "已作废总价(预估)", + name: "invalid_total", + type: "normal", + prop: "invalid_total", + width: "140px", }, { title: "沉默总价(预估)", diff --git a/src/pages/plan/list/list.js b/src/pages/plan/list/list.js index 4224d1a7..ed8cebe7 100644 --- a/src/pages/plan/list/list.js +++ b/src/pages/plan/list/list.js @@ -630,6 +630,13 @@ export default class acclist extends React.Component { prop: "usage", width: "auto", }, + { + title: "已作废key总数", + name: "invalid", + type: "normal", + prop: "invalid", + width: "auto", + }, { title: "沉默总数", name: "silent", @@ -661,6 +668,13 @@ export default class acclist extends React.Component { prop: "usage_total", width: "auto", valueType: "price", + }, { + title: "已作废总价(预估)", + name: "invalid_total", + type: "normal", + prop: "invalid_total", + width: "auto", + valueType: "price", }, { title: "沉默总价(预估)", From ed1c9c15cc8ff0bde1785e81727a86e3da5616ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E7=BA=A2=E6=A2=85?= <1924913374@qq.com> Date: Thu, 26 May 2022 17:46:07 +0800 Subject: [PATCH 02/10] =?UTF-8?q?key=E7=A0=81=E5=89=A9=E4=BD=99=E6=9D=A1?= =?UTF-8?q?=E6=95=B0=E4=B8=BA0=20=E4=BD=9C=E5=BA=9F=EF=BC=8C=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=E6=88=90=E5=B7=B2=E4=BD=BF=E7=94=A8=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=BB=99=E5=87=BA=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/plan/key/detail/list.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/plan/key/detail/list.js b/src/pages/plan/key/detail/list.js index e8b91fd2..1c600f9a 100644 --- a/src/pages/plan/key/detail/list.js +++ b/src/pages/plan/key/detail/list.js @@ -292,7 +292,9 @@ export default class acclist extends React.Component { this.getKeyCodeList(data); Notify.success("作废成功"); }, - (err) => {} + (err) => { + Notify.error(err); + } ); }); } From 8d457031b619bf380fb4a229d18cd4d5f0134beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E7=BA=A2=E6=A2=85?= <1924913374@qq.com> Date: Fri, 27 May 2022 14:05:32 +0800 Subject: [PATCH 03/10] =?UTF-8?q?key=E7=A0=81=E5=89=A9=E4=BD=99=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=B8=BA0,=E6=A0=87=E8=AE=B0=E4=B8=BA=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=A4=B1=E8=B4=A5=E6=93=8D=E4=BD=9C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/plan/key/detail/list.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/plan/key/detail/list.js b/src/pages/plan/key/detail/list.js index 1c600f9a..f0da339b 100644 --- a/src/pages/plan/key/detail/list.js +++ b/src/pages/plan/key/detail/list.js @@ -272,7 +272,9 @@ export default class acclist extends React.Component { this.getKeyCodeList(data); Notify.success("标记为使用成功"); }, - (err) => {} + (err) => { + Notify.error(err); + } ); }); } From 3a435fa96fdf4a8b2f93a9ebf2463b051efd8b8e Mon Sep 17 00:00:00 2001 From: Apple <> Date: Tue, 31 May 2022 14:59:08 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=8F=91=E6=94=BE?= =?UTF-8?q?=E6=80=BB=E4=BB=B7=EF=BC=88=E9=A2=84=E4=BC=B0=EF=BC=89=E3=80=81?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E6=80=BB=E4=BB=B7=EF=BC=88=E9=A2=84=E4=BC=B0?= =?UTF-8?q?=EF=BC=89=E3=80=81=E5=B7=B2=E4=BD=BF=E7=94=A8=E6=80=BB=E4=BB=B7?= =?UTF-8?q?=EF=BC=88=E9=A2=84=E4=BC=B0=EF=BC=89=E3=80=81=E5=B7=B2=E4=BD=9C?= =?UTF-8?q?=E5=BA=9F=E6=80=BB=E4=BB=B7=EF=BC=88=E9=A2=84=E4=BC=B0=EF=BC=89?= =?UTF-8?q?=E3=80=81=E6=B2=89=E9=BB=98=E6=80=BB=E4=BB=B7=EF=BC=88=E9=A2=84?= =?UTF-8?q?=E4=BC=B0=EF=BC=89=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/plan/key/list.js | 68 ++++++++++++++++---------------- src/pages/plan/list/list.js | 78 ++++++++++++++++++------------------- 2 files changed, 73 insertions(+), 73 deletions(-) diff --git a/src/pages/plan/key/list.js b/src/pages/plan/key/list.js index b9721905..74066613 100644 --- a/src/pages/plan/key/list.js +++ b/src/pages/plan/key/list.js @@ -129,40 +129,40 @@ const Column = [ prop: "silent", width: "140px", }, - { - title: "发放总价(预估)", - name: "grant_total", - type: "normal", - prop: "grant_total", - width: "140px", - }, - { - title: "领取总价(预估)", - name: "receive_total", - type: "normal", - prop: "receive_total", - width: "140px", - }, - { - title: "已使用总价(预估)", - name: "usage_total", - type: "normal", - prop: "usage_total", - width: "140px", - },{ - title: "已作废总价(预估)", - name: "invalid_total", - type: "normal", - prop: "invalid_total", - width: "140px", - }, - { - title: "沉默总价(预估)", - name: "silent_total", - type: "normal", - prop: "silent_total", - width: "140px", - }, + // { + // title: "发放总价(预估)", + // name: "grant_total", + // type: "normal", + // prop: "grant_total", + // width: "140px", + // }, + // { + // title: "领取总价(预估)", + // name: "receive_total", + // type: "normal", + // prop: "receive_total", + // width: "140px", + // }, + // { + // title: "已使用总价(预估)", + // name: "usage_total", + // type: "normal", + // prop: "usage_total", + // width: "140px", + // },{ + // title: "已作废总价(预估)", + // name: "invalid_total", + // type: "normal", + // prop: "invalid_total", + // width: "140px", + // }, + // { + // title: "沉默总价(预估)", + // name: "silent_total", + // type: "normal", + // prop: "silent_total", + // width: "140px", + // }, ]; export default class acclist extends React.Component { diff --git a/src/pages/plan/list/list.js b/src/pages/plan/list/list.js index ed8cebe7..37a39f6d 100644 --- a/src/pages/plan/list/list.js +++ b/src/pages/plan/list/list.js @@ -644,46 +644,46 @@ export default class acclist extends React.Component { prop: "silent", width: "auto", }, - { - title: "发放总价(预估)", - name: "grant_total", - type: "normal", - prop: "grant_total", - width: "auto", - valueType: "price", - }, + // { + // title: "发放总价(预估)", + // name: "grant_total", + // type: "normal", + // prop: "grant_total", + // width: "auto", + // valueType: "price", + // }, - { - title: "领取总价(预估)", - name: "receive_total", - type: "normal", - prop: "receive_total", - width: "auto", - valueType: "price", - }, - { - title: "已使用总价(预估)", - name: "usage_total", - type: "normal", - prop: "usage_total", - width: "auto", - valueType: "price", - }, { - title: "已作废总价(预估)", - name: "invalid_total", - type: "normal", - prop: "invalid_total", - width: "auto", - valueType: "price", - }, - { - title: "沉默总价(预估)", - name: "silent_total", - type: "normal", - prop: "silent_total", - width: "auto", - valueType: "price", - }, + // { + // title: "领取总价(预估)", + // name: "receive_total", + // type: "normal", + // prop: "receive_total", + // width: "auto", + // valueType: "price", + // }, + // { + // title: "已使用总价(预估)", + // name: "usage_total", + // type: "normal", + // prop: "usage_total", + // width: "auto", + // valueType: "price", + // }, { + // title: "已作废总价(预估)", + // name: "invalid_total", + // type: "normal", + // prop: "invalid_total", + // width: "auto", + // valueType: "price", + // }, + // { + // title: "沉默总价(预估)", + // name: "silent_total", + // type: "normal", + // prop: "silent_total", + // width: "auto", + // valueType: "price", + // }, ]; return (
From cd7694ec739e433ac220ae038669aff4150331dc Mon Sep 17 00:00:00 2001 From: Apple <> Date: Wed, 8 Jun 2022 10:30:56 +0800 Subject: [PATCH 05/10] =?UTF-8?q?v1=5F2=5F5key=E6=89=B9=E6=AC=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=BB=9F=E8=AE=A1=E5=AD=97=E6=AE=B5=E5=92=8C=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=BB=9F=E8=AE=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/plan/key/detail/list.js | 17 ++++++++++++----- src/pages/plan/key/list.js | 22 ++++++++++++++++++---- src/pages/plan/list/list.js | 22 ++++++++++++++++++---- 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/src/pages/plan/key/detail/list.js b/src/pages/plan/key/detail/list.js index f0da339b..354f8f4d 100644 --- a/src/pages/plan/key/detail/list.js +++ b/src/pages/plan/key/detail/list.js @@ -407,40 +407,47 @@ export default class acclist extends React.Component { width: "auto", }, { - title: "总发放条数", + title: "发放总数", prop: "total", name: "total", width: "auto", type: "normal", }, { - title: "剩余条数", + title: "剩余总数", prop: "residue", name: "residue", width: "auto", type: "normal", }, { - title: "已使用条数", + title: "使用总数", name: "usage", prop: "usage", type: "normal", width: "auto", }, { - title: "已过期条数", + title: "失效总数", name: "overdue", prop: "overdue", type: "normal", width: "auto", }, { - title: "已作废条数", + title: "作废总数", name: "invalid", prop: "invalid", type: "normal", width: "auto", }, + { + title: "已完结总数", + name: "end", + prop: "end", + type: "normal", + width: "auto", + }, { title: "更新时间", name: "update_time", diff --git a/src/pages/plan/key/list.js b/src/pages/plan/key/list.js index 74066613..5f600264 100644 --- a/src/pages/plan/key/list.js +++ b/src/pages/plan/key/list.js @@ -95,7 +95,7 @@ const Column = [ width: "100px", }, { - title: "发放key总数", + title: "发放key码总数", name: "grant", type: "normal", prop: "grant", @@ -109,26 +109,40 @@ const Column = [ width: "120px", }, { - title: "已使用key总数", + title: "使用key码总数", name: "usage", type: "normal", prop: "usage", width: "120px", }, { - title: "已作废key总数", + title: "作废key码总数", name: "invalid", type: "normal", prop: "invalid", width: "120px", }, { - title: "沉默总数", + title: "可用key码总数", name: "silent", type: "normal", prop: "silent", width: "140px", }, + { + title: "失效key码总数", + name: "overdue", + type: "normal", + prop: "overdue", + width: "140px", + }, + { + title: "完结key码总数", + name: "end", + type: "normal", + prop: "end", + width: "140px", + }, // { // title: "发放总价(预估)", // name: "grant_total", diff --git a/src/pages/plan/list/list.js b/src/pages/plan/list/list.js index 37a39f6d..c6dd3cae 100644 --- a/src/pages/plan/list/list.js +++ b/src/pages/plan/list/list.js @@ -610,7 +610,7 @@ export default class acclist extends React.Component { width: "auto", }, { - title: "发放key总数", + title: "发放key码总数", name: "grant", type: "normal", prop: "grant", @@ -624,26 +624,40 @@ export default class acclist extends React.Component { width: "auto", }, { - title: "已使用总数", + title: "使用key码总数", name: "usage", type: "normal", prop: "usage", width: "auto", }, { - title: "已作废key总数", + title: "失效key码总数", + name: "overdue", + type: "normal", + prop: "overdue", + width: "auto", + }, + { + title: "作废key码总数", name: "invalid", type: "normal", prop: "invalid", width: "auto", }, { - title: "沉默总数", + title: "可用key码总数", name: "silent", type: "normal", prop: "silent", width: "auto", }, + { + title: "完结key码总数", + name: "end", + type: "normal", + prop: "end", + width: "auto", + }, // { // title: "发放总价(预估)", // name: "grant_total", From 71a7de9b44291b782e66b1244814e7c7d4ba5608 Mon Sep 17 00:00:00 2001 From: Apple <> Date: Wed, 8 Jun 2022 11:48:43 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E3=80=90key=E7=A0=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=91=E8=BF=9B=E5=85=A5key=E7=A0=81?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E5=88=B0?= =?UTF-8?q?key=E7=A0=81=E5=88=97=E8=A1=A8=EF=BC=8C=E5=86=8D=E4=BB=8Ekey?= =?UTF-8?q?=E7=A0=81=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E5=88=B0key?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=88=97=E8=A1=A8=E6=97=B6=EF=BC=8C=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E4=BA=86=E7=A9=BA=E7=99=BD=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/plan/key/detail/list.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/plan/key/detail/list.js b/src/pages/plan/key/detail/list.js index 354f8f4d..1b4b6c41 100644 --- a/src/pages/plan/key/detail/list.js +++ b/src/pages/plan/key/detail/list.js @@ -302,7 +302,8 @@ export default class acclist extends React.Component { } if (key == 3) { sessionStorage.setItem("keyCode", rowData.key); - this.props.history.push("/home/key-log"); + // this.props.history.push("/home/key-log"); + window.open('#/home/key-log'); sessionStorage.setItem("pathname2", "/home/key-log"); let cur_nav = sessionStorage.getItem("breakchangenav"); @@ -657,7 +658,7 @@ export default class acclist extends React.Component { 标记成已使用 - + 作废 日志 From b870888028d22c02e23ac158c0bc721367b36d92 Mon Sep 17 00:00:00 2001 From: Apple <> Date: Wed, 8 Jun 2022 11:50:32 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E3=80=90key=E7=A0=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E3=80=91=E5=B0=86=E2=80=9C=E5=BE=85=E4=BD=BF=E7=94=A8=E2=80=9D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E2=80=9C=E5=8F=AF=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/plan/key/detail/list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/plan/key/detail/list.js b/src/pages/plan/key/detail/list.js index 1b4b6c41..5d6402bd 100644 --- a/src/pages/plan/key/detail/list.js +++ b/src/pages/plan/key/detail/list.js @@ -61,7 +61,7 @@ export default class acclist extends React.Component { limit: 10, tabList: [ { title: "全部", index: 0 }, - { title: "待使用", index: 1 }, + { title: "可使用", index: 1 }, { title: "已使用", index: 2 }, { title: "已完结", index: 3 }, { title: "已作废", index: 4 }, From 19e17ab307f93578c83c9c31fcb426908b4c30ac Mon Sep 17 00:00:00 2001 From: Apple <> Date: Wed, 8 Jun 2022 14:08:44 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3key=E7=A0=81=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=9F=A5=E8=AF=A2=E5=90=8E=E8=BF=94=E5=9B=9E=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E7=A9=BA=E7=99=BD=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/plan/key/detail/list.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pages/plan/key/detail/list.js b/src/pages/plan/key/detail/list.js index 5d6402bd..60d6f6ba 100644 --- a/src/pages/plan/key/detail/list.js +++ b/src/pages/plan/key/detail/list.js @@ -304,17 +304,17 @@ export default class acclist extends React.Component { sessionStorage.setItem("keyCode", rowData.key); // this.props.history.push("/home/key-log"); window.open('#/home/key-log'); - sessionStorage.setItem("pathname2", "/home/key-log"); + // sessionStorage.setItem("pathname2", "/home/key-log"); - let cur_nav = sessionStorage.getItem("breakchangenav"); + // let cur_nav = sessionStorage.getItem("breakchangenav"); - if (cur_nav.length > 0 && cur_nav[0].items) { - cur_nav[0].items.push({ - path: "/home/key-log", - name: cur_nav[0].items[cur_nav[0].items.length - 1].name + "日志", - }); - } - sessionStorage.setItem("breaknav", JSON.stringify(cur_nav)); + // if (cur_nav.length > 0 && cur_nav[0].items) { + // cur_nav[0].items.push({ + // path: "/home/key-log", + // name: cur_nav[0].items[cur_nav[0].items.length - 1].name + "日志", + // }); + // } + // sessionStorage.setItem("breaknav", JSON.stringify(cur_nav)); } } multipleCancel() { From e258b3a5c84238bc608024c6c267e88bd9cf2e36 Mon Sep 17 00:00:00 2001 From: Apple <> Date: Wed, 8 Jun 2022 16:52:07 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E8=90=A5=E9=94=80=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=9A=82=E5=81=9C=E4=B8=AD=EF=BC=8C=E8=BF=9B=E5=85=A5key?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=88=97=E8=A1=A8=EF=BC=9B=E7=84=B6=E5=90=8E?= =?UTF-8?q?=E5=90=AF=E7=94=A8=E8=AE=A1=E5=88=92=EF=BC=8C=E5=88=B7=E6=96=B0?= =?UTF-8?q?key=E6=89=B9=E6=AC=A1=E9=A1=B5=EF=BC=8C=E6=96=B0=E5=BB=BAkeybut?= =?UTF-8?q?ton=E7=BD=AE=E7=81=B0=E4=B8=8D=E5=8F=AF=E7=82=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/plan/key/list.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/plan/key/list.js b/src/pages/plan/key/list.js index 5f600264..0ed14beb 100644 --- a/src/pages/plan/key/list.js +++ b/src/pages/plan/key/list.js @@ -304,6 +304,7 @@ export default class acclist extends React.Component { (req, msg) => { this.setState({ distdata: req.data }); this.setState({ dataCount: req.total }); + sessionStorage.setItem('key_plan_status',req.plan.status); }, (err) => {} ); From fc684cbf33994953b637f89cfc31afc20d2489b8 Mon Sep 17 00:00:00 2001 From: Apple <> Date: Thu, 9 Jun 2022 15:35:14 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89=E6=97=B6=E9=97=B4=EF=BC=8C?= =?UTF-8?q?=E6=BB=91=E5=8A=A8=E9=97=AA=E9=80=80bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home/home.js | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/src/pages/home/home.js b/src/pages/home/home.js index e2edc872..acc70626 100644 --- a/src/pages/home/home.js +++ b/src/pages/home/home.js @@ -63,7 +63,6 @@ let timerstop = null; export default class App extends Component { constructor(props) { super(props); - window["mydata"] = this; } state = { visible: false, @@ -151,9 +150,6 @@ export default class App extends Component { path: "/home/order-list", }, ], - lastTime: new Date().getTime(), - currentTime: new Date().getTime(), - timeOut: 15 * 60 * 1000, //设置超时时间： 1分 }; componentDidMount(e) { @@ -227,25 +223,7 @@ export default class App extends Component { this.getUserInfuFn(); this.setState({ pathname: `${pathnamestr}` }); sessionStorage.setItem("showflag", true); - window.document.addEventListener("mouseover", function () { - window["mydata"].setState({ lastTime: new Date().getTime() }); //更新操作时间 - }); - //根据权限菜单进行匹配 - - // timerstop=window.setInterval( window["mydata"].testTime, 1000); } - // testTime(){ - // window["mydata"].setState({'currentTime':new Date().getTime()});//更新当前时间 - // if( window["mydata"].state.currentTime - window["mydata"].state.lastTime > window["mydata"].state.timeOut){ //判断是否超时 - // window.clearInterval(timerstop) - // Notify.clear() - // Notify.warn('登录失效，请重新登录!') - // sessionStorage.clear(); - // setTimeout(()=>{ - // window["mydata"].props.history.push('/login'); - // },5000); - // } - // } componentWillReceiveProps(nextProps) { //5分钟更新一次商品数据 let datetime = sessionStorage.getItem("updatetime");