From 9c6cdb47746b349d71e6547194cbde60b10e245a Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Tue, 22 Oct 2024 18:50:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AFbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/report/attReport.js | 10 +++++++- src/api/system/dept.js | 19 +++++++++++++++ src/utils/request.js | 2 +- src/views/dashboard.vue | 2 +- src/views/dashboard/bottomOne.vue | 23 +++++++++++++----- src/views/dashboard/bottomTwo.vue | 22 +++++++++++++++-- src/views/dashboard/topOne.vue | 1 - src/views/dashboard/topTwo.vue | 3 +-- src/views/process/leaveImport/index.vue | 1 + src/views/report/attReport/index.vue | 11 +++++---- src/views/setting/rules/index.vue | 32 ++++++++++++++++++++----- src/views/system/dept/index.vue | 14 ++++++++++- 12 files changed, 114 insertions(+), 26 deletions(-) diff --git a/src/api/report/attReport.js b/src/api/report/attReport.js index 489f79f..7e9e9ab 100644 --- a/src/api/report/attReport.js +++ b/src/api/report/attReport.js @@ -36,4 +36,12 @@ export function updateAttDetailsDataExamine(data) { data: data }) } - +// 导出 +export function exportAttRecord(query) { + return request({ + url: '/system/export/exportAttRecord', + method: 'get', + responseType: 'blob', + params: query + }) +} diff --git a/src/api/system/dept.js b/src/api/system/dept.js index 68f0dcf..5bcb2bb 100644 --- a/src/api/system/dept.js +++ b/src/api/system/dept.js @@ -57,4 +57,23 @@ export function delDept(deptId) { url: '/system/org/' + deptId, method: 'delete' }) +} + + +// 导出 +export function exportOrg(query) { + return request({ + url: '/system/export/exportOrg', + method: 'get', + responseType: 'blob', + params: query + }) +} +//模板下载 +export function orgTempFile(query) { + return request({ + url: '/system/download/orgFile', + method: 'get', + params: query + }) } \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 54eed28..1049c2f 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -62,7 +62,7 @@ service.interceptors.request.use(config => { const s_url = sessionObj.url; // 请求地址 const s_data = sessionObj.data; // 请求数据 const s_time = sessionObj.time; // 请求时间 - const interval = 3000; // 间隔时间(ms)，小于此时间视为重复提交 + const interval = 2000; // 间隔时间(ms)，小于此时间视为重复提交 if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) { const message = '数据正在处理，请勿重复提交'; console.warn(`[${s_url}]: ` + message) diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue index 87c386a..838e032 100644 --- a/src/views/dashboard.vue +++ b/src/views/dashboard.vue @@ -17,7 +17,7 @@
- +
diff --git a/src/views/dashboard/bottomOne.vue b/src/views/dashboard/bottomOne.vue index e9c0035..332e1fe 100644 --- a/src/views/dashboard/bottomOne.vue +++ b/src/views/dashboard/bottomOne.vue @@ -61,11 +61,20 @@ export default { initData(){ // console.log(this.orgNumBean,22222222222222) let arr = this.handleTree(this.orgNumBean, "orgId"); - this.treeData = { - orgName:'组织架构', - orgId:'0', - personNum:'', - children:arr + if(arr.length>0){ + this.treeData = { + orgName:'组织架构', + orgId:'0', + personNum:'', + children:arr + } + }else{ + this.treeData = { + orgName:'组织架构', + orgId:'0', + personNum:'', + children:[] + } } this.expandChange() }, @@ -142,11 +151,13 @@ export default { width: 100%; height: 400px; overflow-x: auto; + text-align: center; } } ::v-deep.org-tree-container .org-tree .org-tree-node .org-tree-node-label { - white-space: nowrap; + white-space: nowrap; font-size: 12px!important; + border-radius: 100px!important; } .bg-white { background-color: chocolate; diff --git a/src/views/dashboard/bottomTwo.vue b/src/views/dashboard/bottomTwo.vue index e6ad673..d7d9def 100644 --- a/src/views/dashboard/bottomTwo.vue +++ b/src/views/dashboard/bottomTwo.vue @@ -17,11 +17,27 @@ export default { components: { }, - name: 'topOne', + name: 'bottomTwo', + props: { + pageData: { + // required: true, + type: Object, + default:{ + addressErrorNum:'0', + earlyNum:'0', + einErrorNum:'0', + lateNum:'0', + leaveNum:'0', + skippingNum:'0' + } + }, + + }, data() { return { pieCharts: null, dateTime:"", + barYData:[22, 18, 11, 23, 29, 33] } }, created() { @@ -34,6 +50,8 @@ export default { }, methods: { getInitData(){ + console.log(this.pageData) + this.barYData=[this.pageData.lateNum,this.pageData.earlyNum,this.pageData.skippingNum,this.pageData.leaveNum,this.pageData.addressErrorNum,this.pageData.einErrorNum] this.initChart() }, initChart(){ @@ -45,7 +63,7 @@ export default { yAxis: {}, series: [{ type: 'bar', - data:[22, 18, 11, 23, 29, 33] + data:this.barYData }] }; diff --git a/src/views/dashboard/topOne.vue b/src/views/dashboard/topOne.vue index 44f8f0e..25a0d7d 100644 --- a/src/views/dashboard/topOne.vue +++ b/src/views/dashboard/topOne.vue @@ -115,7 +115,6 @@ export default { this.initChart() }) }); - }, initChart(){ this.pieCharts = echarts.init(document.getElementById('pieBox')) diff --git a/src/views/dashboard/topTwo.vue b/src/views/dashboard/topTwo.vue index 8820055..1ef4abe 100644 --- a/src/views/dashboard/topTwo.vue +++ b/src/views/dashboard/topTwo.vue @@ -33,8 +33,7 @@ export default { // required: true, type: Object, default:{ - processedData:'0', - unProcessedData:'0' + } }, diff --git a/src/views/process/leaveImport/index.vue b/src/views/process/leaveImport/index.vue index 9f99ae2..a06bec4 100644 --- a/src/views/process/leaveImport/index.vue +++ b/src/views/process/leaveImport/index.vue @@ -371,6 +371,7 @@ export default { }, /** 下载模板操作 */ importTemplate() { + this.download('/system/download/holidayFile', {}, `请假数据模板_${new Date().getTime()}.xlsx`) // this.download('system/user/importTemplate', { // }, `user_template_${new Date().getTime()}.xlsx`) }, diff --git a/src/views/report/attReport/index.vue b/src/views/report/attReport/index.vue index 89c8397..a10ed1d 100644 --- a/src/views/report/attReport/index.vue +++ b/src/views/report/attReport/index.vue @@ -203,8 +203,9 @@ \ No newline at end of file + + + \ No newline at end of file diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 2063d7e..229c11a 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -34,6 +34,10 @@ v-hasPermi="['system:org:add']" >新增 + + 导出 + 导入 @@ -227,8 +231,9 @@