wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
a0049873 2022-07-25 10:17:20 +08:00
parent 011cd3708a 859005e1c0
commit dc4b16d04d
3 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
View File

@ -38,11 +38,11 @@
englishTitle: 'DEPARTMENT&ERVICE', englishTitle: 'DEPARTMENT&ERVICE',
content: [ content: [
{ {
childrenTitle: '归属部门信息', childrenTitle: '归属部门',
childrenContent: [], childrenContent: [],
}, },
{ {
childrenTitle: '服务商信息', childrenTitle: '服务商',
childrenContent: [], childrenContent: [],
}, },
], ],
@ -54,17 +54,17 @@
}) })
if (props.dataList.infoList) { if (props.dataList.infoList) {
let obj = { let obj = {
attrType: '部门名称', attrType: '归属部门',
attrValue: props.dataList.deptName || '------', attrValue: props.dataList.deptName || '------',
} }
dataFrom.value.content[0].childrenContent[0] = obj dataFrom.value.content[0].childrenContent[0] = obj
let deptContacts = { let deptContacts = {
attrType: '部门联系人', attrType: '联系人',
attrValue: props.dataList.deptContacts || '------', attrValue: props.dataList.deptContacts || '------',
} }
dataFrom.value.content[0].childrenContent[1] = deptContacts dataFrom.value.content[0].childrenContent[1] = deptContacts
let deptPhone = { let deptPhone = {
attrType: '部门联系电话', attrType: '联系人电话',
attrValue: props.dataList.deptPhone || '------', attrValue: props.dataList.deptPhone || '------',
} }
dataFrom.value.content[0].childrenContent[2] = deptPhone dataFrom.value.content[0].childrenContent[2] = deptPhone
@ -85,11 +85,13 @@
} }
} else if (item.attrType === '服务商联系人') { } else if (item.attrType === '服务商联系人') {
dataFrom.value.content[1].childrenContent[1] = item dataFrom.value.content[1].childrenContent[1] = item
dataFrom.value.content[1].childrenContent[1].attrType = '联系人'
if (dataFrom.value.content[1].childrenContent[1].attrValue == '') { if (dataFrom.value.content[1].childrenContent[1].attrValue == '') {
dataFrom.value.content[1].childrenContent[1].attrValue = '------' dataFrom.value.content[1].childrenContent[1].attrValue = '------'
} }
} else if (item.attrType === '服务商联系电话') { } else if (item.attrType === '服务商联系电话') {
dataFrom.value.content[1].childrenContent[2] = item dataFrom.value.content[1].childrenContent[2] = item
dataFrom.value.content[1].childrenContent[2].attrType = '联系人电话'
if (dataFrom.value.content[1].childrenContent[2].attrValue == '') { if (dataFrom.value.content[1].childrenContent[2].attrValue == '') {
dataFrom.value.content[1].childrenContent[2].attrValue = '------' dataFrom.value.content[1].childrenContent[2].attrValue = '------'
} }
@ -106,17 +108,17 @@
// dataFrom.value.content[0].childrenContent = [] // dataFrom.value.content[0].childrenContent = []
// dataFrom.value.content[1].childrenContent = [] // dataFrom.value.content[1].childrenContent = []
let obj = { let obj = {
attrType: '部门名称', attrType: '归属部门',
attrValue: props.dataList.deptName || '------', attrValue: props.dataList.deptName || '------',
} }
dataFrom.value.content[0].childrenContent[0] = obj dataFrom.value.content[0].childrenContent[0] = obj
let deptContacts = { let deptContacts = {
attrType: '部门联系人', attrType: '联系人',
attrValue: props.dataList.deptContacts || '------', attrValue: props.dataList.deptContacts || '------',
} }
dataFrom.value.content[0].childrenContent[1] = deptContacts dataFrom.value.content[0].childrenContent[1] = deptContacts
let deptPhone = { let deptPhone = {
attrType: '部门联系电话', attrType: '联系人电话',
attrValue: props.dataList.deptPhone || '------', attrValue: props.dataList.deptPhone || '------',
} }
dataFrom.value.content[0].childrenContent[2] = deptPhone dataFrom.value.content[0].childrenContent[2] = deptPhone
@ -140,6 +142,7 @@
} }
} else if (item.attrType === '服务商联系人') { } else if (item.attrType === '服务商联系人') {
dataFrom.value.content[1].childrenContent[1] = item dataFrom.value.content[1].childrenContent[1] = item
dataFrom.value.content[1].childrenContent[1].attrType = '联系人'
if ( if (
dataFrom.value.content[1].childrenContent[1].attrValue == '' dataFrom.value.content[1].childrenContent[1].attrValue == ''
) { ) {
@ -148,6 +151,8 @@
} }
} else if (item.attrType === '服务商联系电话') { } else if (item.attrType === '服务商联系电话') {
dataFrom.value.content[1].childrenContent[2] = item dataFrom.value.content[1].childrenContent[2] = item
dataFrom.value.content[1].childrenContent[2].attrType =
'联系人电话'
if ( if (
dataFrom.value.content[1].childrenContent[2].attrValue == '' dataFrom.value.content[1].childrenContent[2].attrValue == ''
) { ) {
@ -155,9 +160,9 @@
'------' '------'
} }
} }
} else if (item.attrType === '部门联系人') { } else if (item.attrType === '联系人') {
deptContacts.attrValue = item.attrValue || '------' deptContacts.attrValue = item.attrValue || '------'
} else if (item.attrType === '部门联系人电话') { } else if (item.attrType === '联系人电话') {
deptPhone.attrValue = item.attrValue || '------' deptPhone.attrValue = item.attrValue || '------'
} }
}) })
@ -187,11 +192,10 @@
height: 1.5rem; height: 1.5rem;
width: 6.2rem; width: 6.2rem;
border-radius: 0.2rem; border-radius: 0.2rem;
background: linear-gradient( background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
to right, no-repeat;
rgba(113, 132, 252, 0.4), background-position: center;
rgba(148, 163, 252, 0.4) background-size: 100% 100%;
);
padding: 0 0.3rem; padding: 0 0.3rem;
display: flex; display: flex;
flex-direction: column; flex-direction: column;

15
front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
View File

@ -60,7 +60,7 @@
childrenTitle: '归属部门', childrenTitle: '归属部门',
childrenContent: [ childrenContent: [
{ {
attrType: '归属部门名称', attrType: '归属部门',
attrValue: '------', attrValue: '------',
}, },
{ {
@ -74,10 +74,10 @@
], ],
}, },
{ {
childrenTitle: '服务商信息', childrenTitle: '服务商',
childrenContent: [ childrenContent: [
{ {
attrType: '服务商名称', attrType: '服务商',
attrValue: '------', attrValue: '------',
}, },
{ {
@ -226,11 +226,10 @@
height: 1.8rem; height: 1.8rem;
width: 6.6rem; width: 6.6rem;
border-radius: 0.2rem; border-radius: 0.2rem;
background: linear-gradient( background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
to right, no-repeat;
rgba(113, 132, 252, 0.4), background-position: center;
rgba(148, 163, 252, 0.4) background-size: 100% 100%;
);
padding: 0 0.3rem; padding: 0 0.3rem;
display: flex; display: flex;
align-items: center; align-items: center;

18
front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
View File

@ -247,11 +247,10 @@
.content-left { .content-left {
height: 1.8rem; height: 1.8rem;
width: 6.2rem; width: 6.2rem;
background: linear-gradient( background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
to right, no-repeat;
rgba(113, 132, 252, 0.4), background-position: center;
rgba(148, 163, 252, 0.4) background-size: 100% 100%;
);
border-radius: 0.1rem; border-radius: 0.1rem;
margin-right: 0.6rem; margin-right: 0.6rem;
box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4); box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
@ -310,11 +309,10 @@
.content-right { .content-right {
height: 1.8rem; height: 1.8rem;
width: 6.2rem; width: 6.2rem;
background: linear-gradient( background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
to right, no-repeat;
rgba(113, 132, 252, 0.4), background-position: center;
rgba(148, 163, 252, 0.4) background-size: 100% 100%;
);
border-radius: 0.1rem; border-radius: 0.1rem;
box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4); box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
display: flex; display: flex;