From 5e703caeaef46f0c30db60c46054b5b522b2c106 Mon Sep 17 00:00:00 2001 From: yue <2726433266@qq.com> Date: Mon, 16 Dec 2024 17:22:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B2=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/sys/role.vue | 298 +++++++----- src/views/modules/sys/user-add-or-update.vue | 377 ++++++++------- src/views/modules/sys/user.vue | 306 ++++++------ .../wx/account/wx-account-access-info.vue | 115 ++--- .../wx/account/wx-account-add-or-update.vue | 259 +++++----- .../modules/wx/article-add-or-update.vue | 62 ++- src/views/modules/wx/article.vue | 60 ++- .../modules/wx/assets/assets-selector.vue | 80 ++-- .../wx/assets/material-file-add-or-update.vue | 219 +++++---- src/views/modules/wx/assets/material-file.vue | 388 ++++++++------- .../wx/assets/material-news-add-or-update.vue | 449 +++++++++--------- src/views/modules/wx/assets/material-news.vue | 49 +- .../wx/msg-reply-rule-add-or-update.vue | 106 +++-- src/views/modules/wx/msg-reply-rule.vue | 67 ++- .../modules/wx/msg-template-add-or-update.vue | 354 +++++++------- src/views/modules/wx/msg-template.vue | 213 ++++++--- src/views/modules/wx/template-msg-log.vue | 92 ++-- src/views/modules/wx/wx-account.vue | 152 +++--- src/views/modules/wx/wx-assets.vue | 68 +-- .../modules/wx/wx-menu-button-editor.vue | 115 +++-- 20 files changed, 2205 insertions(+), 1624 deletions(-) diff --git a/src/views/modules/sys/role.vue b/src/views/modules/sys/role.vue index 000c3188..0d0eb2b0 100644 --- a/src/views/modules/sys/role.vue +++ b/src/views/modules/sys/role.vue @@ -1,132 +1,168 @@ - + - + \ No newline at end of file diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue index 7db0c06e..df4336eb 100644 --- a/src/views/modules/sys/user-add-or-update.vue +++ b/src/views/modules/sys/user-add-or-update.vue @@ -1,177 +1,202 @@ - + - + \ No newline at end of file diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue index 6454a769..a63cec29 100644 --- a/src/views/modules/sys/user.vue +++ b/src/views/modules/sys/user.vue @@ -1,140 +1,168 @@ - + - + \ No newline at end of file diff --git a/src/views/modules/wx/account/wx-account-access-info.vue b/src/views/modules/wx/account/wx-account-access-info.vue index fb1f853e..6ee96b14 100644 --- a/src/views/modules/wx/account/wx-account-access-info.vue +++ b/src/views/modules/wx/account/wx-account-access-info.vue @@ -1,54 +1,63 @@ - + - - + + + \ No newline at end of file diff --git a/src/views/modules/wx/account/wx-account-add-or-update.vue b/src/views/modules/wx/account/wx-account-add-or-update.vue index 27090997..dc23c56d 100644 --- a/src/views/modules/wx/account/wx-account-add-or-update.vue +++ b/src/views/modules/wx/account/wx-account-add-or-update.vue @@ -1,118 +1,145 @@ - + + \ No newline at end of file diff --git a/src/views/modules/wx/article-add-or-update.vue b/src/views/modules/wx/article-add-or-update.vue index f400a3a8..ada31ed7 100644 --- a/src/views/modules/wx/article-add-or-update.vue +++ b/src/views/modules/wx/article-add-or-update.vue @@ -1,68 +1,101 @@ + \ No newline at end of file diff --git a/src/views/modules/wx/article.vue b/src/views/modules/wx/article.vue index 076d1606..20792861 100644 --- a/src/views/modules/wx/article.vue +++ b/src/views/modules/wx/article.vue @@ -1,37 +1,56 @@ + \ No newline at end of file diff --git a/src/views/modules/wx/assets/assets-selector.vue b/src/views/modules/wx/assets/assets-selector.vue index 1123ea88..9f76cf10 100644 --- a/src/views/modules/wx/assets/assets-selector.vue +++ b/src/views/modules/wx/assets/assets-selector.vue @@ -1,38 +1,44 @@ - - \ No newline at end of file diff --git a/src/views/modules/wx/assets/material-file-add-or-update.vue b/src/views/modules/wx/assets/material-file-add-or-update.vue index 5f7c8d02..fd658130 100644 --- a/src/views/modules/wx/assets/material-file-add-or-update.vue +++ b/src/views/modules/wx/assets/material-file-add-or-update.vue @@ -1,103 +1,118 @@ - + - + \ No newline at end of file diff --git a/src/views/modules/wx/assets/material-file.vue b/src/views/modules/wx/assets/material-file.vue index cc0b0180..edb2a1b7 100644 --- a/src/views/modules/wx/assets/material-file.vue +++ b/src/views/modules/wx/assets/material-file.vue @@ -1,185 +1,207 @@ - - - \ No newline at end of file diff --git a/src/views/modules/wx/assets/material-news-add-or-update.vue b/src/views/modules/wx/assets/material-news-add-or-update.vue index c2df6169..4198f8eb 100644 --- a/src/views/modules/wx/assets/material-news-add-or-update.vue +++ b/src/views/modules/wx/assets/material-news-add-or-update.vue @@ -1,221 +1,232 @@ - + - - \ No newline at end of file diff --git a/src/views/modules/wx/assets/material-news.vue b/src/views/modules/wx/assets/material-news.vue index 42836b75..e3909200 100644 --- a/src/views/modules/wx/assets/material-news.vue +++ b/src/views/modules/wx/assets/material-news.vue @@ -1,26 +1,45 @@ + \ No newline at end of file diff --git a/src/views/modules/wx/msg-template-add-or-update.vue b/src/views/modules/wx/msg-template-add-or-update.vue index 199aed64..73f63324 100644 --- a/src/views/modules/wx/msg-template-add-or-update.vue +++ b/src/views/modules/wx/msg-template-add-or-update.vue @@ -1,165 +1,195 @@ - + - - \ No newline at end of file diff --git a/src/views/modules/wx/msg-template.vue b/src/views/modules/wx/msg-template.vue index 49e12606..5df70f18 100644 --- a/src/views/modules/wx/msg-template.vue +++ b/src/views/modules/wx/msg-template.vue @@ -1,36 +1,55 @@ + \ No newline at end of file diff --git a/src/views/modules/wx/wx-account.vue b/src/views/modules/wx/wx-account.vue index 9f3a3e5b..599dd413 100644 --- a/src/views/modules/wx/wx-account.vue +++ b/src/views/modules/wx/wx-account.vue @@ -1,41 +1,42 @@ \ No newline at end of file diff --git a/src/views/modules/wx/wx-menu-button-editor.vue b/src/views/modules/wx/wx-menu-button-editor.vue index 723e592d..3da8f2fc 100644 --- a/src/views/modules/wx/wx-menu-button-editor.vue +++ b/src/views/modules/wx/wx-menu-button-editor.vue @@ -1,38 +1,38 @@ - + \ No newline at end of file diff --git a/src/views/common/theme.vue b/src/views/common/theme.vue index 1aeccbcb..388b2ff6 100644 --- a/src/views/common/theme.vue +++ b/src/views/common/theme.vue @@ -1,33 +1,53 @@ - + - + \ No newline at end of file diff --git a/src/views/modules/oss/oss-config.vue b/src/views/modules/oss/oss-config.vue index 484f90d5..ae429ca5 100644 --- a/src/views/modules/oss/oss-config.vue +++ b/src/views/modules/oss/oss-config.vue @@ -1,127 +1,150 @@ - + - + \ No newline at end of file diff --git a/src/views/modules/oss/oss-uploader-tencent.vue b/src/views/modules/oss/oss-uploader-tencent.vue index d3dac232..81e3ddb2 100644 --- a/src/views/modules/oss/oss-uploader-tencent.vue +++ b/src/views/modules/oss/oss-uploader-tencent.vue @@ -1,87 +1,105 @@ - - + +
+ + + +
{{uploading ? infoText : '上传文件'}}
+
+ + + - - + }, + mounted() { + // 组件加载完毕后,发起请求获取 COS 配置数据 + this.$http({ + url: this.$http.adornUrl('/sys/oss/config'), + method: 'get', + params: this.$http.adornParams() // 传递请求参数 + }).then(({ data }) => { + if (data && data.code === 200) { + // 如果获取成功,保存配置数据 + this.cosConfig = data.config; + // 初始化腾讯云 COS 实例 + cos = new COS({ + SecretId: data.config.qcloudSecretId, + SecretKey: data.config.qcloudSecretKey, + }); + } else { + // 配置获取失败,提示错误信息 + this.$message.error('请先配置云存储相关信息!'); + } + }) + }, + methods: { + // 选择文件的方法 + selectFile() { + // 如果当前没有文件正在上传,点击触发文件选择框 + if (!this.uploading) { + this.$refs.fileInput.click(); + } + }, + // 文件选择后触发的回调方法 + onFileChange() { + let file = this.$refs.fileInput.files[0]; // 获取选中的文件 + this.uploading = true; // 设置上传状态为 true + let now = new Date(); + // 生成上传文件的存储路径(包括日期和时间戳确保路径唯一) + let path = now.toISOString().slice(0, 10) + '/' + now.getTime() + file.name.substr(file.name.lastIndexOf('.')); + + // 调用腾讯云 COS 上传文件方法 + cos.putObject({ + Bucket: this.cosConfig.qcloudBucketName, // 必须指定的桶名称 + Region: this.cosConfig.qcloudRegion, // 必须指定的区域 + Key: path, // 文件存储路径(文件名) + Body: file, // 上传的文件对象 + onProgress: (progressData) => { // 上传进度回调 + // 更新上传进度提示文本 + this.infoText = '上传中:' + (progressData.percent * 100).toFixed(2) + '%'; + } + }, (err, data) => { + // 上传完成后回调,处理成功和失败的情况 + console.log(err || data); + this.uploading = false; // 上传状态恢复为 false + if (data) { + // 上传成功,更新提示文本 + this.infoText = '上传文件'; + // 生成文件访问的 URL + let fileUrl = 'https://' + this.cosConfig.qcloudBucketName + '.cos.' + this.cosConfig.qcloudRegion + '.myqcloud.com/' + path; + this.saveUploadResult(fileUrl); // 保存上传结果 + } else { + // 上传失败,显示错误消息 + this.$message.error('文件上传失败', err); + } + }); + }, + // 保存上传结果(上传成功后调用,传入文件的访问 URL) + saveUploadResult(url) { + this.$http({ + url: this.$http.adornUrl('/sys/oss/upload'), + method: 'post', + data: { url: url } // 将上传的文件 URL 传给服务器 + }).then(({ data }) => { + // 上传成功后,触发 `uploaded` 事件,将文件 URL 传递给父组件 + this.$emit('uploaded', url); + }) + } + } + } + + + + \ No newline at end of file diff --git a/src/views/modules/oss/oss-uploader.vue b/src/views/modules/oss/oss-uploader.vue index e013aace..64bc5914 100644 --- a/src/views/modules/oss/oss-uploader.vue +++ b/src/views/modules/oss/oss-uploader.vue @@ -1,59 +1,73 @@ - - + + \ No newline at end of file diff --git a/src/views/modules/oss/oss.vue b/src/views/modules/oss/oss.vue index 35fdcbeb..4c403ce3 100644 --- a/src/views/modules/oss/oss.vue +++ b/src/views/modules/oss/oss.vue @@ -39,108 +39,79 @@ diff --git a/src/views/modules/sys/config-add-or-update.vue b/src/views/modules/sys/config-add-or-update.vue index 26b6aa1a..898bfb61 100644 --- a/src/views/modules/sys/config-add-or-update.vue +++ b/src/views/modules/sys/config-add-or-update.vue @@ -1,96 +1,117 @@ diff --git a/src/views/modules/sys/config.vue b/src/views/modules/sys/config.vue index 6a7517b5..b20162c1 100644 --- a/src/views/modules/sys/config.vue +++ b/src/views/modules/sys/config.vue @@ -1,134 +1,172 @@ diff --git a/src/views/modules/sys/log.vue b/src/views/modules/sys/log.vue index 117b2ac8..5223704c 100644 --- a/src/views/modules/sys/log.vue +++ b/src/views/modules/sys/log.vue @@ -1,90 +1,107 @@ diff --git a/src/views/modules/sys/menu-add-or-update.vue b/src/views/modules/sys/menu-add-or-update.vue index 2d49a09f..ccee5e29 100644 --- a/src/views/modules/sys/menu-add-or-update.vue +++ b/src/views/modules/sys/menu-add-or-update.vue @@ -1,218 +1,253 @@ - - - - + + \ No newline at end of file diff --git a/src/views/modules/sys/menu.vue b/src/views/modules/sys/menu.vue index ad3fb1bc..bcdbd004 100644 --- a/src/views/modules/sys/menu.vue +++ b/src/views/modules/sys/menu.vue @@ -1,109 +1,148 @@ - - + + \ No newline at end of file diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue index 641f01c2..c02f64e5 100644 --- a/src/views/modules/sys/role-add-or-update.vue +++ b/src/views/modules/sys/role-add-or-update.vue @@ -1,111 +1,148 @@ - - + + \ No newline at end of file -- 2.34.1