From 3b5bbe49ca6f123494e9d350aad6ce0ea9f8fcaa Mon Sep 17 00:00:00 2001 From: odc.xiaohui <xiaohui@Q1> Date: 星期四, 07 十二月 2023 09:01:42 +0800 Subject: [PATCH] 修改视频专网互联网 --- src/views/index.vue | 7 ++++--- vite.config.ts | 6 +++--- src/utils/request.ts | 18 ------------------ src/api/system/oss/index.ts | 2 +- src/components/FileUpload/index.vue | 7 ++++--- 5 files changed, 12 insertions(+), 28 deletions(-) diff --git a/src/api/system/oss/index.ts b/src/api/system/oss/index.ts index 57c5ad4..df1e717 100644 --- a/src/api/system/oss/index.ts +++ b/src/api/system/oss/index.ts @@ -29,7 +29,7 @@ export function createUser(winIp: string | number | Array<string | number>) { return request({ url: '/auth/auto' , - method: 'put', + method: 'get', data: winIp }); } diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 7d48d16..d7af105 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -165,13 +165,14 @@ const handleUploadSuccess = (res: any, file: UploadFile) => { console.log(res,'resresres'); if (res.code === 200) { - emit('closePopup',res.data) + proxy?.$modal.msgSuccess("涓婁紶鏂囦欢鎴愬姛"); + emit('closePopup',res) console.log('璋冪敤鐖剁粍浠�',res); fileUploadRef.value!.clearFiles() downloadLoadingInstance.close(); - uploadList.value.push({ name: res.data.fileName, url: res.data.url, ossId: res.data.ossId }); - uploadedSuccessfully(); + // uploadList.value.push({ name: res.data.fileName, url: res.data.url, ossId: res.data.ossId }); + // uploadedSuccessfully(); }else if (res.code == 401) { location.reload() } else { diff --git a/src/utils/request.ts b/src/utils/request.ts index ebd7d89..5d688ad 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -114,24 +114,6 @@ console.log(code, 'code=============='); await router.push({ path: '/login' }); - // prettier-ignore - // if (!isRelogin.show) { - // // isRelogin.show = true; - // isRelogin.show = true; - // ElMessageBox.confirm('鐧诲綍鐘舵�佸凡杩囨湡锛屾偍鍙互缁х画鐣欏湪璇ラ〉闈紝鎴栬�呴噸鏂扮櫥褰�', '绯荤粺鎻愮ず', { - // confirmButtonText: '閲嶆柊鐧诲綍', - // cancelButtonText: '鍙栨秷', - // type: 'warning' - // }).then(() => { - // isRelogin.show = false; - // useUserStore().logout().then(() => { - // location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index'; - // }); - // }).catch(() => { - // isRelogin.show = false; - // }); - // } - // return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍銆�'); return } else if (code === HttpStatus.SERVER_ERROR) { console.log(msg); diff --git a/src/views/index.vue b/src/views/index.vue index 2b64254..a404f2d 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -288,9 +288,10 @@ await childFile.value.handleCilck() dialog.visible = false; } -const lookPawsd = async (row: OssVO) => { - console.log(row, row.ossId); - testtxt.value = row.password; +const lookPawsd = async (row:any) => { + console.log(row); + // row.msg = ':/"123456' + testtxt.value = row.msg.slice(2); titleDownload.value = '鏌ョ湅鎻愬彇鐮�' pasTxt.value = '' visibleCode.value = true diff --git a/vite.config.ts b/vite.config.ts index e81bc74..56b88ac 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -26,9 +26,9 @@ open: true, proxy: { [env.VITE_APP_BASE_API]: { - // target: '171.221.173.53:8801', - // target: 'http://80.36.32.175:8080', - target: 'http://192.168.3.228:8080', + // target: 'http://192.168.3.43:8080', + target: 'http://172.35.50.34:8080', + // target: 'http://192.168.3.228:8080', changeOrigin: true, rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '') } -- Gitblit v1.8.0