289bbea2 by xukangle

fix

1 parent 97692c16
...@@ -8,6 +8,7 @@ import * as XLSX from 'xlsx'; ...@@ -8,6 +8,7 @@ import * as XLSX from 'xlsx';
8 import { 8 import {
9 getImageContent 9 getImageContent
10 } from '@/api/modules/queryService'; 10 } from '@/api/modules/queryService';
11 import { getDownFileSignByUrl, obsDownloadRequest, parseAndDecodeUrl } from "@/api/modules/obsService";
11 12
12 const props = defineProps({ 13 const props = defineProps({
13 noUpload: { 14 noUpload: {
...@@ -266,7 +267,7 @@ const formatterPreviewDate = (row, info) => { ...@@ -266,7 +267,7 @@ const formatterPreviewDate = (row, info) => {
266 return v; 267 return v;
267 }; 268 };
268 269
269 const setFormValue = (v) => { 270 const setFormValue = async (v) => {
270 fileFormItems.value[1].default = v.sheetName || ""; 271 fileFormItems.value[1].default = v.sheetName || "";
271 let url = v.file?.[0]?.url; 272 let url = v.file?.[0]?.url;
272 if (fileFormItems.value[0].default?.[0]?.url !== url) { 273 if (fileFormItems.value[0].default?.[0]?.url !== url) {
...@@ -275,7 +276,13 @@ const setFormValue = (v) => { ...@@ -275,7 +276,13 @@ const setFormValue = (v) => {
275 fileFieldLoading.value = true; 276 fileFieldLoading.value = true;
276 fileTableFields.value = []; 277 fileTableFields.value = [];
277 fileTableData.value = []; 278 fileTableData.value = [];
278 getImageContent(url).then((res: any) => { 279 const refSignInfo: any = await getDownFileSignByUrl(parseAndDecodeUrl(url).fileName);
280 if (!refSignInfo?.data) {
281 refSignInfo?.msg && ElMessage.error(refSignInfo?.msg);
282 return;
283 }
284 const res: any = await obsDownloadRequest(refSignInfo?.data);
285 // getImageContent(url).then((res: any) => {
279 if (res && !res.msg) { 286 if (res && !res.msg) {
280 let urlNames = url.split('/'); 287 let urlNames = url.split('/');
281 let name = urlNames.at(-1); 288 let name = urlNames.at(-1);
...@@ -340,7 +347,7 @@ const setFormValue = (v) => { ...@@ -340,7 +347,7 @@ const setFormValue = (v) => {
340 } else { 347 } else {
341 res?.msg && ElMessage.error(res?.msg); 348 res?.msg && ElMessage.error(res?.msg);
342 } 349 }
343 }) 350 // })
344 } 351 }
345 } 352 }
346 353
......
...@@ -10,7 +10,6 @@ import { ...@@ -10,7 +10,6 @@ import {
10 import { pinyin } from 'pinyin-pro'; 10 import { pinyin } from 'pinyin-pro';
11 import useUserStore from "@/store/modules/user"; 11 import useUserStore from "@/store/modules/user";
12 import { getDictionaryTree } from '@/api/modules/dataInventory'; 12 import { getDictionaryTree } from '@/api/modules/dataInventory';
13 import { pa } from 'element-plus/es/locale';
14 13
15 const emits = defineEmits([ 14 const emits = defineEmits([
16 "cancelImport", 15 "cancelImport",
......
...@@ -95,7 +95,7 @@ const searchItemList = ref([ ...@@ -95,7 +95,7 @@ const searchItemList = ref([
95 { 95 {
96 type: "select", 96 type: "select",
97 label: "", 97 label: "",
98 field: "registerState", 98 field: "isRegister",
99 default: "", 99 default: "",
100 placeholder: "登记状态", 100 placeholder: "登记状态",
101 clearable: true, 101 clearable: true,
...@@ -118,7 +118,7 @@ const pageInfo = ref({ ...@@ -118,7 +118,7 @@ const pageInfo = ref({
118 damType: "", 118 damType: "",
119 tenantGuid: "", 119 tenantGuid: "",
120 dataSources: "", 120 dataSources: "",
121 registerState: "", 121 isRegister: "",
122 subjectDomain: [], 122 subjectDomain: [],
123 }); 123 });
124 124
...@@ -193,7 +193,7 @@ const getTableData = () => { ...@@ -193,7 +193,7 @@ const getTableData = () => {
193 subjectDomain: pageInfo.value.subjectDomain, 193 subjectDomain: pageInfo.value.subjectDomain,
194 tenantGuid: pageInfo.value.tenantGuid, 194 tenantGuid: pageInfo.value.tenantGuid,
195 dataSources: pageInfo.value.dataSources, 195 dataSources: pageInfo.value.dataSources,
196 registerState: pageInfo.value.registerState, 196 isRegister: pageInfo.value.isRegister,
197 }).then((res: any) => { 197 }).then((res: any) => {
198 listDataLoading.value = false; 198 listDataLoading.value = false;
199 if (res.code == proxy.$passCode) { 199 if (res.code == proxy.$passCode) {
...@@ -216,14 +216,14 @@ const toSearch = (val: any, clear: boolean = false) => { ...@@ -216,14 +216,14 @@ const toSearch = (val: any, clear: boolean = false) => {
216 pageInfo.value.damType = ""; 216 pageInfo.value.damType = "";
217 pageInfo.value.subjectDomain = []; 217 pageInfo.value.subjectDomain = [];
218 pageInfo.value.tenantGuid = ""; 218 pageInfo.value.tenantGuid = "";
219 pageInfo.value.registerState = ""; 219 pageInfo.value.isRegister = "";
220 pageInfo.value.dataSources = ""; 220 pageInfo.value.dataSources = "";
221 } else { 221 } else {
222 pageInfo.value.damName = val.damName; 222 pageInfo.value.damName = val.damName;
223 pageInfo.value.damType = val.damType; 223 pageInfo.value.damType = val.damType;
224 pageInfo.value.subjectDomain = val.subjectDomain; 224 pageInfo.value.subjectDomain = val.subjectDomain;
225 pageInfo.value.tenantGuid = val.tenantGuid; 225 pageInfo.value.tenantGuid = val.tenantGuid;
226 pageInfo.value.registerState = val.registerState; 226 pageInfo.value.isRegister = val.isRegister;
227 pageInfo.value.dataSources = val.dataSources; 227 pageInfo.value.dataSources = val.dataSources;
228 } 228 }
229 getTableData(); 229 getTableData();
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!