diff --git a/src/components/cropper.vue b/src/components/cropper.vue index 7fcdfd884958462a5bae2c34044e1a1593b7b5ba..edda74463be4fed009deb051521ff98553b6f416 100644 --- a/src/components/cropper.vue +++ b/src/components/cropper.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/pages/data-analysis/my-application.vue b/src/pages/data-analysis/my-application.vue new file mode 100644 index 0000000000000000000000000000000000000000..2fc4f2c0143417236d4cfe49b0cb8001979e3685 --- /dev/null +++ b/src/pages/data-analysis/my-application.vue @@ -0,0 +1,21 @@ + + + + \ No newline at end of file diff --git a/src/pages/data-analysis/my-service.vue b/src/pages/data-analysis/my-service.vue new file mode 100644 index 0000000000000000000000000000000000000000..24310e78ed45469a8879ef1e41d41e230ad0f9c6 --- /dev/null +++ b/src/pages/data-analysis/my-service.vue @@ -0,0 +1,21 @@ + + + + \ No newline at end of file diff --git a/src/pages/service_shop/shop_list.vue b/src/pages/service_shop/shop_list.vue index 119ed3d84d69855bfda2623f74e4dd9445a5b2f5..707ec260e311730e62c989336b54732810a14e65 100644 --- a/src/pages/service_shop/shop_list.vue +++ b/src/pages/service_shop/shop_list.vue @@ -60,7 +60,7 @@ export default { break; case "comprehensive_app_list": this.name = "综合服务"; - this.urlFilter = "5"; + this.urlFilter = "21"; this.url = "/shop/zhfwDetail"; this.filterNmaes = ["数据服务类型", "数据领域", "数据来源机构"]; break; diff --git a/src/pages/user/order/order_list.vue b/src/pages/user/order/order_list.vue index 502253f8422001fc8d6185642150f34acf239dbc..11f5dde3ecc44d9bc6c679f43cc29863fae12429 100644 --- a/src/pages/user/order/order_list.vue +++ b/src/pages/user/order/order_list.vue @@ -10,7 +10,6 @@ diff --git a/src/request/api/authority.js b/src/request/api/authority.js index 096b3ed81dfda369184ecffdce919a7f0e5cfef1..aece6770de9664a421948383ae1659865149e175 100644 --- a/src/request/api/authority.js +++ b/src/request/api/authority.js @@ -22,7 +22,10 @@ const authority = { return axios.put(`/apaas/backmgt/menu`, params); }, - // + // organization + getOrganizationList() { + return axios.get(`/apaas/backmgt/department/list`); + }, } export default authority; diff --git a/src/request/api/service_shop.js b/src/request/api/service_shop.js index b9d954750de06a59f9b8954835135561b4c2aa5b..ec00e0fb10dd32a036197b640edb917248ad0ac3 100644 --- a/src/request/api/service_shop.js +++ b/src/request/api/service_shop.js @@ -32,6 +32,7 @@ Page=${params.Page}&Size=${params.Size}`); return axios.get(`/apaas/hubApi/market/list?online_state=${params.online_state}&appTypes=${params.appTypes}& businessArea=${params.businessArea}&developable=${params.developable}&orgSource=${params.orgSource}&order=${params.order}&page=${params.page}&limit=${params.limit}&search=${params.search}`); }, + // shopping cart addShoppingCart(params) { return axios.post(`/apaas/serviceapp/v3/shopcart/add`, params); diff --git a/src/request/api/workbench.js b/src/request/api/workbench.js index d6dbf1057e50e8c9465c89798cb817b80851daa3..3985f12b13e59cf6aab845831aba326602736867 100644 --- a/src/request/api/workbench.js +++ b/src/request/api/workbench.js @@ -7,7 +7,12 @@ const workbench = { }, serviceAdd(params) { return axios.post(`/apaas/service/v3/service/manager`, params) - } + }, + + // service area + getServiceAreaList() { + return axios.get(`/apaas/service/v3/service/manager/servarea`) + }, } export default workbench; diff --git a/src/router/index.js b/src/router/index.js index ea97b32f6f2c23b8ce6a1bcf68068eab2e7058bb..29a3285a86ffeb526777de9b12f04dd8eb024a32 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -316,6 +316,24 @@ export default new Router({ }, ], }, // 权限管理 + { + path: "/data_analysis", // 数据分析中心 + name: "dataAnalysis", + redirect: "/data_analysis/my_service", + component: () => import("@/pages/data-analysis/data-analysis"), + children: [ + { + path: "/data_analysis/my_service", // 数据分析中心 + name: "myServiceDataAnalysis", + component: () => import("@/pages/data-analysis/my-service"), + }, + { + path: "/data_analysis/my_application", // 数据分析中心 + name: "myApplicationDataAnalysis", + component: () => import("@/pages/data-analysis/my-application"), + } + ] + } ], }, {