From ff0ae974a1c561eaf2915988dac63cd066af189f Mon Sep 17 00:00:00 2001
From: yinbangzhong <zhongbangyin@126.com>
Date: 星期四, 12 九月 2024 09:23:44 +0800
Subject: [PATCH] bug fix
---
src/views/sessionManager/components/updataFile.vue | 93 ++++++++++++++++++----------------------------
1 files changed, 37 insertions(+), 56 deletions(-)
diff --git a/src/views/sessionManager/components/updataFile.vue b/src/views/sessionManager/components/updataFile.vue
index f1e9980..12c54d6 100644
--- a/src/views/sessionManager/components/updataFile.vue
+++ b/src/views/sessionManager/components/updataFile.vue
@@ -19,6 +19,7 @@
:auto-upload="false"
ref="uploadRef"
@change="onChange"
+ :show-retry-button="false"
multiple
:limit="1"
/>
@@ -26,47 +27,17 @@
style="
width: 100%;
margin-top: 10px;
- display: flex;
justify-content: space-between;
+ text-align: right;
"
class="upload-wrap"
>
- <div>
- <span>瑙ｆ瀽鏂规硶: </span>
- <a-radio-group
- v-model="parser_id"
- style="width: 400px"
- @change="parserChange"
- >
- <a-popover v-for="item in filterData" :key="item.value">
- <a-radio :value="item.value" style="margin-right: 10px">{{
- item.name
- }}</a-radio>
-
- <template #content>
- <p>{{ item.parser_config_str }}</p>
- </template>
- </a-popover>
- </a-radio-group>
- </div>
- <a-select
- :style="{ width: '100px', margin: '0 10px' }"
- :default-value="['閫氱敤', '澶氭ā鎬�']"
- v-model="parser_configs"
- multiple
- size="small"
- >
- <a-option v-for="item in parser_ids" :key="item.value">{{
- item.name
- }}</a-option>
- </a-select>
- <p class="config-text">鏇村閰嶇疆</p>
<a-button
:loading="onFileSelectedLoading"
@click="upDataFile"
type="primary"
size="mini"
- style="border-radius: 24px"
+ style="border-radius: 24px;"
>
<span style="font-size: 12px"> 涓婁紶 </span>
</a-button>
@@ -91,8 +62,8 @@
getParseMethodsListApi,
getSessionDetailsApi,
uploadWithoutKb,
- uploadAndParse,
- } from '@/api/session';
+ uploadAndParse, upload_and_parse, getDocumentStatus
+ } from "@/api/session";
const visible = ref(false);
const loading = ref(false);
@@ -225,7 +196,7 @@
]);
const parser_idsArr = ref([]);
const uploadList = ref([]);
- const props = defineProps(['sessionId']);
+ const props = defineProps(['sessionId','hide']);
const emit = defineEmits(['selectFileCallback']);
const uploadRef = ref();
const files = ref([]);
@@ -288,7 +259,7 @@
});
return type;
};
-
+ let status_timer;
const upDataFile = async () => {
if (!activeSessionId.value) {
//鏂板缓浼氳瘽
@@ -337,29 +308,31 @@
}
}
console.log(formData, 'formData');
- // uploadAndParse(formData).then((res) => {
- // debugger;
- // onFileSelectedLoading.value = false;
- // if (res.code == 200) {
- // cancel();
- // // uploaditemList.value = [];
- // emit('selectFileCallback', uploaditemList.value);
- // Message.success('涓婁紶鎴愬姛');
- // } else {
- // Message.error('涓婁紶澶辫触');
- // }
- // });
- uploadWithoutKb(formData).then((res) => {
+ upload_and_parse(formData).then((res) => {
onFileSelectedLoading.value = false;
- if (res.code == 200) {
+ if (res.code == 0) {
+ //涓婁紶鎴愬姛
+ Message.success("涓婁紶鎴愬姛");
cancel();
- // uploaditemList.value = [];
- emit('selectFileCallback', uploaditemList.value);
- Message.success('涓婁紶鎴愬姛');
+ emit("selectFileCallback", uploaditemList.value,activeSessionId.value);
} else {
Message.error('涓婁紶澶辫触');
}
});
+ };
+
+
+ const checkStatus = async (doc_ids) => {
+ let res = await getDocumentStatus(doc_ids);
+ if (res.code == 200 && res.data.status == "success") {
+ //涓婁紶鎴愬姛
+ Message.success("涓婁紶鎴愬姛");
+ cancel();
+ emit("selectFileCallback", uploaditemList.value);
+ if (status_timer) {
+ clearTimeout(status_timer!);
+ }
+ }
};
const cancel = () => {
@@ -392,12 +365,20 @@
});
onMounted(() => {});
+ //鐩戞帶澶氫釜灞炴�у彉鍖�
watch(
- () => props.sessionId,
- (value, oldValue) => {
- activeSessionId.value = value;
+ () => [props.sessionId, props.hide],
+ ([in_sessionId, in_hide]) => {
+ if (visible.value != in_hide) {
+ visible.value = false;
+ }
+ if (activeSessionId.value != in_sessionId) {
+ activeSessionId.value = in_sessionId;
+ }
}
);
+
+
</script>
<style>
.upload-wrap .arco-select-view-inner {
--
Gitblit v1.8.0