mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bugfix zentao 1

Browse Source
This commit is contained in:
lb
2023-09-15 14:30:19 +08:00
parent 27ebe39a96
commit 772a4b0633
29 changed files with 594 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/views/monitoring/equipmentAlarmLog/index.vue
View File

@@ -81,13 +81,12 @@ export default {
: undefined,
].filter((v) => v),
tableProps: [
{ width: 128, prop: 'productionLine', label: '产线', align: 'center' },
{ width: 128, prop: 'workshopSection', label: '工段', align: 'center' },
{ width: 128, prop: 'equipment', label: '设备名称', align: 'center' },
{ width: 128, prop: 'productionLine', label: '产线' },
{ width: 128, prop: 'workshopSection', label: '工段' },
{ width: 128, prop: 'equipment', label: '设备名称' },
{
prop: 'alarmGrade',
label: '报警级别',
align: 'center',
filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
},
{
@@ -96,11 +95,11 @@ export default {
width: 180,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
},
{ prop: 'alarmContent', label: '报警内容', align: 'center' },
{ prop: 'alarmContent', label: '报警内容' },
// {
// _action: 'equipment-group-show-alert',
// label: '报警',
// align: 'center',
// ,
// subcomponent: {
// props: ['injectData'],
// render: function (h) {
@@ -166,7 +165,7 @@ export default {
this.getList();
},
methods: {
/** 重写 basicPageMixin 里的 handleSearchBarBtnClick */
/** 重写 basicPageMixin 里的 handleSearchBarBtnClick */
handleSearchBarBtnClick(btn) {
// 仅查询一种情况
this.queryParams.createTime = btn.createTime;

8
src/views/monitoring/equipmentFullParams/index.vue
View File

@@ -35,7 +35,9 @@
" />
</div>
</div>
<div v-else style="margin-top: 20px; color: #c7c7c7; text-align: center;">暂无数据</div>
<div v-else style="margin-top: 20px; color: #c7c7c7; text-align: center">
暂无数据
</div>
</div>
</template>
@@ -139,19 +141,16 @@ export default {
width: 48,
prop: 'index',
label: '序号',
align: 'center',
},
{
width: 160,
prop: 'time',
label: '时间',
align: 'center',
},
{
width: 200,
prop: 'plcCode',
label: 'PLC编码',
align: 'center',
},
];
const firstLineData = {
@@ -162,7 +161,6 @@ export default {
otherList.forEach((item) => {
props.push({
label: item.name,
align: 'center',
prop: item.name,
width: 128,
});

6
src/views/monitoring/equipmentProcessAmount/graph.vue
View File

@@ -25,7 +25,7 @@ export default {
grid: {
top: 64,
left: 56,
right: 24,
right: 64,
bottom: 56,
},
title: {
@@ -64,6 +64,10 @@ export default {
color: '#ccc',
},
},
name: '数量',
nameTextStyle: {
fontSize: 14,
},
},
series: [
{

10
src/views/monitoring/equipmentProcessAmount/index.vue
View File

@@ -197,11 +197,11 @@ export default {
// },
],
tableProps: [
{ prop: 'lineName', label: '产线', align: 'center' },
{ prop: 'sectionName', label: '工段', align: 'center' },
{ prop: 'externalCode', label: '设备编码', align: 'center' },
{ prop: 'equipmentName', label: '设备名称', align: 'center' },
{ prop: 'totalQuantity', label: '加工数量', align: 'center' },
{ prop: 'lineName', label: '产线', },
{ prop: 'sectionName', label: '工段', },
{ prop: 'externalCode', label: '设备编码', },
{ prop: 'equipmentName', label: '设备名称', },
{ prop: 'totalQuantity', label: '加工数量', },
],
mode: 'table', // table | graph
queryParams: {

38
src/views/monitoring/equipmentRecentHours/index.vue
View File

@@ -12,15 +12,7 @@
ref="search-bar" />
<el-skeleton v-if="initing" :rows="6" animated />
<div v-else>
<div
v-if="noData"
style="
height: 240px;
background: url(../../../assets/images/no-data-bg.png) 100% / contain
no-repeat;
">
没有数据
</div>
<div v-if="noData" class="no-data">没有数据</div>
<base-table
v-else
:span-method="mergeColumnHandler"
@@ -63,24 +55,22 @@ export default {
} = item;
const props = [
{ prop: 'productLine', label: '产线', align: 'center' },
{ prop: 'specification', label: '规格', align: 'center' },
{ prop: 'equipmentName', label: '设备', align: 'center' },
{ prop: 'totalQuantity', label: '生产总数', align: 'center' },
{ prop: 'productLine', label: '产线' },
{ prop: 'specification', label: '规格' },
{ prop: 'equipmentName', label: '设备' },
{ prop: 'totalQuantity', label: '生产总数' },
];
for (const key of Object.keys(hourData).sort()) {
const subprop = {
label: key,
align: 'center',
children: [
{ prop: key + '__in', label: '进数据', align: 'center' },
{ prop: key + '__out', label: '出数据', align: 'center' },
{ prop: key + '__nok', label: '报废数据', align: 'center' },
{ prop: key + '__in', label: '进数据' },
{ prop: key + '__out', label: '出数据' },
{ prop: key + '__nok', label: '报废数据' },
{
prop: key + '__ratio',
label: '报废率',
align: 'center',
filter: (val) => (val != null ? val + ' %' : '-'),
},
],
@@ -197,4 +187,16 @@ pre {
code {
font-family: 'IntelOne Mono', 'Ubuntu', 'Courier New', Courier, monospace;
}
.no-data {
display: grid;
place-content: center;
padding-top: 180px;
color: #ccc;
font-size: 14px;
letter-spacing: 2px;
height: 30vh;
background: url(../../../assets/images/no-data-bg.png) 50% 50% / contain
no-repeat;
}
</style>

10
src/views/monitoring/equipmentStatusAndParams/index.vue
View File

@@ -74,28 +74,24 @@ export default {
width: 128,
prop: 'equipmentName',
label: '设备名称',
align: 'center',
},
{
width: 128,
prop: 'equipmentCode',
label: '设备编码',
align: 'center',
},
{ width: 128, prop: 'inQuantity', label: '投入数', align: 'center' },
{ width: 128, prop: 'outQuantity', label: '产出数', align: 'center' },
{ width: 128, prop: 'inQuantity', label: '投入数' },
{ width: 128, prop: 'outQuantity', label: '产出数' },
{
width: 128,
prop: 'run',
label: '是否运行',
align: 'center',
filter: (val) => (val != null ? (val ? '是' : '否') : '-'),
},
{
width: 128,
prop: 'status',
label: '状态',
align: 'center',
filter: (val) =>
val != null ? ['正常', '计划停机', '故障'][val] : '-',
},
@@ -103,7 +99,6 @@ export default {
width: 128,
prop: 'error',
label: '是否故障',
align: 'center',
filter: (val) => (val != null ? (val ? '是' : '否') : '-'),
},
{
@@ -121,7 +116,6 @@ export default {
{
_action: 'params-monitor',
label: '参数监控',
align: 'center',
subcomponent: {
props: ['injectData'],
render: function (h) {