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/home/DetailsPageconetent.vue
This commit is contained in:
851673013@qq.com 2022-07-25 19:33:44 +08:00
parent 44e2d6a9b9 975a51e4b4
commit 32997c5f73
12 changed files with 852 additions and 537 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
back/src/mixins/view-module.js
View File

@ -109,11 +109,15 @@ export default {
} }
console.log('数据列表', this.dataList, this.mixinViewModuleOptions.getDataListURL) console.log('数据列表', this.dataList, this.mixinViewModuleOptions.getDataListURL)
// if (this.dataList[0].type === '组件服务') { if (this.dataList[0].type === '组件服务') {
// this.dataList.map(val => { this.dataList.map(val => {
// val.infoList = val.infoList.filter(item => item.attrType === '部署位置' || item.attrType === '组件类型' || item.attrType === '应用领域') val.infoList2 = val.infoList.filter(item => item.attrType === '应用领域' || item.attrType === '组件类型')
// }) })
// } } else if (this.dataList[0].type === '应用资源') {
this.dataList.map(val => {
val.infoList2 = val.infoList.filter(item => item.attrType === '应用领域')
})
}
if (this.mixinViewModuleOptions.requestCallback) { if (this.mixinViewModuleOptions.requestCallback) {
this.mixinViewModuleOptions.requestCallback(res.data) this.mixinViewModuleOptions.requestCallback(res.data)
} }

170
back/src/views/modules/ability/bsabilityai.vue
View File

@ -66,6 +66,38 @@
header-align="center" header-align="center"
align="center" align="center"
></af-table-column> ></af-table-column>
<af-table-column
:show-overflow-tooltip="true"
width="280"
prop="description"
label="组件描述"
header-align="center"
align="center"
></af-table-column>
<af-table-column
:show-overflow-tooltip="true"
width="280"
prop="deptName"
label="归属部门"
header-align="center"
align="center"
></af-table-column>
<af-table-column
:show-overflow-tooltip="true"
width="280"
prop="deptContacts"
label="部门联系人"
header-align="center"
align="center"
></af-table-column>
<af-table-column
:show-overflow-tooltip="true"
width="280"
prop="deptPhone"
label="部门联系人电话"
header-align="center"
align="center"
></af-table-column>
<af-table-column <af-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="280" width="280"
@ -74,18 +106,18 @@
header-align="center" header-align="center"
align="center" align="center"
></af-table-column> ></af-table-column>
<template v-if="dataList[0] && dataList[0].infoList"> <template v-if="dataList[0] && dataList[0].infoList2">
<af-table-column <af-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="300" width="280"
v-for="(item, index) in dataList[0].infoList" v-for="(item, index) in dataList[0].infoList2"
:key="index" :key="index"
:label="item.attrType" :label="item.attrType"
header-align="center" header-align="center"
align="center" align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ findValue(scope.row.infoList, item.attrType) }} {{ findValue(scope.row.infoList2, item.attrType) }}
</template> </template>
</af-table-column> </af-table-column>
</template> </template>
@ -94,7 +126,7 @@
fixed="right" fixed="right"
header-align="center" header-align="center"
align="center" align="center"
width="150" width="300"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button <!-- <el-button
@ -187,10 +219,14 @@
width="50%" width="50%"
> >
<putOnTheShelf <putOnTheShelf
ref="putOnTheShelf"
:putOnTheShelfList="putOnTheShelfList" :putOnTheShelfList="putOnTheShelfList"
@changeInfoList="changeInfoList" @changeInfoList="changeInfoList"
:type="radio" :type="radio"
:typeInput="typeInput" :typeInput="typeInput"
:required="required"
:notFilled="notFilled"
@submitData="submitData"
></putOnTheShelf> ></putOnTheShelf>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="clear">取 消</el-button> <el-button @click="clear">取 消</el-button>
@ -211,6 +247,8 @@ export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
data () { data () {
return { return {
required: ['归属部门', '部门联系人', '部门联系人电话', '应用领域', '共享条件', '算法名称', '算法描述', '图层名称', '图层描述', '组件名称', '组件描述', '组件地址', '服务地址', '服务接口', '接口请求方式', '算法类别'],
notFilled: [],
insertList: [], insertList: [],
putOnTheShelfList: [], putOnTheShelfList: [],
radio: '', radio: '',
@ -300,19 +338,18 @@ export default {
this.dataList = this.mixinViewModuleOptions.getDataListIsPage this.dataList = this.mixinViewModuleOptions.getDataListIsPage
? res.data.list ? res.data.list
: res.data : res.data
// this.dataList.map((item, index) => { this.dataList.map((item, index) => {
// const dataListSinforList = [] const dataListSinforList = []
// item.infoList.map((itemson, indexson) => { item.infoList.map((itemson, indexson) => {
// if ( if (
// itemson.attrType === '部署位置' || itemson.attrType === '应用领域' ||
// itemson.attrType === '组件类型' || itemson.attrType === '组件类型'
// itemson.attrType === '应用领域' ) {
// ) { dataListSinforList.push(itemson)
// dataListSinforList.push(itemson) }
// } })
// }) this.dataList[index].infoList2 = dataListSinforList
// this.dataList[index].infoList = dataListSinforList })
// })
console.log('this.dataList', this.dataList) console.log('this.dataList', this.dataList)
this.total = this.mixinViewModuleOptions.getDataListIsPage this.total = this.mixinViewModuleOptions.getDataListIsPage
? res.data.total ? res.data.total
@ -387,19 +424,18 @@ export default {
this.mixinViewModuleOptions.requestCallback(res.data) this.mixinViewModuleOptions.requestCallback(res.data)
} }
this.dataListLoading = false this.dataListLoading = false
// this.dataList.map((item, index) => { this.dataList.map((item, index) => {
// const dataListSinforList = [] const dataListSinforList = []
// item.infoList.map((itemson, indexson) => { item.infoList.map((itemson, indexson) => {
// if ( if (
// itemson.attrType === '部署位置' || itemson.attrType === '应用领域' ||
// itemson.attrType === '组件类型' || itemson.attrType === '组件类型'
// itemson.attrType === '应用领域' ) {
// ) { dataListSinforList.push(itemson)
// dataListSinforList.push(itemson) }
// } })
// }) this.dataList[index].infoList2 = dataListSinforList
// this.dataList[index].infoList = dataListSinforList })
// })
} else { } else {
this.$message.error('未查询到相关信息') this.$message.error('未查询到相关信息')
this.reset() this.reset()
@ -448,6 +484,7 @@ export default {
// 新上架 // 新上架
clear () { clear () {
console.log('清空----------------------------------------') console.log('清空----------------------------------------')
this.notFilled = []
this.showPutOnTheShelfFlag = false this.showPutOnTheShelfFlag = false
this.showPutOnTheShelfFlag2 = false this.showPutOnTheShelfFlag2 = false
this.insertList = [] this.insertList = []
@ -490,8 +527,24 @@ export default {
) )
this.submitFrom.infoList.push(obj) this.submitFrom.infoList.push(obj)
}, },
changeAdd () {
const arr = []
switch (this.radio) {
case '智能算法':
arr.push('算法优势')
arr.push('计费标准信息')
break
case '开发组件':
case '业务组件':
arr.push('功能介绍')
break
}
arr.push('应用场景')
arr.push('常见问题')
this.$refs.putOnTheShelf.submit(arr)
},
submitData () { submitData () {
console.log('提交11111111111===============>', this.putOnTheShelfList) console.log('提交11111111111===============>', this.putOnTheShelfList, this.submitFrom)
const arr = [] const arr = []
this.putOnTheShelfList.map((item) => { this.putOnTheShelfList.map((item) => {
item.children.map((child) => { item.children.map((child) => {
@ -527,7 +580,7 @@ export default {
(item) => item.attrType !== val.name (item) => item.attrType !== val.name
) )
} }
if (val.note1) { if (val.note1 == '' || val.note1) {
switch (val.name) { switch (val.name) {
case '算法名称': case '算法名称':
case '应用名称': case '应用名称':
@ -603,6 +656,51 @@ export default {
this.submitFrom.infoList = this.submitFrom.infoList.sort( this.submitFrom.infoList = this.submitFrom.infoList.sort(
(a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType) (a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType)
) )
this.notFilled = []
if (!this.submitFrom.name) {
this.notFilled.push('算法名称')
this.notFilled.push('图层名称')
this.notFilled.push('组件名称')
}
if (!this.submitFrom.description) {
this.notFilled.push('算法描述')
this.notFilled.push('图层描述')
this.notFilled.push('组件描述')
}
if (!this.submitFrom.shareCondition) {
this.notFilled.push('共享条件')
}
if (!this.submitFrom.deptContacts) {
this.notFilled.push('部门联系人')
}
if (!this.submitFrom.deptPhone) {
this.notFilled.push('部门联系人电话')
}
if (this.radio === '智能算法' && !this.submitFrom.apiUrl) {
this.notFilled.push('服务接口')
}
if (this.radio === '智能算法' && !this.submitFrom.apiMethodType) {
this.notFilled.push('接口请求方式')
}
if (this.radio === '智能算法' && (!this.submitFrom.infoList.filter(val => val.attrType === '算法类别')[0] || !this.submitFrom.infoList.filter(val => val.attrType === '算法类别')[0].attrValue)) {
this.notFilled.push('算法类别')
}
if (!this.submitFrom.infoList.filter(val => val.attrType === '应用领域')[0] || !this.submitFrom.infoList.filter(val => val.attrType === '应用领域')[0].attrValue) {
this.notFilled.push('应用领域')
}
if (this.radio === '图层服务' && (!this.submitFrom.infoList.filter(val => val.attrType === '服务地址')[0] || !this.submitFrom.infoList.filter(val => val.attrType === '服务地址')[0].attrValue)) {
this.notFilled.push('服务地址')
}
if ((this.radio === '业务组件' || this.radio === '开发组件') && (!this.submitFrom.infoList.filter(val => val.attrType === '组件地址')[0] || !this.submitFrom.infoList.filter(val => val.attrType === '组件地址')[0].attrValue)) {
this.notFilled.push('组件地址')
}
console.log(this.submitFrom, this.notFilled, '表单验证')
if (this.notFilled.length > 0) {
this.$message({
message: '请填写必填字段！',
type: 'warning'
})
} else {
if (this.submitFrom.id) { if (this.submitFrom.id) {
// 解决编辑无组件类型 // 解决编辑无组件类型
this.submitFrom.infoList.map((val) => { this.submitFrom.infoList.map((val) => {
@ -621,10 +719,6 @@ export default {
} }
) )
this.submitFrom.infoList = newArr this.submitFrom.infoList = newArr
console.log(
this.submitFrom.infoList,
'====================================wpwpwp'
)
this.$http this.$http
.put('/resource/update', this.submitFrom) .put('/resource/update', this.submitFrom)
.then(({ data: res }) => { .then(({ data: res }) => {
@ -637,6 +731,7 @@ export default {
}) })
.catch(() => {}) .catch(() => {})
} else { } else {
console.log('提交11111111111===============>', this.putOnTheShelfList, this.submitFrom)
this.$http this.$http
.post('/resource/insert?source= b', this.submitFrom) .post('/resource/insert?source= b', this.submitFrom)
.then(({ data: res }) => { .then(({ data: res }) => {
@ -649,6 +744,7 @@ export default {
}) })
.catch(() => {}) .catch(() => {})
} }
}
}, },
// 新修改 // 新修改
UpdateData (item) { UpdateData (item) {

119
back/src/views/modules/ability/bsabilityservice.vue
View File

@ -61,22 +61,65 @@
width="50" width="50"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
:show-overflow-tooltip="true"
width="280"
prop="name" prop="name"
label="应用名称" label="应用名称"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> ></el-table-column>
<template v-if="dataList[0] && dataList[0].infoList"> <af-table-column
:show-overflow-tooltip="true"
width="280"
prop="description"
label="应用描述"
header-align="center"
align="center"
></af-table-column>
<af-table-column
:show-overflow-tooltip="true"
width="280"
prop="deptName"
label="归属部门"
header-align="center"
align="center"
></af-table-column>
<af-table-column
:show-overflow-tooltip="true"
width="280"
prop="deptContacts"
label="部门联系人"
header-align="center"
align="center"
></af-table-column>
<af-table-column
:show-overflow-tooltip="true"
width="280"
prop="deptPhone"
label="部门联系人电话"
header-align="center"
align="center"
></af-table-column>
<af-table-column
:show-overflow-tooltip="true"
width="280"
prop="shareCondition"
label="共享条件"
header-align="center"
align="center"
></af-table-column>
<template v-if="dataList[0] && dataList[0].infoList2">
<el-table-column <el-table-column
v-for="(item, index) in dataList[0].infoList" v-for="(item, index) in dataList[0].infoList2"
:key="index" :key="index"
:label="item.attrType" :label="item.attrType"
header-align="center" header-align="center"
align="center" align="center"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="280"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ findValue(scope.row.infoList, item.attrType) }} {{ findValue(scope.row.infoList2, item.attrType) }}
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
@ -85,8 +128,7 @@
fixed="right" fixed="right"
header-align="center" header-align="center"
align="center" align="center"
width="94" width="300"
right="0"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -169,7 +211,7 @@
:destroy-on-close='true' :destroy-on-close='true'
:before-close='clear' :before-close='clear'
width="50%"> width="50%">
<putOnTheShelf :putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList' :type='radio' :typeInput='typeInput'></putOnTheShelf> <putOnTheShelf :required="required" :notFilled="notFilled":putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList' :type='radio' :typeInput='typeInput'></putOnTheShelf>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="clear">取 消</el-button> <el-button @click="clear">取 消</el-button>
<el-button type="primary" @click="submitData">确 定</el-button> <el-button type="primary" @click="submitData">确 定</el-button>
@ -191,6 +233,8 @@ export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
data () { data () {
return { return {
required: ['归属部门', '部门联系人', '部门联系人电话', '应用领域', '共享条件', '应用名称', '应用描述', '应用状态', '应用类型'],
notFilled: [],
mixinViewModuleOptions: { mixinViewModuleOptions: {
getDataListURL: '/resource/page', getDataListURL: '/resource/page',
getDataListIsPage: true, getDataListIsPage: true,
@ -282,6 +326,17 @@ export default {
this.mixinViewModuleOptions.requestCallback(res.data) this.mixinViewModuleOptions.requestCallback(res.data)
} }
this.dataListLoading = false this.dataListLoading = false
this.dataList.map((item, index) => {
const dataListSinforList = []
item.infoList.map((itemson, indexson) => {
if (
itemson.attrType === '应用领域'
) {
dataListSinforList.push(itemson)
}
})
this.dataList[index].infoList2 = dataListSinforList
})
}) })
.catch(() => { .catch(() => {
this.dataListLoading = false this.dataListLoading = false
@ -347,6 +402,17 @@ export default {
this.mixinViewModuleOptions.requestCallback(res.data) this.mixinViewModuleOptions.requestCallback(res.data)
} }
this.dataListLoading = false this.dataListLoading = false
this.dataList.map((item, index) => {
const dataListSinforList = []
item.infoList.map((itemson, indexson) => {
if (
itemson.attrType === '应用领域'
) {
dataListSinforList.push(itemson)
}
})
this.dataList[index].infoList2 = dataListSinforList
})
} else { } else {
this.$message.error('未查询到相关信息') this.$message.error('未查询到相关信息')
this.reset() this.reset()
@ -485,6 +551,7 @@ export default {
}, },
// 新上架 // 新上架
clear () { clear () {
this.notFilled = []
this.showPutOnTheShelfFlag2 = false this.showPutOnTheShelfFlag2 = false
this.insertList = [] this.insertList = []
this.putOnTheShelfList = [] this.putOnTheShelfList = []
@ -517,7 +584,6 @@ export default {
this.submitFrom.infoList.push(obj) this.submitFrom.infoList.push(obj)
}, },
submitData () { submitData () {
this.showPutOnTheShelfFlag2 = false
const arr = [] const arr = []
this.putOnTheShelfList.map(item => { this.putOnTheShelfList.map(item => {
item.children.map(child => { item.children.map(child => {
@ -537,7 +603,7 @@ export default {
if (val.type === 'input' || val.type === 'textArea' || val.type === 'select' || val.type === 'checkBox' || val.type === 'radio') { if (val.type === 'input' || val.type === 'textArea' || val.type === 'select' || val.type === 'checkBox' || val.type === 'radio') {
this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== val.name) this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== val.name)
} }
if (val.note1) { if (val.note1 || val.note1) {
switch (val.name) { switch (val.name) {
case '算法名称': case '算法名称':
case '应用名称': case '应用名称':
@ -603,6 +669,38 @@ export default {
}) })
}) })
this.submitFrom.infoList = this.submitFrom.infoList.sort((a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType)) this.submitFrom.infoList = this.submitFrom.infoList.sort((a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType))
this.notFilled = []
console.log(this.submitFrom, '表单验证')
if (!this.submitFrom.name) {
this.notFilled.push('应用名称')
}
if (!this.submitFrom.description) {
this.notFilled.push('应用描述')
}
if (!this.submitFrom.shareCondition) {
this.notFilled.push('共享条件')
}
if (!this.submitFrom.deptContacts) {
this.notFilled.push('部门联系人')
}
if (!this.submitFrom.deptPhone) {
this.notFilled.push('部门联系人电话')
}
if (!this.submitFrom.infoList.filter(val => val.attrType == '应用领域')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用领域')[0].attrValue) {
this.notFilled.push('应用领域')
}
if (!this.submitFrom.infoList.filter(val => val.attrType == '应用状态')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用状态')[0].attrValue) {
this.notFilled.push('应用状态')
}
if (!this.submitFrom.infoList.filter(val => val.attrType == '应用类型')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用类型')[0].attrValue) {
this.notFilled.push('应用类型')
}
if (this.notFilled.length > 0) {
this.$message({
message: '请填写必填字段！',
type: 'warning'
})
} else {
if (this.submitFrom.id) { if (this.submitFrom.id) {
// 解决编辑无组件类型 // 解决编辑无组件类型
this.submitFrom.infoList.map(val => { this.submitFrom.infoList.map(val => {
@ -616,8 +714,10 @@ export default {
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
this.$message.error('修改失败!') this.$message.error('修改失败!')
this.showPutOnTheShelfFlag2 = false
} else { } else {
this.$message.success('修改成功！') this.$message.success('修改成功！')
this.showPutOnTheShelfFlag2 = false
this.clear() this.clear()
} }
}) })
@ -628,13 +728,16 @@ export default {
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
this.$message.error('上架失败!') this.$message.error('上架失败!')
this.showPutOnTheShelfFlag2 = false
} else { } else {
this.$message.success('上架成功！') this.$message.success('上架成功！')
this.showPutOnTheShelfFlag2 = false
this.clear() this.clear()
} }
}) })
.catch(() => {}) .catch(() => {})
} }
}
}, },
// 新修改 // 新修改
UpdateData (item) { UpdateData (item) {

28
back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
View File

@ -16,12 +16,13 @@ js:
<template> <template>
<div id="inputSelectCheckbox"> <div id="inputSelectCheckbox">
<!-- input框 --> <!-- input框 -->
<a-input v-if="type == 'input'" v-model:value="data.note1" :placeholder="'请输入' + name" /> <a-input v-if="type == 'input'" v-model:value="data.note1" :placeholder="'请输入' + name" @change="changeIiem(name,data.note1)"/>
<!-- 下拉框 --> <!-- 下拉框 -->
<el-select <el-select
v-else-if="(type === 'select' && name !== '归属部门' && name !== '使用方式') || type == 'radio'" v-else-if="(type === 'select' && name !== '归属部门' && name !== '使用方式') || type == 'radio'"
style="width: 240px" style="width: 240px"
v-model:value="data.note1" v-model:value="data.note1"
@change="changeIiem(name,data.note1)"
:placeholder="'请选择' + name"> :placeholder="'请选择' + name">
<el-option <el-option
:value="itemSelect.dictLabel" :value="itemSelect.dictLabel"
@ -36,6 +37,7 @@ js:
v-model:value="data.note1" v-model:value="data.note1"
filterable filterable
placeholder="请输入关键词" placeholder="请输入关键词"
@change="changeIiem(name,data.note1)"
:loading="loading"> :loading="loading">
<el-option <el-option
v-for="(itemSelect) in options" v-for="(itemSelect) in options"
@ -73,12 +75,13 @@ js:
v-model="value" v-model="value"
:placeholder="'请输入' + name" :placeholder="'请输入' + name"
:disabled="true" :disabled="true"
@change="changeIiem(name,data.note1)"
/> />
<!-- 单选 --> <!-- 单选 -->
<!-- <el-radio-group v-model:value="data.note1" v-else-if="type == 'radio'"> <!-- <el-radio-group v-model:value="data.note1" v-else-if="type == 'radio'">
<el-radio v-for="item in options" :label="item.dictLabel" :key="item.dictLabel">{{item.dictLabel}}</el-radio> <el-radio v-for="item in options" :label="item.dictLabel" :key="item.dictLabel">{{item.dictLabel}}</el-radio>
</el-radio-group> --> </el-radio-group> -->
<a-textarea v-else-if="type == 'textArea'" v-model:value="data.note1" :showCount="true" :maxlength="200" :placeholder="'请填写' + name" /> <a-textarea v-else-if="type == 'textArea'" @change="changeIiem(name,data.note1)" v-model:value="data.note1" :showCount="true" :maxlength="200" :placeholder="'请填写' + name" />
</div> </div>
</template> </template>
<script> <script>
@ -92,6 +95,7 @@ export default {
data: Array, data: Array,
name: String, name: String,
value: String, value: String,
changeField: Array,
options: { options: {
type: Array, type: Array,
default: null default: null
@ -108,6 +112,15 @@ export default {
} }
}, },
methods: { methods: {
changeIiem (name, value) {
if (value && value !== '' && this.changeField.indexOf(name) == -1) {
this.changeField.push(name)
} else if (!value || value == '') {
if (this.changeField.indexOf(name) > -1) {
this.changeField.splice(this.changeField.indexOf(name), 1)
}
}
},
selectOptions () { selectOptions () {
if (this.data.isLinkToDic === 'true' && this.data.linkValue) { if (this.data.isLinkToDic === 'true' && this.data.linkValue) {
this.$http this.$http
@ -140,7 +153,7 @@ export default {
// dataList.push(element) // dataList.push(element)
// }) // })
// this.options = dataList // this.options = dataList
if (!this.data.note1) { if (this.data.note1 == null) {
this.$http.get('/sys/user/info').then(({ data: res }) => { this.$http.get('/sys/user/info').then(({ data: res }) => {
console.log(res.data) console.log(res.data)
this.data.note1 = res.data.realName || '' this.data.note1 = res.data.realName || ''
@ -154,7 +167,7 @@ export default {
// dataList.push(element) // dataList.push(element)
// }) // })
// this.options = dataList // this.options = dataList
if (!this.data.note1) { if (this.data.note1 == null) {
this.$http.get('/sys/user/info').then(({ data: res }) => { this.$http.get('/sys/user/info').then(({ data: res }) => {
console.log(res.data) console.log(res.data)
this.data.note1 = res.data.mobile || '' this.data.note1 = res.data.mobile || ''
@ -172,6 +185,13 @@ export default {
} }
}) })
this.data.note1 = str this.data.note1 = str
if (str !== '' && this.changeField.indexOf('应用领域') == -1) {
this.changeField.push('应用领域')
} else if (str == '') {
if (this.changeField.indexOf('应用领域') > -1) {
this.changeField.splice(this.changeField.indexOf('应用领域'), 1)
}
}
}, },
showTypeClick (e) { showTypeClick (e) {
this.showType = e this.showType = e

24
back/src/views/modules/putOnTheShelf/components/special.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-07-08 09:54:50 * @Date: 2022-07-08 09:54:50
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-11 16:18:00 * @LastEditTime: 2022-07-25 11:20:25
* @Description: 多条数据特殊处理 * @Description: 多条数据特殊处理
--> -->
<template> <template>
@ -33,7 +33,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="add">添加更多{{ configure.name }}</div> <!-- <div class="add">添加更多{{ configure.name }}</div> -->
<div class="form" v-for="(val, index) in configure.list" :key="'key3' + val.name + index"> <div class="form" v-for="(val, index) in configure.list" :key="'key3' + val.name + index">
<span>{{ val.name }}</span> <span>{{ val.name }}</span>
<a-input v-model:value="val.note1" ::maxlength="24" :placeholder="'请填写' + val.name + ',不超过24个字符'" <a-input v-model:value="val.note1" ::maxlength="24" :placeholder="'请填写' + val.name + ',不超过24个字符'"
@ -42,7 +42,7 @@
<a-input <a-input
v-model:value="val.note1" v-model:value="val.note1"
:placeholder="'请填写' + val.name" :placeholder="'请填写' + val.name"
style="width: calc(100% - 150px);" style="width: 570px;"
/> />
<span style="width: 2.5rem; padding-left: 0.1rem"> <span style="width: 2.5rem; padding-left: 0.1rem">
{{ {{
@ -93,7 +93,8 @@ export default {
} }
}, },
methods: { methods: {
add (title) { add (title, addFlag, submitFlag) {
console.log(title, addFlag, submitFlag)
const list = this.configure.list const list = this.configure.list
let flag = true let flag = true
list.forEach((item) => { list.forEach((item) => {
@ -142,10 +143,23 @@ export default {
}) })
list.forEach((item) => { list.forEach((item) => {
item.note1 = '' item.note1 = ''
})
this.showKey++ this.showKey++
})
if (addFlag && submitFlag) {
this.$emit('submitData')
}
} else { } else {
if (!addFlag) {
this.$message.warning('请填写完整') this.$message.warning('请填写完整')
} else {
list.forEach((item) => {
item.note1 = ''
this.showKey++
})
if (submitFlag) {
this.$emit('submitData')
}
}
} }
}, },
del (title, index) { del (title, index) {

65
back/src/views/modules/putOnTheShelf/index.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-07-08 09:48:52 * @Date: 2022-07-08 09:48:52
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-11 15:11:10 * @LastEditTime: 2022-07-25 15:57:25
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<template> <template>
@ -21,7 +21,11 @@
(showTypeName == 'SDK' && item.name == '接口请求方式') || (showTypeName == 'SDK' && item.name == '接口请求方式') ||
(showTypeName == 'SDK' && item.name == '服务接口') (showTypeName == 'SDK' && item.name == '服务接口')
)"> )">
<span >{{ item.name }}</span> <div class="box">
<div>
<span class="required" v-if="required.indexOf(item.name) > -1">*</span>
{{ item.name }}
</div>
<!-- <upload :list="[]" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1" :data="item" <!-- <upload :list="[]" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1" :data="item"
tip="支持图片类型，大小不超过100M"></upload> --> tip="支持图片类型，大小不超过100M"></upload> -->
<upload @changeInfoList='changeInfoList' :title='item.name' accept='.jpg,.jpeg,.png' :list="item" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1" <upload @changeInfoList='changeInfoList' :title='item.name' accept='.jpg,.jpeg,.png' :list="item" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1"
@ -34,17 +38,20 @@
tip="支持视频类型，大小不超过100M"></upload> tip="支持视频类型，大小不超过100M"></upload>
<upload @changeInfoList='changeInfoList' :title='item.name' accept='.zip' :list="item" v-else-if="item.type == 'package'" type="安装包" btnName="上传安装包" :maxCount="1" :dataList="item" <upload @changeInfoList='changeInfoList' :title='item.name' accept='.zip' :list="item" v-else-if="item.type == 'package'" type="安装包" btnName="上传安装包" :maxCount="1" :dataList="item"
tip="支持.zip类型，大小不超过100M"></upload> tip="支持.zip类型，大小不超过100M"></upload>
<input-select-checkbox :list="[]" v-else-if="item.type == 'AbilityType'" type="disabled" :data="item" :name="item.name" :value="typeInput"></input-select-checkbox> <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'AbilityType'" type="disabled" :data="item" :name="item.name" :value="typeInput"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'ComponentType'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox> <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'ComponentType'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox> <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'select'" type="select" :data="item" :name="item.name" :options="item.options" @show-type="showType"></input-select-checkbox> <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'select'" type="select" :data="item" :name="item.name" :options="item.options" @show-type="showType"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'checkBox'" type="checkBox" :data="item" :name="item.name" :options="item.options"></input-select-checkbox> <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'checkBox'" type="checkBox" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'radio'" type="radio" :data="item" :name="item.name" :options="item.options"></input-select-checkbox> <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'radio'" type="radio" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
<input-select-checkbox :list="[]" v-else-if="item.type == 'textArea'" type="textArea" :data="item" :name="item.name"></input-select-checkbox> <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'textArea'" type="textArea" :data="item" :name="item.name"></input-select-checkbox>
</div>
<div class="requiredTips" v-show="notFilled.indexOf(item.name) > -1 && (item.type=='input' || item.type=='textArea') && changeField.indexOf(item.name) == -1">请填写{{item.name}}！</div>
<div class="requiredTips" v-show="notFilled.indexOf(item.name) > -1 && (item.type=='select' || item.type=='checkBox' || item.type=='radio') && changeField.indexOf(item.name) == -1">请选择{{item.name}}！</div>
</div> </div>
</template> </template>
<template v-else> <template v-else>
<special :configure='judgmentType.filter(item => item.name==child.name)[0]' :showData='child' @changeInfoList='changeInfoList'></special> <special @submitData="submitData" ref="specialRef" :configure='judgmentType.filter(item => item.name==child.name)[0]' :showData='child' @changeInfoList='changeInfoList'></special>
</template> </template>
</div> </div>
</div> </div>
@ -64,10 +71,13 @@ export default {
props: { props: {
type: String, type: String,
putOnTheShelfList: Array, putOnTheShelfList: Array,
typeInput: String typeInput: String,
required: Array,
notFilled: Array
}, },
data () { data () {
return { return {
changeField: [],
judgmentType: [ judgmentType: [
{ {
name: '算法优势', name: '算法优势',
@ -182,6 +192,21 @@ export default {
this.defaultContent() this.defaultContent()
}, },
methods: { methods: {
// 提交
submit (arr) {
console.log('提交', arr.length, this.$refs.specialRef)
arr.map((val, index) => {
if (index === arr.length - 1) {
this.$refs.specialRef[index].add(val, true, true)
} else {
this.$refs.specialRef[index].add(val, true, false)
}
})
},
submitData () {
// console.log('触发提交')
this.$emit('submitData')
},
changeInfoList (obj) { changeInfoList (obj) {
this.$emit('changeInfoList', obj) this.$emit('changeInfoList', obj)
}, },
@ -241,11 +266,27 @@ export default {
} }
} }
.item { .item {
position: relative;
.box{
display: flex; display: flex;
align-items: center; align-items: center;
margin: 25px 0; margin: 25px 0;
& > span:nth-of-type(1) { & > div:nth-of-type(1) {
width: 105px; width: 105px;
display: flex;
align-items: center;
}
.required{
color: #f56c6c;
margin-right: 3px;
}
}
.requiredTips{
font-size: 14px;
color: #f56c6c;
position: absolute;
bottom:-20px;
left:110px;
} }
} }
</style> </style>

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

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-13 10:22:27 * @Date: 2022-06-13 10:22:27
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-15 17:39:25 * @LastEditTime: 2022-07-25 17:30:32
* @Description: 应用上架 * @Description: 应用上架
--> -->
<template> <template>
@ -35,6 +35,7 @@
'归属部门', '归属部门',
'部门联系人', '部门联系人',
'部门联系人电话', '部门联系人电话',
'共享条件',
]" ]"
></put-on-the-shelf> ></put-on-the-shelf>
<put-on-the-shelf <put-on-the-shelf
@ -60,7 +61,7 @@
v-else-if="showView === '部署与应用'" v-else-if="showView === '部署与应用'"
:refData="refData" :refData="refData"
:dataFrom="dataFrom" :dataFrom="dataFrom"
:externalField="['共享条件', '共享类型']" :externalField="['共享类型']"
:configure="bs" :configure="bs"
@submit="submit()" @submit="submit()"
@back="back()" @back="back()"

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

@ -14,6 +14,7 @@
<div></div> <div></div>
</div> </div>
<template v-if="title.isConfigure"> <template v-if="title.isConfigure">
<a-form ref="formRef" :model="data" name="basic">
<div class="bottom"> <div class="bottom">
<!-- <div class="items" v-if="data[title.name].length > 0"> <!-- <div class="items" v-if="data[title.name].length > 0">
<div <div
@ -76,6 +77,7 @@
:key="'key2' + attr.name + index2" :key="'key2' + attr.name + index2"
> >
<span>{{ attr.name }}</span> <span>{{ attr.name }}</span>
<a-input <a-input
disabled disabled
v-model:value="val[attr.field]" v-model:value="val[attr.field]"
@ -200,8 +202,10 @@
</a-button> </a-button>
</div> </div>
</div> </div>
</a-form>
</template> </template>
<template v-else> <template v-else>
<a-form>
<div class="bottom"> <div class="bottom">
<div <div
class="form" class="form"
@ -220,20 +224,28 @@
) )
" "
> >
<span>{{ item.name }}</span> <span v-if="item.name.indexOf('名称') == -1">
{{ item.name }}：
</span>
<a-input <a-input
v-if="item.type == 'input' && item.name.indexOf('名称') == -1" v-if="item.type == 'input' && item.name.indexOf('名称') == -1"
v-model:value="item.note1" v-model:value="item.note1"
:placeholder="'请输入' + item.name" :placeholder="'请输入' + item.name"
/> />
<a-input <a-form-item
v-else-if=" v-else-if="
item.type == 'input' && item.name.indexOf('名称') != -1 item.type == 'input' && item.name.indexOf('名称') != -1
" "
:label="item.name"
name="username"
:rules="[{ required: true, message: '请输入名称' }]"
>
<a-input
:maxLength="50" :maxLength="50"
v-model:value="item.note1" v-model:value="item.note1"
:placeholder="'请输入' + item.name + '，不超过50个字符'" :placeholder="'请输入' + item.name + '，不超过50个字符'"
/> />
</a-form-item>
<a-radio-group <a-radio-group
v-else-if="item.type == 'radio'" v-else-if="item.type == 'radio'"
v-model:value="item.note1" v-model:value="item.note1"
@ -449,6 +461,7 @@
</a-modal> </a-modal>
</div> </div>
</div> </div>
</a-form>
</template> </template>
</div> </div>
</div> </div>

2
front/src/views/home/components/searchResultList.vue
View File

@ -293,7 +293,7 @@
" "
> >
{{ {{
item.shareCondition == '免批申请' ? '立即申请' : '立即申请' item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
}} }}
</a-button> </a-button>
</div> </div>

2
front/src/views/home/infrastructurePage.vue
View File

@ -435,7 +435,7 @@
mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051', mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
pageNum: mapSearchParam.value.pageNum, pageNum: mapSearchParam.value.pageNum,
pageSize: mapSearchParam.value.pageSize, pageSize: mapSearchParam.value.pageSize,
name: mapSearchParam.value.name || '', name: mapSearchParam.value.cameraName || '',
longitude: mapSearchParam.value.gpsX || '', longitude: mapSearchParam.value.gpsX || '',
atitude: mapSearchParam.value.gpsY || '', atitude: mapSearchParam.value.gpsY || '',
radius: mapSearchParam.value.radius || '', radius: mapSearchParam.value.radius || '',

2
front/src/views/home/videoSurveillance/index.vue
View File

@ -223,7 +223,7 @@
'70be8c5b664f4bcf869d82f2e8335051', '70be8c5b664f4bcf869d82f2e8335051',
pageNum: this.mapSearchParam.pageNum, pageNum: this.mapSearchParam.pageNum,
pageSize: this.mapSearchParam.pageSize, pageSize: this.mapSearchParam.pageSize,
name: this.mapSearchParam.name || '', name: this.mapSearchParam.cameraName || '',
longitude: this.mapSearchParam.gpsX || '', longitude: this.mapSearchParam.gpsX || '',
atitude: this.mapSearchParam.gpsY || '', atitude: this.mapSearchParam.gpsY || '',
radius: this.mapSearchParam.radius || '', radius: this.mapSearchParam.radius || '',

29
front/src/views/personalCenter/components/AbilityApplication.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-07-12 09:42:44 * @Date: 2022-07-12 09:42:44
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-21 17:25:45 * @LastEditTime: 2022-07-25 15:07:05
* @Description:我的申请 能力申请 查看详情 * @Description:我的申请 能力申请 查看详情
--> -->
<template> <template>
@ -132,8 +132,20 @@
</div> </div>
</div> </div>
<div class="ability-bottom"> <div class="ability-bottom">
<div class="dec">位置：{{ val.nodeName }}</div> <div class="dec2">位置：{{ val.nodeName }}</div>
<!-- <div class="result">申请结果：{{ val.content || '--' }}</div> --> <div class="result" v-if="item.approveStatus == '通过'">
申请结果：{{
'列表地址：' +
backUrl +
'resource/getApplyCameraList/' +
item.instanceId +
';' +
'视频流地址：' +
backUrl +
'/resource/hls/getHls/?channelId=' +
val.channelId
}}
</div>
</div> </div>
</div> </div>
</div> </div>
@ -144,6 +156,7 @@
</template> </template>
<script setup> <script setup>
import { ref, defineProps } from 'vue' import { ref, defineProps } from 'vue'
const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
const props = defineProps({ const props = defineProps({
refObj: { type: Object, default: null }, refObj: { type: Object, default: null },
}) })
@ -334,6 +347,16 @@
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
word-break: break-all; word-break: break-all;
} }
.dec2 {
width: 7rem;
height: 0.22rem;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
word-break: break-all;
}
.result:hover { .result:hover {
color: #0058e1; color: #0058e1;
cursor: pointer; cursor: pointer;