From 521023aeea004a1b54efef63ddc029651342d15a Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Wed, 1 Mar 2023 18:55:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- src/views/dashboard/HomePage.vue | 137 +++++++++++++++--- .../description/ProcessDescriptionList.vue | 6 +- src/views/modules/oss/OSSFileList.vue | 40 ++--- .../costecharts/ItemCost.vue | 87 ++++++++--- 5 files changed, 206 insertions(+), 66 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 245b7e0..4ad9d3b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,7 +17,7 @@ let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot"; const service = axios.create({ //baseURL: '/jeecg-boot', baseURL: apiBaseUrl, // api base_url - timeout: 50000 // 请求超时时间 + timeout: 100000 // 请求超时时间 }) const err = (error) => { diff --git a/src/views/dashboard/HomePage.vue b/src/views/dashboard/HomePage.vue index ea6ab38..ad8a394 100644 --- a/src/views/dashboard/HomePage.vue +++ b/src/views/dashboard/HomePage.vue @@ -5,39 +5,90 @@
- 待办 + 公司风采
-
- - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + +
- 站内消息 + 待办
-
+
- @@ -119,7 +170,6 @@ import KeyApplications from '@views/dashboard/KeyApplications' // import { mixinDevice } from '@/utils/mixin' // import { JeecgListMixin } from '@/mixins/JeecgListMixin' - export default { name: 'HomePage', // mixins:[JeecgListMixin,mixinDevice], @@ -142,6 +192,7 @@ export default { keyApplications: '/keyApplications/processKeyApplications/list', addKeyApplications: '/keyApplications/processKeyApplications/add', lists: '/sys/log/listHomePage', + listMien: "/sys/oss/file/list", listMseeage: '/sys/sysAnnouncementSend/getMyAnnouncementSend', editCementSend:"/sys/sysAnnouncementSend/editByAnntIdAndUserId", }, @@ -204,6 +255,7 @@ export default { keyApplic:false, //全部用户菜单 userMean:[], + listMien:[], //用户子菜单 userChildren:[], keyChildren:[], @@ -219,6 +271,13 @@ export default { // console.log("res===========",res.result); this.KeyApplicationsChildren = res.result; } + }) ; + this.listMien = []; + getAction(this.url.listMien,{status:1}).then((res) => { + if (res.success) { + console.log("sfdvzdf", res.result.records||res.result); + this.listMien = res.result.records||res.result; + } }) this.todoList(); this.loginList(); @@ -231,6 +290,7 @@ export default { }, methods: { + expandedRowKeys(row){ console.log("=====",row); this.selectRowKeys = row; @@ -505,6 +565,45 @@ export default {