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:80/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
gongjiale 2022-10-26 19:11:03 +08:00
parent 474292f532 1e3b315d35
commit c5e48f69f5
2 changed files with 269 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/views/abilityStatistics/components/ResourceAggregation.vue
View File

@ -262,6 +262,7 @@
center: ['50%', '40%'],
type: 'pie',
selectedMode: 'single',
silent: true,
radius: ['50%', '30%'],
color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#FAC858'],
top: '0',
@ -289,6 +290,7 @@
type: 'pie',
center: ['50%', '40%'],
radius: ['58%', '50%'],
silent: true,
itemStyle: {
normal: {
color: '#c2c7d6',

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

@ -1,8 +1,8 @@
<!--
* @Author: hisense.liangjunhua
* @Date: 2022-06-17 14:11:08
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-25 19:52:03
* @LastEditors: Light
* @LastEditTime: 2022-10-26 14:57:25
* @Description: 上架
-->
<template>
@ -95,7 +95,7 @@
disabled
v-model:value="val[attr.field]"
:showCount="true"
:maxlength="200"
:maxlength="1000"
:placeholder="'请填写' + attr.name"
v-else-if="attr.type == 'textArea'"
/>
@ -166,7 +166,7 @@
<a-textarea
v-model:value="val.note1"
:showCount="true"
:maxlength="200"
:maxlength="1000"
:placeholder="'请填写' + val.name"
v-else-if="val.type == 'textArea'"
/>
@ -203,7 +203,7 @@
</div>
</div>
</template>
<template v-else>
<div class="bottom">
<div
@ -270,7 +270,7 @@
v-else-if="item.type == 'textArea'"
v-model:value="item.note1"
:showCount="true"
:maxlength="200"
:maxlength="1000"
:placeholder="'请输入' + item.name"
@change="changeIiem(item.name, item.note1)"
/>
@ -703,7 +703,7 @@
data.value.list.push(item)
}
})
}
}
// else if (item.name === '部门联系人') {
// if (!item.note1) {
// getUserInfo().then(({ data: res1 }) => {
@ -724,7 +724,7 @@
// } else {
// data.value.list.push(item)
// }
// }
// }
else if (item.name === '来源应用') {
queryApplicationRelByResourceId({
referenceId: 0,
@ -1132,290 +1132,290 @@
</script>
<style></style>
<style lang="less" scoped>
.put-on-the-shelf {
height: 6.8rem;
overflow: scroll;
display: flex;
flex-direction: column;
align-items: center;
padding: 0.5rem 1rem 0.25rem;
.Technical-text {
height: 0.3rem;
width: 1rem;
border: 0.01rem solid #bbd3ef;
border-radius: 0.06rem;
background: #edf4fc;
color: #0087ff;
font-size: 0.14rem;
text-align: center;
line-height: 0.3rem;
}
.Technical-text:hover {
cursor: pointer;
}
& > div {
width: 100%;
margin-top: 0.6rem;
.top {
color: #333333;
font-size: 0.22rem;
display: flex;
justify-content: center;
align-items: center;
margin-bottom: 0.25rem;
div:first-child,
div:last-child {
width: 2.45rem;
height: 0.01rem;
background: #f0f0f0;
}
div:nth-child(2) {
margin: 0 0.3rem;
}
.put-on-the-shelf {
height: 6.8rem;
overflow: scroll;
display: flex;
flex-direction: column;
align-items: center;
padding: 0.5rem 1rem 0.25rem;
.Technical-text {
height: 0.3rem;
width: 1rem;
border: 0.01rem solid #bbd3ef;
border-radius: 0.06rem;
background: #edf4fc;
color: #0087ff;
font-size: 0.14rem;
text-align: center;
line-height: 0.3rem;
}
.Technical-text:hover {
cursor: pointer;
}
.bottom {
margin-top: 0.25rem;
& > div {
width: 100%;
margin-top: 0.6rem;
.items {
background: #fafafa;
padding: 0.1rem;
.top {
color: #333333;
font-size: 0.22rem;
display: flex;
justify-content: center;
align-items: center;
margin-bottom: 0.25rem;
p {
display: flex;
justify-content: space-between;
div:first-child,
div:last-child {
width: 2.45rem;
height: 0.01rem;
background: #f0f0f0;
}
span:nth-of-type(1) {
width: 2rem;
div:nth-child(2) {
margin: 0 0.3rem;
}
}
.bottom {
margin-top: 0.25rem;
.items {
background: #fafafa;
padding: 0.1rem;
p {
display: flex;
justify-content: space-between;
span:nth-of-type(1) {
width: 2rem;
}
span:nth-of-type(2) {
width: 100%;
font-weight: 600;
}
}
span:nth-of-type(2) {
width: 100%;
p:nth-of-type(1) > span:nth-of-type(1) {
font-size: 0.18rem;
font-weight: 600;
}
}
p:nth-of-type(1) > span:nth-of-type(1) {
font-size: 0.18rem;
font-weight: 600;
}
}
.add {
cursor: pointer;
margin-top: 0.1rem;
font-size: 0.16rem;
color: #007efb;
}
.form {
margin-top: 0.2rem;
display: flex;
justify-content: flex-start;
align-items: center;
span:first-child {
width: 1.2rem;
.add {
cursor: pointer;
margin-top: 0.1rem;
font-size: 0.16rem;
color: #007efb;
}
:deep(.ant-input-textarea) {
width: 5.2rem;
.form {
margin-top: 0.2rem;
display: flex;
justify-content: flex-start;
align-items: center;
span:first-child {
width: 1.2rem;
}
:deep(.ant-input-textarea) {
width: 5.2rem;
}
:deep(.ant-radio-group) {
width: 5.2rem;
}
:deep(.ant-input-number) {
width: 2rem;
}
:deep(.ant-input) {
resize: none;
width: 5.2rem;
}
.ant-btn {
width: 1.6rem;
height: 0.32rem;
text-align: center;
background: #edf4fc;
color: #0087ff;
border: 0.01rem solid #bbd3ef;
border-radius: 0.06rem;
}
}
:deep(.ant-radio-group) {
width: 5.2rem;
}
.submit {
margin-top: 0.4rem;
font-size: 0.14rem;
display: flex;
justify-content: flex-end;
:deep(.ant-input-number) {
width: 2rem;
}
:deep(.ant-input) {
resize: none;
width: 5.2rem;
}
.ant-btn {
width: 1.6rem;
height: 0.32rem;
text-align: center;
background: #edf4fc;
color: #0087ff;
border: 0.01rem solid #bbd3ef;
border-radius: 0.06rem;
}
}
.submit {
margin-top: 0.4rem;
font-size: 0.14rem;
display: flex;
justify-content: flex-end;
.ant-btn {
width: 1.8rem;
height: 0.3rem;
text-align: center;
background: #d9ebff;
color: #0087ff;
border: 0.01rem solid #0087ff;
border-radius: 0.06rem;
.ant-btn {
width: 1.8rem;
height: 0.3rem;
text-align: center;
background: #d9ebff;
color: #0087ff;
border: 0.01rem solid #0087ff;
border-radius: 0.06rem;
}
}
}
}
}
& > div:nth-of-type(1) {
margin-top: 0;
}
}
.application-Area {
width: 5.2rem;
display: grid;
margin-top: -0.05rem;
grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
.application-Area-son {
cursor: pointer;
font-size: 0.14rem;
width: 0.9rem;
height: 0.26rem;
border-radius: 0.13rem;
color: #333333;
background: #f5f5f5;
border: 0.01rem #cccccc solid;
display: flex;
justify-content: center;
align-items: center;
margin-top: 0.1rem;
font-weight: 500;
}
.application-Area-down {
background: #0087ff;
color: #fff;
}
}
:deep(.ant-image-img) {
width: 100%;
height: 100%;
object-fit: contain;
}
:deep(.ant-modal) {
width: 9.6rem;
}
:deep(.ant-transfer-list) {
width: 39.5%;
height: 5.2rem;
}
:deep(.ant-transfer-operation) {
flex-direction: row-reverse;
margin: 0 0.3rem;
}
:deep(.ant-btn) {
width: 0.56rem;
height: 0.4rem;
border-radius: 0.04rem;
}
:deep(.ant-btn:first-child) {
margin-left: 0.04rem;
}
:deep(.ant-modal-footer) {
border: 0;
}
:deep(.ant-modal-header) {
border: 0;
}
:deep(.ant-modal-title) {
line-height: 0.24rem;
font-size: 0.18rem;
color: #303133;
}
:deep(.ant-transfer-list-header) {
background: #f5f7fa;
}
:deep(.ant-transfer-list-header-selected) {
display: flex;
width: 90%;
flex-direction: row-reverse;
justify-content: space-between;
align-items: center;
}
:deep(.ant-transfer-list-header-title) {
font-size: 0.16rem;
color: #303133;
font-weight: 400;
text-align: left;
}
:deep(.ant-transfer-list-header .ant-checkbox-wrapper) {
display: none !important;
}
:deep(.ant-upload-list-item-name) {
width: 1rem;
}
.del {
display: flex;
justify-content: flex-start;
align-items: center;
font-size: 0.14rem;
margin-left: 0.2rem;
.delImg {
cursor: pointer;
display: inline-block;
width: 0.16rem;
height: 0.18rem;
background: url(~@/assets/home/sf_del.png) no-repeat;
margin-right: 0.05rem;
}
div {
cursor: pointer;
}
}
.item {
position: relative;
span:first-child {
width: unset;
}
.box {
display: flex;
align-items: center;
// margin: 15px 0;
& > div:nth-of-type(1) {
width: 105px;
margin-top: 0;
}
}
.application-Area {
width: 5.2rem;
display: grid;
margin-top: -0.05rem;
grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
.application-Area-son {
cursor: pointer;
font-size: 0.14rem;
width: 0.9rem;
height: 0.26rem;
border-radius: 0.13rem;
color: #333333;
background: #f5f5f5;
border: 0.01rem #cccccc solid;
display: flex;
justify-content: center;
align-items: center;
margin-top: 0.1rem;
font-weight: 500;
}
.application-Area-down {
background: #0087ff;
color: #fff;
}
}
:deep(.ant-image-img) {
width: 100%;
height: 100%;
object-fit: contain;
}
:deep(.ant-modal) {
width: 9.6rem;
}
:deep(.ant-transfer-list) {
width: 39.5%;
height: 5.2rem;
}
:deep(.ant-transfer-operation) {
flex-direction: row-reverse;
margin: 0 0.3rem;
}
:deep(.ant-btn) {
width: 0.56rem;
height: 0.4rem;
border-radius: 0.04rem;
}
:deep(.ant-btn:first-child) {
margin-left: 0.04rem;
}
:deep(.ant-modal-footer) {
border: 0;
}
:deep(.ant-modal-header) {
border: 0;
}
:deep(.ant-modal-title) {
line-height: 0.24rem;
font-size: 0.18rem;
color: #303133;
}
:deep(.ant-transfer-list-header) {
background: #f5f7fa;
}
:deep(.ant-transfer-list-header-selected) {
display: flex;
width: 90%;
flex-direction: row-reverse;
justify-content: space-between;
align-items: center;
}
:deep(.ant-transfer-list-header-title) {
font-size: 0.16rem;
color: #303133;
font-weight: 400;
text-align: left;
}
:deep(.ant-transfer-list-header .ant-checkbox-wrapper) {
display: none !important;
}
:deep(.ant-upload-list-item-name) {
width: 1rem;
}
.del {
display: flex;
justify-content: flex-start;
align-items: center;
font-size: 0.14rem;
margin-left: 0.2rem;
.delImg {
cursor: pointer;
display: inline-block;
width: 0.16rem;
height: 0.18rem;
background: url(~@/assets/home/sf_del.png) no-repeat;
margin-right: 0.05rem;
}
div {
cursor: pointer;
}
}
.item {
position: relative;
span:first-child {
width: unset;
}
.box {
display: flex;
align-items: center;
// margin: 15px 0;
& > div:nth-of-type(1) {
width: 105px;
display: flex;
align-items: center;
}
.required {
color: #f56c6c;
margin-right: 3px;
}
}
.required {
.requiredTips {
font-size: 14px;
color: #f56c6c;
margin-right: 3px;
position: absolute;
bottom: -20px;
left: 110px;
}
}
.requiredTips {
font-size: 14px;
color: #f56c6c;
position: absolute;
bottom: -20px;
left: 110px;
}
}
</style>