提交代码

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';
+      nav = 'zg';
-    }else if(index == 2){
+    }if(index == 2){
-      nav = 'ycl';
+      nav = 'fj';
     }else if(index == 3){
+      nav = 'ycl';
+    }else if(index == 4){
       nav = 'zgcs';
     }
 

miniprogram/pageage/project_problemmodify/quality/list/index.wxml

@@ -13,9 +13,10 @@
 <scroll-view class="max_content_scroll" type="list" scroll-y bindscrolltolower="onScrollToLower">   
 <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
 <view class="modify_video_nav" style="margin-top: 5rpx;">
-      <view class="{{activeState=='dzg'?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>待我办理（{{dzgCount}}）</text></view>
+      <view class="{{activeState=='zg'?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>整改（{{dzgCount}}）</text></view>
-      <view class="{{activeState=='ycl'?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>整改完成（{{yclCount}}）</text></view>
+      <view class="{{activeState=='fj'?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>复检（{{dfjCount}}）</text></view>
-      <view class="{{activeState=='zgcs'?'active':''}}" bindtap="trainingTypeJump" data-index="3"><text>整改超时（{{zgcsCount}}）</text></view>
+      <view class="{{activeState=='ycl'?'active':''}}" bindtap="trainingTypeJump" data-index="3"><text>完成（{{yclCount}}）</text></view>
+      <view class="{{activeState=='zgcs'?'active':''}}" bindtap="trainingTypeJump" data-index="4"><text>超时（{{zgcsCount}}）</text></view>
   </view>
   <view class="inspect_max_scroll">
        <view class="inspect_for_scroll {{item.problemType=='2'?'zxjc':''}}" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">

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';
+      nav = 'zg';
-    }else if(index == 2){
+    }if(index == 2){
-      nav = 'ycl';
+      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`,
     })
   },
 

miniprogram/pageage/project_problemmodify/security/list/index.wxml

@@ -13,9 +13,10 @@
 <scroll-view class="max_content_scroll" type="list" scroll-y bindscrolltolower="onScrollToLower">
    <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
 <view class="modify_video_nav" style="margin-top: 5rpx;">
-      <view class="{{activeState=='dzg'?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>待我办理（{{dzgCount}}）</text></view>
+  <view class="{{activeState=='zg'?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>整改（{{dzgCount}}）</text></view>
-      <view class="{{activeState=='ycl'?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>整改完成（{{yclCount}}）</text></view>
+      <view class="{{activeState=='fj'?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>复检（{{dfjCount}}）</text></view>
-      <view class="{{activeState=='zgcs'?'active':''}}" bindtap="trainingTypeJump" data-index="3"><text>整改超时（{{zgcsCount}}）</text></view>
+      <view class="{{activeState=='ycl'?'active':''}}" bindtap="trainingTypeJump" data-index="3"><text>完成（{{yclCount}}）</text></view>
+      <view class="{{activeState=='zgcs'?'active':''}}" bindtap="trainingTypeJump" data-index="4"><text>超时（{{zgcsCount}}）</text></view>
 </view>
 <view class="inspect_max_scroll">
     <view class="inspect_for_scroll {{item.problemType=='2'?'zxjc':''}}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">