Merge branch 'dev_20241202_xukangle' into develop

@@ -8,6 +8,7 @@ import * as XLSX from 'xlsx';
 import {
 import {
   getImageContent
   getImageContent
 } from '@/api/modules/queryService';
 } from '@/api/modules/queryService';
+import { getDownFileSignByUrl, obsDownloadRequest, parseAndDecodeUrl } from "@/api/modules/obsService";
 
 
 const props = defineProps({
 const props = defineProps({
   noUpload: {
   noUpload: {
@@ -266,7 +267,7 @@ const formatterPreviewDate = (row, info) => {
   return v;
   return v;
 };
 };
 
 
-const setFormValue = (v) => {
+const setFormValue = async (v) => {
   fileFormItems.value[1].default = v.sheetName || "";
   fileFormItems.value[1].default = v.sheetName || "";
   let url = v.file?.[0]?.url;
   let url = v.file?.[0]?.url;
   if (fileFormItems.value[0].default?.[0]?.url !== url) {
   if (fileFormItems.value[0].default?.[0]?.url !== url) {
@@ -275,7 +276,13 @@ const setFormValue = (v) => {
     fileFieldLoading.value = true;
     fileFieldLoading.value = true;
     fileTableFields.value = [];
     fileTableFields.value = [];
     fileTableData.value = [];
     fileTableData.value = [];
-    getImageContent(url).then((res: any) => {
+    const refSignInfo: any = await getDownFileSignByUrl(parseAndDecodeUrl(url).fileName);
+    if (!refSignInfo?.data) {
+      refSignInfo?.msg && ElMessage.error(refSignInfo?.msg);
+      return;
+    }
+    const res: any = await obsDownloadRequest(refSignInfo?.data);
+    // getImageContent(url).then((res: any) => {
     if (res && !res.msg) {
     if (res && !res.msg) {
       let urlNames = url.split('/');
       let urlNames = url.split('/');
       let name = urlNames.at(-1);
       let name = urlNames.at(-1);
@@ -340,7 +347,7 @@ const setFormValue = (v) => {
     } else {
     } else {
       res?.msg && ElMessage.error(res?.msg);
       res?.msg && ElMessage.error(res?.msg);
     }
     }
-    })
+    // })
   }
   }
 }
 }
 
 

@@ -10,7 +10,6 @@ import {
 import { pinyin } from 'pinyin-pro';
 import { pinyin } from 'pinyin-pro';
 import useUserStore from "@/store/modules/user";
 import useUserStore from "@/store/modules/user";
 import { getDictionaryTree } from '@/api/modules/dataInventory';
 import { getDictionaryTree } from '@/api/modules/dataInventory';
-import { pa } from 'element-plus/es/locale';
 
 
 const emits = defineEmits([
 const emits = defineEmits([
   "cancelImport",
   "cancelImport",

@@ -95,7 +95,7 @@ const searchItemList = ref([
   {
   {
     type: "select",
     type: "select",
     label: "",
     label: "",
-    field: "registerState",
+    field: "isRegister",
     default: "",
     default: "",
     placeholder: "登记状态",
     placeholder: "登记状态",
     clearable: true,
     clearable: true,
@@ -118,7 +118,7 @@ const pageInfo = ref({
   damType: "",
   damType: "",
   tenantGuid: "",
   tenantGuid: "",
   dataSources: "",
   dataSources: "",
-  registerState: "",
+  isRegister: "",
   subjectDomain: [],
   subjectDomain: [],
 });
 });
 
 
@@ -193,7 +193,7 @@ const getTableData = () => {
     subjectDomain: pageInfo.value.subjectDomain,
     subjectDomain: pageInfo.value.subjectDomain,
     tenantGuid: pageInfo.value.tenantGuid,
     tenantGuid: pageInfo.value.tenantGuid,
     dataSources: pageInfo.value.dataSources,
     dataSources: pageInfo.value.dataSources,
-    registerState: pageInfo.value.registerState,
+    isRegister: pageInfo.value.isRegister,
   }).then((res: any) => {
   }).then((res: any) => {
     listDataLoading.value = false;
     listDataLoading.value = false;
     if (res.code == proxy.$passCode) {
     if (res.code == proxy.$passCode) {
@@ -216,14 +216,14 @@ const toSearch = (val: any, clear: boolean = false) => {
     pageInfo.value.damType = "";
     pageInfo.value.damType = "";
     pageInfo.value.subjectDomain = [];
     pageInfo.value.subjectDomain = [];
     pageInfo.value.tenantGuid = "";
     pageInfo.value.tenantGuid = "";
-    pageInfo.value.registerState = "";
+    pageInfo.value.isRegister = "";
     pageInfo.value.dataSources = "";
     pageInfo.value.dataSources = "";
   } else {
   } else {
     pageInfo.value.damName = val.damName;
     pageInfo.value.damName = val.damName;
     pageInfo.value.damType = val.damType;
     pageInfo.value.damType = val.damType;
     pageInfo.value.subjectDomain = val.subjectDomain;
     pageInfo.value.subjectDomain = val.subjectDomain;
     pageInfo.value.tenantGuid = val.tenantGuid;
     pageInfo.value.tenantGuid = val.tenantGuid;
-    pageInfo.value.registerState = val.registerState;
+    pageInfo.value.isRegister = val.isRegister;
     pageInfo.value.dataSources = val.dataSources;
     pageInfo.value.dataSources = val.dataSources;
   }
   }
   getTableData();
   getTableData();