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

# Conflicts:
#	front/src/api/personalCenter.js
#	front/src/views/personalCenter/components/ApplyDetails.vue
#	front/src/views/personalCenter/components/MyApply.vue
This commit is contained in:
a0049873 2022-11-11 18:43:49 +08:00
commit 65d35e4501
5 changed files with 1597 additions and 1868 deletions

View File

@ -7,19 +7,18 @@
-->
<template>
<div class="box">
<!-- <div class="header">能力上架申请</div> -->
<div class="header">能力上架申请</div>
<div class="top">
<div
v-for="(nav, index) in navList"
:key="nav"
:class="[index <= navList2.indexOf(showView) ? 'finish' : 'ff']"
:class="[index <= navList2.indexOf(showView) ? 'finish' : '']"
>
<div class="wai">
<span class="bg-box">
<span>{{ index + 1 }}</span>
</span>
<span class="bg-name">{{ nav.name }}</span>
</div>
<span>{{ nav.name }}</span>
<div class="line" v-if="index !== navList.length - 1"></div>
</div>
</div>
@ -81,10 +80,37 @@
:required="required"
:notFilled="notFilled"
></put-on-the-shelf>
<!-- <algorithm-essential-information
v-if="showView === '基本信息' && refData.name"
:refData="refData"
:dataFrom="dataFrom"
:videoList="videoList"
></algorithm-essential-information>
<algorithm-advantage
v-else-if="showView === '算法优势'"
:refData="refData"
:dataFrom="dataFrom"
></algorithm-advantage>
<algorithm-scenarios
v-else-if="showView === '应用场景'"
:refData="refData"
:dataFrom="dataFrom"
></algorithm-scenarios> -->
<!-- <algorithm-scenarios
v-else-if="showView === '应用场景'"
:refData="refData"
:dataFrom="dataFrom"
></algorithm-scenarios> -->
<!-- <algorithm-deployment-use
v-else-if="showView === '部署与使用'"
:refData="refData"
:dataFrom="dataFrom"
:fileList="fileList"
:imgList="imgList"
></algorithm-deployment-use> -->
</div>
<div class="btn" :class="showView === '基本信息' ? 'first' : ''">
<button @click="close()">取消</button>
<a-popconfirm
v-if="
showView == '算法优势' &&
@ -98,7 +124,7 @@
@confirm="changeSfys('上一步')"
@cancel="cancel"
>
<button class="buzhou">上一步</button>
<button>上一步</button>
</a-popconfirm>
<button
v-else-if="
@ -107,7 +133,6 @@
sfys[0].list.length
"
@click="changeSfys('上一步')"
class="buzhou"
>
上一步
</button>
@ -124,7 +149,7 @@
@confirm="changeYycj('上一步')"
@cancel="cancel"
>
<button class="buzhou">上一步</button>
<button>上一步</button>
</a-popconfirm>
<button
v-else-if="
@ -133,11 +158,10 @@
yycj[0].list.length
"
@click="changeYycj('上一步')"
class="buzhou"
>
上一步
</button>
<button class="buzhou" v-else-if="showView !== '基本信息'" @click="back()">
<button v-else-if="showView !== '基本信息'" @click="back()">
上一步
</button>
<a-popconfirm
@ -154,9 +178,9 @@
@confirm="changeBs('预览')"
@cancel="cancel"
>
<button class="buzhou">预览</button>
<button>预览</button>
</a-popconfirm>
<button v-else-if="showView === '部署与使用'" @click="preview()" class="buzhou">
<button v-else-if="showView === '部署与使用'" @click="preview()">
预览
</button>
<a-popconfirm
@ -172,7 +196,7 @@
@confirm="changeSfys('下一步')"
@cancel="cancel"
>
<button class="buzhou">下一步</button>
<button>下一步</button>
</a-popconfirm>
<button
v-else-if="
@ -181,7 +205,6 @@
sfys[0].list.length
"
@click="changeSfys('下一步')"
class="buzhou"
>
下一步
</button>
@ -198,7 +221,7 @@
@confirm="changeYycj('下一步')"
@cancel="cancel"
>
<button class="buzhou">下一步</button>
<button>下一步</button>
</a-popconfirm>
<button
v-else-if="
@ -207,11 +230,10 @@
yycj[0].list.length
"
@click="changeYycj('下一步')"
class="buzhou"
>
下一步
</button>
<button class="buzhou" v-else-if="showView !== '部署与使用'" @click="next()">
<button v-else-if="showView !== '部署与使用'" @click="next()">
下一步
</button>
<a-popconfirm
@ -228,37 +250,36 @@
@confirm="changeBs('提交')"
@cancel="cancel"
>
<button class="buzhou">提交</button>
<button>提交</button>
</a-popconfirm>
<button class="buzhou" v-else-if="服务商联系电话 === '部署与使用'" @click="submit()">
<button v-else-if="showView === '部署与使用'" @click="submit()">
提交
</button>
<button class="quxiao" @click="close()">取消</button>
</div>
</div>
</template>
<script setup>
// import AlgorithmEssentialInformation from '@/views/capacityOnTheShelf/components/AlgorithmEssentialInformation.vue'
// import AlgorithmAdvantage from '@/views/capacityOnTheShelf/components/AlgorithmAdvantage.vue'
// import AlgorithmScenarios from '@/views/capacityOnTheShelf/components/AlgorithmScenarios.vue'
import PutOnTheShelf from '@/views/capacityOnTheShelf/components/PutOnTheShelf.vue'
// import AlgorithmDeploymentUse from '@/views/capacityOnTheShelf/components/AlgorithmDeploymentUse.vue'
import { ref, onBeforeUnmount } from 'vue'
import { useRouter } from 'vue-router'
import { getCategoryTree } from '@/api/personalCenter'
import { shangjiainsert, shangjiaapply } from '@/api/personalCenter'
import {
// import AlgorithmEssentialInformation from '@/views/capacityOnTheShelf/components/AlgorithmEssentialInformation.vue'
// import AlgorithmAdvantage from '@/views/capacityOnTheShelf/components/AlgorithmAdvantage.vue'
// import AlgorithmScenarios from '@/views/capacityOnTheShelf/components/AlgorithmScenarios.vue'
import PutOnTheShelf from '@/views/capacityOnTheShelf/components/PutOnTheShelf.vue'
// import AlgorithmDeploymentUse from '@/views/capacityOnTheShelf/components/AlgorithmDeploymentUse.vue'
import { ref, onBeforeUnmount } from 'vue'
import { useRouter } from 'vue-router'
import { getCategoryTree } from '@/api/personalCenter'
import { shangjiainsert, shangjiaapply } from '@/api/personalCenter'
import {
getUser,
getUserInfo,
selectOne,
updateRes,
relaunch,
} from '@/api/home'
import { message } from 'ant-design-vue'
import mybus from '@/myplugins/mybus'
const router = useRouter()
const showView = ref('基本信息')
const sfys = ref([
} from '@/api/home'
import { message } from 'ant-design-vue'
import mybus from '@/myplugins/mybus'
const router = useRouter()
const showView = ref('基本信息')
const sfys = ref([
{
name: '算法优势',
list: [
@ -276,8 +297,8 @@ const sfys = ref([
},
],
},
])
const yycj = ref([
])
const yycj = ref([
{
name: '应用场景',
list: [
@ -301,8 +322,8 @@ const yycj = ref([
},
],
},
])
const bs = ref([
])
const bs = ref([
{
name: '计费标准信息',
list: [
@ -345,19 +366,19 @@ const bs = ref([
},
],
},
])
let shiyongshouce = ref({})
const navList = ref([])
const navList2 = ref([])
const fileList = ref({})
const packageList = ref({})
const accessoryList = ref({})
const imgList = ref({})
const videoList = ref({})
const data = ref({})
const refData = ref({})
const submitFlag = ref(true)
const dataFrom = ref({
])
let shiyongshouce = ref({})
const navList = ref([])
const navList2 = ref([])
const fileList = ref({})
const packageList = ref({})
const accessoryList = ref({})
const imgList = ref({})
const videoList = ref({})
const data = ref({})
const refData = ref({})
const submitFlag = ref(true)
const dataFrom = ref({
infoList: [
{
attrType: '组件类型',
@ -368,8 +389,8 @@ const dataFrom = ref({
delFlag: 0,
type: '组件服务',
deptId: '',
})
const required = ref([
})
const required = ref([
'归属部门',
'部门联系人',
'部门联系人电话',
@ -386,15 +407,15 @@ const required = ref([
'服务接口',
'接口请求方式',
'算法类别',
])
const notFilled = ref([])
getUser().then((res) => {
])
const notFilled = ref([])
getUser().then((res) => {
dataFrom.value.deptId = res.data.data.deptId
})
const close = () => {
})
const close = () => {
window.close()
}
const back = () => {
}
const back = () => {
navList.value.forEach((val, index) => {
if (val.key === showView.value && index > 0) {
showView.value = navList2.value[index - 1]
@ -404,8 +425,8 @@ const back = () => {
console.log('表单数据=============>', dataFrom.value)
}
})
}
const next = () => {
}
const next = () => {
notFilled.value = []
console.log(dataFrom.value, 'dataFrom.value.name')
if (!dataFrom.value.name) {
@ -427,14 +448,18 @@ const next = () => {
notFilled.value.push('部门联系人电话')
}
if (
!dataFrom.value.infoList.filter((val) => val.attrType === '算法类别')[0] ||
!dataFrom.value.infoList.filter(
(val) => val.attrType === '算法类别'
)[0] ||
!dataFrom.value.infoList.filter((val) => val.attrType === '算法类别')[0]
.attrValue
) {
notFilled.value.push('算法类别')
}
if (
!dataFrom.value.infoList.filter((val) => val.attrType === '应用领域')[0] ||
!dataFrom.value.infoList.filter(
(val) => val.attrType === '应用领域'
)[0] ||
!dataFrom.value.infoList.filter((val) => val.attrType === '应用领域')[0]
.attrValue
) {
@ -459,9 +484,9 @@ const next = () => {
console.log('表单数据=============>', dataFrom.value, refData.value)
}
}
}
//
const preview = () => {
}
//
const preview = () => {
notFilled.value = []
console.log(dataFrom.value, 'dataFrom.value.name')
if (
@ -496,8 +521,8 @@ const preview = () => {
})
window.open(newpage.href, '_blank')
}
}
const submit = () => {
}
const submit = () => {
notFilled.value = []
console.log(dataFrom.value, 'dataFrom.value.name')
if (
@ -587,8 +612,8 @@ const submit = () => {
}
}
}
}
const init = () => {
}
const init = () => {
getCategoryTree().then((res) => {
// console.clear()
res.data.data = res.data.data
@ -704,14 +729,16 @@ const init = () => {
}
})
data.value = res.data.data.children
refData.value = data.value.filter((item) => item.name === showView.value)[0]
refData.value = data.value.filter(
(item) => item.name === showView.value
)[0]
console.log('所有编目结构==============>', data.value)
})
}
const resourceId = router.currentRoute.value.query.id
const taskId = router.currentRoute.value.query.taskId
const echoData = ref({})
if (resourceId) {
}
const resourceId = router.currentRoute.value.query.id
const taskId = router.currentRoute.value.query.taskId
const echoData = ref({})
if (resourceId) {
//
selectOne(resourceId).then((res) => {
echoData.value = res.data.data
@ -719,25 +746,25 @@ if (resourceId) {
init()
// console.log('===================>', echoData.value)
})
} else {
} else {
init()
}
//
const refPutOnTheShelf = ref(null)
const changeSfys = (type) => {
}
//
const refPutOnTheShelf = ref(null)
const changeSfys = (type) => {
console.log(refPutOnTheShelf, sfys.value)
refPutOnTheShelf.value.add('算法优势', true, type)
}
const changeYycj = (type) => {
}
const changeYycj = (type) => {
console.log(refPutOnTheShelf)
refPutOnTheShelf.value.add('应用场景', true, type)
}
const changeBs = (type) => {
}
const changeBs = (type) => {
console.log(refPutOnTheShelf)
refPutOnTheShelf.value.add('计费标准信息', true)
refPutOnTheShelf.value.add('常见问题', true, type)
}
mybus.on('chageDataFrom', (obj) => {
}
mybus.on('chageDataFrom', (obj) => {
if (obj.attrType == '技术文档' && obj.attrValue != null) {
shiyongshouce.value = obj
}
@ -756,24 +783,24 @@ mybus.on('chageDataFrom', (obj) => {
})
}
console.log('数据变更=================》', obj, dataFrom.value.infoList)
})
mybus.on('chageFileList', (obj) => {
})
mybus.on('chageFileList', (obj) => {
fileList.value = obj
})
mybus.on('chagePackageList', (obj) => {
})
mybus.on('chagePackageList', (obj) => {
packageList.value = obj
})
mybus.on('chageAccessory', (obj) => {
})
mybus.on('chageAccessory', (obj) => {
accessoryList.value = obj
})
mybus.on('chageImgList', (obj) => {
})
mybus.on('chageImgList', (obj) => {
imgList.value = obj
})
mybus.on('chageVideoList', (obj) => {
})
mybus.on('chageVideoList', (obj) => {
videoList.value = obj
})
//datafrom
mybus.on('chageDataFromDwon', (obj) => {
})
//datafrom
mybus.on('chageDataFromDwon', (obj) => {
switch (obj.attrType) {
case '算法名称':
dataFrom.value.name = obj.attrValue
@ -807,8 +834,8 @@ mybus.on('chageDataFromDwon', (obj) => {
break
}
// console.log('dataFrom.value', dataFrom.value)
})
onBeforeUnmount(() => {
})
onBeforeUnmount(() => {
mybus.off('chageDataFrom')
mybus.off('chageFileList')
mybus.off('chageImgList')
@ -816,13 +843,13 @@ onBeforeUnmount(() => {
mybus.off('chageVideoList')
mybus.off('chagePackageList')
mybus.off('chageAccessory')
})
})
</script>
<style lang="less" scoped>
.box {
.box {
position: relative;
top: 0.64rem;
// margin: 0.15rem 3rem;
margin: 0.15rem 4rem;
padding: 0.1rem;
background: #fff;
.header {
@ -833,87 +860,57 @@ onBeforeUnmount(() => {
padding: 0 1rem;
}
.top {
font-size: 16px;
margin: 0.32px 0.4px 0;
padding: 24px 24pxs;
margin: 0.1rem 0.2rem 0;
padding: 0.15rem 0.3rem;
background: #edf4fc;
display: flex;
justify-content: space-between;
div {
font-size: 0.18rem;
color: #999;
display: flex;
justify-content: center;
.ff {
color: #b3b3b3;
display: inline-flex;
justify-content: center;
align-items: center;
.wai {
margin-top: 14px;
.bg-box {
display: flex;
justify-content: center;
align-items: center;
width: 32px;
height: 32px;
width: 0.45rem;
height: 0.45rem;
border-radius: 50%;
// border: 0.01rem solid rgb(214, 214, 214);
margin: 0px 16px;
border: 0.01rem solid rgb(214, 214, 214);
margin-right: 0.1rem;
transition: all 0.3s ease;
span {
display: flex;
justify-content: center;
align-items: center;
width: 32px;
height: 32px;
width: 0.3rem;
height: 0.3rem;
border-radius: 50%;
border: 1px solid #d9d9d9;
}
}
.bg-name {
color: #b3b3b3;
border: 0.01rem solid #999;
}
}
.line {
// margin-left: 16px;
width: 326px;
height: 2px;
background: #d9d9d9;
margin-left: 0.1rem;
width: 1.3rem;
height: 0.01rem;
background: #999;
}
}
.finish {
color: #fff;
display: inline-flex;
justify-content: center;
align-items: center;
.wai {
margin-top: 14px;
color: #0087ff;
.bg-box {
display: flex;
justify-content: center;
align-items: center;
width: 32px;
height: 32px;
border-radius: 50%;
// border: 0.01rem solid rgb(214, 214, 214);
margin: 0px 16px;
transition: all 0.3s ease;
background: #9ccefa;
color: #fff;
border: 0.01rem solid #9ccefa;
span {
background: #0058e1;
display: flex;
justify-content: center;
align-items: center;
width: 32px;
height: 32px;
border-radius: 50%;
border: 1px solid solid #0058e1;
}
}
.bg-name {
color: #212121;
font-weight: bold;
background: #0087ff;
border: 0.01rem solid #0087ff;
}
}
.line {
// margin-left: 16px;
width: 326px;
height: 2px;
background: #0058e1;
background: #0087ff;
}
}
.btn {
@ -945,55 +942,34 @@ onBeforeUnmount(() => {
}
}
.first {
justify-content: center;
justify-content: space-around;
}
}
.btn {
display: flex;
justify-content: center;
justify-content: space-between;
padding: 0.1rem 3.5rem 0;
// button {
// cursor: pointer;
// font-size: 14px;
// text-align: center;
// color: #fff;
// border: none;
// border-radius: 0.06rem;
// background: #0087ff;
// margin-right:12px;
// margin-right:12px;
.quxiao{
margin-right:12px;
button {
cursor: pointer;
width: 90px;
height: 32px;
background: #ffffff;
color:#0058e1;
border-radius: 2px;
border: 1px #0058e1 solid;
font-size: 0.14rem;
width: 0.8rem;
height: 0.35rem;
text-align: center;
color: #fff;
border: none;
border-radius: 0.06rem;
background: #0087ff;
}
// .quxiao:hover{
// background: #0058e1;
// color:#ffffff;
// }
.buzhou{
margin-right:12px;
cursor: pointer;
background: #0058e1;
color:#ffffff;
width: 90px;
height: 32px;
border-radius: 2px;
border: 1px #0058e1 solid;
button:nth-of-type(1) {
color: #0087ff;
background: #e1edfa;
}
button:nth-of-type(2) {
background: #01c5dc;
}
// .buzhou:hover{
// background: #ffffff;
// color:#0058e1;
// }
}
.first {
justify-content: center;
justify-content: space-around;
}
}
}
</style>

View File

@ -53,9 +53,6 @@
let dataList = ref([])
const getList = () => {
selectRecommend().then((res) => {
if (res.data.data.records.length > 9) {
res.data.data.records.length = 9
}
dataList.value = res.data.data.records
dataList.value.map((item, index) => {
// debugger
@ -98,7 +95,7 @@
router.push({
path: '/DetailsPageconetent',
query: {
select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
},
})
}

View File

@ -31,12 +31,7 @@
<div class="title">审批详情</div>
<template v-for="item in dataSource.data" :key="item">
<div class="oddNumbers">子单号:{{ item[0] }}</div>
<a-table
:dataSource="item[1]"
:columns="dataSourceColumns"
v-if="showType === '数据资源申请'"
></a-table>
<a-table :dataSource="item[1]" :columns="columns" v-else>
<a-table :dataSource="item[1]" :columns="columns">
<template #bodyCell="{ column, text }">
<template v-if="column.dataIndex === 'name'">
<a>{{ text }}</a>
@ -174,33 +169,8 @@
width: '180px',
},
]
const dataSourceColumns = [
{
title: '操作',
dataIndex: 'cz',
key: 'cz',
width: '180px',
},
{
title: '处理用户',
dataIndex: 'czyh',
key: 'czyh',
width: '180px',
},
{
title: '处理时间',
dataIndex: 'clsj',
key: 'clsj',
width: '180px',
},
{
title: '备注',
dataIndex: 'remark',
key: 'remark',
width: '180px',
},
]
const getInfo = () => {
console.log(props.processInstanceId, '============================')
if (props.processDefinitionName == '能力申请') {
// getTaskVariables({ taskId: props.processInstanceId }).then((res) => {
// console.log('====================>', res.data.data)
@ -245,6 +215,7 @@
shifoushizujian.value = false
console.log(res.data.data.resourceDTO)
res.data.data.resourceDTO.infoList.forEach((val) => {
console.log(val, '111111111111111111111111')
if (val.attrValue === '智能算法') {
nameNotShow.value = true
algorithmShow.value = false
@ -252,6 +223,7 @@
}
})
}
console.log('222222222222', dataForm.data)
})
}
if (props.processDefinitionName == '能力资源下架') {
@ -293,6 +265,7 @@
})
const getResourceURL = () => {
console.log('111111111111111111111111111111', Cookies.get('token'))
const params = qs.stringify({
token: Cookies.get('token'),
// processInstanceId: this.dataForm.processInstanceId

View File

@ -72,10 +72,7 @@
</div>
</a-tooltip>
<div class="content-body-content">
<p
class="content-body-content-son"
v-if="typeName !== '设备申请' && typeName !== '数据资源申请'"
>
<p class="content-body-content-son" v-if="typeName !== '设备申请'">
审核结果{{ item.ended ? '审核完成' : '审核中' }}
</p>
<p
@ -90,11 +87,6 @@
>
审核结果{{ item.STATUS }}
</p>
<p class="content-body-content-son" v-else>
审核结果{{ item.bmyijian ? '审核完成' : '审核中' }}
</p>
</div>
<div class="content-body-bottom">
<div>
申请日期{{
item.createDate ||
@ -355,7 +347,6 @@
//
const changeType = (item, index) => {
contentList.data = []
console.log('item, index-----选择类型------->', item, index)
numFlag.value = true
num.value = []