From cfa5f387337a497fed7e70775855d93f7cb6addf Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期日, 30 七月 2023 17:10:45 +0800
Subject: [PATCH] 7.30提交
---
ruoyi-ui/src/api/honor/index.js | 2 +-
ruoyi-ui/src/api/wish/index.js | 26 +++++++++++++++++---------
ruoyi-ui/src/views/wish/index.vue | 8 ++++----
3 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/ruoyi-ui/src/api/honor/index.js b/ruoyi-ui/src/api/honor/index.js
index 321d37a..9a1fe90 100644
--- a/ruoyi-ui/src/api/honor/index.js
+++ b/ruoyi-ui/src/api/honor/index.js
@@ -11,7 +11,7 @@
// 鏍规嵁id鏌ヨ璁板綍
export function getHonor(id) {
return request({
- url: '/zHonor/id=${id}',
+ url: '/zHonor/'+ id,
method: 'get',
})
diff --git a/ruoyi-ui/src/api/wish/index.js b/ruoyi-ui/src/api/wish/index.js
index eb4e58c..756153e 100644
--- a/ruoyi-ui/src/api/wish/index.js
+++ b/ruoyi-ui/src/api/wish/index.js
@@ -53,6 +53,14 @@
data: data
})
}
+//涓婁紶鏂囦欢
+export function enload(data) {
+ return request({
+ url: '/zIdea/importData',
+ method: 'post',
+ data: data
+ })
+}
//涓嬭浇鏂囦欢
export function download(data) {
return request({
@@ -62,12 +70,12 @@
responseType: 'blob'
})
}
-//瀵煎叆妯℃澘
-export function downloadModel(data) {
- return request({
- url: '/zIdea/model',
- method: 'get',
- params: data,
- responseType: 'blob'
- })
-}
+// //瀵煎叆妯℃澘
+// export function downloadModel(data) {
+// return request({
+// url: '/zIdea/model',
+// method: 'get',
+// params: data,
+// responseType: 'blob'
+// })
+// }
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index 8726ac1..6a8655e 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -395,8 +395,8 @@
//瀵煎叆鎺ュ彛鍑芥暟
-import {listWish, getWish, addWish,updateWish, delWish,uploadPic,downloadModel} from "@/api/wish/index";
-import {enload} from "@/api/doctor";
+import {listWish, getWish, addWish,updateWish, delWish,uploadPic,downloadModel,enload} from "@/api/wish/index";
+
import {Message} from "element-ui";
@@ -783,11 +783,11 @@
if(Ids.length==0)
{
- this.download('zIdea/export', {
+ this.download('/zIdea/export', {
...this.queryParams
}, `zIdea_${new Date().getTime()}.xlsx`)
}else{
- this.download('zIdea/export1/'+Ids, {
+ this.download('/zIdea/export1/'+Ids, {
}, `zIdea_${new Date().getTime()}.xlsx`)
}
},
--
Gitblit v1.9.1