wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

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

This commit is contained in:
unknown 2022-11-15 18:23:46 +08:00
parent 6d806547ef e60f697325
commit ac544cee15
11 changed files with 2533 additions and 1914 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
back/src/views/modules/abilityStatistics/components/abilityDetails.vue
View File

@ -34,9 +34,9 @@
<p>
<span>应用背景：{{ detailParams.applicationBackground }}</span>
</p>
<p>
<!-- <p>
<span>期望效果：{{ detailParams.effectWish }}</span>
</p>
</p> -->
</div>
</div>
</div>
@ -53,13 +53,13 @@
<span class="img"></span>
<span>{{ item.name }}</span>
</div>
<div
<!-- <div
style="
display: flex;
justify-content: space-between;
align-items: center;
"
></div>
></div> -->
<div class="ability" v-for="val in item.list" :key="val.id">
<div class="box" v-if="item.list.length > 0">
<div class="right">
@ -280,7 +280,7 @@ export default {
}
}
</script>
<style scoped>
<style lang="scss" scoped>
.title {
font-size: 22px;
color: #000;
@ -324,7 +324,7 @@ export default {
font-size: 16px;
span {
width: 50px;
width: 300px;
}
}
}
@ -334,7 +334,8 @@ export default {
.main {
.item {
border-top: 1px #eee solid;
line-height: 30px;
margin-bottom: 10px;
.deptName {
color: #0058e1;
font-size: 16px;

8
back/src/views/modules/abilityStatistics/index.vue
View File

@ -71,8 +71,9 @@
<!--资源名称 仅明细添加-->
<el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
<span>名称：</span>
<!-- <span v-if="this.departmentId === 2 || this.departmentId === 4">资源名称：</span> -->
<el-input v-model="resourceName" placeholder="请输入资源名称" clearable></el-input>
<el-input style="width:80%;" v-model="resourceName" placeholder="请输入资源名称" clearable></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" style="display: flex;justify-content: end;margin-right: 40px;">
@ -1188,7 +1189,7 @@ input::placeholder {
background: #fff;
border: 1px solid #dcdfe6;
color: #000;
color: #FFF;
color: #fff;
background-color: #0058e1;
border-color: #0058e1;
text-decoration: none;
@ -1197,7 +1198,6 @@ input::placeholder {
.export:hover {
background: #65a5f9;
border-color: #65a5f9;
color: #FFF;
color: #fff;
}
</style>

27
back/src/views/modules/activiti/demo/abilitydemandapply.vue
View File

@ -57,10 +57,28 @@
:disabled="fieldDisabled"
placeholder="需求描述"
></el-input>
</el-tooltip>
</el-tooltip>
</el-form-item>
<el-form-item v-if="dataForm.enclosure" label="申请附件" prop="enclosure">
<el-button @click="downloadFile(dataForm.enclosure, '申请附件')">附件下载</el-button>
<button
style="
width: 100px;
height: 30px;
margin-right: 10px;
background: rgb(237, 244, 252);
color: rgb(0, 135, 255);
font-size: 14px;
border-radius: 6px;
border: 1px solid rgb(187, 211, 239);
padding: 0px;
text-align: center;
cursor: pointer;
"
@click="downloadFile(dataForm.enclosure, '申请附件')"
>
附件下载
</button>
<!-- <el-button class="DownloadAttachment" @click="downloadFile(dataForm.enclosure, '申请附件')">附件下载</el-button> -->
</el-form-item>
</el-form>
<!-- 流程综合组件 -->
@ -339,6 +357,11 @@ export default {
}
</script>
<style lang="scss">
.DownloadAttachment {
position: absolute;
right: 10px;
top: -150px;
}
.agreeOr {
& > div {
// text-align: right;

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

File diff suppressed because it is too large Load Diff

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

@ -7,17 +7,19 @@
-->
<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' : '']"
:class="[index <= navList2.indexOf(showView) ? 'finish' : 'ff']"
>
<span class="bg-box">
<span>{{ index + 1 }}</span>
</span>
<span>{{ nav.name }}</span>
<div class="wai">
<span class="bg-box">
<span>{{ index + 1 }}</span>
</span>
<span class="bg-name">{{ nav.name }}</span>
</div>
<div class="line" v-if="index !== navList.length - 1"></div>
</div>
</div>
@ -101,7 +103,7 @@
></application-deployment-use> -->
</div>
<div class="btn" :class="showView === '基本信息' ? 'first' : ''">
<button @click="close()">取消</button>
<a-popconfirm
v-if="
@ -116,13 +118,14 @@
@confirm="changeGnjs('上一步')"
@cancel="cancel"
>
<button>上一步</button>
<button class="buzhou">上一步</button>
</a-popconfirm>
<button v-else-if="showView == '功能介绍'" @click="changeGnjs('上一步')">
<button class="buzhou" v-else-if="showView == '功能介绍'" @click="changeGnjs('上一步')">
上一步
</button>
<!-- 分割线 -->
<button
class="buzhou"
v-show="showView !== '基本信息' && showView === '部署与应用'"
@click="back()"
>
@ -141,12 +144,12 @@
@confirm="changeBs('预览')"
@cancel="cancel"
>
<button>预览</button>
<button class="buzhou">预览</button>
</a-popconfirm>
<button v-else-if="showView === '部署与应用'" @click="preview()">
<button class="buzhou" v-else-if="showView === '部署与应用'" @click="preview()">
预览
</button>
<button v-show="showView === '基本信息'" @click="next()">下一步</button>
<button class="buzhou" v-show="showView === '基本信息'" @click="next()">下一步</button>
<a-popconfirm
v-if="
showView == '功能介绍' &&
@ -160,9 +163,9 @@
@confirm="changeGnjs('下一步')"
@cancel="cancel"
>
<button>下一步</button>
<button class="buzhou">下一步</button>
</a-popconfirm>
<button v-else-if="showView == '功能介绍'" @click="changeGnjs('下一步')">
<button class="buzhou" v-else-if="showView == '功能介绍'" @click="changeGnjs('下一步')">
下一步
</button>
<a-popconfirm
@ -178,11 +181,12 @@
@confirm="changeBs('提交')"
@cancel="cancel"
>
<button>提交</button>
<button class="buzhou">提交</button>
</a-popconfirm>
<button v-else-if="showView === '部署与应用'" @click="submit()">
<button class="buzhou" v-else-if="showView === '部署与应用'" @click="submit()">
提交
</button>
<button class="quxiao" @click="close()">取消</button>
</div>
</div>
</template>
@ -715,85 +719,120 @@
</script>
<style lang="less" scoped>
.box {
position: relative;
top: 64px;
margin: 15px 400px;
padding: 10px;
background: #fff;
.header {
font-size: 28px;
font-weight: 600;
}
.vue-box {
padding: 0 100px;
}
.top {
margin: 10px 20px 0;
padding: 15px 30px;
background: #edf4fc;
display: flex;
justify-content: space-between;
div {
font-size: 18px;
color: #999;
display: flex;
justify-content: center;
align-items: center;
position: relative;
top: 0.64rem;
// margin: 0.15rem 3rem;
padding: 0.1rem;
background: #fff;
.header {
font-size: 0.28rem;
font-weight: 600;
}
.vue-box {
padding: 0 1rem;
}
.top {
font-size: 16px;
margin: 0.32px 0.4px 0;
padding: 24px 24pxs;
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: 45px;
height: 45px;
width: 32px;
height: 32px;
border-radius: 50%;
border: 1px solid rgb(214, 214, 214);
margin-right: 10px;
// border: 0.01rem solid rgb(214, 214, 214);
margin: 0px 16px;
transition: all 0.3s ease;
span {
display: flex;
justify-content: center;
align-items: center;
width: 30px;
height: 30px;
width: 32px;
height: 32px;
border-radius: 50%;
border: 1px solid #999;
border: 1px solid #d9d9d9;
}
}
.line {
margin-left: 10px;
width: 280px;
height: 1px;
background: #999;
.bg-name {
color: #b3b3b3;
}
}
.finish {
color: #0087ff;
.line {
// margin-left: 16px;
width: 326px;
height: 2px;
background: #d9d9d9;
}
}
.finish {
color: #fff;
display: inline-flex;
justify-content: center;
align-items: center;
.wai {
margin-top: 14px;
.bg-box {
background: #9ccefa;
color: #fff;
border: 1px solid #9ccefa;
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;
span {
background: #0087ff;
border: 1px solid #0087ff;
background: #0058e1;
display: flex;
justify-content: center;
align-items: center;
width: 32px;
height: 32px;
border-radius: 50%;
border: 1px solid solid #0058e1;
}
}
.line {
background: #0087ff;
.bg-name {
color: #212121;
font-weight: bold;
}
}
.line {
// margin-left: 16px;
width: 326px;
height: 2px;
background: #0058e1;
}
}
.btn {
display: flex;
justify-content: space-between;
padding: 10px 350px 0;
justify-content: space-around;
padding: 0.1rem 3.5rem 0;
button {
cursor: pointer;
width: 80px;
height: 35px;
font-size: 0.14rem;
width: 0.8rem;
height: 0.35rem;
text-align: center;
color: #fff;
border: none;
border-radius: 6px;
border: 0.01rem solid #9ccefa;
span {
background: #0087ff;
border: 0.01rem solid #0087ff;
}
}
.line {
background: #0087ff;
}
button:nth-of-type(1) {
@ -805,7 +844,55 @@
}
}
.first {
justify-content: space-around;
justify-content: center;
}
}
.btn {
display: flex;
justify-content: center;
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;
cursor: pointer;
width: 90px;
height: 32px;
background: #ffffff;
color:#0058e1;
border-radius: 2px;
border: 1px #0058e1 solid;
}
// .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;
}
// .buzhou:hover{
// background: #ffffff;
// color:#0058e1;
// }
}
.first {
justify-content: center;
}
}
</style>

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

@ -7,17 +7,19 @@
-->
<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' : '']"
:class="[index <= navList2.indexOf(showView) ? 'finish' : 'ff']"
>
<span class="bg-box">
<span>{{ index + 1 }}</span>
</span>
<span>{{ nav.name }}</span>
<div class="wai">
<span class="bg-box">
<span>{{ index + 1 }}</span>
</span>
<span class="bg-name">{{ nav.name }}</span>
</div>
<div class="line" v-if="index !== navList.length - 1"></div>
</div>
</div>
@ -80,7 +82,7 @@
></put-on-the-shelf>
</div>
<div class="btn" :class="showView === '基本信息' ? 'first' : ''">
<button @click="close()">取消</button>
<a-popconfirm
v-if="
showView == '功能介绍' &&
@ -94,9 +96,10 @@
@confirm="changeGnjs('上一步')"
@cancel="cancel"
>
<button>上一步</button>
<button class="buzhou" >上一步</button>
</a-popconfirm>
<button
class="buzhou"
v-else-if="
showView == '功能介绍' &&
gnjs[0].list.filter((val) => val.note1 !== '').length ==
@ -119,9 +122,10 @@
@confirm="changeYycj('上一步')"
@cancel="cancel"
>
<button>上一步</button>
<button class="buzhou" >上一步</button>
</a-popconfirm>
<button
class="buzhou"
v-else-if="
showView == '应用场景' &&
yycj[0].list.filter((val) => val.note1 !== '').length ==
@ -131,7 +135,7 @@
>
上一步
</button>
<button v-else-if="showView !== '基本信息'" @click="back()">
<button class="buzhou" v-else-if="showView !== '基本信息'" @click="back()">
上一步
</button>
<a-popconfirm
@ -146,9 +150,9 @@
@confirm="changeBs('预览')"
@cancel="cancel"
>
<button>预览</button>
<button class="buzhou" >预览</button>
</a-popconfirm>
<button v-else-if="showView === '部署与使用'" @click="preview()">
<button class="buzhou" v-else-if="showView === '部署与使用'" @click="preview()">
预览
</button>
<a-popconfirm
@ -164,9 +168,10 @@
@confirm="changeGnjs('下一步')"
@cancel="cancel"
>
<button>下一步</button>
<button class="buzhou" >下一步</button>
</a-popconfirm>
<button
class="buzhou"
v-else-if="
showView == '功能介绍' &&
gnjs[0].list.filter((val) => val.note1 !== '').length ==
@ -189,9 +194,10 @@
@confirm="changeYycj('下一步')"
@cancel="cancel"
>
<button>下一步</button>
<button class="buzhou" >下一步</button>
</a-popconfirm>
<button
class="buzhou"
v-else-if="
showView == '应用场景' &&
yycj[0].list.filter((val) => val.note1 !== '').length ==
@ -201,7 +207,7 @@
>
下一步
</button>
<button v-else-if="showView !== '部署与使用'" @click="next()">
<button class="buzhou" v-else-if="showView !== '部署与使用'" @click="next()">
下一步
</button>
<a-popconfirm
@ -216,11 +222,12 @@
@confirm="changeBs('提交')"
@cancel="cancel"
>
<button>提交</button>
<button class="buzhou" >提交</button>
</a-popconfirm>
<button v-else-if="showView === '部署与使用'" @click="submit()">
<button class="buzhou" v-else-if="showView === '部署与使用'" @click="submit()">
提交
</button>
<button class="quxiao" @click="close()">取消</button>
</div>
</div>
</template>
@ -802,86 +809,121 @@
})
</script>
<style lang="less" scoped>
.box {
position: relative;
top: 64px;
margin: 15px 400px;
padding: 10px;
background: #fff;
.header {
font-size: 28px;
font-weight: 600;
}
.vue-box {
padding: 0 100px;
}
.top {
margin: 10px 20px 0;
padding: 15px 30px;
background: #edf4fc;
display: flex;
justify-content: space-between;
div {
font-size: 18px;
color: #999;
display: flex;
justify-content: center;
align-items: center;
.box {
position: relative;
top: 0.64rem;
// margin: 0.15rem 3rem;
padding: 0.1rem;
background: #fff;
.header {
font-size: 0.28rem;
font-weight: 600;
}
.vue-box {
padding: 0 1rem;
}
.top {
font-size: 16px;
margin: 0.32px 0.4px 0;
padding: 24px 24pxs;
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: 45px;
height: 45px;
width: 32px;
height: 32px;
border-radius: 50%;
border: 1px solid rgb(214, 214, 214);
margin-right: 10px;
// border: 0.01rem solid rgb(214, 214, 214);
margin: 0px 16px;
transition: all 0.3s ease;
span {
display: flex;
justify-content: center;
align-items: center;
width: 30px;
height: 30px;
width: 32px;
height: 32px;
border-radius: 50%;
border: 1px solid #999;
border: 1px solid #d9d9d9;
}
}
.line {
margin-left: 10px;
width: 130px;
height: 1px;
background: #999;
.bg-name {
color: #b3b3b3;
}
}
.finish {
color: #0087ff;
.line {
// margin-left: 16px;
width: 326px;
height: 2px;
background: #d9d9d9;
}
}
.finish {
color: #fff;
display: inline-flex;
justify-content: center;
align-items: center;
.wai {
margin-top: 14px;
.bg-box {
background: #9ccefa;
color: #fff;
border: 1px solid #9ccefa;
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;
span {
background: #0087ff;
border: 1px solid #0087ff;
background: #0058e1;
display: flex;
justify-content: center;
align-items: center;
width: 32px;
height: 32px;
border-radius: 50%;
border: 1px solid solid #0058e1;
}
}
.line {
background: #0087ff;
.bg-name {
color: #212121;
font-weight: bold;
}
}
.line {
// margin-left: 16px;
width: 326px;
height: 2px;
background: #0058e1;
}
}
.btn {
display: flex;
justify-content: space-between;
padding: 10px 350px 0;
justify-content: space-around;
padding: 0.1rem 3.5rem 0;
button {
cursor: pointer;
width: 80px;
height: 35px;
font-size: 0.14rem;
width: 0.8rem;
height: 0.35rem;
text-align: center;
color: #fff;
border: none;
border-radius: 6px;
border: 0.01rem solid #9ccefa;
span {
background: #0087ff;
border: 0.01rem solid #0087ff;
}
}
.line {
background: #0087ff;
}
button:nth-of-type(1) {
@ -893,7 +935,55 @@
}
}
.first {
justify-content: space-around;
justify-content: center;
}
}
.btn {
display: flex;
justify-content: center;
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;
cursor: pointer;
width: 90px;
height: 32px;
background: #ffffff;
color:#0058e1;
border-radius: 2px;
border: 1px #0058e1 solid;
}
// .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;
}
// .buzhou:hover{
// background: #ffffff;
// color:#0058e1;
// }
}
.first {
justify-content: center;
}
}
</style>

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

@ -7,17 +7,19 @@
-->
<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' : '']"
:class="[index <= navList2.indexOf(showView) ? 'finish' : 'ff']"
>
<span class="bg-box">
<span>{{ index + 1 }}</span>
</span>
<span>{{ nav.name }}</span>
<div class="wai">
<span class="bg-box">
<span>{{ index + 1 }}</span>
</span>
<span class="bg-name">{{ nav.name }}</span>
</div>
<div class="line" v-if="index !== navList.length - 1"></div>
</div>
</div>
@ -79,7 +81,7 @@
></put-on-the-shelf>
</div>
<div class="btn" :class="showView === '基本信息' ? 'first' : ''">
<button @click="close()">取消</button>
<a-popconfirm
v-if="
showView == '功能介绍' &&
@ -93,9 +95,10 @@
@confirm="changeGnjs('上一步')"
@cancel="cancel"
>
<button>上一步</button>
<button class="buzhou">上一步</button>
</a-popconfirm>
<button
class="buzhou"
v-else-if="
showView == '功能介绍' &&
gnjs[0].list.filter((val) => val.note1 !== '').length ==
@ -118,9 +121,10 @@
@confirm="changeYycj('上一步')"
@cancel="cancel"
>
<button>上一步</button>
<button class="buzhou">上一步</button>
</a-popconfirm>
<button
class="buzhou"
v-else-if="
showView == '应用场景' &&
yycj[0].list.filter((val) => val.note1 !== '').length ==
@ -130,7 +134,7 @@
>
上一步
</button>
<button v-else-if="showView !== '基本信息'" @click="back()">
<button class="buzhou" v-else-if="showView !== '基本信息'" @click="back()">
上一步
</button>
<a-popconfirm
@ -145,9 +149,9 @@
@confirm="changeBs('预览')"
@cancel="cancel"
>
<button>预览</button>
<button class="buzhou">预览</button>
</a-popconfirm>
<button v-else-if="showView === '部署与使用'" @click="preview()">
<button class="buzhou" v-else-if="showView === '部署与使用'" @click="preview()">
预览
</button>
<a-popconfirm
@ -163,9 +167,10 @@
@confirm="changeGnjs('下一步')"
@cancel="cancel"
>
<button>下一步</button>
<button class="buzhou">下一步</button>
</a-popconfirm>
<button
class="buzhou"
v-else-if="
showView == '功能介绍' &&
gnjs[0].list.filter((val) => val.note1 !== '').length ==
@ -188,9 +193,10 @@
@confirm="changeYycj('下一步')"
@cancel="cancel"
>
<button>下一步</button>
<button class="buzhou">下一步</button>
</a-popconfirm>
<button
class="buzhou"
v-else-if="
showView == '应用场景' &&
yycj[0].list.filter((val) => val.note1 !== '').length ==
@ -200,7 +206,7 @@
>
下一步
</button>
<button v-else-if="showView !== '部署与使用'" @click="next()">
<button class="buzhou" v-else-if="showView !== '部署与使用'" @click="next()">
下一步
</button>
<a-popconfirm
@ -215,11 +221,12 @@
@confirm="changeBs('提交')"
@cancel="cancel"
>
<button>提交</button>
<button class="buzhou">提交</button>
</a-popconfirm>
<button v-else-if="showView === '部署与使用'" @click="submit()">
<button class="buzhou" v-else-if="showView === '部署与使用'" @click="submit()">
提交
</button>
<button class="quxiao" @click="close()">取消</button>
</div>
</div>
</template>
@ -800,85 +807,120 @@
</script>
<style lang="less" scoped>
.box {
position: relative;
top: 64px;
margin: 15px 400px;
padding: 10px;
background: #fff;
.header {
font-size: 28px;
font-weight: 600;
}
.vue-box {
padding: 0 100px;
}
.top {
margin: 10px 20px 0;
padding: 15px 30px;
background: #edf4fc;
display: flex;
justify-content: space-between;
div {
font-size: 18px;
color: #999;
display: flex;
justify-content: center;
align-items: center;
position: relative;
top: 0.64rem;
// margin: 0.15rem 3rem;
padding: 0.1rem;
background: #fff;
.header {
font-size: 0.28rem;
font-weight: 600;
}
.vue-box {
padding: 0 1rem;
}
.top {
font-size: 16px;
margin: 0.32px 0.4px 0;
padding: 24px 24pxs;
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: 45px;
height: 45px;
width: 32px;
height: 32px;
border-radius: 50%;
border: 1px solid rgb(214, 214, 214);
margin-right: 10px;
// border: 0.01rem solid rgb(214, 214, 214);
margin: 0px 16px;
transition: all 0.3s ease;
span {
display: flex;
justify-content: center;
align-items: center;
width: 30px;
height: 30px;
width: 32px;
height: 32px;
border-radius: 50%;
border: 1px solid #999;
border: 1px solid #d9d9d9;
}
}
.line {
margin-left: 10px;
width: 130px;
height: 1px;
background: #999;
.bg-name {
color: #b3b3b3;
}
}
.finish {
color: #0087ff;
.line {
// margin-left: 16px;
width: 326px;
height: 2px;
background: #d9d9d9;
}
}
.finish {
color: #fff;
display: inline-flex;
justify-content: center;
align-items: center;
.wai {
margin-top: 14px;
.bg-box {
background: #9ccefa;
color: #fff;
border: 1px solid #9ccefa;
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;
span {
background: #0087ff;
border: 1px solid #0087ff;
background: #0058e1;
display: flex;
justify-content: center;
align-items: center;
width: 32px;
height: 32px;
border-radius: 50%;
border: 1px solid solid #0058e1;
}
}
.line {
background: #0087ff;
.bg-name {
color: #212121;
font-weight: bold;
}
}
.line {
// margin-left: 16px;
width: 326px;
height: 2px;
background: #0058e1;
}
}
.btn {
display: flex;
justify-content: space-between;
padding: 10px 350px 0;
justify-content: space-around;
padding: 0.1rem 3.5rem 0;
button {
cursor: pointer;
width: 80px;
height: 35px;
font-size: 0.14rem;
width: 0.8rem;
height: 0.35rem;
text-align: center;
color: #fff;
border: none;
border-radius: 6px;
border: 0.01rem solid #9ccefa;
span {
background: #0087ff;
border: 0.01rem solid #0087ff;
}
}
.line {
background: #0087ff;
}
button:nth-of-type(1) {
@ -890,7 +932,55 @@
}
}
.first {
justify-content: space-around;
justify-content: center;
}
}
.btn {
display: flex;
justify-content: center;
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;
cursor: pointer;
width: 90px;
height: 32px;
background: #ffffff;
color:#0058e1;
border-radius: 2px;
border: 1px #0058e1 solid;
}
// .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;
}
// .buzhou:hover{
// background: #ffffff;
// color:#0058e1;
// }
}
.first {
justify-content: center;
}
}
</style>

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

@ -7,17 +7,19 @@
-->
<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' : '']"
:class="[index <= navList2.indexOf(showView) ? 'finish' : 'ff']"
>
<span class="bg-box">
<span>{{ index + 1 }}</span>
</span>
<span>{{ nav.name }}</span>
<div class="wai">
<span class="bg-box">
<span>{{ index + 1 }}</span>
</span>
<span class="bg-name">{{ nav.name }}</span>
</div>
<div class="line" v-if="index !== navList.length - 1"></div>
</div>
</div>
@ -76,7 +78,7 @@
></put-on-the-shelf>
</div>
<div class="btn" :class="showView === '基本信息' ? 'first' : ''">
<button @click="close()">取消</button>
<a-popconfirm
v-if="
showView == '应用场景' &&
@ -90,9 +92,10 @@
@confirm="changeYycj('上一步')"
@cancel="cancel"
>
<button>上一步</button>
<button class="buzhou">上一步</button>
</a-popconfirm>
<button
class="buzhou"
v-else-if="
showView == '应用场景' &&
yycj[0].list.filter((val) => val.note1 !== '').length ==
@ -102,7 +105,7 @@
>
上一步
</button>
<button v-else-if="showView !== '基本信息'" @click="back()">
<button class="buzhou" v-else-if="showView !== '基本信息'" @click="back()">
上一步
</button>
<a-popconfirm
@ -118,9 +121,9 @@
@confirm="changeBs('预览')"
@cancel="cancel"
>
<button>预览</button>
<button class="buzhou">预览</button>
</a-popconfirm>
<button v-else-if="showView === '部署与使用'" @click="preview()">
<button class="buzhou" v-else-if="showView === '部署与使用'" @click="preview()">
预览
</button>
<a-popconfirm
@ -136,9 +139,10 @@
@confirm="changeYycj('下一步')"
@cancel="cancel"
>
<button>下一步</button>
<button class="buzhou">下一步</button>
</a-popconfirm>
<button
class="buzhou"
v-else-if="
showView == '应用场景' &&
yycj[0].list.filter((val) => val.note1 !== '').length ==
@ -148,7 +152,7 @@
>
下一步
</button>
<button v-else-if="showView !== '部署与使用'" @click="next()">
<button class="buzhou" v-else-if="showView !== '部署与使用'" @click="next()">
下一步
</button>
<a-popconfirm
@ -164,11 +168,12 @@
@confirm="changeBs('提交')"
@cancel="cancel"
>
<button>提交</button>
<button class="buzhou">提交</button>
</a-popconfirm>
<button v-else-if="showView === '部署与使用'" @click="submit()">
<button class="buzhou" v-else-if="showView === '部署与使用'" @click="submit()">
提交
</button>
<button class="quxiao" @click="close()">取消</button>
</div>
</div>
</template>
@ -670,85 +675,120 @@
</script>
<style lang="less" scoped>
.box {
position: relative;
top: 64px;
margin: 15px 400px;
padding: 10px;
background: #fff;
.header {
font-size: 28px;
font-weight: 600;
}
.vue-box {
padding: 0 100px;
}
.top {
margin: 10px 20px 0;
padding: 15px 30px;
background: #edf4fc;
display: flex;
justify-content: space-between;
div {
font-size: 18px;
color: #999;
display: flex;
justify-content: center;
align-items: center;
position: relative;
top: 0.64rem;
// margin: 0.15rem 3rem;
padding: 0.1rem;
background: #fff;
.header {
font-size: 0.28rem;
font-weight: 600;
}
.vue-box {
padding: 0 1rem;
}
.top {
font-size: 16px;
margin: 0.32px 0.4px 0;
padding: 24px 24pxs;
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: 45px;
height: 45px;
width: 32px;
height: 32px;
border-radius: 50%;
border: 1px solid rgb(214, 214, 214);
margin-right: 10px;
// border: 0.01rem solid rgb(214, 214, 214);
margin: 0px 16px;
transition: all 0.3s ease;
span {
display: flex;
justify-content: center;
align-items: center;
width: 30px;
height: 30px;
width: 32px;
height: 32px;
border-radius: 50%;
border: 1px solid #999;
border: 1px solid #d9d9d9;
}
}
.line {
margin-left: 10px;
width: 130px;
height: 1px;
background: #999;
.bg-name {
color: #b3b3b3;
}
}
.finish {
color: #0087ff;
.line {
// margin-left: 16px;
width: 326px;
height: 2px;
background: #d9d9d9;
}
}
.finish {
color: #fff;
display: inline-flex;
justify-content: center;
align-items: center;
.wai {
margin-top: 14px;
.bg-box {
background: #9ccefa;
color: #fff;
border: 1px solid #9ccefa;
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;
span {
background: #0087ff;
border: 1px solid #0087ff;
background: #0058e1;
display: flex;
justify-content: center;
align-items: center;
width: 32px;
height: 32px;
border-radius: 50%;
border: 1px solid solid #0058e1;
}
}
.line {
background: #0087ff;
.bg-name {
color: #212121;
font-weight: bold;
}
}
.line {
// margin-left: 16px;
width: 326px;
height: 2px;
background: #0058e1;
}
}
.btn {
display: flex;
justify-content: space-between;
padding: 10px 350px 0;
justify-content: space-around;
padding: 0.1rem 3.5rem 0;
button {
cursor: pointer;
width: 80px;
height: 35px;
font-size: 0.14rem;
width: 0.8rem;
height: 0.35rem;
text-align: center;
color: #fff;
border: none;
border-radius: 6px;
border: 0.01rem solid #9ccefa;
span {
background: #0087ff;
border: 0.01rem solid #0087ff;
}
}
.line {
background: #0087ff;
}
button:nth-of-type(1) {
@ -760,7 +800,55 @@
}
}
.first {
justify-content: space-around;
justify-content: center;
}
}
.btn {
display: flex;
justify-content: center;
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;
cursor: pointer;
width: 90px;
height: 32px;
background: #ffffff;
color:#0058e1;
border-radius: 2px;
border: 1px #0058e1 solid;
}
// .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;
}
// .buzhou:hover{
// background: #ffffff;
// color:#0058e1;
// }
}
.first {
justify-content: center;
}
}
</style>

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

File diff suppressed because it is too large Load Diff

2
front/src/views/demandCenter/demandDetails.vue
View File

@ -147,7 +147,7 @@
<button
style="
width: 100px;
height: 30px;
height: 35px;
margin-right: 10px;
background: rgb(237, 244, 252);
color: rgb(0, 135, 255);

35
front/src/views/personalCenter/components/MyApply.vue
View File

@ -306,20 +306,24 @@
getUserInfo().then((res) => {
userName.value = res.data.data.username
})
let typeList = ref([
'能力申请',
'能力上架',
'能力下架',
'能力需求',
'需求评论',
'数据资源申请',
'云资源申请',
'云视频申请',
// '能力评价',
])
const formState = ref({ name: '' })
// 西海岸-设备申请
let isXiHaiAn = whoShow.itShowXiHaiAn
let typeList = ref(
isXiHaiAn
? ['能力申请', '能力上架', '能力下架', '能力需求', '需求评论']
: [
'能力申请',
'能力上架',
'能力下架',
'能力需求',
'需求评论',
'数据资源申请',
'云资源申请',
'云视频申请',
// '能力评价',
]
)
const itShowXiHaiAn = ref(isXiHaiAn)
const phoneSate = ref([2, 3])
if (isXiHaiAn) {
@ -769,8 +773,9 @@
contentList.data = res.data.data.list
total.value = res.data.data.total
initNum()
console.log('typeIndex', typeIndex.value)
switch (typeIndex.value) {
case 2:
case 1:
contentList.data.map((val) => {
nengliziyuanshangjiaapply(val.businessKey).then((res1) => {
console.log('上架===========>', res1.data.data)
@ -780,7 +785,7 @@
})
})
break
case 3:
case 2:
contentList.data.map((val) => {
selectOneDel(val.businessKey).then((res1) => {
console.log('下架===========>', res1.data.data)
@ -790,7 +795,7 @@
})
})
break
case 4:
case 3:
contentList.data.map((val) => {
getDemandForm(val.businessKey).then((res1) => {
console.log('需求===========>', res1.data.data)
@ -801,7 +806,7 @@
})
})
break
case 5:
case 4:
contentList.data.map((val) => {
demandComment(val.businessKey).then((res1) => {
console.log('评论===========>', res1.data.data)