diff --git a/miniprogram/pageage/project_problemmodify/quality/list/index.js b/miniprogram/pageage/project_problemmodify/quality/list/index.js index ba91889..551e5c6 100644 --- a/miniprogram/pageage/project_problemmodify/quality/list/index.js +++ b/miniprogram/pageage/project_problemmodify/quality/list/index.js @@ -15,8 +15,9 @@ Page({ initData: {}, show:false, listData:[], - activeState:"dzg", + activeState:"zg", dzgCount:0, + dfjCount:0, yclCount:0, zgcsCOunt:0, request:app.globalData.reqUrl, @@ -36,7 +37,7 @@ Page({ skipAddDarft(){ wx.setStorageSync('nav-menu', "list"); wx.redirectTo({ - url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text, + url: `../draft/index`, }) }, @@ -145,11 +146,12 @@ Page({ method: "get", success: function (res) { let sum1=0; + let sumfj=0; if(res.data.data.check0){ sum1+=res.data.data.check0; } if(res.data.data.check1){ - sum1+=res.data.data.check1; + sumfj+=res.data.data.check1; } if(res.data.data.check3){ sum1+=res.data.data.check3; @@ -164,6 +166,7 @@ Page({ } that.setData({ dzgCount:sum1, + dfjCount:sumfj, yclCount:sum4, zgcsCount:sum99 }); @@ -178,10 +181,12 @@ Page({ let index = e.currentTarget.dataset.index; let nav = ""; if(index == 1){ - nav = 'dzg'; - }else if(index == 2){ - nav = 'ycl'; + nav = 'zg'; + }if(index == 2){ + nav = 'fj'; }else if(index == 3){ + nav = 'ycl'; + }else if(index == 4){ nav = 'zgcs'; } diff --git a/miniprogram/pageage/project_problemmodify/quality/list/index.wxml b/miniprogram/pageage/project_problemmodify/quality/list/index.wxml index 545c968..b9421bb 100644 --- a/miniprogram/pageage/project_problemmodify/quality/list/index.wxml +++ b/miniprogram/pageage/project_problemmodify/quality/list/index.wxml @@ -13,9 +13,10 @@ - 待我办理({{dzgCount}}) - 整改完成({{yclCount}}) - 整改超时({{zgcsCount}}) + 整改({{dzgCount}}) + 复检({{dfjCount}}) + 完成({{yclCount}}) + 超时({{zgcsCount}}) diff --git a/miniprogram/pageage/project_problemmodify/security/list/index.js b/miniprogram/pageage/project_problemmodify/security/list/index.js index 0cbb029..71679a6 100644 --- a/miniprogram/pageage/project_problemmodify/security/list/index.js +++ b/miniprogram/pageage/project_problemmodify/security/list/index.js @@ -15,8 +15,9 @@ Page({ initData: {}, show:false, listData:[], - activeState:"dzg", + activeState:"zg", dzgCount:0, + dfjCount:0, yclCount:0, zgcsCOunt:0, request:app.globalData.reqUrl, @@ -137,11 +138,12 @@ Page({ method: "get", success: function (res) { let sum1=0; + let sumfj=0; if(res.data.data.check0){ sum1+=res.data.data.check0; } if(res.data.data.check1){ - sum1+=res.data.data.check1; + sumfj+=res.data.data.check1; } if(res.data.data.check3){ sum1+=res.data.data.check3; @@ -156,6 +158,7 @@ Page({ } that.setData({ dzgCount:sum1, + dfjCount:sumfj, yclCount:sum4, zgcsCount:sum99 }); @@ -170,10 +173,12 @@ Page({ let index = e.currentTarget.dataset.index; let nav = ""; if(index == 1){ - nav = 'dzg'; - }else if(index == 2){ - nav = 'ycl'; + nav = 'zg'; + }if(index == 2){ + nav = 'fj'; }else if(index == 3){ + nav = 'ycl'; + }else if(index == 4){ nav = 'zgcs'; } this.setData({ @@ -202,7 +207,7 @@ Page({ skipAddDarft(){ wx.setStorageSync('nav-menu', "list"); wx.redirectTo({ - url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text, + url: `../draft/index`, }) }, diff --git a/miniprogram/pageage/project_problemmodify/security/list/index.wxml b/miniprogram/pageage/project_problemmodify/security/list/index.wxml index f9f572a..b776f1f 100644 --- a/miniprogram/pageage/project_problemmodify/security/list/index.wxml +++ b/miniprogram/pageage/project_problemmodify/security/list/index.wxml @@ -13,9 +13,10 @@ - 待我办理({{dzgCount}}) - 整改完成({{yclCount}}) - 整改超时({{zgcsCount}}) + 整改({{dzgCount}}) + 复检({{dfjCount}}) + 完成({{yclCount}}) + 超时({{zgcsCount}})