This commit is contained in:
赵正易 2024-11-19 13:18:41 +08:00
parent 5b26fc6d8d
commit 840e3bb178
11 changed files with 38 additions and 27 deletions

View File

@ -2,15 +2,14 @@
<template>
<div>
<div class="title">{{ title }}</div>
<el-table height="900" :data="dataList" v-loading="loading" ref="tableRef" highlight-current-row @mouseover.native="clearScroll" @mouseleave.native="createScroll">
<el-table-column type="index" width="50" align="center" />
<el-table-column width="80px" prop="groupCode" label="组编号" :show-overflow-tooltip="true" />
<el-table-column width="200px" label="零件完成数(计划/报工)" :show-overflow-tooltip="true">
<el-table height="700" :data="dataList" v-loading="loading" ref="tableRef" highlight-current-row @mouseover.native="clearScroll" @mouseleave.native="createScroll">
<el-table-column width="80px" prop="groupCode" label="组" :show-overflow-tooltip="true" />
<el-table-column width="120px" label="报工/计划" :show-overflow-tooltip="true">
<template #default="scope">
{{ ` ${scope.row.reportQuantity} / ${scope.row.planQuantity}` }}
</template>
</el-table-column>
<el-table-column min-width="260px" label="零件生产进度" align="center">
<el-table-column min-width="260px" label="生产进度" align="center">
<template #default="scope">
<el-progress :text-inside="true" :stroke-width="24" :percentage="getPercentage(scope.row)" :color="getProgressColor(scope.row)" />
</template>

View File

@ -18,7 +18,7 @@ const props = defineProps({
},
height: {
type: String,
default: '450px'
default: '350px'
}
})
const options = {
@ -66,9 +66,9 @@ const options = {
data: [],
label: {
show: true,
position: 'top',
position: 'inside',
textBorderColor: '#fff',
textBorderWidth: 1,
textBorderWidth: 0,
color: '#fff'
}
},
@ -80,7 +80,7 @@ const options = {
show: true,
position: 'top',
textBorderColor: '#fff',
textBorderWidth: 1,
textBorderWidth: 0,
color: '#fff'
}
}

View File

@ -18,7 +18,7 @@ const props = defineProps({
},
height: {
type: String,
default: '450px'
default: '350px'
}
})
const options = {
@ -66,9 +66,9 @@ const options = {
data: [],
label: {
show: true,
position: 'top',
position: 'inside',
textBorderColor: '#fff',
textBorderWidth: 1,
textBorderWidth: 0,
color: '#fff'
}
},
@ -80,7 +80,7 @@ const options = {
show: true,
position: 'top',
textBorderColor: '#fff',
textBorderWidth: 1,
textBorderWidth: 0,
color: '#fff'
}
}

View File

@ -2,7 +2,7 @@
<template>
<div>
<div class="title">今日异常工单</div>
<el-table height="450" :data="dataList" v-loading="loading" ref="tableRef" highlight-current-row @mouseover.native="clearScroll" @mouseleave.native="createScroll">
<el-table height="350" :data="dataList" v-loading="loading" ref="tableRef" highlight-current-row @mouseover.native="clearScroll" @mouseleave.native="createScroll">
<el-table-column prop="workorder" label="工单号" :show-overflow-tooltip="true" />
<el-table-column prop="description" label="描述" :show-overflow-tooltip="true" />
</el-table>

View File

@ -18,7 +18,7 @@ const props = defineProps({
},
height: {
type: String,
default: '450px'
default: '350px'
}
})
const options = {
@ -28,7 +28,8 @@ const options = {
},
legend: {
type: 'scroll',
top: 20,
top: 10,
right: 10,
textStyle: {
color: '#fff'
}

View File

@ -18,7 +18,7 @@ const props = defineProps({
},
height: {
type: String,
default: '450px'
default: '350px'
}
})
const options = {

View File

@ -18,7 +18,7 @@ const props = defineProps({
},
height: {
type: String,
default: '400px'
default: '300px'
}
})
let options = {
@ -53,6 +53,9 @@ let options = {
},
//
legend: {
type: 'scroll',
icon: 'circle',
top: 'top',
data: ['本月每天产量', '1组', '2组', '3组', '4组', '5组', '6组', '7组', '8组', '9组', '10组', '11组', '12组', '13组', '14组', '15组', '16组', '17组', '18组', '内1', '内2']
},
series: [

View File

@ -24,13 +24,13 @@ import imgUrl from '@/assets/logo/logo.png'
justify-content: center;
}
.logo {
width: 50px;
height: 50px;
width: 40px;
height: 40px;
}
.text {
margin-left: 10px;
text-align: center;
/* line-height: 25px; */
font-size: 36px;
font-size: 24px;
}
</style>

View File

@ -52,6 +52,6 @@ body{
flex-direction: column;
}
.box{
min-height: 450px;
min-height: 350px;
padding: 20px;
}

View File

@ -187,25 +187,25 @@ const { proxy } = getCurrentInstance()
margin-bottom: 10px;
}
.top {
height: 140px;
height: 80px;
background-color: rgba(60, 232, 248, 0.1);
}
.num-item {
/* border: #0072ff 1px solid; */
padding: 10px;
width: 100%;
height: 140px;
height: 80px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.num-title {
font-size: 24px;
font-size: 20px;
font-weight: bold;
}
.num-value {
font-size: 36px;
font-size: 24px;
font-weight: 800;
-webkit-background-clip: text; /* 仅将背景应用于文本 */
-webkit-text-fill-color: transparent; /* 设置文本颜色为透明 */

View File

@ -26,7 +26,15 @@
<el-table-column prop="lineCode" label="线别" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('lineCode')" />
<el-table-column prop="materialCode" label="物料编号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('materialCode')" />
<el-table-column prop="materialName" label="物料名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('materialName')" />
<el-table-column prop="action" label="操作" align="center" v-if="columns.showColumn('action')" />
<el-table-column prop="action" label="操作" align="center" v-if="columns.showColumn('action')">
<template #default="scope">
<el-tag v-if="scope.row.action == 1" type="primary">出库</el-tag>
<el-tag v-if="scope.row.action == 2" type="warning">取消出库</el-tag>
<el-tag v-if="scope.row.action == 3" type="success">入库</el-tag>
<el-tag v-if="scope.row.action == 4" type="warning">取消入库</el-tag>
<el-tag v-if="scope.row.action == -1" type="danger">异常</el-tag>
</template>
</el-table-column>
<el-table-column prop="quantity" label="数量" align="center" v-if="columns.showColumn('quantity')" />
<el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
<el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')" />