From d75d7e1eab77f8f5d9be17f78f6ce0333a8afa8c Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Fri, 1 Jul 2022 18:33:11 +0800 Subject: [PATCH] =?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 --- .../components/Business/BusinessUsageMode.vue | 31 +++- .../LayerService/LayerServiceUsageMode.vue | 141 +++++++++++------- 2 files changed, 111 insertions(+), 61 deletions(-) diff --git a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue index 4c3df242..8ae5dd57 100644 --- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue +++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue @@ -27,7 +27,7 @@
- +
{{ item.contact }}

{{ item.contact }} @@ -53,7 +53,7 @@

- +
{{ item.contact2 }}

{{ item.contact2 }} @@ -97,14 +97,14 @@ name: '接口地址：', }, linkValue: '', - contact: '归属部门：', + contact: '归属部门', facilitator: { name: '归属部门：', value: '' }, people: { name: '部门联系人：', value: '' }, phone: { name: '联系人电话：', value: '', }, - contact2: '服务商：', + contact2: '服务商', facilitator2: { name: '服务商：', value: '' }, people2: { name: '服务商联系人：', value: '' }, phone2: { @@ -121,7 +121,14 @@ const flag = ref(true) if (props.dataList.infoList) { let obj = props.dataList.infoList.filter( - (item) => item.attrType === '技术文档' + (item) => + item.attrType === '技术文档' || + item.attrType === '服务商' || + item.attrType === '服务商联系人' || + item.attrType === '使用手册' || + item.attrType === '服务地址' || + item.attrType === '样式服务地址' || + item.attrType === '服务商联系电话' )[0] if (!obj) { flag.value = false @@ -149,7 +156,16 @@ () => props.dataList, (val) => { if (val) { - let obj = val.infoList.filter((item) => item.attrType === '技术文档')[0] + let obj = val.infoList.filter( + (item) => + item.attrType === '技术文档' || + item.attrType === '服务商' || + item.attrType === '服务商联系人' || + item.attrType === '使用手册' || + item.attrType === '服务地址' || + item.attrType === '样式服务地址' || + item.attrType === '服务商联系电话' + )[0] if (!obj) { flag.value = false } else { @@ -299,7 +315,7 @@ } .content-right-content { display: flex; - font-size: 0.18rem; + font-size: 0.16rem; color: rgba(33, 41, 86, 0.8); line-height: 0.2rem; overflow: hidden; @@ -311,6 +327,7 @@ height: 0.2rem; display: -webkit-box; // overflow: hidden; + margin-bottom: 0.08rem; white-space: nowrap; -webkit-line-clamp: 1; -webkit-box-orient: vertical; diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue index 51a3610e..4e100f80 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue @@ -27,25 +27,57 @@

-
- - {{ item.contact }} +
+
{{ item.contact }}
+
+

+ {{ item.contact }} + + + {{ item.facilitator.value }} + +

+

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

+

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

+
-
-

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

-

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

+
+
{{ item.contact2 }}
+
+

+ {{ item.contact2 }} + + + {{ item.facilitator2.value }} + +

+

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

+

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

+
@@ -67,13 +99,19 @@ name: '接口地址：', }, linkValue: '', - csslnkValue: '', contact: '归属部门', - facilitator: { name: '归属部门：', values: '讯飞科大' }, - people: { name: '部门联系人：', value: '李四' }, + facilitator: { name: '归属部门：', value: '' }, + people: { name: '部门联系人：', value: '' }, phone: { name: '联系人电话：', - value: '12345678901', + value: '', + }, + contact2: '服务商', + facilitator2: { name: '服务商：', value: '' }, + people2: { name: '服务商联系人：', value: '' }, + phone2: { + name: '联系人电话：', + value: '', }, }, ], @@ -98,22 +136,21 @@ flag.value = false } else { // eslint-disable-next-line vue/no-setup-props-destructure - // dataFrom.value.content[0].link.value = props.dataList.apiUrl - dataFrom.value.content[0].facilitator.values = props.dataList.deptName + dataFrom.value.content[0].link.value = props.dataList.apiUrl + dataFrom.value.content[0].facilitator.value = props.dataList.deptName dataFrom.value.content[0].people.value = props.dataList.deptContacts dataFrom.value.content[0].phone.value = props.dataList.deptPhone console.log('dataList', props.dataList) props.dataList.infoList.map((item) => { - if (item.attrType === '使用手册') { - dataFrom.value.link = item.attrValue || '--' - } else if (item.attrType === '服务地址') { + if (item.attrType === '组件地址') { dataFrom.value.content[0].linkValue = item.attrValue || '--' - } else if (item.attrType === '样式服务地址') { - dataFrom.value.content[0].csslnkValue = item.attrValue || '--' + } else if (item.attrType === '服务商') { + dataFrom.value.content[0].facilitator2.value = item.attrValue || '--' + } else if (item.attrType === '服务商联系人') { + dataFrom.value.content[0].people2.value = item.attrValue || '--' + } else if (item.attrType === '服务商联系电话') { + dataFrom.value.content[0].phone2.value = item.attrValue || '--' } - // else if (item.attrType === '服务商联系电话') { - // dataFrom.value.content[0].phone.value = item.deptPhone || '--' - // } }) } } @@ -134,27 +171,22 @@ if (!obj) { flag.value = false } else { - // dataFrom.value.content[0].link.value = val.apiUrl - dataFrom.value.content[0].facilitator.values = val.deptName + dataFrom.value.content[0].link.value = val.apiUrl + dataFrom.value.content[0].facilitator.value = val.deptName dataFrom.value.content[0].people.value = val.deptContacts dataFrom.value.content[0].phone.value = val.deptPhone console.log('dataList', val) val.infoList.map((item) => { - if (item.attrType === '使用手册') { - dataFrom.value.link = item.attrValue || '--' - } else if (item.attrType === '服务地址') { + if (item.attrType === '组件地址') { dataFrom.value.content[0].linkValue = item.attrValue || '--' - } else if (item.attrType === '样式服务地址') { - dataFrom.value.content[0].csslnkValue = item.attrValue || '--' + } else if (item.attrType === '服务商') { + dataFrom.value.content[0].facilitator2.value = + item.attrValue || '--' + } else if (item.attrType === '服务商联系人') { + dataFrom.value.content[0].people2.value = item.attrValue || '--' + } else if (item.attrType === '服务商联系电话') { + dataFrom.value.content[0].phone2.value = item.attrValue || '--' } - // else if (item.attrType === '服务商') { - // dataFrom.value.content[0].facilitator.value = - // item.attrValue || '--' - // } else if (item.attrType === '服务商联系人') { - // dataFrom.value.content[0].people.value = item.attrValue || '--' - // } else if (item.attrType === '服务商联系电话') { - // dataFrom.value.content[0].phone.value = item.attrValue || '--' - // } }) } } @@ -275,10 +307,13 @@ box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4); display: flex; justify-content: space-around; - + align-items: center; padding: 0 0.3rem; - flex-direction: column; - justify-content: center; + .content-right-left { + border-right: 0.01rem solid #b0b9f1; + padding-right: 0.1rem; + margin-right: 0.1rem; + } .content-right-title { font-size: 0.26rem; line-height: 0.26rem; @@ -287,15 +322,13 @@ } .content-right-content { display: flex; - font-size: 0.18rem; + font-size: 0.16rem; color: rgba(33, 41, 86, 0.8); line-height: 0.2rem; overflow: hidden; -webkit-line-clamp: 1; -webkit-box-orient: vertical; - flex-direction: row; - margin-top: 0.2rem; - justify-content: space-between; + flex-direction: column; p { // width: 1.60rem; height: 0.2rem;