diff --git a/app/components.d.ts b/app/components.d.ts index 9619d73..d200d25 100644 --- a/app/components.d.ts +++ b/app/components.d.ts @@ -26,6 +26,7 @@ declare module 'vue' { NInputGroup: typeof import('naive-ui')['NInputGroup'] NMessageProvider: typeof import('naive-ui')['NMessageProvider'] NModal: typeof import('naive-ui')['NModal'] + NPopconfirm: typeof import('naive-ui')['NPopconfirm'] NQrCode: typeof import('naive-ui')['NQrCode'] NRadio: typeof import('naive-ui')['NRadio'] NRadioGroup: typeof import('naive-ui')['NRadioGroup'] diff --git a/app/components/EditUserInfo.vue b/app/components/EditUserInfo.vue index 9eea70a..b4a91d0 100644 --- a/app/components/EditUserInfo.vue +++ b/app/components/EditUserInfo.vue @@ -1,23 +1,23 @@ diff --git a/app/pages/publish-model/index.vue b/app/pages/publish-model/index.vue index 39424d8..0d08d80 100644 --- a/app/pages/publish-model/index.vue +++ b/app/pages/publish-model/index.vue @@ -4,6 +4,7 @@ import EditVersion from "@/components/publishModel/EditVersion.vue"; import UploadImg from "@/components/publishModel/UploadImg.vue"; import { NConfigProvider, NMessageProvider } from "naive-ui"; import { useRoute } from "vue-router"; +const message = useMessage(); const route = useRoute(); const { type, id } = route.query; @@ -31,6 +32,9 @@ async function initFormData() { modelVersionList: [ { + objectKey:null, + id:null, + isEncrypt:0, delFlag: "0", // 0代表存在 2代表删除 versionName: "", // 版本名称 modelVersionType: null, // 基础模型 @@ -97,8 +101,24 @@ const timeLineList = ref([ index: 3, }, ]); -function nextStep() { - currentStep.value += 1; +async function nextStep() { + if(currentStep.value === 1){ + const name = formData.value.modelProduct.modelName + try { + const res = await request.get(`/file/selectFile?type=model&name=${name}`); + if (res.code == 200) { + if(res.data === 1){ //存在为0 不存在为1 + currentStep.value += 1; + }else{ + message.warning('该模型名称已存在') + } + } + } catch (err) { + console.log(err); + } + }else{ + currentStep.value += 1; + } } function prevStep() { currentStep.value -= 1; diff --git a/app/pages/publish-workflow/index.vue b/app/pages/publish-workflow/index.vue index 960975c..34e78e5 100644 --- a/app/pages/publish-workflow/index.vue +++ b/app/pages/publish-workflow/index.vue @@ -24,6 +24,7 @@ async function initFormData() { }, workFlowVersionList: [ { + id:null, versionName: "", hideGenInfo: 0, // 是否隐藏图片生成信息 versionDescription: "", // 富文本 @@ -70,8 +71,21 @@ const currentStep = ref(1); function handleAddVersion() { EditVersionRef.value.addVersion(); } -function nextStep() { - currentStep.value += 1; +async function nextStep() { + // currentStep.value += 1; + if(currentStep.value === 1){ + const name = formData.value.workFlow.workflowName + try { + const res = await request.get(`/file/selectFile?type=workflow&name=${name}`); + if (res.code == 200) { + currentStep.value += 1; + } + } catch (err) { + console.log(err); + } + }else{ + currentStep.value += 1; + } } function preStep() { currentStep.value -= 1; diff --git a/app/stores/user.ts b/app/stores/user.ts index 14afa2c..83eeb8d 100644 --- a/app/stores/user.ts +++ b/app/stores/user.ts @@ -24,6 +24,7 @@ export const useUserStore = defineStore('user', () => { function setUserInfo(info: any) { userInfo.value = info + debugger } async function getUserInfo() { const res = await request.get('/system/user/selectUserById', { @@ -36,6 +37,7 @@ export const useUserStore = defineStore('user', () => { } // 登出 function logout() { + console.log('object-------out'); isLoggedIn.value = false token.value = '' userInfo.value = {} as UserInfoType diff --git a/app/utils/request.ts b/app/utils/request.ts index b171e3d..57b7c0e 100644 --- a/app/utils/request.ts +++ b/app/utils/request.ts @@ -28,12 +28,14 @@ class RequestHttp { this.instance.interceptors.request.use( (config:any) => { const userStore = useUserStore() - const isToken = (config.headers || {}).isToken === false if (userStore.token && !isToken) { config.headers.Authorization = `Bearer ${userStore.token}` // 让每个请求携带自定义token 请根据实际情况自行修改 } + // if (userStore.token && !isToken) { + // config.headers.Authorization = `Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjA1NDk1MmNmLTg2YTgtNDZkNC05OWU0LWUzYzU5ODFjZGE2OSJ9.fifWwKgHIswkqGLqp71BWx-UJjv_qYiPO_XeMYt2HkzLfEoDVVpdHysebp_2XNWdjLi4weRga1GzlUBdW_xebw` // 让每个请求携带自定义token 请根据实际情况自行修改 + // } // 开启 loading if (config.loading) { loadingBar.start() @@ -59,7 +61,6 @@ class RequestHttp { this.handleError(data.code) // token过期以后，需要重新登录 if (data.code === 401) { - debugger // message.error(data.message || '登录已过期,请重新登录') // const modalStore = useModalStore() const modalStore = useModalStore(); @@ -67,8 +68,8 @@ class RequestHttp { const userStore = useUserStore() try { // eslint-disable-next-line ts/no-use-before-define - await request.post('/logout') - userStore.logout() + // await request.post('/logout') + // userStore.logout() // navigateTo('/model-square') } catch (error) { diff --git a/app/utils/uploadImg.ts b/app/utils/uploadImg.ts index 2b1b4dc..1ae8b7a 100644 --- a/app/utils/uploadImg.ts +++ b/app/utils/uploadImg.ts @@ -57,8 +57,9 @@ export async function uploadFileBatches(files, batchSize = 3) { uploadResults.push(res.data) } catch (error) { - console.error(`文件上传失败: ${file.name}`, error) - uploadResults.push({ success: false, error }) + throw new Error(`上传第 ${i + 1} 个文件失败!`); + // console.error(`文件上传失败: ${file.name}`, error) + // uploadResults.push({ success: false, error }) } } return uploadResults diff --git a/nuxt.config.ts b/nuxt.config.ts index 8981dc3..cd055dc 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -83,8 +83,8 @@ export default defineNuxtConfig({ devProxy: { '/api': { // target: 'http://1.13.246.108:8080', // 线上 - target: 'http://192.168.2.10:8080', // 代 - // target: 'http://192.168.1.69:8080', // 嗨 + // target: 'http://192.168.2.10:8080', // 代 + target: 'http://192.168.2.7:8080', // 嗨 // target: 'https://2d1a399f.r27.cpolar.top', // 嗨 changeOrigin: true, prependPath: true,