Merge branch 'master' of http://8.141.155.183:3000/bjquanjiang/pinganxiaoyuan

SafeCampus.WEB/src/views/userManage/dormitory/components/formDormitory/index.vue

@@ -133,18 +133,49 @@ async function handleSubmit() {
     }
   });
 }
-
+watch(
+  () => visibleDormitory.value,
+  newVal =>
+    nextTick(() => {
+      if (newVal) {
+        getCreamaList();
+      }
+    }),
+  { deep: true, immediate: true }
+);
 /** 关闭表单*/
 function onClose() {
   visibleDormitory.value = false;
-  getCreamaList();
+  // getCreamaList();
 }
 onMounted(() => {
   getCreamaList();
 });
 const getCreamaList = () => {
   userManageDormitoryApi.getBuildCameraList().then((res: any) => {
+    console.log(sysDormitoryProps.record, 89);
+
     creamaData.value = res.data;
+    let dormitoryData = sysDormitoryProps.record;
+    let insObj = reactive({
+      sensorId: "",
+      sensorName: ""
+    });
+    let outObj = reactive({
+      sensorId: "",
+      sensorName: ""
+    });
+    if (dormitoryData.insCameraId) {
+      insObj.sensorId = dormitoryData.insCameraId;
+      insObj.sensorName = dormitoryData.insCameraName;
+      creamaData.value.push(insObj);
+    }
+    if (dormitoryData.outCameraId && dormitoryData.insCameraId != dormitoryData.outCameraId) {
+      outObj.sensorId = dormitoryData.outCameraId;
+      outObj.sensorName = dormitoryData.outCameraName;
+      creamaData.value.push(outObj);
+    }
+    console.log(creamaData.value);
   });
 };
 // 暴露给父组件的方法

monitorMobile/pages/earlyWarning/detail.vue

@@ -68,6 +68,14 @@
 					<text v-else>--</text>
 				</view>
 			</view>
+			<view class="cli">
+				<view class="labelBox">
+					处理时间：
+				</view>
+				<view class="valueBox">
+					{{ detailData.handTime || "--" }}
+				</view>
+			</view>
 			<view class="cli2">
 				<view class="labelBox">
 					备注信息：

monitorMobile/pages/earlyWarning/index.vue

@@ -131,7 +131,7 @@
 										<u-row>
 											<u-col span="6">
 												<view class="midContent">
-													姓名：{{item.sceneName || '--'}}
+													姓名：{{item.personName || '--'}}
 												</view>
 											</u-col>
 											<u-col span="6">
@@ -174,7 +174,7 @@
 								</view>
 								<view class="btoCard">
 									<view class="btoContent">
-										时间：{{item.tick}}
+										预警时间：{{item.tick}}
 									</view>
 									<view class="rightBox btoBox" @click="toDetail(item)">
 										<view class="txt">
@@ -733,6 +733,15 @@
 							font-size: 26rpx;
 							font-family: 'PingFang SC';
 							width: calc(100% - 140rpx);
+							.midContent {
+								overflow: hidden;
+								word-wrap: break-word;
+								white-space: pre-wrap;
+								// font-size: 14px;
+								display: -webkit-box;
+								-webkit-box-orient: vertical;
+								-webkit-line-clamp: 1;
+							}
 						}
 					}