diff --git a/src/components/settings/item/ItemSearch.vue b/src/components/settings/item/ItemSearch.vue
index 8c16007..215f7a0 100644
--- a/src/components/settings/item/ItemSearch.vue
+++ b/src/components/settings/item/ItemSearch.vue
@@ -34,8 +34,8 @@
v-model:current-page="searchResult.pageNum" @current-change="changePage"/>
- 确认
- 关闭
+ 关闭
+ 确认
@@ -53,7 +53,7 @@ const show = ref(false);
const emit = defineEmits(["confirm"])
-let searchResult = ref({
+let searchResult = ref({
totalPage: 0,
list: [],
pageNum: 1,
@@ -95,8 +95,6 @@ function initSearchData() {
let confirm = () => {
emit('confirm', curItem)
close()
-
-
}
let isloading = ref(false);
let searchSocialItem = () => {
@@ -113,6 +111,9 @@ let searchSocialItem = () => {
}
const close = () => {
show.value = false;
+ keyword.value = ''
+ curItem = null;
+ searchResult.value = {}
}
diff --git a/src/components/settings/item/group/GroupAdd.vue b/src/components/settings/item/group/GroupAdd.vue
index 3fdb922..bf84420 100644
--- a/src/components/settings/item/group/GroupAdd.vue
+++ b/src/components/settings/item/group/GroupAdd.vue
@@ -29,7 +29,7 @@
-
+
¥
@@ -38,7 +38,7 @@
-
+
¥
@@ -89,7 +89,10 @@
- 保存
+
+ 取消
+ 保存
+
@@ -225,5 +228,10 @@ defineExpose({init})
align-items: center;
padding: 0 24px;
}
-
+.default-btn{
+ margin-left: 0;
+}
+.default-close-btn{
+ margin-right: 10px;
+}
\ No newline at end of file
diff --git a/src/components/settings/item/group/GroupList.vue b/src/components/settings/item/group/GroupList.vue
index 14164e6..3807ae8 100644
--- a/src/components/settings/item/group/GroupList.vue
+++ b/src/components/settings/item/group/GroupList.vue
@@ -11,7 +11,7 @@
{
cursor: pointer;
color: #ff0000;
}
+.default-btn{
+ margin-left: 0;
+}
diff --git a/src/views/settings/log.vue b/src/views/settings/log.vue
index ce1121b..eaed571 100644
--- a/src/views/settings/log.vue
+++ b/src/views/settings/log.vue
@@ -11,8 +11,12 @@
end-placeholder="结束时间"
unlink-panels
/>
-
-
+
+
+
+
+ 重置
+
查询
@@ -26,7 +30,7 @@
:header-cell-style="{backgroundColor: '#F1F5FB'}"
>
-
+
@@ -99,12 +103,18 @@ const handleDateChange = (date: any[]) => {
selectedDate.value = formatDateArray(date)
selectedDate.value[1] = getEndOfDay(selectedDate.value[1]); // 输出今天 23:59
}
+ getData()
}
const copy = (text: any) => {
ElMessage.success('复制成功')
navigator.clipboard.writeText(text)
}
+const colse=() => {
+ selectedDate.value = []
+ searchModel.value = {}
+ getData()
+}