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 

# Conflicts:
#	front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
This commit is contained in:
a0049873 2022-07-19 18:52:02 +08:00
parent 7bcb6b2062 b6ce94a078
commit f820d49f58
8 changed files with 110 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -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

22
front/src/views/capacityOnTheShelf/Algorithm.vue
View File

@ -28,7 +28,15 @@
:refData="refData"
:dataFrom="dataFrom"
:videoList="videoList"
:externalField="['算法名称', '算法描述', '共享条件', '共享类型']"
:externalField="[
'算法名称',
'算法描述',
'共享条件',
'共享类型',
'归属部门',
'部门联系人',
'部门联系人电话',
]"
></put-on-the-shelf>
<put-on-the-shelf
v-else-if="showView === '算法优势'"
@ -328,7 +336,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 = {
@ -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)
})

14
front/src/views/capacityOnTheShelf/Application.vue
View File

@ -28,7 +28,13 @@
:dataFrom="dataFrom"
:videoList="videoList"
:imgList="imgList"
:externalField="['应用名称', '应用描述']"
:externalField="[
'应用名称',
'应用描述',
'归属部门',
'部门联系人',
'部门联系人电话',
]"
></put-on-the-shelf>
<put-on-the-shelf
v-else-if="showView === '功能介绍'"
@ -225,7 +231,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 = {
@ -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

7
front/src/views/capacityOnTheShelf/BusinessComponent.vue
View File

@ -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

7
front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
View File

@ -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

7
front/src/views/capacityOnTheShelf/LayerServices.vue
View File

@ -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

62
front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
View File

@ -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: 上架
-->
<template>
@ -318,12 +318,24 @@
:list="props.videoList"
tip="支持视频类型，大小不超过100M"
></upload>
<a-button
<!-- <a-button
v-else-if="item.type == 'AssociatedApplication'"
@click="sourceClick"
>
请选择来源应用
</a-button>
</a-button> -->
<a-select
v-else-if="item.type == 'select' && item.name == '来源应用'"
style="width: 2.4rem"
v-model:value="item.note1"
show-search
placeholder="请输入关键字"
:options="item.options"
:filter-option="applicationsOption"
@focus="applicationsFocus"
@blur="applicationsBlur"
@change="applicationsChange"
></a-select>
<a-button
v-else-if="item.type == 'AssociatedComponents'"
@click="componentsClick"
@ -605,6 +617,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)
})
@ -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
}
</script>
<style></style>
<style lang="less" scoped>

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

@ -237,6 +237,7 @@
max-width: 2.8rem;
div {
max-width: 2.8rem;
display: flex;
// overflow: hidden;
// text-overflow: ellipsis;
// display: -webkit-box;