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

Compare commits

base: wuhongjian:e03c1455ec531f61ac54d417c67dd4160a529e74
Branches Tags
wuhongjian:master
wuhongjian:hi-ucs-dev
wuhongjian:release
wuhongjian:hi-ucs-pre
wuhongjian:hi-ucs-dev-xha
wuhongjian:hi-ucs-bt
wuhongjian:hi-ucs-xha
wuhongjian:v0.8.2.2.release.sj
wuhongjian:v0.8.2.1.release
wuhongjian:v0.8.2.2.release
wuhongjian:v0.8.1.6.release
wuhongjian:v0.8.1.5.release
wuhongjian:v0.8.1.4.release
wuhongjian:v0.8.1.3.release
wuhongjian:v0.8.1.2.release
wuhongjian:v0.8.1.1.release
wuhongjian:v0.8.1.dev
wuhongjian:v0.8.1.release
wuhongjian:v0.8.0
...
compare: wuhongjian:6a5139f8b3edd690eaa63c887aafa6d0ae1a5305
Branches Tags
wuhongjian:hi-ucs-dev
wuhongjian:release
wuhongjian:master
wuhongjian:hi-ucs-pre
wuhongjian:hi-ucs-dev-xha
wuhongjian:hi-ucs-bt
wuhongjian:hi-ucs-xha
wuhongjian:v0.8.2.2.release.sj
wuhongjian:v0.8.2.1.release
wuhongjian:v0.8.2.2.release
wuhongjian:v0.8.1.6.release
wuhongjian:v0.8.1.5.release
wuhongjian:v0.8.1.4.release
wuhongjian:v0.8.1.3.release
wuhongjian:v0.8.1.2.release
wuhongjian:v0.8.1.1.release
wuhongjian:v0.8.1.dev
wuhongjian:v0.8.1.release
wuhongjian:v0.8.0

2 Commits
e03c1455ec ... 6a5139f8b3

Author SHA1 Message Date
gongjiale 6a5139f8b3 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-15 14:57:32 +08:00
gongjiale 3eab1e693f UI样式修改 2022-11-15 14:57:22 +08:00
8 changed files with 2501 additions and 1888 deletions
Show Stats Expand all files Collapse all files

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

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

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

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

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

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

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

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