From 86a701ce885871d2468ec31eb13be5595673a01b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 10:24:13 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持
---
web_src/src/components/dialog/importChannel.vue | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/web_src/src/components/dialog/importChannel.vue b/web_src/src/components/dialog/importChannel.vue
old mode 100644
new mode 100755
index 6d83819..e61b642
--- a/web_src/src/components/dialog/importChannel.vue
+++ b/web_src/src/components/dialog/importChannel.vue
@@ -14,8 +14,11 @@
<el-upload
class="upload-box"
drag
- action="debug/api/push/upload"
+ :action="uploadUrl"
name="file"
+ :headers="headers"
+ :on-success="successHook"
+ :on-error="errorHook"
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
@@ -23,14 +26,21 @@
</el-upload>
</div>
</el-dialog>
+ <ShowErrorData ref="showErrorData" :gbIds="errorGBIds" :streams="errorStreams" ></ShowErrorData>
</div>
</template>
<script>
+import ShowErrorData from './importChannelShowErrorData.vue'
+
+import userService from "../service/UserService";
+
export default {
name: "importChannel",
- computed: {},
+ components: {
+ ShowErrorData,
+ },
created() {},
data() {
return {
@@ -38,6 +48,12 @@
showDialog: false,
isLoging: false,
isEdit: false,
+ errorStreams: [],
+ errorGBIds: [],
+ headers: {
+ "access-token": userService.getToken()
+ },
+ uploadUrl: process.env.NODE_ENV === 'development'? `http://127.0.0.1:8080/debug/api/push/upload`: (window.baseUrl ? window.baseUrl : "") + `/api/push/upload`,
};
},
methods: {
@@ -72,8 +88,35 @@
},
close: function () {
this.showDialog = false;
- this.$refs.form.resetFields();
},
+ successHook: function(response, file, fileList){
+ if (response.code === 0) {
+ this.$message({
+ showClose: true,
+ message: response.msg,
+ type: "success",
+ });
+ }else if (response.code === 1) {
+ this.errorGBIds = response.data.gbId
+ this.errorStreams = response.data.stream
+ console.log(this.$refs)
+ console.log(this.$refs.showErrorData)
+ this.$refs.showErrorData.openDialog()
+ }else {
+ this.$message({
+ showClose: true,
+ message: response.msg,
+ type: "error",
+ });
+ }
+ },
+ errorHook: function (err, file, fileList) {
+ this.$message({
+ showClose: true,
+ message: err,
+ type: "error",
+ });
+ }
},
};
</script>
@@ -81,4 +124,8 @@
.upload-box{
text-align: center;
}
+.errDataBox{
+ max-height: 15rem;
+ overflow: auto;
+}
</style>
--
Gitblit v1.8.0