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

This commit is contained in:
wuhongjian 2022-06-14 13:59:37 +08:00
parent 85d714d7eb efad411cf9
commit 8058b17c08
6 changed files with 114 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
front/src/views/home/components/header.vue
View File

@ -36,7 +36,7 @@
</svg> </svg>
<!-- <a-avatar shape="square" size="large" /> --> <!-- <a-avatar shape="square" size="large" /> -->
</a-badge> </a-badge>
<a-badge :count="mynoticeNum" style="margin-left: .2rem"> <a-badge :count="mynoticeNum" style="margin-left: 0.2rem">
<svg <svg
t="1654051054113" t="1654051054113"
class="icon2" class="icon2"
@ -253,7 +253,7 @@
src: url('~@/assets/newHome/font/header-typeface.ttf'); src: url('~@/assets/newHome/font/header-typeface.ttf');
} }
.home-header { .home-header {
height: .64rem; height: 0.64rem;
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -265,17 +265,17 @@
top: 0; top: 0;
div { div {
color: #fff; color: #fff;
font-size: .16rem; font-size: 0.16rem;
} }
.name { .name {
font-size: .22rem; font-size: 0.22rem;
font-family: header-typeface; font-family: header-typeface;
margin-right: .2rem; margin-right: 0.2rem;
} }
.nav { .nav {
width: 1.2rem; width: 1.2rem;
height: .64rem; height: 0.64rem;
line-height: .64rem; line-height: 0.64rem;
text-align: center; text-align: center;
} }
.nav:hover { .nav:hover {
@ -289,31 +289,31 @@
} }
.info { .info {
width: 2rem; width: 2rem;
margin-left: .2rem; margin-left: 0.2rem;
display: flex; display: flex;
justify-content: center; justify-content: center;
.img { .img {
width: .3rem; width: 0.3rem;
height: .3rem; height: 0.3rem;
border-radius: .1rem; border-radius: 0.1rem;
background: url('~@/assets/newHome/user.png') no-repeat; background: url('~@/assets/newHome/user.png') no-repeat;
background-size: 100%; background-size: 100%;
} }
span { span {
height: .3rem; height: 0.3rem;
line-height: .3rem; line-height: 0.3rem;
margin-left: .08rem; margin-left: 0.08rem;
margin-right: .06rem; margin-right: 0.06rem;
font-size: .16rem; font-size: 0.16rem;
} }
.name { .name {
max-width: .75rem; max-width: 0.75rem;
overflow: hidden; overflow: hidden;
} }
.out { .out {
cursor: pointer; cursor: pointer;
padding: 0 .16rem; padding: 0 0.16rem;
border-left: .01rem solid #666; border-left: 0.01rem solid #666;
} }
} }
} }
@ -358,9 +358,9 @@
width: 2.5rem; width: 2.5rem;
height: 3rem; height: 3rem;
background: #eee; background: #eee;
border-radius: .05rem; border-radius: 0.05rem;
position: absolute; position: absolute;
top: .45rem; top: 0.45rem;
right: 3.1rem; right: 3.1rem;
overflow-y: scroll; overflow-y: scroll;
} }
@ -368,13 +368,13 @@
display: none; display: none;
} }
:deep(.ant-list-item) { :deep(.ant-list-item) {
border-bottom: .01rem solid #ccc; border-bottom: 0.01rem solid #ccc;
} }
:deep(.ant-list-item-meta-title) { :deep(.ant-list-item-meta-title) {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
padding: 0 .05rem; padding: 0 0.05rem;
a { a {
width: 1.5rem; width: 1.5rem;
// 超出显示... // 超出显示...
@ -383,13 +383,13 @@
white-space: nowrap; white-space: nowrap;
} }
button { button {
width: .7rem; width: 0.7rem;
height: .25rem; height: 0.25rem;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
span { span {
font-size: .1rem; font-size: 0.1rem;
} }
} }
} }

36
front/src/views/newHome/components/Header.vue
View File

@ -116,7 +116,7 @@
src: url('~@/assets/newHome/font/header-typeface.ttf'); src: url('~@/assets/newHome/font/header-typeface.ttf');
} }
.home-header { .home-header {
height: .64rem; height: 0.64rem;
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -127,17 +127,17 @@
z-index: 1000; z-index: 1000;
div { div {
color: #fff; color: #fff;
font-size: .16rem; font-size: 0.16rem;
} }
.name { .name {
font-size: .22rem; font-size: 0.22rem;
font-family: header-typeface; font-family: header-typeface;
margin-right: .2rem; margin-right: 0.2rem;
} }
.nav { .nav {
width: 1.44rem; width: 1.44rem;
height: .64rem; height: 0.64rem;
line-height: .64rem; line-height: 0.64rem;
text-align: center; text-align: center;
} }
.nav:hover { .nav:hover {
@ -151,31 +151,31 @@
} }
.info { .info {
width: 2rem; width: 2rem;
margin-left: .2rem; margin-left: 0.2rem;
display: flex; display: flex;
justify-content: center; justify-content: center;
.img { .img {
width: .3rem; width: 0.3rem;
height: .3rem; height: 0.3rem;
border-radius: .1rem; border-radius: 0.1rem;
background: url('~@/assets/newHome/user.png') no-repeat; background: url('~@/assets/newHome/user.png') no-repeat;
background-size: 100%; background-size: 100%;
} }
span { span {
height: .3rem; height: 0.3rem;
line-height: .3rem; line-height: 0.3rem;
margin-left: .08rem; margin-left: 0.08rem;
margin-right: .06rem; margin-right: 0.06rem;
font-size: .16rem; font-size: 0.16rem;
} }
.name { .name {
max-width: .75rem; max-width: 0.75rem;
overflow: hidden; overflow: hidden;
} }
.out { .out {
cursor: pointer; cursor: pointer;
padding: 0 .16rem; padding: 0 0.16rem;
border-left: .01rem solid #666; border-left: 0.01rem solid #666;
} }
} }
} }

23
front/src/views/newHome/components/WorkDynamics.vue
View File

@ -118,6 +118,7 @@
</template> </template>
<script setup> <script setup>
import { gongZuoZhuangTai } from '@/api/home.js' import { gongZuoZhuangTai } from '@/api/home.js'
import { message } from 'ant-design-vue'
import { ref, watch } from 'vue' import { ref, watch } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { useStore } from 'vuex' import { useStore } from 'vuex'
@ -167,10 +168,18 @@
const handleOk = (e) => { const handleOk = (e) => {
let snum = ref({}) let snum = ref({})
if (abilityToTypeFunctionData.value == '组件服务') { if (abilityToTypeFunctionData.value == '组件服务') {
if (!componentTypeValue.value || componentTypeValue.value == '') {
message.error('请选择组件类型！')
return
} else if (componentTypeValue.value !== '智能算法') {
message.error('功能开发中！')
return
} else {
snum.value = { snum.value = {
abilityToType: abilityToTypeFunctionData.value, abilityToType: abilityToTypeFunctionData.value,
componentTypeValue: componentTypeValue.value, componentTypeValue: componentTypeValue.value,
} }
}
} else { } else {
snum.value = { snum.value = {
abilityToType: abilityToTypeFunctionData.value, abilityToType: abilityToTypeFunctionData.value,
@ -262,7 +271,6 @@
} }
.ant-modal-content { .ant-modal-content {
border-radius: 0.1rem; border-radius: 0.1rem;
.ability-to-type, .ability-to-type,
.component-type { .component-type {
display: flex; display: flex;
@ -322,7 +330,6 @@
border: 0; border: 0;
text-align: center; text-align: center;
padding-bottom: 0.2rem; padding-bottom: 0.2rem;
button { button {
margin-right: 0.2rem; margin-right: 0.2rem;
border-radius: 0.08rem; border-radius: 0.08rem;
@ -346,7 +353,6 @@
align-items: center; align-items: center;
padding-bottom: 0.8rem; padding-bottom: 0.8rem;
padding-top: 0.78rem; padding-top: 0.78rem;
.title { .title {
font-size: 0.3rem; font-size: 0.3rem;
font-family: 'convergence-typeface'; font-family: 'convergence-typeface';
@ -354,11 +360,7 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
margin-bottom: 0.32rem; margin-bottom: 0.32rem;
.title-son {
width: 0.34rem; width: 0.34rem;
height: 0.03rem;
background: #0058e1;
border-radius: 0.01rem; border-radius: 0.01rem;
margin-top: 0.18rem; margin-top: 0.18rem;
} }
@ -369,14 +371,10 @@
height: 4.8rem; height: 4.8rem;
display: flex; display: flex;
padding-left: 0.2rem; padding-left: 0.2rem;
.content-empty { .content-empty {
height: 2.2rem; height: 2.2rem;
padding-top: 0.49rem; padding-top: 0.49rem;
} }
}
.content > div {
background: #f3f5f9; background: #f3f5f9;
border: #eaedf2 0.01rem solid; border: #eaedf2 0.01rem solid;
} }
@ -393,7 +391,6 @@
padding-top: 0.2rem; padding-top: 0.2rem;
align-items: center; align-items: center;
padding-bottom: 0.1rem; padding-bottom: 0.1rem;
.content-miaoshui-title { .content-miaoshui-title {
padding-left: 0.05rem; padding-left: 0.05rem;
padding-right: 0.05rem; padding-right: 0.05rem;
@ -434,7 +431,6 @@
align-items: bottom; align-items: bottom;
margin-right: 0.16rem; margin-right: 0.16rem;
margin-left: 0.16rem; margin-left: 0.16rem;
div:first-child { div:first-child {
margin-left: 0.16rem; margin-left: 0.16rem;
} }
@ -467,7 +463,6 @@
align-items: center; align-items: center;
background-size: 100%; background-size: 100%;
padding-top: 0.15rem; padding-top: 0.15rem;
.shijain { .shijain {
margin-top: 0.2rem; margin-top: 0.2rem;
} }

3
front/src/views/personalCenter/components/Collection.vue
View File

@ -170,7 +170,10 @@
getTopCategory().then((res) => { getTopCategory().then((res) => {
console.log('编目一级=============>', res.data) console.log('编目一级=============>', res.data)
res.data.data.forEach((val) => { res.data.data.forEach((val) => {
// tabList.value.push(val.name)
if (val.name == '应用资源' || val.name == '组件服务') {
tabList.value.push(val.name) tabList.value.push(val.name)
}
}) })
}) })
} }

9
front/src/views/personalCenter/components/MyPublish.vue
View File

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

80
front/src/views/personalCenter/components/PurchaseVehicle.vue
View File

@ -11,7 +11,7 @@
/> />
<a-button <a-button
type="primary" type="primary"
style="width: 80px; height: 36px; margin-left: 10px" style="width: 0.8rem; height: 0.36rem; margin-left: 0.1rem"
@click="clean" @click="clean"
> >
重置 重置
@ -62,7 +62,7 @@
width="50" width="50"
height="50" height="50"
v-if="item.delFlag == 4 || item.delFlag == 5" v-if="item.delFlag == 4 || item.delFlag == 5"
style="position: absolute; top: 0; left: 100px" style="position: absolute; top: 0; left: 1rem"
> >
<path <path
d="M955.22053 256C813.82053 11.2 500.72053-72.6 255.92053 68.8S-72.67947 523.2 68.72053 768 523.22053 1096.6 768.02053 955.2c244.7-141.2 328.6-454.1 187.4-698.8 0-0.1-0.1-0.3-0.2-0.4zM762.02053 944.7c-239 138.1-544.8 56.2-682.9-182.8S22.92053 217.1 261.92053 79.1s544.8-56.2 682.9 182.8c137.9 239 56.1 544.6-182.8 682.8z" d="M955.22053 256C813.82053 11.2 500.72053-72.6 255.92053 68.8S-72.67947 523.2 68.72053 768 523.22053 1096.6 768.02053 955.2c244.7-141.2 328.6-454.1 187.4-698.8 0-0.1-0.1-0.3-0.2-0.4zM762.02053 944.7c-239 138.1-544.8 56.2-682.9-182.8S22.92053 217.1 261.92053 79.1s544.8-56.2 682.9 182.8c137.9 239 56.1 544.6-182.8 682.8z"
@ -130,14 +130,14 @@
> >
<a-button <a-button
type="primary" type="primary"
style="width: 70px; height: 32px; margin-left: 10px" style="width: 0.7rem; height: 0.32rem; margin-left: 0.1rem"
> >
删除 删除
</a-button> </a-button>
</a-popconfirm> </a-popconfirm>
<a-button <a-button
type="primary" type="primary"
style="width: 70px; height: 32px; margin-left: 10px" style="width: 0.7rem; height: 0.32rem; margin-left: 0.1rem"
@click="collection" @click="collection"
> >
收藏 收藏
@ -151,7 +151,7 @@
</p> </p>
<a-button <a-button
type="primary" type="primary"
style="width: 100px; height: 32px; margin-left: 30px" style="width: 1rem; height: 0.32rem; margin-left: 0.3rem"
@click="apply" @click="apply"
> >
一键申请 一键申请
@ -227,7 +227,9 @@
getTopCategory().then((res) => { getTopCategory().then((res) => {
console.log('编目一级=============>', res.data) console.log('编目一级=============>', res.data)
res.data.data.forEach((val) => { res.data.data.forEach((val) => {
if (val.name == '应用资源' || val.name == '组件服务') {
tabList.value.push(val.name) tabList.value.push(val.name)
}
}) })
}) })
} }
@ -431,23 +433,23 @@
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.ant-list { .ant-list {
height: 540px; height: 5.4rem;
overflow-y: scroll; overflow-y: scroll;
.ant-list-item-meta { .ant-list-item-meta {
align-items: center; align-items: center;
:deep(.ant-list-item-meta-avatar) { :deep(.ant-list-item-meta-avatar) {
padding-left: 20px; padding-left: 0.2rem;
margin-right: 30px; margin-right: 0.3rem;
} }
.time { .time {
margin-left: 30px; margin-left: 0.3rem;
font-size: 12px; font-size: 0.12rem;
color: #ccc; color: #ccc;
} }
:deep(.ant-list-item-meta-description) { :deep(.ant-list-item-meta-description) {
max-height: 44px; max-height: 0.44rem;
overflow: hidden; overflow: hidden;
margin-right: 10px; margin-right: 0.1rem;
} }
} }
} }
@ -455,12 +457,12 @@
width: 0 !important; width: 0 !important;
} }
.bottom { .bottom {
margin: 10px; margin: 0.1rem;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.left span { .left span {
margin-left: 10px; margin-left: 0.1rem;
} }
.right { .right {
display: flex; display: flex;
@ -469,63 +471,63 @@
color: #0087ff; color: #0087ff;
} }
.num { .num {
font-size: 20px; font-size: 0.2rem;
} }
button { button {
margin-bottom: 10px; margin-bottom: 0.1rem;
} }
} }
} }
.title { .title {
font-size: 20px; font-size: 0.2rem;
color: #000000; color: #000000;
font-family: 'Alibaba PuHuiTi'; font-family: 'Alibaba PuHuiTi';
font-weight: 500; font-weight: 500;
margin-top: 20px; margin-top: 0.2rem;
margin-left: 20px; margin-left: 0.2rem;
} }
.sousuokuang { .sousuokuang {
margin: 10px 0px 21px 20px; margin: 0.1rem 0rem 0.21rem 0.2rem;
.ant-input-search { .ant-input-search {
max-width: 490px; max-width: 4.9rem;
} }
:deep(.ant-input) { :deep(.ant-input) {
width: 400px; width: 4rem;
height: 36px; height: 0.36rem;
font-size: 14px; font-size: 0.14rem;
color: #b2b2b2; color: #b2b2b2;
background: #f5f5f5; background: #f5f5f5;
} }
:deep(.ant-input-group-addon) { :deep(.ant-input-group-addon) {
display: inline-block; display: inline-block;
margin-left: 10px; margin-left: 0.1rem;
.ant-input-search-button { .ant-input-search-button {
width: 80px; width: 0.8rem;
height: 36px; height: 0.36rem;
border-radius: 4px; border-radius: 0.04rem;
font-size: 14px; font-size: 0.14rem;
} }
} }
} }
.tab { .tab {
margin-top: 10px; margin-top: 0.1rem;
margin-left: 20px; margin-left: 0.2rem;
margin-bottom: 10px; margin-bottom: 0.1rem;
display: flex; display: flex;
font-size: 14px; font-size: 0.14rem;
color: #999999; color: #999999;
div { div {
width: 70px; width: 0.7rem;
height: 24px; height: 0.24rem;
border: 1px solid #cccccc; border: 0.01rem solid #cccccc;
border-radius: 12px; border-radius: 0.12rem;
margin-left: 10px; margin-left: 0.1rem;
text-align: center; text-align: center;
color: #666666; color: #666666;
cursor: pointer; cursor: pointer;
} }
.tabclass { .tabclass {
border: 1px solid #0087ff; border: 0.01rem solid #0087ff;
color: #0087ff; color: #0087ff;
} }
} }