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

Merge branch 'projects/mes-test' into projects/mes-dy

Browse Source
This commit is contained in:
helloDy 2023-11-15 17:47:31 +08:00
commit 4ce62c14ee
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/views/OperationalOverview/coldBoard.vue
View File

@ -15,9 +15,9 @@
</el-row> </el-row>
<el-row class="container-main flex-col" type="flex"> <el-row class="container-main flex-col" type="flex">
<el-row :style="{ padding: '0 ' + 9 + 'px' }"> <el-row>
<el-col :span="8"> <el-col :span="8" :style="{ padding: '0 ' + 8 + 'px' }">
<el-row > <el-row>
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24"> <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24">
<base-container :beilv="1" :height="460" :title="'切割数据'" :title-icon="'1_1'"> <base-container :beilv="1" :height="460" :title="'切割数据'" :title-icon="'1_1'">
<!-- <div style="width:100%"> <!-- <div style="width:100%">
@ -26,7 +26,7 @@
<p class="now-team-content" style="margin:0">{{ exceptionAlarm.total }}</p> <p class="now-team-content" style="margin:0">{{ exceptionAlarm.total }}</p>
</el-row> </el-row>
</div> --> </div> -->
<base-table1 :page="1" :limit="9" :show-index="false" :beilv="1" :table-config="inciseTableProps" <base-table1 :page="1" :limit="10" :show-index="false" :beilv="1" :table-config="inciseTableProps"
:table-data="inciseList" /> :table-data="inciseList" />
</base-container> </base-container>
</el-col> </el-col>
@ -34,16 +34,16 @@
<!-- 各产线投入数量和产出 --> <!-- 各产线投入数量和产出 -->
<base-container :beilv="1" :height="180" :title="'缺陷数据'" :title-icon="'1_3'"> <base-container :beilv="1" :height="180" :title="'缺陷数据'" :title-icon="'1_3'">
<!-- <top-radio-group :data-type="0" @change-time-range="handleChangeChartTable3" /> --> <!-- <top-radio-group :data-type="0" @change-time-range="handleChangeChartTable3" /> -->
<base-table :page="1" :limit="10" :beilv="1" :table-config="qualityTableProps" <base-table :page="1" :limit="10" :show-index="false" :beilv="1" :table-config="qualityTableProps"
:table-data="qualityList" /> :table-data="qualityList" />
</base-container> </base-container>
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16" :style="{ padding: '0 ' + 8 + 'px' }">
<!-- 中间栏 --> <!-- 中间栏 -->
<el-row > <el-row>
<el-col> <el-col>
<!-- 各产线投入数量折线展示 --> <!-- 各产线投入数量折线展示 -->
<el-row> <el-row>
@ -74,7 +74,7 @@
<el-row> <el-row>
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24"> <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24">
<base-container1 :beilv="1" :title="'下片数量统计'" :title-icon="'1_5'"> <base-container1 :beilv="1" :title="'下片数量统计'" :title-icon="'1_5'">
<linear-bar-chart :id=" 'NumCharts' " :name-list="NumList" :data-list="NumDataList" :height="225" <linear-bar-chart :id=" 'NumCharts' " :name-list="NumList" :data-list="NumDataList" :height="235"
:beilv="1" :show-legend="true" /> :beilv="1" :show-legend="true" />
</base-container1> </base-container1>
<!-- <base-container :beilv="1" :title="'成品率折线展示'" :title-icon="'1_6'"> <!-- <base-container :beilv="1" :title="'成品率折线展示'" :title-icon="'1_6'">
@ -497,11 +497,11 @@ const qualityList = [
{ createTime: '10:30:49', content: '报废', productLine: '钢五线', process: '包装' }, { createTime: '10:30:49', content: '报废', productLine: '钢五线', process: '包装' },
{ createTime: '10:40:35', content: '报废', productLine: '钢六线', process: '钢化' }, { createTime: '10:40:35', content: '报废', productLine: '钢六线', process: '钢化' },
{ createTime: '10:31:35', content: '报废', productLine: '钢七线', process: '包装' }, { createTime: '10:31:35', content: '报废', productLine: '钢七线', process: '包装' },
// { createTime: '10:32:35', content: '报废', productLine: '钢八线', process: '钢化' }, { createTime: '10:32:35', content: '报废', productLine: '钢八线', process: '钢化' },
// { createTime: '10:33:35', content: '报废', productLine: '钢一线', process: '磨边' }, { createTime: '10:33:35', content: '报废', productLine: '钢一线', process: '磨边' },
// { createTime: '10:34:35', content: '报废', productLine: '钢二线', process: '镀膜' }, { createTime: '10:34:35', content: '报废', productLine: '钢二线', process: '镀膜' },
// { createTime: '10:38:35', content: '报废', productLine: '钢三线', process: '钢化' } { createTime: '10:38:35', content: '报废', productLine: '钢三线', process: '钢化' },
// { createTime: '10:31:35', content: '报废', productLine: '钢四线', process: '镀膜' }, { createTime: '10:31:35', content: '报废', productLine: '钢四线', process: '镀膜' },
// { createTime: '10:43:35', content: '报废', productLine: '钢五线', process: '镀膜' }, // { createTime: '10:43:35', content: '报废', productLine: '钢五线', process: '镀膜' },
// { createTime: '10:43:35', content: '报废', productLine: '钢五线', process: '镀膜' }, // { createTime: '10:43:35', content: '报废', productLine: '钢五线', process: '镀膜' },
// { createTime: '10:43:35', content: '报废', productLine: '钢五线', process: '镀膜' }, // { createTime: '10:43:35', content: '报废', productLine: '钢五线', process: '镀膜' },
@ -538,6 +538,7 @@ const inciseList = [
{ finishNum: '43423', scrapNum: '14', area: '12235.24' }, { finishNum: '43423', scrapNum: '14', area: '12235.24' },
{ finishNum: '32343', scrapNum: '15', area: '12345.24' }, { finishNum: '32343', scrapNum: '15', area: '12345.24' },
{ finishNum: '43434', scrapNum: '18', area: '12455.24' }, { finishNum: '43434', scrapNum: '18', area: '12455.24' },
{ finishNum: '43432', scrapNum: '19', area: '12345.24' },
{ finishNum: '43432', scrapNum: '19', area: '12345.24' } { finishNum: '43432', scrapNum: '19', area: '12345.24' }
] ]
export default { export default {
@ -1020,7 +1021,7 @@ export default {
top: 2em; top: 2em;
} }
.container-main { .container-main {
padding: 10px; // padding: 10px;
} }
} }
@ -1123,7 +1124,7 @@ export default {
flex: 1 1; flex: 1 1;
} }
.h-full { .h-full {
height: calc(100vh - 150px); height: calc(100vh);
} }
/* .container-main { /* .container-main {
min-height: calc(100vh - 10em); min-height: calc(100vh - 10em);