From 621882746b29b71669ccdc9529eb7c7988f93a0e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 19 五月 2025 08:20:42 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 2 +-
admin/src/views/business/retention.vue | 7 ++++---
screen/vite.config.js | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index 4c1df05..724e319 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -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>
diff --git a/screen/vite.config.js b/screen/vite.config.js
index 31658b3..ff40646 100644
--- a/screen/vite.config.js
+++ b/screen/vite.config.js
@@ -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/, ""),
},
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 68651cf..4390f95 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -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){
--
Gitblit v1.9.3