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

lb #12

Merged
gtz217 merged 27 commits from lb into master 2022-11-18 17:04:51 +08:00
Conversation 0 Commits 27 Files Changed 33 +34 -32
3 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 00be50ed95 - Show all commits

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

@ -52,23 +52,23 @@ const PriorityComponent = {
} }
const tableProps = [ const tableProps = [
{ prop: 'eqName', label: '设备名称', align: 'center', 'min-width': 100 }, { prop: 'eqName', label: '设备名称', align: 'center', 'min-width': 90 },
{ prop: 'plName', label: '所属产线', align: 'center', 'min-width': 100 }, { prop: 'plName', label: '所属产线', align: 'center', 'min-width': 90 },
{ prop: 'priority', label: '提示等级', align: 'center', 'min-width': 100, subcomponent: PriorityComponent }, { prop: 'priority', label: '提示等级', align: 'center', 'min-width': 90, subcomponent: PriorityComponent },
{ prop: 'content', label: '巡检内容', align: 'center', 'min-width': 120 }, { prop: 'content', label: '巡检内容', align: 'center', 'min-width': 120 },
{ prop: 'duration', label: '累计时间(min)', align: 'center', 'min-width': 128 } { prop: 'duration', label: '累计时间(min)', align: 'center', 'min-width': 125 }
] ]
const tableData = [ const tableData = [
{ eqName: '磨边', plName: 'B', content: '所受第按政酸南角写作给还些。', priority: 4, duration: '30 min' }, { eqName: '磨边', plName: 'B', content: '表面检测光源和相机的卫生', priority: 4, duration: '30 min' },
{ eqName: '冷却', plName: 'A', content: '自变流门行极声将通确为用目很导处种。', priority: 4, duration: '1 min' }, { eqName: '冷却', plName: 'A', content: '辊道下方的碎玻璃清理', priority: 4, duration: '1 min' },
{ eqName: '丝印', plName: 'A', content: '从小定需间太则选下上又原。', priority: 2, duration: '57 min' }, { eqName: '丝印', plName: 'A', content: '边角检测设备水平的校正', priority: 2, duration: '57 min' },
{ eqName: '打孔后清洗机', plName: 'B', content: '表新和新总我音层采示道产当列。', priority: 3, duration: '17 min' }, { eqName: '打孔后清洗机', plName: 'B', content: '设备表面的卫生', priority: 3, duration: '17 min' },
{ eqName: '固化', plName: 'B', content: '义往历安日况整家小心什会。', priority: 2, duration: '22 min' }, { eqName: '固化', plName: 'B', content: '操作台保持整洁', priority: 2, duration: '22 min' },
{ eqName: '一镀', plName: 'B', content: '收直素新要府收强而着明速省。', priority: 3, duration: '2 min' }, { eqName: '一镀', plName: 'B', content: '辊道下方的碎玻璃清理', priority: 3, duration: '2 min' },
{ eqName: '钢化', plName: 'A', content: '它养土党把采商发活门没千联同设和。', priority: 4, duration: '23 min' }, { eqName: '钢化', plName: 'A', content: '检查每日不良是否存在误检', priority: 4, duration: '23 min' },
{ eqName: '磨边', plName: 'B', content: '拉养必型制规想科得价向别任。', priority: 3, duration: '6 min' }, { eqName: '磨边', plName: 'B', content: '水冷机内水量充足并且清洁', priority: 3, duration: '6 min' },
{ eqName: '磨边', plName: 'B', content: '确验效五什第也片什八装所红。', priority: 2, duration: '23 min' }, { eqName: '磨边', plName: 'B', content: '表面检测光源和相机的卫生', priority: 2, duration: '23 min' },
{ {
eqName: '磨边后清洗机', eqName: '磨边后清洗机',
plName: 'A', plName: 'A',

20
src/views/3DOverview/components/RightContentQualityAnalysis.vue
View File

@ -26,16 +26,16 @@ export default {
data() { data() {
return { return {
datalist: [ datalist: [
{ name: '热端', value: 2332039120, color: '#0b88ff' }, { name: '热端', value: 2023233, color: '#0b88ff' },
{ name: '原片上片', value: 30, color: '#0bffa6' }, { name: '丝印', value: 2023233, color: '#0bffa6' },
{ name: '上片', value: 27, color: '#e3ff0b' }, { name: '原片', value: 20, color: '#0bffa6' },
{ name: '磨边', value: 23, color: '#950bff' }, { name: '钢化', value: 20, color: '#e3ff0b' },
{ name: '原片磨边', value: 30, color: '#0bffa6' }, { name: '上片磨边', value: 20, color: '#e3ff0b' },
{ name: '原片', value: 30, color: '#0bffa6' }, { name: '下片铺纸', value: 202324, color: '#950bff' },
{ name: '上片', value: 27, color: '#e3ff0b' }, { name: '镀膜', value: 20, color: '#950bff' },
{ name: '磨边镀膜膜', value: 23, color: '#950bff' }, { name: '物流仓储', value: 202324, color: '#ff7d0b' },
{ name: '镀膜', value: 10, color: '#ff0bc2' }, { name: '清洗', value: 20, color: '#0bffa6' },
{ name: '清晰', value: 66, color: '#ff7d0b' } { name: '包装', value: 2, color: '#ff0bc2' }
] ]
} }
}, },

20
src/views/3DOverview/components/TechyAnalysisBar.vue
View File

@ -12,7 +12,9 @@
<span class="quality-analysis-bar__name"> <span class="quality-analysis-bar__name">
{{ name }} {{ name }}
</span> </span>
<span class="quality-analysis-bar__amount" :title="'数量:' + amount">{{ amount | amountFilter }}</span> <span class="quality-analysis-bar__amount" :title="'数量:' + amount">
{{ amount | amountFilter }}
</span>
</div> </div>
</template> </template>
@ -22,7 +24,7 @@ export default {
filters: { filters: {
amountFilter: val => { amountFilter: val => {
const sVal = val.toString() const sVal = val.toString()
return sVal.length > 7 ? sVal.slice(0, 6) + '...' : sVal return sVal.length > 9 ? sVal.slice(0, 8) + '...' : sVal
} }
}, },
props: { props: {
@ -97,17 +99,17 @@ export default {
} }
.block-green-5 { .block-green-5 {
background: linear-gradient(to left, #35abad, hsla(181, 53%, 44%, 0.65)); background: linear-gradient(to left, #35abad, hsla(181, 53%, 44%, 0.75));
/* margin-left: 4px; */ /* margin-left: 4px; */
} }
.block-green-4 { .block-green-4 {
background: linear-gradient(to left, hsla(181, 53%, 44%, 0.65), hsla(181, 53%, 44%, 0.4)); background: linear-gradient(to left, hsla(181, 53%, 44%, 0.75), hsla(181, 53%, 44%, 0.44));
} }
.block-green-3 { .block-green-3 {
background: linear-gradient(to left, hsla(181, 53%, 44%, 0.4), hsla(181, 53%, 44%, 0.2)); background: linear-gradient(to left, hsla(181, 53%, 44%, 0.44), hsla(181, 53%, 44%, 0.15));
} }
.block-green-2 { .block-green-2 {
background: linear-gradient(to left, hsla(181, 53%, 44%, 0.2), hsla(181, 53%, 44%, 0)); background: linear-gradient(to left, hsla(181, 53%, 44%, 0.15), hsla(181, 53%, 44%, 0));
} }
.block-green-1 { .block-green-1 {
/* background: linear-gradient(to left, hsla(181, 53%, 44%, 0.2), hsla(181, 53%, 44%, 0)); */ /* background: linear-gradient(to left, hsla(181, 53%, 44%, 0.2), hsla(181, 53%, 44%, 0)); */
@ -187,10 +189,10 @@ export default {
color: rgba(255, 255, 255, 0.725); color: rgba(255, 255, 255, 0.725);
display: inline-block; display: inline-block;
/* min-width: 35%; */ /* min-width: 35%; */
width: 35%; width: 45%;
text-align: left; text-align: left;
padding: calc(3px * var(--beilv)) 0; padding: calc(3px * var(--beilv)) 0;
font-size: calc(14px * var(--beilv));; font-size: calc(14px * var(--beilv));
line-height: calc(12px * var(--beilv));; line-height: calc(12px * var(--beilv));
} }
</style> </style>