From 651c58404f48704e39919a51220f46dee5b29403 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Tue, 2 Aug 2022 11:58:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=89=8D=E5=8F=B0-=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E6=96=87=E6=A1=A3-=E6=80=BB=E4=BD=93=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hasToDoTasks/AbilityResourceShelf.vue | 8 + .../myAgent/demo/ResourcesAndServices.vue | 125 ++++---- .../myAgent/demo/ability-resource-shelf.vue | 27 +- .../src/assets/menu/TheOverallProcess-bg.png | Bin 0 -> 584723 bytes .../components/TheOverallProcess.vue | 171 ++++++++++ .../instructionManual/components/menuBook.vue | 295 +++++++++--------- 6 files changed, 407 insertions(+), 219 deletions(-) create mode 100644 front/src/assets/menu/TheOverallProcess-bg.png create mode 100644 front/src/views/instructionManual/components/TheOverallProcess.vue diff --git a/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue index 0da3a386..dd77df1c 100644 --- a/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue +++ b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue @@ -136,7 +136,15 @@ export default { return this.$message.error(this.$t('task.detailError')) } this.getProcDefRouteSet(row, this.forwardDetail) + }, + methodsThree () { + this.$http.get('/category/getCategoryTree').then((res) => { + localStorage.setItem('getCategoryTree', JSON.stringify(res.data.data)) + }) } + }, + mounted () { + this.methodsThree() } } diff --git a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue index 92c363dd..f7e74c61 100644 --- a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue +++ b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue @@ -1,6 +1,6 @@ + + + + diff --git a/front/src/views/instructionManual/components/menuBook.vue b/front/src/views/instructionManual/components/menuBook.vue index ce9ed800..d86ec7f5 100644 --- a/front/src/views/instructionManual/components/menuBook.vue +++ b/front/src/views/instructionManual/components/menuBook.vue @@ -1,125 +1,134 @@ - \ No newline at end of file + } + From ee9ec454504bb971cb759d27925b2e641e5320bf Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Tue, 2 Aug 2022 11:59:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E4=B8=8A=E6=9E=B6=20?= =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../myAgent/demo/ability-resource-shelf.vue | 9 +- front/public/index.html | 28 +-- .../views/capacityOnTheShelf/Algorithm.vue | 190 +++++++++++++--- .../views/capacityOnTheShelf/Application.vue | 211 +++++++++++++++-- .../capacityOnTheShelf/BusinessComponent.vue | 213 ++++++++++++++++-- .../DevelopmentComponents.vue | 211 +++++++++++++++-- .../capacityOnTheShelf/LayerServices.vue | 184 +++++++++++++-- .../components/PutOnTheShelf.vue | 32 ++- front/src/views/components/upload/index.vue | 49 ++-- .../personalCenter/components/MyApply.vue | 21 +- 10 files changed, 975 insertions(+), 173 deletions(-) diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue index 42319aaf..1f3ec8b6 100644 --- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue +++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue @@ -37,8 +37,8 @@

审批

同意 - 拒绝驳回 @@ -48,22 +48,18 @@ // window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin'; // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 西海岸版本 - window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797'; - window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/'; - window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/'; - window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; + // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797'; + // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/'; + // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/'; + // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // 开发 - // window.SITE_CONFIG['backUrl'] = 'http://localhost:8001'; - // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/'; - // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/'; - // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin'; - // window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin'; - window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; - // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/'; - // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/'; - // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin'; - // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; + window.SITE_CONFIG['backUrl'] = 'http://localhost:8001'; + window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/'; + window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/'; + window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin'; + window.SITE_CONFIG['websocketURL'] = '192.168.124.236:8888/renren-admin'; + window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 穿透版本 // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue index baba1447..789854a8 100644 --- a/front/src/views/capacityOnTheShelf/Algorithm.vue +++ b/front/src/views/capacityOnTheShelf/Algorithm.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-13 10:22:27 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-26 14:35:45 + * @LastEditTime: 2022-08-02 11:28:00 * @Description: 算法上架 -->