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 bb9de2a6..96ecab54 100644
--- a/front/src/views/capacityOnTheShelf/Algorithm.vue
+++ b/front/src/views/capacityOnTheShelf/Algorithm.vue
@@ -28,7 +28,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 = {
@@ -457,6 +465,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 2c637f08..63898e7d 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-17 14:11:08
* @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-19 18:49:40
+ * @LastEditTime: 2022-07-19 18:51:52
* @Description: 上架
-->
@@ -318,12 +318,24 @@
:list="props.videoList"
tip="支持视频类型,大小不超过100M"
>
-
请选择来源应用
-
+ -->
+
{
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)
})
@@ -616,6 +631,7 @@
console.log(res1.data)
item.note1 = res1.data.realName || ''
})
+ data.value.list.push(item)
}
} else if (item.name === '部门联系人电话') {
if (!item.note1) {
@@ -623,7 +639,22 @@
console.log(res1.data)
item.note1 = res1.data.mobile || ''
})
+ data.value.list.push(item)
}
+ } else if (item.name === '来源应用') {
+ queryApplicationRelByResourceId({
+ referenceId: 0,
+ }).then((res) => {
+ const dataList = []
+ res.data.data.notLinked.forEach((element) => {
+ dataList.push({
+ value: element.id,
+ label: element.name,
+ })
+ })
+ item.options = dataList
+ data.value.list.push(item)
+ })
} else {
data.value.list.push(item)
}
@@ -659,7 +690,6 @@
}
mybus.on('showTextFunctionEmit', (show) => {
console.log('ssdcsd')
- debugger
showText.value = show
})
mybus.off('func')
@@ -775,7 +805,7 @@
const targetKeysOther = ref([])
// 上一步关联数据
// const targetKeysBack = ref([])
-
+ // 来源应用-back
const sourceClick = () => {
mockData.value = []
visibleAssociatedApplication.value = true
@@ -927,10 +957,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 !== '发布端') {
@@ -946,14 +981,28 @@
const handleChange2 = (value) => {
console.log(`selected ${value}`)
}
+ const applicationsChange = (value) => {
+ data.value.list.map((item) => {
+ if (item.name === '来源应用') {
+ item.note1 = value
+ }
+ })
+ console.log(`selected ${value}`)
+ }
const handleBlur = () => {
console.log('blur')
}
+ const applicationsBlur = () => {
+ console.log('blur')
+ }
const handleFocus = () => {
console.log('focus')
}
+ const applicationsFocus = () => {
+ console.log('focus')
+ }
const filterOption = (input, option) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -961,6 +1010,9 @@
defineExpose({
add,
})
+ const applicationsOption = (input, option) => {
+ return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ }