diff --git a/.gitignore b/.gitignore
index 95d963eb..ea7fa33a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ back/dist-市局-后台管理-v0.8.2.1.zip
front/public/index.html
back/dist-西海岸-后台管理-v0.8.2.1.zip
back/dist-市局-后台管理-v0.8.2.3.zip
+back/dist-西海岸-后台管理-v0.8.2.4.d.zip
+*.zip
\ No newline at end of file
diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue
index b0340a92..85cebc5b 100644
--- a/front/src/views/capacityOnTheShelf/Algorithm.vue
+++ b/front/src/views/capacityOnTheShelf/Algorithm.vue
@@ -27,7 +27,15 @@
:refData="refData"
:dataFrom="dataFrom"
:videoList="videoList"
- :externalField="['算法名称', '算法描述', '共享条件', '共享类型']"
+ :externalField="[
+ '算法名称',
+ '算法描述',
+ '共享条件',
+ '共享类型',
+ '归属部门',
+ '部门联系人',
+ '部门联系人电话',
+ ]"
>
{
getUserInfo(res6.data.data.id).then((res2) => {
- const deptId = res2.data.data.deptId
+ const deptId = dataFrom.value.deptId
const userId = res2.data.data.id
const userName = res2.data.data.realName
const params = {
@@ -386,6 +394,16 @@
case '接口请求方式':
dataFrom.value.apiMethodType = obj.attrValue
break
+ case '归属部门':
+ dataFrom.value.deptId = obj.attrValue
+ dataFrom.value.deptName = obj.attrValueTwo.label
+ break
+ case '部门联系人':
+ dataFrom.value.deptContacts = obj.attrValue
+ break
+ case '部门联系人电话':
+ dataFrom.value.deptPhone = obj.attrValue
+ break
}
// console.log('dataFrom.value', dataFrom.value)
})
diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue
index 9e66206a..dae497f0 100644
--- a/front/src/views/capacityOnTheShelf/Application.vue
+++ b/front/src/views/capacityOnTheShelf/Application.vue
@@ -28,7 +28,13 @@
:dataFrom="dataFrom"
:videoList="videoList"
:imgList="imgList"
- :externalField="['应用名称', '应用描述']"
+ :externalField="[
+ '应用名称',
+ '应用描述',
+ '归属部门',
+ '部门联系人',
+ '部门联系人电话',
+ ]"
>
{
getUserInfo(res6.data.data.id).then((res2) => {
- const deptId = res2.data.data.deptId
+ const deptId = dataFrom.value.deptId
const userId = res2.data.data.id
const userName = res2.data.data.realName
const params = {
@@ -339,6 +345,10 @@
case '访问地址':
dataFrom.value.link = obj.attrValue
break
+ case '归属部门':
+ dataFrom.value.deptId = obj.attrValue
+ dataFrom.value.deptName = obj.attrValueTwo.label
+ break
case '部门联系人':
dataFrom.value.deptContacts = obj.attrValue
break
diff --git a/front/src/views/capacityOnTheShelf/BusinessComponent.vue b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
index 9d8a9617..dd1d89e2 100644
--- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue
+++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
@@ -32,6 +32,7 @@
'组件描述',
'共享条件',
'共享类型',
+ '归属部门',
'部门联系人',
'部门联系人电话',
]"
@@ -253,7 +254,7 @@
dataFrom.value.id = res.data.data
getUser().then((res6) => {
getUserInfo(res6.data.data.id).then((res2) => {
- const deptId = res2.data.data.deptId
+ const deptId = dataFrom.value.deptId
const userId = res2.data.data.id
const userName = res2.data.data.realName
const params = {
@@ -349,6 +350,10 @@
case '共享类型':
dataFrom.value.shareType = obj.attrValue
break
+ case '归属部门':
+ dataFrom.value.deptId = obj.attrValue
+ dataFrom.value.deptName = obj.attrValueTwo.label
+ break
case '部门联系人':
dataFrom.value.deptContacts = obj.attrValue
break
diff --git a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
index 9203d616..ead4358f 100644
--- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
+++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
@@ -33,6 +33,7 @@
'组件描述',
'共享条件',
'共享类型',
+ '归属部门',
'部门联系人',
'部门联系人电话',
]"
@@ -253,7 +254,7 @@
dataFrom.value.id = res.data.data
getUser().then((res6) => {
getUserInfo(res6.data.data.id).then((res2) => {
- const deptId = res2.data.data.deptId
+ const deptId = dataFrom.value.deptId
const userId = res2.data.data.id
const userName = res2.data.data.realName
const params = {
@@ -349,6 +350,10 @@
case '共享类型':
dataFrom.value.shareType = obj.attrValue
break
+ case '归属部门':
+ dataFrom.value.deptId = obj.attrValue
+ dataFrom.value.deptName = obj.attrValueTwo.label
+ break
case '部门联系人':
dataFrom.value.deptContacts = obj.attrValue
break
diff --git a/front/src/views/capacityOnTheShelf/LayerServices.vue b/front/src/views/capacityOnTheShelf/LayerServices.vue
index 0c58e0e2..4d898100 100644
--- a/front/src/views/capacityOnTheShelf/LayerServices.vue
+++ b/front/src/views/capacityOnTheShelf/LayerServices.vue
@@ -32,6 +32,7 @@
'图层描述',
'共享条件',
'共享类型',
+ '归属部门',
'部门联系人',
'部门联系人电话',
]"
@@ -201,7 +202,7 @@
dataFrom.value.id = res.data.data
getUser().then((res6) => {
getUserInfo(res6.data.data.id).then((res2) => {
- const deptId = res2.data.data.deptId
+ const deptId = dataFrom.value.deptId
const userId = res2.data.data.id
const userName = res2.data.data.realName
const params = {
@@ -297,6 +298,10 @@
case '共享类型':
dataFrom.value.shareType = obj.attrValue
break
+ case '归属部门':
+ dataFrom.value.deptId = obj.attrValue
+ dataFrom.value.deptName = obj.attrValueTwo.label
+ break
case '部门联系人':
dataFrom.value.deptContacts = obj.attrValue
break
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index 8f1a3a81..a0359b3b 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -609,6 +609,9 @@
getUserInfo().then(({ data: res1 }) => {
console.log(res1.data)
item.note1 = res1.data.deptId
+ item.note2 = item.options.filter(
+ (val) => val.value == item.note1
+ )[0]
console.log('默认部门=========>', item, res1.data)
data.value.list.push(item)
})
@@ -620,6 +623,7 @@
console.log(res1.data)
item.note1 = res1.data.realName || ''
})
+ data.value.list.push(item)
}
} else if (item.name === '部门联系人电话') {
if (!item.note1) {
@@ -627,6 +631,7 @@
console.log(res1.data)
item.note1 = res1.data.mobile || ''
})
+ data.value.list.push(item)
}
} else if (item.name === '来源应用') {
queryApplicationRelByResourceId({
@@ -676,7 +681,6 @@
}
mybus.on('showTextFunctionEmit', (show) => {
console.log('ssdcsd')
- debugger
showText.value = show
})
mybus.off('func')
@@ -921,10 +925,15 @@
props.externalField &&
props.externalField.indexOf(val.name) > -1
) {
+ let note2 = {} //储存归属部门的名字
+ if (val.options) {
+ note2 = val.options.filter((item) => item.value == val.note1)[0]
+ }
mybus.emit('chageDataFromDwon', {
attrType: val.name,
attrValue: val.note1,
delFlag: 0,
+ attrValueTwo: note2,
})
} else {
if (val.name !== '应用领域' && val.name !== '发布端') {
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
index 1d5f2198..32acb728 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
@@ -237,6 +237,7 @@
max-width: 2.8rem;
div {
max-width: 2.8rem;
+ display: flex;
// overflow: hidden;
// text-overflow: ellipsis;
// display: -webkit-box;