From 0c4015cb5c994d1840d2069a22c3ae3edf2ec69c Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Tue, 23 Aug 2022 17:47:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BF=E7=82=B9=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../myAgent/demo/competency-application.vue | 2 +- front/public/static/config/location.js | 4 +- .../src/views/demandCenter/demandDetails.vue | 14 +- front/src/views/demandCenter/index.vue | 48 +++ .../Algorithm/AlgorithmUsageMode.vue | 350 ++++++++++++------ ...tionOwningDepartmentAndServiceProvider.vue | 58 ++- .../components/Business/BusinessUsageMode.vue | 219 +++++++---- ...operOwningDepartmentAndServiceProvider.vue | 84 +++-- .../LayerService/LayerServicePreview.vue | 4 +- .../LayerService/LayerServiceUsageMode.vue | 232 ++++++++---- front/src/views/home/apply.vue | 8 +- front/src/views/home/components/header.vue | 5 + front/src/views/home/infrastructurePage.vue | 14 +- 13 files changed, 744 insertions(+), 298 deletions(-) diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue index 9dff6741..52874502 100644 --- a/back/src/views/modules/myAgent/demo/competency-application.vue +++ b/back/src/views/modules/myAgent/demo/competency-application.vue @@ -44,7 +44,7 @@

- 应用背景: + 需求依据: {{ dataForm.content.applicationBackground || '--' }}

diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index 16a78c7d..50a18864 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -38,8 +38,8 @@ if (newLocation === 'qingdao') { // { name: '个人中心', key: 'personalCenter' }, { name: '区市站点', key: 'mapTest' }, // { name: '后台管理', key: 'houtaiguanli' }, - { name: '赋能案例', key: 'assignCase' }, - { name: '融合服务', key: 'integrationServices' }, + { name: '典型赋能案例', key: 'assignCase' }, + // { name: '融合服务', key: 'integrationServices' }, { name: 'CIM专区', key: 'cimSpecialArea' }, ] footerDataList.footerList = { diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue index 97a3c31c..ca9e50fa 100644 --- a/front/src/views/demandCenter/demandDetails.vue +++ b/front/src/views/demandCenter/demandDetails.vue @@ -236,6 +236,8 @@ /> + +
X
@@ -378,7 +380,9 @@ } } } - + const closeMain = () => { + window.history.go(-1) + } onMounted(() => { // const formData = computed(() => store.getters['home/demandDetailsData']) // formName.value = formData.value @@ -410,6 +414,7 @@ display: flex; justify-content: center; .main { + position: relative; width: 1550px; height: 100%; padding-top: 30px; @@ -476,6 +481,13 @@ } } } + .closeMain { + position: absolute; + top: 40px; + right: 20px; + font-size: 0.2rem; + cursor: pointer; + } } .form-container { padding: 20px 20px 30px 20px; diff --git a/front/src/views/demandCenter/index.vue b/front/src/views/demandCenter/index.vue index 3b519187..cc631cdb 100644 --- a/front/src/views/demandCenter/index.vue +++ b/front/src/views/demandCenter/index.vue @@ -70,6 +70,13 @@ + +
+
+

+

需求申请

+
+
@@ -166,6 +173,12 @@ }, }) } + const newpage = router.resolve({ + path: '/addApplication', // 跳转的页面路由 + }) + const toView = () => { + window.open(newpage.href, '_blank') + } onMounted(() => { const params = { @@ -284,6 +297,41 @@ margin-top: 10px; } } + .fixedmount { + height: 1.5rem; + display: flex; + position: fixed; + right: 2.6rem; + z-index: 10; + flex-direction: column; + justify-content: space-between; + align-items: center; + } + + .fixedmount div { + width: 0.7rem; + height: 0.7rem; + border-radius: 0.04rem; + border: 0.01rem #94aac9 solid; + display: flex; + flex-direction: column; + // justify-content: center; + align-items: center; + padding-top: 0.13rem; + position: relative; + cursor: pointer; + background: #e3edfc; + p { + margin: 0; + } + } + .fixedmount div p:nth-child(1) { + height: 0.24rem; + width: 0.24rem; + background: url('~@/assets/home/shenqing.png') no-repeat; + background-size: contain; + background-position: center; + } } } diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue index 5a27c980..916ba67b 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue @@ -7,120 +7,252 @@ :type="dataFrom.englishTitle" > -
-
-
-
- {{ item.title }}:{{ item.titleType }} + +
+
+
+
+
+ {{ item.title }}:{{ item.titleType }} +
+
+

+ {{ item.link.name }} + + + {{ item.link.value }} + +

+

+ {{ item.postMethod.name }} + {{ item.postMethod.value }} +

+
-
-

- {{ item.link.name }} - - - {{ item.link.value }} - -

-

- {{ item.postMethod.name }} - {{ item.postMethod.value }} -

+
+
技术文档
+ +
-
-
技术文档
- - +
+
+
+ {{ item.title }}:{{ item.titleType }} +
+
+

+ {{ item.linkPlatform.name }} + + + {{ item.linkPlatform.value }} + + + + **************** + +

+
+
+
+
技术文档
+ + +
+
+
+
+
+ {{ item.title }}:{{ item.titleType }} +
+
+
+
技术文档
+ +
SDK安装包
+
+
+
+
+
{{ item.contact }}
+
+

+ {{ item.facilitator.name }} + + + {{ item.facilitator.value }} + +

+

+ {{ item.people.name }} + + + {{ item.people.value }} + +

+

+ {{ item.phone.name }} + + + {{ item.phone.value }} + +

+
+
+
+
{{ item.contact2 }}
+
+

+ {{ item.facilitator2.name }} + + + {{ item.facilitator2.value }} + +

+

+ {{ item.people2.name }} + + + {{ item.people2.value }} + +

+

+ {{ item.phone2.name }} + + + {{ item.phone2.value }} + +

+
+
-
-
-
- {{ item.title }}:{{ item.titleType }} -
-
-

- {{ item.linkPlatform.name }} - - - {{ item.linkPlatform.value }} - - - - **************** - -

-
-
-
-
技术文档
- - -
+
+ 请申请后查看
-
-
-
- {{ item.title }}:{{ item.titleType }} +
+ +
+
+
+
+
+ {{ item.title }}:{{ item.titleType }} +
+
+

+ {{ item.link.name }} + + + {{ item.link.value }} + +

+

+ {{ item.postMethod.name }} + {{ item.postMethod.value }} +

+
+
+
+
技术文档
+ +
-
-
技术文档
- -
SDK安装包
-
-
-
-
-
{{ item.contact }}
-
-

- {{ item.facilitator.name }} - - - {{ item.facilitator.value }} - -

-

- {{ item.people.name }} - - - {{ item.people.value }} - -

-

- {{ item.phone.name }} - - - {{ item.phone.value }} - -

+
+
+
+ {{ item.title }}:{{ item.titleType }} +
+
+

+ {{ item.linkPlatform.name }} + + + {{ item.linkPlatform.value }} + + + + **************** + +

+
+
+
+
技术文档
+ +
-
-
{{ item.contact2 }}
-
-

- {{ item.facilitator2.name }} - - - {{ item.facilitator2.value }} - -

-

- {{ item.people2.name }} - - - {{ item.people2.value }} - -

-

- {{ item.phone2.name }} - - - {{ item.phone2.value }} - -

+
+
+
+ {{ item.title }}:{{ item.titleType }} +
+
+
+
技术文档
+ +
SDK安装包
+
+
+
+
+
{{ item.contact }}
+
+

+ {{ item.facilitator.name }} + + + {{ item.facilitator.value }} + +

+

+ {{ item.people.name }} + + + {{ item.people.value }} + +

+

+ {{ item.phone.name }} + + + {{ item.phone.value }} + +

+
+
+
+
{{ item.contact2 }}
+
+

+ {{ item.facilitator2.name }} + + + {{ item.facilitator2.value }} + +

+

+ {{ item.people2.name }} + + + {{ item.people2.value }} + +

+

+ {{ item.phone2.name }} + + + {{ item.phone2.value }} + +

+
@@ -133,7 +265,8 @@ import { pinyin } from 'pinyin-pro' import { ref, defineProps, watch } from 'vue' import { message } from 'ant-design-vue' - const approveStatus = ref('') + const approveStatus = ref('通过') + const whoShow1 = ref(whoShow) let dataFrom = ref({ title: '使用方式', englishTitle: 'USAGE', @@ -188,7 +321,7 @@ dataFrom.value.content[0].people.value = props.dataList.deptContacts dataFrom.value.content[0].phone.value = props.dataList.deptPhone dataFrom.value.content[0].postMethod.value = props.dataList.apiMethodType - approveStatus.value = props.dataList.approveStatus + // approveStatus.value = props.dataList.approveStatus console.log('dataList', props.dataList) props.dataList.infoList.map((item) => { if (item.attrType === '组件地址') { @@ -449,5 +582,10 @@ } } } + .contentOther { + width: 100%; + height: 0.3rem; + background: pink; + } } diff --git a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue index 89c7fdc8..875ad9d0 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue @@ -7,21 +7,46 @@ :type="dataFrom.englishTitle" >
-
-
-
{{ item.childrenTitle }}
-
-
-
- {{ carditem.attrType }}: - - - {{ carditem.attrValue }} - +
+
+
+
{{ item.childrenTitle }}
+
+
+
+ {{ carditem.attrType }}: + + + {{ carditem.attrValue }} + +
+
+
+
+
+
请申请后查看
+
+
+
+
+
{{ item.childrenTitle }}
+
+
+
+ {{ carditem.attrType }}: + + + {{ carditem.attrValue }} + +
@@ -33,6 +58,8 @@