zc

pages_manage/views/laboratory/iotControl.vue

@@ -10,7 +10,7 @@
 		<!-- 传感器监测 -->
 		<view class="small-title" v-if="sensorData[0]">
 			<view></view>
-			<view>传感器监测</view>
+			<view>环境感知</view>
 		</view>
 		<view class="sensor">
 			<view v-for="(item,index) in sensorData" :key="index">

pages_manage/views/laboratory/safetyCardScan.vue

@@ -24,8 +24,8 @@
 				<view class="lab-info-c">
 					<view class="lab-info-c-t">
 						<view class="lab-info-c-t-l">{{newData.subName}}</view>
-						<view class="lab-info-c-t-r"
-							:style="'border:1rpx solid '+newData.levelColor+';background:'+newData.levelColorTow+';'">
+						<view class="lab-info-c-t-r" v-if="newData.levelName&&newData.typeName"
+						:style="'border:1rpx solid '+newData.levelColor+';background:'+newData.levelColorTow+';'">
 							<text
 								:style="'border-right:1rpx solid '+newData.levelColor+';color:'+newData.levelColor+';'">{{newData.levelName?newData.levelName:''}}</text>
 							<text