From f34f2fda119d271a9bd0c281c03464181988ea2a Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期三, 20 十二月 2023 16:57:03 +0800
Subject: [PATCH] 互联网
---
src/views/index.vue | 4 ++--
vite.config.ts | 4 ++--
src/components/FileUpload/index.vue | 9 +++++----
src/views/system/oss/index.vue | 2 +-
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 1613f02..2082e70 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -16,6 +16,7 @@
>
<!-- 涓婁紶鎸夐挳 -->
<el-button type="primary">閫夊彇鏂囦欢</el-button>
+<!-- <el-progress :percentage="downloadProgress" />-->
</el-upload>
<!-- 涓婁紶鎻愮ず -->
<div class="el-upload__tip" v-if="showTip">
@@ -62,7 +63,7 @@
);
const fileUploadRef = ref<ElUploadInstance>();
-
+const downloadProgress = ref(0);
// watch(() => props.modelValue, async val => {
// console.log(val,props.modelValue);
// if (val) {
@@ -170,9 +171,9 @@
}
}
const handleUploadProgress=(e: any) => {
- debounce(() =>{
- emit('closePopup','123123');
- },1500)
+ // downloadProgress.value = downloadProgress.value + 50
+ // emit('closePopup','123123');
+ emit('openPopup','123123');
}
// 涓婁紶鎴愬姛鍥炶皟
const handleUploadSuccess = (res: any, file: UploadFile) => {
diff --git a/src/views/index.vue b/src/views/index.vue
index 07c0b53..b28bd2d 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -66,7 +66,7 @@
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="ossFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="鏂囦欢鍚�">
- <fileUpload ref="childFile" @closePopup="getList();lookPawsd($event)" v-model="form.file" v-if="type === 0" />
+ <fileUpload ref="childFile" @closePopup="getList();lookPawsd($event)" @openPopup="lookPawsd($event)" v-model="form.file" v-if="type === 0" />
<imageUpload v-model="form.file" v-if="type === 1" />
<video-upload v-model="form.file" v-if="type === 2" />
</el-form-item>
@@ -360,7 +360,7 @@
dialogVisible.value = false;
clearInterval(state.mytime);
state.mytime = 0;
- testtxt.value = row.password;
+ testtxt.value = row.msg;
// testtxt.value = row.msg.slice(2);
titleDownload.value = '鏌ョ湅鎻愬彇鐮�'
pasTxt.value = ''
diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index 786012e..39796d3 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -66,7 +66,7 @@
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="ossFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="鏂囦欢鍚�">
- <fileUpload ref="childFile" @closePopup="getList();lookPawsd($event)" v-model="form.file" v-if="type === 0" />
+ <fileUpload ref="childFile" @closePopup="getList();lookPawsd($event)" @openPopup="lookPawsd($event)" v-model="form.file" v-if="type === 0" />
<imageUpload v-model="form.file" v-if="type === 1" />
<video-upload v-model="form.file" v-if="type === 2" />
</el-form-item>
diff --git a/vite.config.ts b/vite.config.ts
index fe667e0..a4437a1 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -38,8 +38,8 @@
open: true,
proxy: {
[env.VITE_APP_BASE_API]: {
- // target: 'http://192.168.3.43:8080',
- target: 'http://172.35.50.34:8080',
+ target: 'http://162.14.79.111:2023',
+ // target: 'http://172.35.50.34:8080',
// target: 'http://192.168.3.43:8080',
changeOrigin: true,
rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')
--
Gitblit v1.8.0