mt-fe-group/11-mes-new
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update table 的距离问题

Browse Source
This commit is contained in:
lb
2022-11-08 14:40:04 +08:00
parent 567aa98452
commit 9b91d86f40
9 changed files with 139 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/3DOverview/components/LeftContentEquipmentCheck.vue
View File

@@ -2,7 +2,7 @@
<div class="left-content-equipment-check">
<!-- <TechyFakeTable :table-props="tableProps" :table-data="tableData" />
<TechyFakeTable :table-props="tableProps2" :table-data="tableData2" /> -->
<div class="el-table-wrapper">
<div class="el-table-wrapper fix-table">
<!-- <TechyTable key="table-1" :showIndex="false" :table-config="tableProps" :table-data="tableData"></TechyTable> -->
<el-table
key="LeftContentEquipmentCheck1"
@@ -10,10 +10,10 @@
:data="tableData"
:header-cell-style="{ background: 'rgba(79,114,136,0.29)' }"
>
<el-table-column label="设备名称" prop="eqName" />
<el-table-column label="所属产线" prop="pl" />
<el-table-column label="提示等级" prop="warningLevel" />
<el-table-column label="提示等级" prop="checkContent" />
<el-table-column label="设备名称" prop="eqName" align="center" />
<el-table-column label="所属产线" prop="pl" align="center" />
<el-table-column label="提示等级" prop="warningLevel" align="center" />
<el-table-column label="提示等级" prop="checkContent" align="center" />
</el-table>
</div>
<!-- <div class="el-table-wrapper">
@@ -73,6 +73,12 @@ export default {
</script>
<style scoped>
.fix-table >>> .el-table td .cell {
width: 60% !important;
margin: auto;
text-align: left;
}
.left-content-equipment-check {
height: calc(100% - 32px);
display: flex;

32
src/views/3DOverview/components/LeftContentOrder.vue
View File

@@ -2,7 +2,7 @@
<div class="left-content-equipment-check">
<!-- <TechyFakeTable :table-props="tableProps" :table-data="tableData" />
<TechyFakeTable :table-props="tableProps2" :table-data="tableData2" /> -->
<div class="el-table-wrapper">
<div class="el-table-wrapper fix-table">
<!-- <TechyTable key="table-1" :showIndex="false" :table-config="tableProps" :table-data="tableData"></TechyTable> -->
<el-table
key="LeftContentOrder1"
@@ -10,10 +10,22 @@
:data="tableData"
:header-cell-style="{ background: 'rgba(79,114,136,0.29)' }"
>
<el-table-column label="订单编号" prop="orderCode" :show-overflow-tooltip="true" :resizable="true" />
<el-table-column label="客户名称" prop="clientName" :show-overflow-tooltip="true" :resizable="true" />
<el-table-column label="规格" prop="specs" :resizable="true" />
<el-table-column label="完成度" prop="finished" :resizable="true">
<el-table-column
label="订单编号"
prop="orderCode"
:show-overflow-tooltip="true"
:resizable="true"
align="center"
/>
<el-table-column
label="客户名称"
prop="clientName"
:show-overflow-tooltip="true"
:resizable="true"
align="center"
/>
<el-table-column label="规格" prop="specs" :resizable="true" align="center" />
<el-table-column label="完成度" prop="finished" :resizable="true" align="center">
<template slot-scope="scope">
<el-progress
class="lb-progress-bar"
@@ -79,6 +91,12 @@ export default {
</script>
<style scoped>
.fix-table >>> .el-table td .cell {
width: 70% !important;
margin: auto;
text-align: left;
}
.left-content-equipment-check {
display: flex;
gap: calc(100vw / 1920 * 16);
@@ -144,11 +162,11 @@ export default {
}
.lb-progress-bar {
left: 40px;
left: 30px;
display: flex;
}
.lb-progress-bar >>> .el-progress__text {
color: #fff9;
left: -70%;
left: -75%;
}
</style>

18
src/views/3DOverview/components/RightContentAlert.vue
View File

@@ -1,17 +1,17 @@
<template>
<div class="right-content-alert">
<div class="el-table-wrapper">
<div class="el-table-wrapper fix-table">
<el-table
key="RightContentAlertTable"
border
:data="tableData"
:header-cell-style="{ background: 'rgba(79,114,136,0.29)' }"
>
<el-table-column label="设备名称" prop="eqName" :show-overflow-tooltip="true" :resizable="true" />
<el-table-column label="所属产线" prop="plName" :show-overflow-tooltip="true" :resizable="true" />
<el-table-column label="故障等级" prop="level" :resizable="true" />
<el-table-column label="故障内容" prop="content" :resizable="true" />
<el-table-column label="累计时间(min)" prop="duration" :resizable="true" />
<el-table-column label="设备名称" prop="eqName" :show-overflow-tooltip="true" :resizable="true" align="center" />
<el-table-column label="所属产线" prop="plName" :show-overflow-tooltip="true" :resizable="true" align="center" />
<el-table-column label="故障等级" prop="level" :resizable="true" align="center" />
<el-table-column label="故障内容" prop="content" :resizable="true" align="center" />
<el-table-column label="累计时间(min)" prop="duration" :resizable="true" align="center" :width="128" />
</el-table>
</div>
</div>
@@ -42,6 +42,12 @@ export default {
</script>
<style scoped>
.fix-table >>> .el-table td .cell {
width: 80% !important;
margin: auto;
text-align: left;
}
.right-content-alert {
height: calc(100% - 32px);
display: flex;

28
src/views/3DOverview/index.vue
View File

@@ -19,7 +19,7 @@
<div class="techy-body-part__middle">
<TechyBox>
<div class="flex">
<div class="techy-body-part__middle__inner">
<p>
<b>产线名称 :</b>
<span>A产线</span>
@@ -29,7 +29,7 @@
<span>清洗机</span>
</p>
<p>
<b>累计加工数量 :</b>
<b>累计加工 :</b>
<span>20</span>
</p>
<p>
@@ -167,7 +167,7 @@ export default {
}
#v3d-outter *::-webkit-scrollbar-track {
background-color: #14243F;
background-color: #14243f;
/* background-color: white; */
border-radius: 0;
}
@@ -244,19 +244,21 @@ export default {
.techy-body-part__middle {
position: absolute;
top: 12%;
left: 36%;
height: 96px;
width: 128px;
top: 9%;
left: 26%;
height: 136px;
width: 176px;
}
.flex {
.techy-body-part__middle__inner {
height: 100%;
padding: 12px;
display: flex;
flex-direction: column;
justify-content: space-between;
}
.flex p {
.techy-body-part__middle__inner p {
margin: 0;
padding: 0;
font-size: 12px;
@@ -264,15 +266,15 @@ export default {
color: #fff;
}
.flex p > span {
.techy-body-part__middle__inner p > span {
position: relative;
padding-left: 6px;
padding-left: 16px;
}
.round-dot::before {
content: '';
position: absolute;
top: 5px;
left: -3px;
top: 4px;
left: 2px;
width: 8px;
height: 8px;
background-color: rgb(82, 231, 82);