dedsudiyu vor 9 Monaten
Ursprung
Commit
706d5117ea
1 geänderte Dateien mit 5 neuen und 6 gelöschten Zeilen
  1. 5 6
      pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

+ 5 - 6
pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -26,8 +26,8 @@
 		</view>
 		<scroll-view scroll-y style="overflow-y: scroll;flex:1;" @scrolltolower="scrollGet" class="info-max-box">
 			<view class="list">
-				<view class="total" :class="curTabTow == 2?'total-color-1':(curTabTow == 0?'total-color-3':(curTabTow == 1?'total-color-2':''))" v-if="pageType == 0">
-					{{curTabTow == 2?'待检查共'+total+'项':(curTabTow == 0?'检查中草稿箱共'+total+'项':(curTabTow == 1?'已检查共'+total+'项':''))}}
+				<view class="total" :class="curTabTow == 0?'total-color-1':(curTabTow == 2?'total-color-3':(curTabTow == 1?'total-color-2':''))" v-if="pageType == 0">
+					{{curTabTow == 0?'待检查共'+total+'项':(curTabTow == 2?'检查中草稿箱共'+total+'项':(curTabTow == 1?'已检查共'+total+'项':''))}}
 				</view>
 				<view class="total" :class="curTabTow == 0?'total-color-1':(curTabTow == 1?'total-color-2':(curTabTow == 2?'total-color-3':''))"v-if="pageType == 1">
 					{{curTabTow == 0?'待复查共'+total+'项':(curTabTow == 1?'复查完毕共'+total+'项':(curTabTow == 2?'退回整改共'+total+'项':''))}}
@@ -40,8 +40,7 @@
 						<img v-if="item.rectifyStatus==0" src="@/pages_safetyCheck/images/icon_zg_zh@1x.png">
 						<img v-if="item.rectifyStatus==1" src="@/pages_safetyCheck/images/icon_xz_fc@1x.png">
 						<img v-if="item.rectifyStatus==2" src="@/pages_safetyCheck/images/icon_xz_zg@1x.png">
-						<view v-if="item.hazardCheckId">{{item.hazardCheckCode}}{{item.hazardCheckName}}</view>
-						<view v-if="!item.hazardCheckId">{{item.hazardDescribe}}</view>
+						<view >{{item.hazardCheckCode}}{{item.hazardCheckName}}</view>
 					</view>
 					<view v-if="item.hazardCheckId" class="list-li-b" @click="hiddenDangerClick(item)">
 						此检查项在当前实验室累计出现<text>{{item.hazardCheckNum}}</text>次隐患
@@ -111,11 +110,11 @@
 					optionData.checkPlanSetVoList.overdueUnrectify ? '整改期限' + optionData.checkPlanSetVoList.checkStartTime +
 					'(逾期未完成整改关闭实验室)' : '整改期限' + optionData.checkPlanSetVoList.checkStartTime));
 			this.$set(this, 'tabTextTow',
-				optionData.pageType == 0 ? [{value: '2',label: '检查中'}, {value: '0',label: '待检查'}, {value: '1',label: '已检查'}] : (
+				optionData.pageType == 0 ? [{value: '0',label: '待检查'}, {value: '2',label: '检查中'}, {value: '1',label: '已检查'}] : (
 				optionData.pageType == 1 ? [{value: '0',label: '待复查'}, {value: '1',label: '复查完毕'}, {value: '2',label: '退回整改'}] : (
 				optionData.pageType == 2 ? [{value: '2',label: '待整改'}, {value: '1',label: '已整改'}, {value: '4',label: '暂无法整改'}] : []
 			)))
-			this.$set(this, 'curTabTow', optionData.pageType == 0 ? '2' : (optionData.pageType == 1 ? '0' : (optionData
+			this.$set(this, 'curTabTow', optionData.pageType == 0 ? '0' : (optionData.pageType == 1 ? '0' : (optionData
 				.pageType == 2 ? '2' : '')));
 			this.$set(this, 'newData', optionData);
 			this.$nextTick(() => {