heyang

pages/safetyExamineWorkbench.vue

@@ -310,7 +310,7 @@ export default {
 	  //获取当前日期
 	  this.currentDate=this.getNowFormatDate()
 
-	  this.getCheckStatusCount();
+	  //this.getCheckStatusCount();
 	  //this.getManageStatusCount();
 	  this.dataStatistics(this.pageType);
 	  this.checkClapListAllNum();//随手拍待整改总数
@@ -318,6 +318,8 @@ export default {
 
 	  if(this.pageType==1){//管理员
 		   this.getList();
+      this.checkPlanListAllNum()
+      this.checkPlanListAllNum2()
 	  }else if(this.pageType==2){//检查者
 		   this.getList2();
 		   this.checkManageListAllNum();//检查者-待检查总数
@@ -380,6 +382,9 @@ export default {
       this.dataStatistics(this.pageType);
       if(this.pageType==1){//管理员
         this.getList();
+        this.checkPlanListAllNum()
+        this.checkPlanListAllNum2()
+
       }else if(this.pageType==2){//检查者
         this.getList2();
         this.checkManageListAllNum();//检查者-待检查总数
@@ -675,25 +680,25 @@ export default {
 	  },
 
 
-	  //检查计划各检查状态数据数量
-	  async getCheckStatusCount(){
-	      let self = this;
-	      const {data} = await getCheckStatusCount();
-	      if(data.code==200){
-			  this.tabText[0].num=data.data.noStart;
-			  this.tabText[1].num=data.data.start;
-	  	  }
-	  },
-	  //检查各检查状态数据数量
-	  async getManageStatusCount(){
-	      let self = this;
-	      const {data} = await getManageStatusCount();
-	      if(data.code==200){
-	  			  this.tabTextTow[0].num=data.data.noCheck;
-	  			  this.tabTextTow[1].num=data.data.checking;
-	  			  this.tabTextTow[2].num=data.data.applyNum;
-	  	  }
-	  },
+	  // //检查计划各检查状态数据数量
+	  // async getCheckStatusCount(){
+	  //     let self = this;
+	  //     const {data} = await getCheckStatusCount();
+	  //     if(data.code==200){
+		// 	  this.tabText[0].num=data.data.noStart;
+		// 	  this.tabText[1].num=data.data.start;
+	  // 	  }
+	  // },
+	  // //检查各检查状态数据数量
+	  // async getManageStatusCount(){
+	  //     let self = this;
+	  //     const {data} = await getManageStatusCount();
+	  //     if(data.code==200){
+	  // 			  this.tabTextTow[0].num=data.data.noCheck;
+	  // 			  this.tabTextTow[1].num=data.data.checking;
+	  // 			  this.tabTextTow[2].num=data.data.applyNum;
+	  // 	  }
+	  // },
 
 	  //管理员
 	  async getList(){
@@ -704,6 +709,30 @@ export default {
 			  this.total=data.data.total;
 		  }
       },
+    async checkPlanListAllNum(){
+      let self = this;
+      let obj={
+        pageNum:1,
+        pageSize:20,
+        checkStatus:1,
+      }
+      const {data} = await checkPlanList(obj);
+      if(data.code==200){
+        this.tabText[0].num=data.data.total;
+      }
+    },
+    async checkPlanListAllNum2(){
+      let self = this;
+      let obj={
+        pageNum:1,
+        pageSize:20,
+        checkStatus:2,
+      }
+      const {data} = await checkPlanList(obj);
+      if(data.code==200){
+        this.tabText[1].num=data.data.total;
+      }
+    },
 	  //检查者
 	  async getList2(){
 	  	let self = this;

pages_safetyExamine/examineManage/examineDetail.vue

@@ -102,7 +102,7 @@
 			<view class="pack_up" @click="switchFun(item)">{{item.switch?'收起':'展开'}}<img v-if="item.switch" src="@/pages_safetyExamine/images/icon_06_1.png"/><img v-if="!item.switch" src="@/pages_safetyExamine/images/icon_06.png"/></view>
 		</view>
 	</scroll-view>
-	<view class="report" @change="rectifyReport" v-if="manageStatus==2 && infoData.checkResult==0">整改报告</view>	
+	<view class="report" @click="rectifyReport" v-if="manageStatus==2 && infoData.checkResult==0">整改报告</view>	
 	<view class="bottom_btn" v-if="manageStatus==0 && isSelfData==1" @click="handleClick('','startInspect')">开始检查</view>
   </view>
 
@@ -276,6 +276,7 @@ export default {
 		},
 		//整改报告
 		rectifyReport(){
+			console.log(1111)
 			uni.showLoading({
 				title: '下载中'
 			});