diff --git a/package.json b/package.json index 8b6a539..f6496e0 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "url": "https://gitee.com/y_project/RuoYi-Vue.git" }, "dependencies": { + "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "0.4.0", "axios": "0.18.1", "clipboard": "2.0.4", diff --git a/src/api/work/orderHistory.js b/src/api/work/orderHistory.js index ac2b5a8..fc388e1 100644 --- a/src/api/work/orderHistory.js +++ b/src/api/work/orderHistory.js @@ -26,4 +26,11 @@ export function giveUpNote(params) { url: '/order/giveUpNote', params }); +} +// 获取导出 +export function exportExcelTxt(params) { + return request({ + url: '/order/export', + params + }); } \ No newline at end of file diff --git a/src/main.js b/src/main.js index 64fa077..057d4f2 100644 --- a/src/main.js +++ b/src/main.js @@ -25,6 +25,10 @@ import Pagination from "@/components/Pagination"; //自定义表格工具扩展 import RightToolbar from "@/components/RightToolbar" +// 将自动注册所有组件为全局组件 +import dataV from '@jiaminghi/data-view' +Vue.use(dataV) + // 全局方法挂载 Vue.prototype.getDicts = getDicts Vue.prototype.getConfigKey = getConfigKey diff --git a/src/views/chart/boxBoardBody.vue b/src/views/chart/boxBoardBody.vue index 1be85d9..28c69ed 100644 --- a/src/views/chart/boxBoardBody.vue +++ b/src/views/chart/boxBoardBody.vue @@ -35,7 +35,7 @@ export default { text-align: center; vertical-align: middle; line-height: 100%; - background-color: rgba(0, 0, 0, 0.2); + background-color: rgba(7, 26, 72, 0.2); border: 0px solid rgba(70, 233, 255, 1); border-radius: 3px 3px 3px 3px; -webkit-box-shadow: #666 0px 0px 10px; diff --git a/src/views/chart/index.vue b/src/views/chart/index.vue index 2243237..789d00f 100644 --- a/src/views/chart/index.vue +++ b/src/views/chart/index.vue @@ -1,30 +1,83 @@