Browse Source

性诱器加上红外计数值

yf_zd 5 years atrás
parent
commit
3c8e666626

+ 11 - 7
bigdata2/src/pages/forecasting/cbd/cbdDataPhotos.vue

@@ -85,13 +85,14 @@
 						</template>
 					</div>
 					<div class="photoCtrl">
+						<div class="time">{{item.upl_time}}</div>
 						<!-- <div @click="handAddFun(item)">
 							手动添加
 						</div>
 						<div @click="handAddDataFun(item)">
 							手动统计
 						</div> -->
-						<div v-if="disc==1" @click="discernFun(item)">
+						<div class="ctrl" v-if="disc==1" @click="discernFun(item)">
 							识别统计
 						</div>
 					</div>
@@ -572,13 +573,16 @@ export default {
 	.photoCtrl {
 		background-color: #fff;
 		text-align: center;
-		line-height: 50px;
+		line-height: 36px;
 		font-size: 16px;
-		display: flex;
-		justify-content: space-between;
-		div {
-			flex: 1;
-			border-right: 1px solid #d8d8d8;
+		// display: flex;
+		// justify-content: space-between;
+		.time{
+			font-size: 12px;
+		}
+		.ctrl {
+			// flex: 1;
+			// border-right: 1px solid #d8d8d8;
 			margin-bottom: 0;
 			cursor: pointer;
 			&:hover {

+ 1 - 0
bigdata2/src/pages/forecasting/xycb/xycbDataDetail.vue

@@ -112,6 +112,7 @@ export default {
 				['环境湿度', 'ah'],
 				['充电电压', 'cv'],
 				['电池电压', 'bv'],
+				['红外计数值', 'infr_ct'],
 				['充电状态', 'cs'],
 				['电池状态', 'bs'],
 				['信号强度', 'csq'],