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

lb #6

Merged
gtz217 merged 26 commits from lb into master 2022-11-10 15:52:33 +08:00
Conversation 0 Commits 26 Files Changed 47 +47 -18
4 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit affc23fbc2 - Show all commits

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

@ -163,7 +163,7 @@ export default {
} }
#v3d-outter *::-webkit-scrollbar { #v3d-outter *::-webkit-scrollbar {
width: 8px; width: calc(8px * var(--beilv));
} }
#v3d-outter *::-webkit-scrollbar-track { #v3d-outter *::-webkit-scrollbar-track {
@ -173,14 +173,14 @@ export default {
} }
#v3d-outter *::-webkit-scrollbar-button { #v3d-outter *::-webkit-scrollbar-button {
width: 8px; width: calc(8px * var(--beilv));
height: 8px; height: calc(8px * var(--beilv));
background: #5bc4bf9f; background: #5bc4bf9f;
position: relative; position: relative;
} }
#v3d-outter *::-webkit-scrollbar-thumb { #v3d-outter *::-webkit-scrollbar-thumb {
border-radius: 8px; border-radius: calc(8px * var(--beilv));
background: #5bc4bf9f; background: #5bc4bf9f;
} }

2
src/views/EquipmentManager/HomePage.vue
View File

@ -288,7 +288,7 @@ export default {
.table-wrapper { .table-wrapper {
height: calc(100% - 3vh); height: calc(100% - 3vh);
overflow: scroll; overflow: auto;
} }
.grid { .grid {

37
src/views/EquipmentManager/components/TechyTable.vue
View File

@ -7,7 +7,7 @@
--> -->
<template> <template>
<div class="visual-base-table-container"> <div class="visual-base-table-container">
<el-table class="techy-el-table" v-loading="isLoading" :data="renderData" border> <el-table class="techy-el-table" v-loading="isLoading" :data="renderData" border height="100%">
<el-table-column <el-table-column
v-if="page && limit && showIndex" v-if="page && limit && showIndex"
prop="_pageIndex" prop="_pageIndex"
@ -116,11 +116,40 @@ export default {
</script> </script>
<style scoped> <style scoped>
.visual-base-table-container, .visual-base-table-container >>> ::-webkit-scrollbar {
.visual-base-table-container >>> .el-table { width: calc(8px * var(--beilv));
min-width: 100%;
} }
.visual-base-table-container >>> ::-webkit-scrollbar-track {
background-color: #14243f;
border-radius: 0;
}
.visual-base-table-container >>> ::-webkit-scrollbar-button {
width: calc(8px * var(--beilv));;
height: calc(8px * var(--beilv));;
background: #5bc4bf9f;
position: relative;
}
.visual-base-table-container >>> ::-webkit-scrollbar-thumb {
border-radius: calc(8px * var(--beilv));;
background: #5bc4bf9f;
}
/* .visual-base-table-container {
min-width: 30vw;
} */
.visual-base-table-container {
height: 100%;
}
/* .visual-base-table-container >>> .el-table {
min-width: 120%;
} */
/* 清除默认样式 */ /* 清除默认样式 */
.visual-base-table-container >>> th.gutter {
display: none;
}
.visual-base-table-container >>> table { .visual-base-table-container >>> table {
background: transparent; background: transparent;
} }

18
src/views/EquipmentManager/mockData.js
View File

@ -33,12 +33,12 @@ const PriorityComponent = {
} }
export const equipmentExceptionProps = [ export const equipmentExceptionProps = [
{ label: '设备名称', prop: 'eqName', align: 'center' }, { label: '设备名称', prop: 'eqName', align: 'center', 'min-width': 60 },
{ label: '所属产线', prop: 'pl', align: 'center', width: 80 }, { label: '所属产线', prop: 'pl', align: 'center', 'min-width': 60 },
{ label: '报修/异常内容', prop: 'content', align: 'center' }, { label: '报修/异常内容', prop: 'content', align: 'center', 'min-width': 80 },
{ label: '报修/发现人', prop: 'creator', align: 'center', width: 100 }, { label: '报修/发现人', prop: 'creator', align: 'center', width: 110 },
{ label: '时间', prop: 'time', align: 'center' }, { label: '时间', prop: 'time', align: 'center', 'min-width': 80 },
{ label: '优先级', prop: 'priority', align: 'center', subcomponent: PriorityComponent, width: 80 } { label: '优先级', prop: 'priority', align: 'center', subcomponent: PriorityComponent, 'min-width': 60 },
] ]
export const equipmentExceptionDatalist = [ export const equipmentExceptionDatalist = [
@ -80,10 +80,10 @@ const LifeRemainComponent = {
} }
export const equipmentAlarmProps = [ export const equipmentAlarmProps = [
{ label: '设备名称', prop: 'eqName', align: 'center' }, { label: '设备名称', prop: 'eqName', align: 'center', 'min-width': 100 },
{ label: '设备编码', prop: 'eqCode', align: 'center' }, { label: '设备编码', prop: 'eqCode', align: 'center', 'min-width': 100 },
{ label: '所属产线', prop: 'pl', align: 'center' }, { label: '所属产线', prop: 'pl', align: 'center' },
{ label: '报警级别', prop: 'priority', align: 'center', width: 80, subcomponent: PriorityComponent }, { label: '报警级别', prop: 'priority', align: 'center', subcomponent: PriorityComponent, 'min-width': 85 },
{ label: '报警内容', prop: 'content', align: 'center' } { label: '报警内容', prop: 'content', align: 'center' }
] ]