Compare commits

...

3 Commits

Author SHA1 Message Date
a0049873 8b48a62f9c 格式 2022-06-14 11:52:16 +08:00
a0049873 3b3459206d Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-14 11:50:33 +08:00
a0049873 0f1a9d56e0 新增跳转逻辑判断 2022-06-14 11:49:37 +08:00
2 changed files with 98 additions and 80 deletions

View File

@ -118,6 +118,7 @@
</template>
<script setup>
import { gongZuoZhuangTai } from '@/api/home.js'
import { message } from 'ant-design-vue'
import { ref, watch } from 'vue'
import { useRouter } from 'vue-router'
import { useStore } from 'vuex'
@ -167,9 +168,17 @@
const handleOk = (e) => {
let snum = ref({})
if (abilityToTypeFunctionData.value == '组件服务') {
snum.value = {
abilityToType: abilityToTypeFunctionData.value,
componentTypeValue: componentTypeValue.value,
if (!componentTypeValue.value || componentTypeValue.value == '') {
message.error('请选择组件类型!')
return
} else if (componentTypeValue.value !== '智能算法') {
message.error('功能开发中!')
return
} else {
snum.value = {
abilityToType: abilityToTypeFunctionData.value,
componentTypeValue: componentTypeValue.value,
}
}
} else {
snum.value = {
@ -247,11 +256,11 @@
top: 50%;
margin-left: -2.6rem;
margin-top: -1.44rem;
font-size: .14rem;
font-size: 0.14rem;
font-weight: 500;
.ant-radio-inner {
height: .16rem;
width: .16rem;
height: 0.16rem;
width: 0.16rem;
}
.ant-radio-inner::after {
background-color: unset;
@ -260,24 +269,24 @@
background-position: center;
}
.ant-modal-content {
border-radius: .1rem;
border-radius: 0.1rem;
.ability-to-type,
.component-type {
display: flex;
margin-top: .2rem;
margin-top: 0.2rem;
.title {
white-space: nowrap;
margin-right: .2rem;
margin-right: 0.2rem;
display: flex;
align-items: center;
height: .26rem;
height: 0.26rem;
}
.content {
width: 100%;
.ant-radio-group {
display: grid;
grid-template-columns: 1fr 1fr 1fr;
grid-gap: .15rem;
grid-gap: 0.15rem;
}
}
}
@ -286,15 +295,15 @@
display: grid;
grid-template-columns: 1fr 1fr 1fr;
div {
margin-right: .15rem;
margin-right: 0.15rem;
cursor: pointer;
font-size: .14rem;
width: .9rem;
height: .26rem;
border-radius: .13rem;
font-size: 0.14rem;
width: 0.9rem;
height: 0.26rem;
border-radius: 0.13rem;
color: #333333;
background: #f5f5f5;
border: .01rem #cccccc solid;
border: 0.01rem #cccccc solid;
display: flex;
justify-content: center;
align-items: center;
@ -314,19 +323,19 @@
.ant-modal-footer {
border: 0;
text-align: center;
padding-bottom: .2rem;
padding-bottom: 0.2rem;
button {
margin-right: .2rem;
border-radius: .08rem;
margin-right: 0.2rem;
border-radius: 0.08rem;
}
}
.showBg {
height: .24rem;
width: .24rem;
height: 0.24rem;
width: 0.24rem;
background: url('~@/assets/home/shenqing.png') no-repeat;
background-size: cover;
background-position: center;
margin-right: .1rem;
margin-right: 0.1rem;
}
}
</style>
@ -335,75 +344,75 @@
display: flex;
flex-direction: column;
align-items: center;
padding-bottom: .8rem;
padding-top: .78rem;
padding-bottom: 0.8rem;
padding-top: 0.78rem;
.title {
font-size: .3rem;
font-size: 0.3rem;
font-family: 'convergence-typeface';
display: flex;
flex-direction: column;
align-items: center;
margin-bottom: .32rem;
margin-bottom: 0.32rem;
.title-son {
width: .34rem;
height: .03rem;
width: 0.34rem;
height: 0.03rem;
background: #0058e1;
border-radius: .01rem;
margin-top: .18rem;
border-radius: 0.01rem;
margin-top: 0.18rem;
}
}
.content {
width: 13rem;
height: 4.8rem;
display: flex;
padding-left: .2rem;
padding-left: 0.2rem;
.content-empty {
height: 2.2rem;
padding-top: .49rem;
padding-top: 0.49rem;
}
}
.content > div {
background: #f3f5f9;
border: #eaedf2 .01rem solid;
border: #eaedf2 0.01rem solid;
}
.content > div:hover {
border-radius: .02rem;
border: .01rem solid #0058e1;
box-shadow: 0rem .08rem .2rem rgba(0, 88, 225, 0.3);
border-radius: 0.02rem;
border: 0.01rem solid #0058e1;
box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
}
.content-miaoshui {
display: flex;
flex-direction: column;
padding-top: .2rem;
padding-top: 0.2rem;
align-items: center;
padding-bottom: .1rem;
padding-bottom: 0.1rem;
.content-miaoshui-title {
padding-left: .05rem;
padding-right: .05rem;
font-size: .18rem;
padding-left: 0.05rem;
padding-right: 0.05rem;
font-size: 0.18rem;
font-weight: bold;
height: .3rem;
height: 0.3rem;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
margin-bottom: .12rem;
margin-bottom: 0.12rem;
word-break: break-all;
}
.content-miaoshui-content {
height: 1.2rem;
width: 2.98rem;
margin: .12rem .1rem .1rem .1rem;
margin: 0.12rem 0.1rem 0.1rem 0.1rem;
font-family: text-typeface;
font-size: .14rem;
line-height: .2rem;
font-size: 0.14rem;
line-height: 0.2rem;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 6;
-webkit-box-orient: vertical;
margin-bottom: .12rem;
margin-bottom: 0.12rem;
word-break: break-all;
cursor: pointer;
}
@ -413,18 +422,18 @@
display: flex;
justify-content: space-between;
align-items: bottom;
margin-right: .16rem;
margin-left: .16rem;
margin-right: 0.16rem;
margin-left: 0.16rem;
div:first-child {
margin-left: .16rem;
margin-left: 0.16rem;
}
}
.shijain-content-bootom {
margin-right: .16rem;
width: .8rem;
height: .24rem;
margin-right: 0.16rem;
width: 0.8rem;
height: 0.24rem;
text-align: center;
border: .01rem solid #0058e1;
border: 0.01rem solid #0058e1;
cursor: pointer;
color: #0058e1;
}
@ -442,9 +451,9 @@
justify-content: center;
align-items: center;
background-size: 100%;
padding-top: .15rem;
padding-top: 0.15rem;
.shijain {
margin-top: .2rem;
margin-top: 0.2rem;
}
:deep(.ant-imag) {
text-align: center;
@ -459,30 +468,30 @@
}
}
.bottom {
height: .24rem;
font-size: .16rem;
height: 0.24rem;
font-size: 0.16rem;
width: 1rem;
margin-top: .4rem;
margin-top: 0.4rem;
cursor: pointer;
text-align: center;
color: #000000;
.gengduo {
display: inline-block;
margin-left: .04rem;
width: .1rem;
height: .1rem;
margin-left: 0.04rem;
width: 0.1rem;
height: 0.1rem;
background: url('~@/assets/newHome/gd2.png') no-repeat;
background-position: center;
}
}
.bottom:hover {
border-radius: .02rem;
border-radius: 0.02rem;
background-color: rgba(1, 102, 255, 0.1);
}
.content > div {
height: 4.8rem;
width: 3.1rem;
margin-right: .2rem;
margin-right: 0.2rem;
}
.fixedmount {
height: 1.5rem;
@ -496,15 +505,15 @@
align-items: center;
}
.fixedmount div {
width: .7rem;
height: .7rem;
border-radius: .04rem;
border: .01rem #94aac9 solid;
width: 0.7rem;
height: 0.7rem;
border-radius: 0.04rem;
border: 0.01rem #94aac9 solid;
display: flex;
flex-direction: column;
// justify-content: center;
align-items: center;
padding-top: .13rem;
padding-top: 0.13rem;
position: relative;
cursor: pointer;
background: #e3edfc;
@ -512,22 +521,22 @@
.fixedmount div p:nth-child(2) {
position: absolute;
bottom: 0rem;
height: .14rem;
font-size: .14rem;
line-height: .14rem;
height: 0.14rem;
font-size: 0.14rem;
line-height: 0.14rem;
color: #000000;
// margin-top: .08rem;
}
.fixedmount div:nth-child(1) p:nth-child(1) {
height: .24rem;
width: .24rem;
height: 0.24rem;
width: 0.24rem;
background: url('~@/assets/home/shenqing.png') no-repeat;
background-size: cover;
background-position: center;
}
.fixedmount div:nth-child(2) p:nth-child(1) {
height: .24rem;
width: .24rem;
height: 0.24rem;
width: 0.24rem;
background: url('~@/assets/home/shangjia.png') no-repeat;
}
}

View File

@ -229,6 +229,7 @@
<script setup>
import { onMounted, reactive, ref } from 'vue'
import { useRouter } from 'vue-router'
import { message } from 'ant-design-vue'
// , reactive
import { wodepage, undercarriage } from '@/api/personalCenter'
import { getUserInfo } from '@/api/user'
@ -280,9 +281,17 @@
const handleOk = (e) => {
let snum = ref({})
if (abilityToTypeFunctionData.value == '组件服务') {
snum.value = {
abilityToType: abilityToTypeFunctionData.value,
componentTypeValue: componentTypeValue.value,
if (!componentTypeValue.value || componentTypeValue.value == '') {
message.error('请选择组件类型!')
return
} else if (componentTypeValue.value !== '智能算法') {
message.error('功能开发中!')
return
} else {
snum.value = {
abilityToType: abilityToTypeFunctionData.value,
componentTypeValue: componentTypeValue.value,
}
}
} else {
snum.value = {