diff --git a/.env.development b/.env.development index c49579a..7471996 100644 --- a/.env.development +++ b/.env.development @@ -4,4 +4,5 @@ ENV = 'development' # base api # 这里修改成api服务器地址 VUE_APP_BASE_API = '/api' -VUE_APP_VIEW_PIC = 'http://tft.mes.picaiba.com/api/common/attachment/downloadFile?type=0&attachmentId=' \ No newline at end of file +VUE_APP_VIEW_PIC = 'http://tft.mes.picaiba.com/api/common/attachment/downloadFile?type=0&attachmentId=' +VUE_APP_REPORT_DESIGN_URL = 'http://hfxny.mes.picaiba.com/ureport/designer' \ No newline at end of file diff --git a/.env.production b/.env.production index 9a8d04e..7a3d5ab 100644 --- a/.env.production +++ b/.env.production @@ -4,4 +4,5 @@ ENV = 'production' # base api # 这里修改成api服务器地址 VUE_APP_BASE_API = '/api' -VUE_APP_VIEW_PIC = 'http://tft.mes.picaiba.com/api/common/attachment/downloadFile?type=0&attachmentId=' \ No newline at end of file +VUE_APP_VIEW_PIC = 'http://tft.mes.picaiba.com/api/common/attachment/downloadFile?type=0&attachmentId=' +VUE_APP_REPORT_DESIGN_URL = 'http://hfxny.mes.picaiba.com/ureport/designer' \ No newline at end of file diff --git a/src/assets/basic/report.png b/src/assets/basic/report.png new file mode 100644 index 0000000..b7e4ef1 Binary files /dev/null and b/src/assets/basic/report.png differ diff --git a/src/router/index.js b/src/router/index.js index e48a04b..06129bd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -577,6 +577,65 @@ export const routes = [ title: '设备配置' }, component: () => import('../views/basicConfig/deviceConfig') + }, + { + path: 'reportManagement', + name: 'reportManagement', + meta: { + title: '报表管理' + }, + component: () => import('../views/basicConfig/reportManagement'), + redirect: '/basicConfig/reportManagement/reportList', + children: [ + { + path: 'reportList', + name: 'reportList', + meta: { + title: '报表列表' + }, + component: () => + import('../views/basicConfig/reportManagement/reportList') + }, + { + path: 'reportListDetail', + name: 'reportListDetail', + hidden: true, + meta: { + title: '报表列表明细' + }, + component: () => + import('../views/basicConfig/reportManagement/reportListDetail') + }, + { + path: 'reportView', + name: 'reportView', + meta: { + title: '报表预览' + }, + component: () => + import('../views/basicConfig/reportManagement/reportView') + }, + { + path: 'reportDesign', + name: 'reportDesign', + meta: { + title: '报表设计' + }, + component: () => + import('../views/basicConfig/reportManagement/reportDesign') + }, + { + path: 'reportClassification', + name: 'reportClassification', + meta: { + title: '报表分类' + }, + component: () => + import( + '../views/basicConfig/reportManagement/reportClassification' + ) + } + ] } ] }, diff --git a/src/views/basicConfig/components/reportClassAdd.vue b/src/views/basicConfig/components/reportClassAdd.vue new file mode 100644 index 0000000..b2d5e37 --- /dev/null +++ b/src/views/basicConfig/components/reportClassAdd.vue @@ -0,0 +1,83 @@ + + diff --git a/src/views/basicConfig/components/reportNameEdit.vue b/src/views/basicConfig/components/reportNameEdit.vue new file mode 100644 index 0000000..d13d3db --- /dev/null +++ b/src/views/basicConfig/components/reportNameEdit.vue @@ -0,0 +1,82 @@ + + diff --git a/src/views/basicConfig/reportManagement.vue b/src/views/basicConfig/reportManagement.vue new file mode 100644 index 0000000..5af0b83 --- /dev/null +++ b/src/views/basicConfig/reportManagement.vue @@ -0,0 +1,68 @@ + + + diff --git a/src/views/basicConfig/reportManagement/reportClassification.vue b/src/views/basicConfig/reportManagement/reportClassification.vue new file mode 100644 index 0000000..b251f0b --- /dev/null +++ b/src/views/basicConfig/reportManagement/reportClassification.vue @@ -0,0 +1,188 @@ + + + diff --git a/src/views/basicConfig/reportManagement/reportDesign.vue b/src/views/basicConfig/reportManagement/reportDesign.vue new file mode 100644 index 0000000..86e5e95 --- /dev/null +++ b/src/views/basicConfig/reportManagement/reportDesign.vue @@ -0,0 +1,39 @@ + + + diff --git a/src/views/basicConfig/reportManagement/reportList.vue b/src/views/basicConfig/reportManagement/reportList.vue new file mode 100644 index 0000000..c44d114 --- /dev/null +++ b/src/views/basicConfig/reportManagement/reportList.vue @@ -0,0 +1,139 @@ + + + diff --git a/src/views/basicConfig/reportManagement/reportListDetail.vue b/src/views/basicConfig/reportManagement/reportListDetail.vue new file mode 100644 index 0000000..281684d --- /dev/null +++ b/src/views/basicConfig/reportManagement/reportListDetail.vue @@ -0,0 +1,215 @@ + + + diff --git a/src/views/basicConfig/reportManagement/reportView.vue b/src/views/basicConfig/reportManagement/reportView.vue new file mode 100644 index 0000000..6fd730f --- /dev/null +++ b/src/views/basicConfig/reportManagement/reportView.vue @@ -0,0 +1,8 @@ + +