From 20b968bebae3a68cbdfd9ab8e467caaeb7d4eaa5 Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Tue, 5 Jul 2022 13:51:21 +0800 Subject: [PATCH 1/9] demandSubject --- .../views/modules/ability/bsdataresources.vue | 6 +- .../LayerService/LayerServiceUsageMode.vue | 512 ++++++++--------- .../components/addApplication.vue | 534 ++++++++---------- 3 files changed, 497 insertions(+), 555 deletions(-) diff --git a/back/src/views/modules/ability/bsdataresources.vue b/back/src/views/modules/ability/bsdataresources.vue index dcb29158..77d9b1b0 100644 --- a/back/src/views/modules/ability/bsdataresources.vue +++ b/back/src/views/modules/ability/bsdataresources.vue @@ -84,7 +84,11 @@ export default { methods: { // 重置 resetDataList () { - this.dataForm = this.noDataForm + this.dataForm = { + orderId: '', + status: '', + userId: '' + }, this.page = 1 // 当前页码 this.query() }, diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue index 89c9a973..de0edf4b 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue @@ -2,10 +2,7 @@
- +
@@ -31,7 +28,7 @@
{{ item.contact }}

- {{ item.contact }} + {{ item.facilitator.name }} {{ item.facilitator.value }} @@ -57,7 +54,7 @@

{{ item.contact2 }}

- {{ item.contact2 }} + {{ item.facilitator2.name }} {{ item.facilitator2.value }} @@ -85,275 +82,286 @@ diff --git a/front/src/views/personalCenter/components/addApplication.vue b/front/src/views/personalCenter/components/addApplication.vue index f6a5df1f..581d5c5b 100644 --- a/front/src/views/personalCenter/components/addApplication.vue +++ b/front/src/views/personalCenter/components/addApplication.vue @@ -9,83 +9,38 @@

申请人信息
- +
- - + + - - + + - - + +
需求信息
- - + + - - + + 基础设施 数据资源 组件服务 @@ -94,26 +49,14 @@ - - + + - - + + " v-model:value="formName.demandDetails" /> - - - + + + "> 文件上传 @@ -163,8 +93,7 @@ - + " type="primary" html-type="cancle" @click="signOut"> 退出申请 - + " type="primary" html-type="submit" @click="processStartHandle()"> 提交申请 @@ -209,7 +129,7 @@

您已成功申请{{ - formName.demandSubject || '' + formName.demandSubject || '' }},请耐心等待审批结果,结果会第一时间通知您!

@@ -220,209 +140,219 @@ From 3ec46bdd0a46de90db151328a8be15a014e8a75d Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Tue, 5 Jul 2022 14:37:22 +0800 Subject: [PATCH 2/9] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/newHome/components/Navigation.vue | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/front/src/views/newHome/components/Navigation.vue b/front/src/views/newHome/components/Navigation.vue index 8457eb4e..71f12971 100644 --- a/front/src/views/newHome/components/Navigation.vue +++ b/front/src/views/newHome/components/Navigation.vue @@ -80,26 +80,32 @@ - + {{ item.name }} - + {{ item.name }} @@ -167,9 +173,9 @@ id: '100001', }, ]) - let shi = ref(['请先选择省份']) - let qu = ref(['请先选择市']) - let jiedao = ref(['请先选择区']) + let shi = ref([]) + let qu = ref([]) + let jiedao = ref([]) function qushijiedao(value) { let danwei = value.substr(-1) // name.substr(-1) From c30b02c3e53c552867178820c434800772e3de70 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Tue, 5 Jul 2022 14:57:59 +0800 Subject: [PATCH 3/9] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/home/components/searchResultList.vue | 16 ++++++++++------ .../components/PurchaseVehicle.vue | 3 ++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index e9bdd500..d6f01f59 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -123,7 +123,10 @@ {{ item.deptName || '--' }}
- {{ item.description || '--' }} + + + {{ item.description || '--' }} +
@@ -420,12 +423,13 @@ if (props.selectCardsname == '数据资源') { if (whoShow1.itShowQingDao) { window.open( - 'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' + - item.guid - ) + 'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' + + item.guid + ) } else { - window.open( - 'http://10.134.135.24:30090/api/share-portal/platform/catalogue/query?serviceName=') + window.open( + 'http://10.134.135.24:30090/api/share-portal/platform/catalogue/query?serviceName=' + ) } } else { if (type === 'apply') { diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue index 14faff0e..21083fa3 100644 --- a/front/src/views/personalCenter/components/PurchaseVehicle.vue +++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue @@ -97,7 +97,8 @@ diff --git a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue index 6ddc28fe..f38a936f 100644 --- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue +++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue @@ -2,10 +2,7 @@
- +
@@ -30,7 +27,7 @@
{{ item.contact }}

- {{ item.contact }} + {{ item.facilitator.name }} {{ item.facilitator.value }} @@ -56,7 +53,7 @@

{{ item.contact2 }}

- {{ item.contact2 }} + {{ item.facilitator2.name }} {{ item.facilitator2.value }} @@ -84,264 +81,276 @@ From 2b211dae96aa5f0cf7d665f7162bbfba6502d2f9 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Tue, 5 Jul 2022 16:20:11 +0800 Subject: [PATCH 5/9] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9=20=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=85=A8=E5=B1=80=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main.js | 10 ++++++++-- .../capabilityCloud/components/PlatformOverview.vue | 4 ++-- .../src/views/personalCenter/components/Collection.vue | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/front/src/main.js b/front/src/main.js index 5ceb3773..8cd80605 100644 --- a/front/src/main.js +++ b/front/src/main.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2022-03-29 17:48:03 - * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-10 15:45:34 + * @LastEditors: hisense.liangjunhua + * @LastEditTime: 2022-07-05 15:04:47 * @Description: 告诉大家这是什么 */ import { createApp } from 'vue' @@ -45,3 +45,9 @@ app for (const [key, component] of Object.entries(ElementPlusIconsVue)) { app.component(key, component) } +router.beforeEach((to, from, next) => { + // console.log('跳转路由=========>', to, from, next) + document.documentElement.scrollTop = 0 + document.body.scrollTop = 0 + next() +}) diff --git a/front/src/views/capabilityCloud/components/PlatformOverview.vue b/front/src/views/capabilityCloud/components/PlatformOverview.vue index 10f569e2..3b68b35d 100644 --- a/front/src/views/capabilityCloud/components/PlatformOverview.vue +++ b/front/src/views/capabilityCloud/components/PlatformOverview.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-19 10:15:33 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-19 17:52:04 + * @LastEditTime: 2022-07-05 16:11:11 * @Description: 告诉大家这是什么 -->