heyang

pages.json

@@ -1,6 +1,6 @@
 {
 	"pages": [
-		
+
 		{
 			"path": "pages/views/login/login", //登录
 			"style": {
@@ -9,7 +9,7 @@
 				"navigationStyle": "custom" //关闭原生导航
 			}
 		},
-		
+
 		{
 			"path": "pages/views/home/home", //首页
 			"style": {
@@ -197,6 +197,7 @@
 						"navigationBarTitleText": "进出详情"
 					}
 				},
+				
 				{
 					"path": "views/signature/signature",
 					"style": {
@@ -668,7 +669,7 @@
 				// },
 				/* 安全检查扫一扫进入实验室详情 */
 				{
-					"path": "views/laboratory/safetyCardScan", 
+					"path": "views/laboratory/safetyCardScan",
 					"style": {
 						"navigationBarTitleText": "实验室"
 					}
@@ -912,14 +913,13 @@
 			/* 安全检查分包 */
 			"root": "pages_safetyCheck", //分包根路径
 			"name": "safetyCheck", //分包名字可写可不写
-			"pages": [
-				{
+			"pages": [{
 					"path": "views/safetyCheck",
 					"style": {
 						"navigationBarTitleText": "安全检查"
 					}
 				},
-				
+
 				{
 					"path": "views/inspectManage/inspectAdd",
 					"style": {
@@ -944,8 +944,8 @@
 						"navigationBarTitleText": "检查"
 					}
 				},
-				
-				
+
+
 				{
 					"path": "views/itemsManage/hiddenDangerItemsSearch",
 					"style": {
@@ -988,7 +988,7 @@
 						"navigationBarTitleText": "随手拍整改项"
 					}
 				},
-				
+
 				{
 					"path": "views/snapshotManage/snapshotRectification",
 					"style": {

pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -13,11 +13,11 @@
 			</view>
 			<view class="line"></view>
 			<view class="search">
-				<view class="search-l" v-if="pageType == 0 && curTabTow != 0">
+				<view class="search-l" v-if="pageType == 0 && curTabTow != 0 && curTabTow != 2">
 					<view :class="checkFlag == 1 ?'search-B':'search-A'" @click="checkFlagChange(1)">符合</view>
 					<view :class="checkFlag == 0 ?'search-B':'search-A'" @click="checkFlagChange(0)">不符合</view>
 				</view>
-				<view class="search-r" :class="(pageType == 0 && curTabTow == 0)||(pageType != 0) ?'search-r-margin':''"
+				<view class="search-r" :class="(pageType == 0 && curTabTow == 0 || curTabTow == 2)||(pageType != 0) ?'search-r-margin':''"
 					@click="checkItemModuleButton('open')">
 					<img src="@/pages_safetyCheck/images/icon_aqjc_ss.png">
 					{{newData.hazardCheckCode?newData.hazardCheckCode:''}}{{newData.hazardCheckName?newData.hazardCheckName:'搜索检查项'}}