diff --git a/src/api/request.ts b/src/api/request.ts
index 4704ea1b..8ca6f5fd 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -14,12 +14,17 @@ const service = axios.create({
});
const company = 'carsafe';
-const userId = $wujie?.props?.USER_ID || localStorage.getItem('USER_ID') || '';
-const token = $wujie?.props?.TOKEN || localStorage.getItem('TOKEN') || '';
-const tenantId = $wujie?.props?.TENANT_ID || localStorage.getItem('TENANT_ID') || '';
+let userId = $wujie?.props?.USER_ID || localStorage.getItem('USER_ID') || '';
+let token = $wujie?.props?.TOKEN || localStorage.getItem('TOKEN') || '';
+let tenantId = $wujie?.props?.TENANT_ID || localStorage.getItem('TENANT_ID') || '';
service.interceptors.request.use(
(config) => {
+ if (config.params?.token) {
+ userId = config.params.userId;
+ token = config.params.token;
+ tenantId = config.params.tenantId;
+ }
config.headers['company'] = company;
config.headers['jobNumber'] = userId;
config.headers['token'] = token;
diff --git a/src/components/common/filePreview/index.vue b/src/components/common/filePreview/index.vue
index bfafa18c..f612b72c 100644
--- a/src/components/common/filePreview/index.vue
+++ b/src/components/common/filePreview/index.vue
@@ -8,7 +8,7 @@
@@ -39,6 +39,9 @@ const diaVisible = ref(false);
const url = ref('');
const fileData = ref('');
const fileKey = ref('fileKey');
+const userId = ref(localStorage.getItem('USER_ID'));
+const token = ref(localStorage.getItem('TOKEN'));
+const tenantId = ref(localStorage.getItem('TENANT_ID'));
const emit = defineEmits(['update:modelValue']);
diff --git a/src/components/common/table/baseTable.vue b/src/components/common/table/baseTable.vue
index 264f8d62..fc8573b0 100644
--- a/src/components/common/table/baseTable.vue
+++ b/src/components/common/table/baseTable.vue
@@ -55,13 +55,13 @@
-
+
diff --git a/src/components/common/table/treeTable.vue b/src/components/common/table/treeTable.vue
index 751ccbae..324759b3 100644
--- a/src/components/common/table/treeTable.vue
+++ b/src/components/common/table/treeTable.vue
@@ -36,13 +36,13 @@
-
+
diff --git a/src/views/data/overview/components/search.vue b/src/views/data/overview/components/search.vue
index 0d56f8bd..7416c072 100644
--- a/src/views/data/overview/components/search.vue
+++ b/src/views/data/overview/components/search.vue
@@ -46,12 +46,14 @@ const searchData = ref({});
interface Props {
modelValue: boolean;
- dirId: number;
+ data: any;
+ fileIds: any;
}
const props = withDefaults(defineProps(), {
modelValue: false,
- dirId: 0,
+ data: {},
+ fileIds: [],
});
watch(
@@ -66,10 +68,16 @@ const searchFun = async () => {
if (valid) {
const params = {
...searchData.value,
- parentDirId: props.dirId,
current: 1,
size: 9999,
};
+ if (props.data.id) {
+ params.parentDirId = props.data.id;
+ params.fileIds = props.fileIds;
+ } else {
+ // 根目录
+ params.dirType = 2;
+ }
dataOverViewSearchSimulationNodeFilesApi(params).then((res: any) => {
if (res.code === 200) {
emit('search', res.data);
diff --git a/src/views/data/overview/index.vue b/src/views/data/overview/index.vue
index af4481df..4ed8ab88 100644
--- a/src/views/data/overview/index.vue
+++ b/src/views/data/overview/index.vue
@@ -194,7 +194,8 @@
/>
@@ -672,7 +673,7 @@ const choseNodeFun = (mergeData: any) => {
let data: any = {};
if (mergeData.mergeSameNameChildren) {
mergeDataList.value = mergeData.mergeSameNameChildren;
- mergeDataName.value = mergeDataList.value[0].totalName;
+ // mergeDataName.value = mergeDataList.value[0].totalName;
data = mergeDataList.value[0];
} else {
data = mergeData;
diff --git a/src/views/data/storage/components/storageSettings/index.vue b/src/views/data/storage/components/storageSettings/index.vue
index fd0df112..54ac804e 100644
--- a/src/views/data/storage/components/storageSettings/index.vue
+++ b/src/views/data/storage/components/storageSettings/index.vue
@@ -13,7 +13,9 @@
>
- 批量修改
+
+ 批量修改
+
@@ -43,44 +45,43 @@
-->
-