From 274fdb99d22987ed058f48e71d6b4f4f08f6ca03 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 07 十二月 2023 11:16:57 +0800
Subject: [PATCH] 导出下载错误信息更改
---
Source/UBCS-WEB/src/components/Master/MasterTransfer.vue | 32 +++++-----
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 39 +++++++------
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 8 +-
Source/UBCS-WEB/src/components/BatchImport/index.vue | 3
Source/UBCS-WEB/src/views/modeling/Business.vue | 60 ++++++++++++-------
5 files changed, 80 insertions(+), 62 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index cb8caaa..d9f082b 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -61,7 +61,7 @@
>
</el-upload>
<template #footer>
- <div style="display: inline-block">
+ <div style="display: inline-block" v-if="type != 'groupCode'">
<el-button
v-if="type !== 'bulkEdit' "
:loading="downloadLoading"
@@ -323,6 +323,7 @@
}
},
onSuccess(res) {
+ console.log(res)
if (Object.keys(res.data).length === 0) {
this.$message.success(this.title + "瀵煎叆鎴愬姛锛�");
this.resetTable()
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
index 00d593e..08d4d34 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -122,20 +122,22 @@
},
methods: {
handlerFile(res) {
- let reader = new FileReader();
- reader.readAsText(res.data);
- reader.onload = (result) => {
- try {
- let resData = JSON.parse(result.target.result); // 瑙ｆ瀽瀵硅薄鎴愬姛
- if (resData.code != 200) {
- this.$message.error(resData.msg);
- }
- } catch (err) {
- // console.log("err",err)// 瑙ｆ瀽鎴愬璞″け璐ワ紝璇存槑鏄甯哥殑鏂囦欢娴�
- func.downloadFileByBlobHandler(res);
- this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
- }
- };
+ // let reader = new FileReader();
+ // reader.readAsText(res.data);
+ // reader.onload = (result) => {
+ // try {
+ // let resData = JSON.parse(result.target.result); // 瑙ｆ瀽瀵硅薄鎴愬姛
+ // if (resData.code != 200) {
+ // this.$message.error(resData.msg);
+ // }
+ // } catch (err) {
+ // // 瑙ｆ瀽鎴愬璞″け璐ワ紝璇存槑鏄甯哥殑鏂囦欢娴�
+ // func.downloadFileByBlobHandler(res);
+ // this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
+ // }
+ // };
+ func.downloadFileByBlobHandler(res);
+ this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
},
escHandler() {
this.$emit('update:visible', false);
@@ -257,7 +259,7 @@
page: start,
endPage: end
}).then(res => {
- console.log('res', res)
+ // console.log('res', res)
this.handlerFile(res);
this.escHandler();
})
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 4157faa..92973d5 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -578,24 +578,27 @@
exportGroupCodeExcel({
codeClassifyOid: this.codeClassifyOid,
}).then(res => {
- let reader = new FileReader();
- reader.readAsText(res.data)
- reader.onload = (result) => {
- try {
- let resData = JSON.parse(result.target.result); // 瑙ｆ瀽瀵硅薄鎴愬姛
- if (!resData.success) {
- console.log("resData", resData)
- this.$message.error(resData.msg);
- this.isLoading = false;
- }
- } catch (err) {
- // console.log("err",err)// 瑙ｆ瀽鎴愬璞″け璐ワ紝璇存槑鏄甯哥殑鏂囦欢娴�
- func.downloadFileByBlobHandler(res);
- this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
- this.isLoading = false;
- }
- };
-
+ // let reader = new FileReader();
+ // reader.readAsText(res.data);
+ // reader.onload = () => {
+ // try {
+ // let resData = JSON.parse(reader.result); // 瑙ｆ瀽瀵硅薄鎴愬姛
+ // if (!resData.success) {
+ // this.$message.error(resData.msg);
+ // this.isLoading = false;
+ // }
+ // } catch (err) {
+ // // 瑙ｆ瀽鎴愬璞″け璐ワ紝璇存槑鏄甯哥殑鏂囦欢娴�
+ // func.downloadFileByBlobHandler(res);
+ // this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
+ // this.isLoading = false;
+ // }
+ // };
+ func.downloadFileByBlobHandler(res);
+ this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
+ this.isLoading = false;
+ }).catch(error=>{
+ this.$message.error(error);
});
},
//鏍囧噯鐢宠
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 0fe3d8e..a8f99fe 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -892,7 +892,6 @@
this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
return;
}
- console.log(this.nodeClickList.oid)
flowingDependencyGen(this.nodeClickList.oid).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
}).catch(res => {
@@ -902,7 +901,6 @@
// switch
switchChange() {
this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue === true ? 1 : 0;
- // console.log(this.TreeAddform.isParticipateCheck)
},
//瀛樺偍鐨勪笟鍔＄被鍨嬪叧闂�
BtmEscHandler() {
@@ -1346,7 +1344,7 @@
});
}
} catch (error) {
- console.error(error);
+ // console.error(error);
} finally {
this.loading = false;
}
@@ -1389,7 +1387,7 @@
});
}
} catch (error) {
- console.error(error);
+ // console.error(error);
} finally {
this.loading = false;
}
@@ -1459,7 +1457,7 @@
}
},
treeClick(e) {
- console.log(e);
+ // console.log(e);
},
//鍩烘湰淇℃伅琛ㄥ崟鍒锋柊
referTreeForm() {
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index eef4952..8bbac5a 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -1,24 +1,24 @@
<template>
<el-container>
- <el-header class="businessHeader" style="height: 40px;padding:0 8px">
- <div>
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" size="small" type="primary" @click="businessAdd" plain>
- 鏂板
- </el-button>
- <el-button v-if="permissionList.editBtn" icon="el-icon-edit" size="small" type="primary" @click="businessEdit" plain>
- 淇敼
- </el-button>
- <el-button v-if="permissionList.table" icon="el-icon-thumb" size="small" type="primary"
- @click="selectFromTable" plain> 浠庡凡鏈変腑鑾峰彇
- </el-button>
- </div>
- </el-header>
+<!-- <el-header class="businessHeader" style="height: 40px;padding:0 8px">-->
+
+<!-- </el-header>-->
<el-container>
- <el-aside style="width:250px">
+ <el-aside>
<basic-container class="businessTreeContainer">
<div class="app">
- <p style="margin-top: 10px;font-weight: 570;font-size: 19px">{{ treeOption.title }}</p>
- <avue-tree id="basic" :data="treeData" :option="treeOption" class="businessTree" @node-click="nodeClick">
+ <div style="display: flex;margin-bottom: 10px;justify-content: space-around;">
+ <el-button v-if="permissionList.addBtn" size="mini" type="primary" @click="businessAdd" plain style="width: 60px">
+ 鏂板
+ </el-button>
+ <el-button v-if="permissionList.editBtn" size="mini" type="primary" @click="businessEdit" plain style="width: 60px">
+ 淇敼
+ </el-button>
+ <el-button v-if="permissionList.table" size="mini" type="primary"
+ @click="selectFromTable" plain> 浠庡凡鏈変腑鑾峰彇
+ </el-button>
+ </div>
+ <avue-tree :data="treeData" :option="treeOption" class="businessTree" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span>
<i :class="(node || {}).level === 2 ? 'el-icon-star-off' : 'el-icon-folder-opened'"></i>
@@ -382,10 +382,6 @@
</script>
<style lang="scss">
-#basic {
- height: 770px;
- border-radius: 10px;
-}
.businessCrud > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu {
display: none !important;
@@ -395,6 +391,24 @@
display: none !important;
}
-.businessTreeContainer > .el-card > .el-card__body {
- height: 775px;
-}</style>
+
+.app {
+ overflow: auto;
+ height: calc(100vh - 150px);
+}
+
+.app::-webkit-scrollbar {
+ height: 15px; // 绾靛悜婊氬姩鏉� 蹇呭啓
+ background: white;
+ border: white;
+ width: 10px;
+
+}
+
+// 婊氬姩鏉＄殑婊戝潡
+.app::-webkit-scrollbar-thumb {
+ background-color: #ececec;
+ border-radius: 20px;
+ border: #ececec;
+}
+</style>
--
Gitblit v1.9.3