Commit 88a25a20 authored by “yiyousong”'s avatar “yiyousong”

fix:修改材料列表显示

parent c5fcce14
<template> <template>
<div> <div>
<el-drawer size="70%" :visible.sync="drawer" direction="rtl"> <el-drawer size="1200px" :visible.sync="drawer" direction="rtl">
<div slot="title" class="title flex"> <div slot="title" class="title flex">
<span <span
>材料列表(共{{ >材料列表(共{{
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</div> </div>
<div class="for-short">{{ v.materialName }}</div> <div class="for-short">{{ v.materialName }}</div>
<div class="matterDatumList-name"> <div class="matterDatumList-name">
{{ v.materiaFullName }} 材料全称:{{ v.materiaFullName }}
</div> </div>
<!-- <div class="check-btn" @click.stop>点击查看二维码</div> --> <!-- <div class="check-btn" @click.stop>点击查看二维码</div> -->
</div> </div>
...@@ -67,7 +67,7 @@ export default { ...@@ -67,7 +67,7 @@ export default {
api: local.getLocal("baseUrl") api: local.getLocal("baseUrl")
? local.getLocal("baseUrl") + "/" ? local.getLocal("baseUrl") + "/"
: "http://192.168.0.98:11078/", : "http://192.168.0.98:11078/",
row: 5, row: 4,
}; };
}, },
computed: { computed: {
...@@ -102,6 +102,20 @@ export default { ...@@ -102,6 +102,20 @@ export default {
border-top: 1px solid #e0e0e0; border-top: 1px solid #e0e0e0;
padding: 40px; padding: 40px;
padding-top: 0px; padding-top: 0px;
overflow-y: auto;
&::-webkit-scrollbar {
width: 12px;
overflow-y: auto;
}
&::-webkit-scrollbar-thumb {
border-radius: 6px;
background-color: rgba(144, 147, 153, 0.5);
}
&::-webkit-scrollbar-track {
border-radius: 6px;
background: #fff;
}
} }
.title { .title {
font-size: 28px; font-size: 28px;
...@@ -124,35 +138,22 @@ export default { ...@@ -124,35 +138,22 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
align-content: flex-start; align-content: flex-start;
overflow-y: auto;
&::-webkit-scrollbar {
width: 12px;
overflow-y: auto;
}
&::-webkit-scrollbar-thumb {
border-radius: 6px;
background-color: rgba(144, 147, 153, 0.5);
}
&::-webkit-scrollbar-track {
border-radius: 6px;
background: #fff;
}
.list { .list {
content: ""; content: "";
width: 19%; width: 236px;
border: 1px solid transparent; border: 1px solid transparent;
padding: 5px; padding: 5px;
overflow: hidden; overflow: hidden;
} }
} }
.matterDatumList-item { .matterDatumList-item {
width: 19%; width: 236px;
margin-top: 40px; margin-top: 40px;
// height: 430px; // height: 430px;
.pic-box { .pic-box {
width: 207px; width: 236px;
height: 256px; height: 300px;
padding: 16px 24px; padding: 16px 24px;
background: #f4f6fc; background: #f4f6fc;
border-radius: 16px; border-radius: 16px;
...@@ -169,22 +170,26 @@ export default { ...@@ -169,22 +170,26 @@ export default {
} }
} }
.for-short { .for-short {
width: 100%;
margin-top: 18px; margin-top: 18px;
margin-bottom: 8px; margin-bottom: 8px;
font-size: 24px; font-size: 24px;
font-family: Source Han Sans CN; font-family: Source Han Sans CN;
color: #333333; color: #333333;
letter-spacing: 1px;
overflow: hidden; overflow: hidden;
text-align: center; text-align: center;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.matterDatumList-name { .matterDatumList-name {
width: 100%;
font-size: 18px; font-size: 18px;
font-family: Source Han Sans CN; font-family: Source Han Sans CN;
color: #777777; color: #777777;
line-height: 30px; line-height: 30px;
text-align: center; letter-spacing: 1px;
text-align: left;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
......
...@@ -187,7 +187,7 @@ export default { ...@@ -187,7 +187,7 @@ export default {
computed: { computed: {
optionLeft() { optionLeft() {
return { return {
direction: 2, // 向左滚动 direction: 2, // 滚动方向
step: 0.5, // 数值越大速度滚动越快 step: 0.5, // 数值越大速度滚动越快
limitMoveNum: 5, // 开启无缝滚动的数据量 设置(数值<=页面展示数据条数不滚)(超过页面展示条数滚动) limitMoveNum: 5, // 开启无缝滚动的数据量 设置(数值<=页面展示数据条数不滚)(超过页面展示条数滚动)
openWatch: true, // 开启数据实时监控刷新dom openWatch: true, // 开启数据实时监控刷新dom
...@@ -196,7 +196,7 @@ export default { ...@@ -196,7 +196,7 @@ export default {
}, },
optionTop() { optionTop() {
return { return {
direction: 1, // 向左滚动 direction: 1, // 滚动方向
step: 0.5, // 数值越大速度滚动越快 step: 0.5, // 数值越大速度滚动越快
limitMoveNum: 4, // 开启无缝滚动的数据量 设置(数值<=页面展示数据条数不滚)(超过页面展示条数滚动) limitMoveNum: 4, // 开启无缝滚动的数据量 设置(数值<=页面展示数据条数不滚)(超过页面展示条数滚动)
openWatch: true, // 开启数据实时监控刷新dom openWatch: true, // 开启数据实时监控刷新dom
...@@ -442,6 +442,7 @@ export default { ...@@ -442,6 +442,7 @@ export default {
border-radius: 8px; border-radius: 8px;
font-size: 22px; font-size: 22px;
color: var(--main-theme-color1); color: var(--main-theme-color1);
letter-spacing: 2px;
&:nth-child(2n-1) { &:nth-child(2n-1) {
background-color: #fff; background-color: #fff;
} }
...@@ -484,18 +485,18 @@ export default { ...@@ -484,18 +485,18 @@ export default {
animation: shadow 6s infinite; animation: shadow 6s infinite;
} }
.fill-btn-text1 { // .fill-btn-text1 {
animation: ring 6s 20ms infinite; // animation: ring 6s 20ms infinite;
} // }
.fill-btn-text2 { // .fill-btn-text2 {
animation: ring 6s 60ms infinite; // animation: ring 6s 60ms infinite;
} // }
.fill-btn-text3 { // .fill-btn-text3 {
animation: ring 6s 105ms infinite; // animation: ring 6s 105ms infinite;
} // }
.fill-btn-text4 { // .fill-btn-text4 {
animation: ring 6s 145ms infinite; // animation: ring 6s 145ms infinite;
} // }
} }
.empty-btn { .empty-btn {
width: 284px; width: 284px;
...@@ -524,8 +525,9 @@ export default { ...@@ -524,8 +525,9 @@ export default {
margin-bottom: 4px; margin-bottom: 4px;
line-height: 45px; line-height: 45px;
border-radius: 8px; border-radius: 8px;
font-size: 22px; font-size: 20px;
color: var(--main-theme-color1); color: var(--main-theme-color1);
letter-spacing: 2px;
&:nth-child(2n) { &:nth-child(2n) {
background-color: #f6f9fe; background-color: #f6f9fe;
} }
......
...@@ -221,6 +221,7 @@ export default { ...@@ -221,6 +221,7 @@ export default {
font-weight: 500; font-weight: 500;
line-height: 36px; line-height: 36px;
color: #333333; color: #333333;
letter-spacing: 1px;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
...@@ -235,6 +236,7 @@ export default { ...@@ -235,6 +236,7 @@ export default {
font-family: Source Han Sans CN; font-family: Source Han Sans CN;
color: #888888; color: #888888;
line-height: 24px; line-height: 24px;
letter-spacing: 1px;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
...@@ -246,7 +248,6 @@ export default { ...@@ -246,7 +248,6 @@ export default {
font-family: Source Han Sans CN; font-family: Source Han Sans CN;
color: #333333; color: #333333;
line-height: 28px; line-height: 28px;
.count { .count {
color: #2878ff; color: #2878ff;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment