productDev/dmvisit.git

			@@ -76,15 +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">
			<el-table-column label="进场门禁" min-width="150px">
			<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="备注" prop="remark" min-width="100px"></el-table-column>
			<el-table-column label="人脸照片" min-width="100px">
			<template slot-scope="{ row }">
			<el-image v-if="row.faceImgFull != null" style="width: 80px; height: 80px" :src="row.faceImgFull"
			@@ -92,12 +91,14 @@
			</el-image>
			</template>
			</el-table-column>

			<el-table-column label="操作" min-width="120" fixed="right">
			<template slot-scope="{ row }">
			<el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
			v-permissions="['business:retention:delete']">标记离场</el-button>
			</template>
			</el-table-column>

			</el-table>
			<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
			</pagination>

			@@ -26,8 +26,8 @@
			proxy: {
			"/gateway_interface": {
			// target: "http://192.168.0.104:10010",
			target: "http://10.50.250.253:8088/gateway_interface",
			// target: "https://atwl.ahzyssl.com/zhyq_interface",
			// target: "http://10.50.250.253:8088/gateway_interface",
			target: "https://atwl.ahzyssl.com/zhyq_interface",
			changeOrigin: true,
			rewrite: (path) => path.replace(/^\/gateway_interface/, ""),
			},

			@@ -146,7 +146,7 @@
			if(delRetentionLis.size()>0){
			//先删除原有的在场人员(内部人员）
			retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
			.eq(Retention::getType,Constants.memberType.internal)
			// .eq(Retention::getType,Constants.memberType.internal)
			.in(Retention::getMemberId,delRetentionLis));
			}
			if(retentionList.size()>0){

	admin/src/views/business/retention.vue	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	screen/vite.config.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史