admin/src/views/business/retention.vue
@@ -76,12 +76,14 @@ <span v-else>访客</span> </template> </el-table-column>--> <el-table-column label="备注" prop="remark" min-width="100px"></el-table-column> <el-table-column label="进场门禁" min-width="100px"> <template slot-scope="{ row }"> <!-- <span v-if="row.type === 1">-</span> --> <span>{{ row.deviceName || '-' }}</span> </template> </el-table-column> <el-table-column label="备注" prop="remark" min-width="120px"></el-table-column> <el-table-column prop="eventDate" label="最后进场时间" min-width="140px"></el-table-column> <el-table-column label="人脸照片" min-width="100px"> <template slot-scope="{ row }"> server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -1403,6 +1403,7 @@ retention.setDeviceName(request.getSrcName()); retention.setDeviceIndex(request.getSrcIndex()); retention.setCarNo(inoutRecord.getCarCode()); retention.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName()); retention.setRemark("跟随车辆【"+inoutRecord.getCarCode()+"】入园区"); return retention; } @@ -1419,6 +1420,7 @@ retention.setCategoryName(carrecord.getCategoryName()); retention.setCategoryParentId(carrecord.getCategoryParentId()); retention.setCategoryParentName(carrecord.getCategoryParentName()); retention.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName()); // retention.setDeviceName(request.getSrcName()); // retention.setDeviceIndex(request.getSrcIndex());