diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 4bbacf0..f3ed6f7 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -41,6 +41,9 @@ import emitter from '@/utils/mitt'
import { formatToDateHMS } from '@/utils/dateUtil'
import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
import DataHeader from '@/components/DataHeader/index.vue'
+import console from 'console'
+
+
const emit = defineEmits(['changeShow'])
function changeContent() {
@@ -482,6 +485,14 @@ async function query(page: number, pageSize: number, filterId?: any, taskName?:
// 有过滤配置的时候优先使用过滤配置,不要使用左侧参数
let params = filterId ? { userSearchId: filterId } : asideParmas
params = params?.izshowall ? {} : params
+
+ console.log(111,"query函数被调用", {
+ sortorder: sortorder.value,
+ pageSize,
+ currPage: page,
+ sortname: sortname.value,
+ taskName,
+ })
const result = await getFinalList({
sortorder: sortorder.value,
pageSize,
@@ -499,7 +510,6 @@ async function query(page: number, pageSize: number, filterId?: any, taskName?:
}
async function handleSorterChange(value) {
- console.log(value)
let name = value.columnKey
if (name === 'fromuptime')
name = 'field11'
@@ -582,8 +592,9 @@ const scrollX = computed(() => {
return width
})
-
-query(pagination.page, pagination.pageSize)
+onMounted(() => {
+ query(pagination.page, pagination.pageSize)
+})
const customTabelRef = ref(null)
const importExcelRef = ref(null)
@@ -704,7 +715,7 @@ function resetHandler() {
// TODO:需要支持重置
// const result = await resetApproval()
},
- onNegativeClick: () => {},
+ onNegativeClick: () => { },
})
}
@@ -811,7 +822,7 @@ function doAudit(param: any) {
}
})
},
- onNegativeClick: () => {},
+ onNegativeClick: () => { },
})
}
@@ -856,11 +867,11 @@ async function refreshHandler(searchId?: any) {
function filterTableData(keyword) {
pagination.page = 1
pagination.pageSize = 10
- if (keyword)
- // tableData.value = tableData.value.filter(item => item.id.includes(keyword))
+ if (keyword) {
query(pagination.page, pagination.pageSize, '', keyword)
- else query(pagination.page, pagination.pageSize)
+ } else { query(pagination.page, pagination.pageSize) }
}
+
defineExpose({
filterTableData,
})
@@ -871,20 +882,10 @@ defineExpose({
-->
-
+
-
+
-
+
-
+
@@ -1040,6 +1000,7 @@ defineExpose({
border-radius: 8px;
cursor: pointer;
}
+
.wrapper {
display: flex;
flex: 1;
@@ -1185,12 +1146,15 @@ defineExpose({
background: #fff;
}
}
+
:deep(.n-data-table .n-data-table-td.n-data-table-td--fixed-right) {
z-index: 100 !important;
}
+
:deep(.n-data-table-th__title) {
color: #333;
}
+
:deep(.n-data-table .n-data-table-td) {
color: #666;
}
diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue
index 8a108a1..05278a0 100644
--- a/src/views/home/aside/comp/Search.vue
+++ b/src/views/home/aside/comp/Search.vue
@@ -1,5 +1,5 @@
diff --git a/src/views/home/content/modal/LoginSuccessModal.vue b/src/views/home/content/modal/LoginSuccessModal.vue
index a9629aa..9155a61 100644
--- a/src/views/home/content/modal/LoginSuccessModal.vue
+++ b/src/views/home/content/modal/LoginSuccessModal.vue
@@ -71,7 +71,7 @@ defineExpose({
-
{{ 83 }}
+
{{ toolsData?.repeat }}
重复图片
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 7b738b9..19076e4 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -148,16 +148,12 @@ function handleKeydown(event) {
// 清除已经设置的定时器(如果有的话)
clearTimeout(keyPressTimer);
const item = taskDetailInfo.value;
- if (
- item?.userapprove?.statshis === 2 ||
- item?.userapprove?.statshis == 3
- ) {
+ if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
overTask.value = null;
return;
}
- if (validate([item]) == null && batch.value === false)
- overTask.value = item;
+ if (validate([item]) == null && batch.value === false) overTask.value = item;
// 执行想要的操作
approvalHandler();
@@ -183,16 +179,12 @@ function handleKeydown(event) {
// 清除已经设置的定时器(如果有的话)
clearTimeout(keyPressTimer);
const item = taskDetailInfo.value;
- if (
- item?.userapprove?.statshis === 2 ||
- item?.userapprove?.statshis == 3
- ) {
+ if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
overTask.value = null;
return;
}
- if (validate([item]) == null && batch.value === false)
- overTask.value = item;
+ if (validate([item]) == null && batch.value === false) overTask.value = item;
// 执行想要的操作
const modal = unref(notPassModalRef)! as any;
modal.showModal([taskDetailInfo.value]);
@@ -265,8 +257,7 @@ function approvalHandler(items?: any) {
processItems = [cloneItem];
}
- if (items !== undefined && !(items instanceof PointerEvent))
- processItems = items;
+ if (items !== undefined && !(items instanceof PointerEvent)) processItems = items;
const msg = validate(processItems);
@@ -520,9 +511,7 @@ function notPassSuccess(param) {
function reloadList(param, text) {
// 修改左侧状态
const id = currentTaskId();
- const hasCurrentId = param.flowTaskInfoList.find(
- (item) => item.formId === id
- );
+ const hasCurrentId = param.flowTaskInfoList.find((item) => item.formId === id);
finalStore.setListKey();
if (hasCurrentId) emit("setAsideItemName", text);
@@ -556,8 +545,7 @@ function overTaskHandelr(item: any) {
return;
}
- if (validate([item]) == null && batchtwo.value === false)
- overTasktwo.value = item;
+ if (validate([item]) == null && batchtwo.value === false) overTasktwo.value = item;
}
function closePassno() {
console.log(notPassModalRef.value);
@@ -591,8 +579,7 @@ function checkBottom() {
const scrollTop = window.pageYOffset || document.documentElement.scrollTop;
// 获取视口的内部高度
- const clientHeight =
- window.innerHeight || document.documentElement.clientHeight;
+ const clientHeight = window.innerHeight || document.documentElement.clientHeight;
// 获取整个文档的高度
const scrollHeight = document.documentElement.scrollHeight;
@@ -661,18 +648,8 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
任务ID:{{ taskDetailInfo.fromtaskname }}
-
-
+
+
@@ -769,9 +746,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
v-show="!imgbigshow"
:style="{
position: 'fixed',
- height: '100vh',
zIndex: 169,
- height: '100vh',
background: 'rgb(80, 122, 253)',
right: '16px',
marginTop: '5px',
@@ -867,18 +842,10 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
/>
-
+
-
+
@@ -888,11 +855,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
-
+
@@ -911,39 +874,23 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
- {{ totalCount }}张
-
+ {{ totalCount }}张
相似匹配
-
+
- {{
- taskDetailInfo?.ocrPicture?.photoDateTimestamp ?? "-"
- }}
+ {{ taskDetailInfo?.ocrPicture?.photoDateTimestamp ?? "-" }}
-
+
{{
taskDetailInfo?.ocrPicture?.submitDateTimestamp
- ? formatToDateHMS(
- Number(taskDetailInfo.ocrPicture.submitDateTimestamp)
- )
+ ? formatToDateHMS(Number(taskDetailInfo.ocrPicture.submitDateTimestamp))
: "-"
}}
@@ -1043,12 +990,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
/>
-
+
{{
item.photoDateTimestamp
? formatToDateHMS(Number(item.photoDateTimestamp))
@@ -1056,12 +998,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
}}
-
+
{{
item.submitDateTimestamp
? formatToDateHMS(Number(item.submitDateTimestamp))
@@ -1143,16 +1080,10 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
{{ item[0].value }}
-
+
{{ item[0].label }}
-
+
{{ item[0].value }}
时间排序
-
-
+
+
相似度排序
-
-
+
+
@@ -1317,12 +1224,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
/>
-
+
{{
item.photoDateTimestamp
? formatToDateHMS(Number(item.photoDateTimestamp))
@@ -1330,12 +1232,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
}}
-
+
{{
item.submitDateTimestamp
? formatToDateHMS(Number(item.submitDateTimestamp))
@@ -1343,10 +1240,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
}}
-
+
{{ item.similarityScore }}%
@@ -1433,16 +1327,8 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
-->
-
-
+
+
@@ -2151,11 +2037,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
.small-mark {
width: 100%;
height: 53px;
- background: linear-gradient(
- 180deg,
- rgba(0, 0, 0, 0.01),
- rgba(0, 0, 0, 0.44) 88%
- );
+ background: linear-gradient(180deg, rgba(0, 0, 0, 0.01), rgba(0, 0, 0, 0.44) 88%);
border-radius: 0px 8px 8px 8px;
position: absolute;
left: 0;
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 0d531b2..e47ae9e 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -905,14 +905,14 @@ defineExpose({
.left {
flex: 0.6;
- background-size: auto 346px;
-
+ // background-size: auto 346px;
+ background-size: cover;
background-position: center;
background-repeat: no-repeat;
border-radius: 8px;
position: relative;
- width: 632px;
- height: 346px;
+ // width: 632px;
+ // height: 346px;
.preview {
position: absolute;