Front_Team/SPDM
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
lijing1
2026-02-26 09:25:09 +08:00
parent e2da22afd3 32a7e34e64
commit fc6ee1649f
14 changed files with 85 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@@ -17,8 +17,8 @@ VITE_API_STATIC_FILE=http://192.168.65.161:3000/static
VITE_API_IMAGE_PREVIEW_URL=http://192.168.65.161:3000/imagePreview
# 文件预览地址
VITE_API_FILE_PREVIEW_URL=http://192.168.65.161:3000/preview/onlinePreview
# 文件下载地址（暂未使用）
VITE_API_FILE_URL=http://192.168.65.161:7104
# 文件下载地址
VITE_API_DOWNLOAD_URL=http://192.168.65.161:9000
# onlyOffice服务
VITE_API_ONLYOFFICE_URL=http://192.168.65.161:18888
# onlyOffice回调服务

40
.env.eontec Normal file
View File

@@ -0,0 +1,40 @@
# 测试环境
NODE_ENV=test
VITE_APP_ENV=test
# 租户
VITE_API_TENANT_NAME = eontec
# http请求的baseUrl，/api为代理字段
VITE_API_BASE_URL=/api/simulation
# 本地环境http地址，线上通过nginx转发/api到指定服务地址
VITE_API_HTTP_URL=http://192.168.65.161:7100
# ws请求的baseUrl，/wsApi为代理字段
VITE_API_WS_BASE_URL=/wsApi/simulation
# 本地环境ws地址，线上通过nginx转发/wsApi到指定服务地址
VITE_API_WS_URL=ws://192.168.65.161:7100
# 静态资源/usr/local/nginx/html/static
VITE_API_STATIC_FILE=http://192.168.65.161:3000/static
# 图片预览地址
VITE_API_IMAGE_PREVIEW_URL=http://cidweb.eon.com.cn:3000/imagePreview
# 文件预览地址
VITE_API_FILE_PREVIEW_URL=http://cidweb.eon.com.cn:3000/preview/onlinePreview
# 文件下载地址
VITE_API_DOWNLOAD_URL=http://cidweb.eon.com.cn:3000
# onlyOffice服务
VITE_API_ONLYOFFICE_URL=http://192.168.65.161:18888
# onlyOffice回调服务
VITE_API_ONLYOFFICE_CALLBACK=http://192.168.65.161:3000/api/simulation/data/data/onlyOfficeCallback
# 基线地址，用于onlyOffice预览
VITE_API_SPDM_URL=http://192.168.65.161:3000/spdm
# CID地址
VITE_API_CID_URL=http://192.168.65.161:3001
VITE_API_PREFIX_APPROVE=/approve/
VITE_API_PREFIX_CAPABILITY=/capability/
VITE_API_PREFIX_DATA=/data/
VITE_API_PREFIX_PBS=/pbs/
VITE_API_PREFIX_PERFORMANCE=/performance/
VITE_API_PREFIX_PROJECT=/project/
VITE_API_PREFIX_SYSTEM=/system/
VITE_API_PREFIX_TASK=/task/
VITE_API_PREFIX_APPLICATION=/application/
VITE_API_PREFIX_FLOWABLE=/flowable/

4
.env.lyric
View File

@@ -17,8 +17,8 @@ VITE_API_STATIC_FILE=http://192.168.30.147:7115/static
VITE_API_IMAGE_PREVIEW_URL=http://192.168.30.147:7115/imagePreview
# 文件预览地址
VITE_API_FILE_PREVIEW_URL=http://192.168.30.147:7115/preview/onlinePreview
# 文件下载地址（暂未使用）
VITE_API_FILE_URL=http://192.168.30.148:7104
# 文件下载地址
VITE_API_DOWNLOAD_URL=http://192.168.30.146:9000
# onlyOffice服务
VITE_API_ONLYOFFICE_URL=http://192.168.30.148:18888
# onlyOffice回调服务

4
.env.production
View File

@@ -17,8 +17,8 @@ VITE_API_STATIC_FILE=http://192.168.190.161:3000/static
VITE_API_IMAGE_PREVIEW_URL=http://192.168.190.161:3000/imagePreview
# 文件预览地址
VITE_API_FILE_PREVIEW_URL=http://192.168.190.161:3000/preview/onlinePreview
# 文件下载地址（暂未使用）
VITE_API_FILE_URL=http://192.168.190.161:7104
# 文件下载地址
VITE_API_DOWNLOAD_URL=http://192.168.190.161:9000
# onlyOffice服务
VITE_API_ONLYOFFICE_URL=http://192.168.65.161:18888
# onlyOffice回调服务

4
.env.test
View File

@@ -17,8 +17,8 @@ VITE_API_STATIC_FILE=http://192.168.65.161:3000/static
VITE_API_IMAGE_PREVIEW_URL=http://192.168.65.161:3000/imagePreview
# 文件预览地址
VITE_API_FILE_PREVIEW_URL=http://192.168.65.161:3000/preview/onlinePreview
# 文件下载地址（暂未使用）
VITE_API_FILE_URL=http://192.168.65.161:7104
# 文件下载地址
VITE_API_DOWNLOAD_URL=http://192.168.65.161:9000
# onlyOffice服务
VITE_API_ONLYOFFICE_URL=http://192.168.65.161:18888
# onlyOffice回调服务

1
package.json
View File

@@ -10,6 +10,7 @@
"dev": "vite --mode development",
"build:dev": "vite build --mode development",
"build:lyric": "vite build --mode lyric",
"build:eontec": "vite build --mode eontec",
"build:test": "vite build --mode test",
"build:prod": "vite build --mode production",
"build": "run-p type-check \"build-only {@}\" --",

30
src/components/common/filePreview/index.vue
View File

@@ -105,7 +105,7 @@ const initFun = () => {
modeType.value = 'csv';
return;
}
if (enableConfigByTenant([TENANT_ENUM.LYRIC])) {
if (enableConfigByTenant([TENANT_ENUM.LYRIC, TENANT_ENUM.EONTEC])) {
modeType.value = 'kkFile';
diaVisible.value = true;
return;
@@ -134,25 +134,31 @@ const getCsvDataFun = () => {
current: 1,
size: 1,
};
listSimulationKeyResultApi(params).then((res: any) => {
if (res.code === 200) {
csvData.value = res.data?.data[0] || {};
listSimulationKeyResultApi(params)
.then((res: any) => {
if (res.code === 200) {
csvData.value = res.data?.data[0] || {};
}
})
.finally(() => {
diaVisible.value = true;
}
});
});
};
const getOnlyOfficeFun = () => {
const params = {
fileId: props.fileId,
};
downloadFileForEditApi(params).then((res: any) => {
if (res.code === 200) {
fileData.value = JSON.stringify(res.data);
fileKey.value = `${props.fileId}_${getUserId()}`;
downloadFileForEditApi(params)
.then((res: any) => {
if (res.code === 200) {
fileData.value = JSON.stringify(res.data);
fileKey.value = `${props.fileId}_${getUserId()}`;
}
})
.finally(() => {
diaVisible.value = true;
}
});
});
};
const closeFun = () => {

1
src/components/common/table/baseTable.vue
View File

@@ -606,7 +606,6 @@ defineExpose({
setSearchParamsFun,
setSearchParamByKeyFun,
setOptionsFun,
getTableDataFun,
});
</script>

1
src/components/taskDetail/taskInfo.vue
View File

@@ -93,6 +93,7 @@ watch(
expStatus: localDetail.value.expStatus ? '1' : '0',
eMemberList: getMemberListIds(localDetail.value.eMemberList),
pMemberList: getMemberListIds(localDetail.value.pMemberList),
planTime: [localDetail.value.beginTime, localDetail.value.endTime],
});
standard.value = localDetail.value.standard;
if (localDetail.value.flowTemplate) {

5
src/utils/file.ts
View File

@@ -223,7 +223,7 @@ export const exportFile = (api: any, tableName: string, fileName: string, params
export const downloadFileById = async (fileId: number) => {
// 1.点击事件下载
// const link = document.createElement('a');
// link.href = `${env.VITE_API_FILE_URL}/data/downloadFile?fileId=${fileId}`;
// link.href = `${env.VITE_API_DOWNLOAD_URL}/data/downloadFile?fileId=${fileId}`;
// document.body.appendChild(link);
// link.click();
// document.body.removeChild(link);
@@ -232,7 +232,8 @@ export const downloadFileById = async (fileId: number) => {
// 3.浏览器下载
getMinioPresignedUrlApi({ fileId }).then((res: any) => {
if (res.code === 200) {
const downloadUrl = res.data.minioDownloadUrl;
const { minioDownloadUrl } = res.data;
const downloadUrl = env.VITE_API_DOWNLOAD_URL + minioDownloadUrl.split(':9000')[1];
window.open(downloadUrl, '_blank');
}
});

2
src/views/data/analysis/index.vue
View File

@@ -979,7 +979,7 @@ const updatePerformanceFun = async (data: any) => {
const res: any = await editPerformanceApi(data);
if (res && res.code === 200) {
ElMessage.success('操作成功');
tableRef.value.getTableDataFun();
tableRef.value.resetFun();
}
};

9
src/views/data/overview/components/configuration.vue
View File

@@ -22,7 +22,13 @@
<div class="select-content">
<div class="select-content-head">
<el-space>
<el-button type="primary" @click="addSelectLevelFun">添加层级</el-button>
<el-button
type="primary"
@click="addSelectLevelFun"
:disabled="selectLevelFormData.selectLevelList.length >= 10"
>
添加层级
</el-button>
<el-button type="primary" @click="saveSelectLevelFun">保存</el-button>
<el-button type="primary" @click="editFun">编辑</el-button>
</el-space>
@@ -384,6 +390,7 @@ watch(
width: 100%;
flex: 1;
padding: var(--padding-normal) 0;
overflow-y: auto;
.select-level-box {
width: 100%;
display: flex;

3
src/views/data/overview/components/index.vue
View File

@@ -755,6 +755,9 @@ const goDetailFun = (data: any) => {
const mergeCurrentData = ref<any>({});
const choseNodeFun = (mergeData: any) => {
if (isSearching.value) {
isSearching.value = false;
}
mergeCurrentData.value = mergeData;
chosenData.value = [];
let data: any = {};

4
src/views/system/recycleBin/index.vue
View File

@@ -44,7 +44,7 @@
<script setup lang="ts">
import { ref } from 'vue';
import BaseTable from '@/components/common/table/baseTable.vue';
// import BaseTable from '@/components/common/table/baseTable.vue';
import FileTable from '@/components/common/fileTable/index.vue';
import { formatFileSize } from '@/utils/file';
import {
@@ -108,7 +108,7 @@ const clickDeleteFun = () => {
// 清空回收站
const deleteAllLoading = ref(false);
const clearAll = () => {
ElMessageBox.confirm('是否确认清空回收站？', '提示', {
ElMessageBox.confirm('该操作会删除回收站中所有文件，是否继续？', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',