+
+
+
+
-
+
产线名称 :
- A产线
+ {{ currentEquipment.pl }}
设备名称 :
- 清洗机
+ {{ currentEquipment.name }}
累计加工 :
- 20
+ {{ currentEquipment.amount }}
通信状态 :
- 运行中
+
+ {{ currentEquipment.status }}
+
-
@@ -73,7 +81,7 @@
-
+
@@ -110,6 +118,8 @@ import TechyBox from './components/TechyBox.vue'
import screenfull from 'screenfull'
+import eqList from './v3dApp/data'
+
export default {
name: '',
components: {
@@ -129,6 +139,8 @@ export default {
},
data() {
return {
+ eqId: null,
+ currentEquipment: null,
showPage: false,
toggleResize: 'toggle-1' // <=== no need to worry this
}
@@ -153,6 +165,12 @@ export default {
},
handle3DLoaded() {
this.showPage = true
+ },
+ handle3DClick() {
+ this.eqId = document.getElementById('V3DData').rel
+ if (this.eqId) {
+ this.currentEquipment = eqList.find(item => item.id === this.eqId)
+ }
}
}
}
@@ -349,4 +367,12 @@ export default {
background-color: rgb(82, 231, 82);
border-radius: calc(4px * var(--beilv));
}
+
+.danger-dot::before {
+ background-color: #e71837;
+}
+
+.warning-dot::before {
+ background-color: #d6961f;
+}
diff --git a/src/views/3DOverview/v3dApp/data.js b/src/views/3DOverview/v3dApp/data.js
new file mode 100644
index 0000000..b171d3c
--- /dev/null
+++ b/src/views/3DOverview/v3dApp/data.js
@@ -0,0 +1,73 @@
+export default [
+ { id: 'C1-0', pl: 'A', name: '上片', amount: 32, status: '生产中' },
+ { id: 'C1-1', pl: 'A', name: '磨边', amount: 32, status: '生产中' },
+ { id: 'C1-2', pl: 'A', name: '磨边', amount: 32, status: '调试中' },
+ { id: 'C1-3', pl: 'A', name: '清洗', amount: 32, status: '生产中' },
+ { id: 'C1-4', pl: 'A', name: '打孔', amount: 32, status: '生产中' },
+ { id: 'C1-5', pl: 'A', name: '清洗', amount: 32, status: '生产中' },
+ { id: 'C1-6', pl: 'A', name: '丝印', amount: 32, status: '生产中' },
+ { id: 'C1-7', pl: 'A', name: '固化', amount: 32, status: '生产中' },
+ { id: 'C1-8', pl: 'A', name: '储片', amount: 32, status: '生产中' },
+ { id: 'C1-9', pl: 'A', name: '清洗', amount: 32, status: '生产中' },
+ { id: 'C1-10', pl: 'A', name: '下片', amount: 32, status: '生产中' },
+
+ { id: 'C2-0', pl: 'B', name: '上片', amount: 32, status: '调试中' },
+ { id: 'C2-1', pl: 'B', name: '磨边', amount: 32, status: '生产中' },
+ { id: 'C2-2', pl: 'B', name: '磨边', amount: 32, status: '调试中' },
+ { id: 'C2-3', pl: 'B', name: '清洗', amount: 32, status: '调试中' },
+ { id: 'C2-4', pl: 'B', name: '打孔', amount: 32, status: '调试中' },
+ { id: 'C2-5', pl: 'B', name: '清洗', amount: 32, status: '生产中' },
+ { id: 'C2-6', pl: 'B', name: '丝印', amount: 32, status: '生产中' },
+ { id: 'C2-7', pl: 'B', name: '固化', amount: 32, status: '生产中' },
+ { id: 'C2-8', pl: 'B', name: '储片', amount: 32, status: '生产中' },
+ { id: 'C2-9', pl: 'B', name: '清洗', amount: 32, status: '生产中' },
+ { id: 'C2-10', pl: 'B', name: '下片', amount: 32, status: '生产中' },
+
+ { id: 'C3-0', pl: 'C', name: '上片', amount: 32, status: '生产中' },
+ { id: 'C3-1', pl: 'C', name: '磨边', amount: 32, status: '生产中' },
+ { id: 'C3-2', pl: 'C', name: '磨边', amount: 32, status: '生产中' },
+ { id: 'C3-3', pl: 'C', name: '清洗', amount: 32, status: '生产中' },
+ { id: 'C3-4', pl: 'C', name: '打孔', amount: 32, status: '生产中' },
+ { id: 'C3-5', pl: 'C', name: '清洗', amount: 32, status: '故障' },
+ { id: 'C3-6', pl: 'C', name: '丝印', amount: 32, status: '生产中' },
+ { id: 'C3-7', pl: 'C', name: '固化', amount: 32, status: '生产中' },
+ { id: 'C3-8', pl: 'C', name: '储片', amount: 32, status: '生产中' },
+ { id: 'C3-9', pl: 'C', name: '清洗', amount: 32, status: '生产中' },
+ { id: 'C3-10', pl: 'C', name: '下片', amount: 32, status: '生产中' },
+
+ { id: 'C4-0', pl: 'D', name: '上片', amount: 32, status: '故障' },
+ { id: 'C4-1', pl: 'D', name: '磨边', amount: 32, status: '生产中' },
+ { id: 'C4-2', pl: 'D', name: '磨边', amount: 32, status: '生产中' },
+ { id: 'C4-3', pl: 'D', name: '清洗', amount: 32, status: '故障' },
+ { id: 'C4-4', pl: 'D', name: '打孔', amount: 32, status: '故障' },
+ { id: 'C4-5', pl: 'D', name: '清洗', amount: 32, status: '生产中' },
+ { id: 'C4-6', pl: 'D', name: '丝印', amount: 32, status: '生产中' },
+ { id: 'C4-7', pl: 'D', name: '固化', amount: 32, status: '生产中' },
+ { id: 'C4-8', pl: 'D', name: '储片', amount: 32, status: '生产中' },
+ { id: 'C4-9', pl: 'D', name: '清洗', amount: 32, status: '生产中' },
+ { id: 'C4-10', pl: 'D', name: '下片', amount: 32, status: '生产中' },
+
+ { id: 'C5-0', pl: 'E', name: '上片', amount: 32, status: '生产中' },
+ { id: 'C5-1', pl: 'E', name: '磨边', amount: 32, status: '生产中' },
+ { id: 'C5-2', pl: 'E', name: '磨边', amount: 32, status: '生产中' },
+ { id: 'C5-3', pl: 'E', name: '清洗', amount: 32, status: '生产中' },
+ { id: 'C5-4', pl: 'E', name: '打孔', amount: 32, status: '生产中' },
+ { id: 'C5-5', pl: 'E', name: '清洗', amount: 32, status: '生产中' },
+ { id: 'C5-6', pl: 'E', name: '丝印', amount: 32, status: '生产中' },
+ { id: 'C5-7', pl: 'E', name: '固化', amount: 32, status: '生产中' },
+ { id: 'C5-8', pl: 'E', name: '储片', amount: 32, status: '生产中' },
+ { id: 'C5-9', pl: 'E', name: '清洗', amount: 32, status: '生产中' },
+ // { id: 'C5-10', pl: 'E', name: '下片', amount: 32, status: '生产中' },
+
+ { id: 'C6-0', pl: 'F', name: '上片', amount: 32, status: '生产中' },
+ { id: 'C6-1', pl: 'F', name: '磨边', amount: 32, status: '生产中' },
+ { id: 'C6-2', pl: 'F', name: '磨边', amount: 32, status: '生产中' },
+ { id: 'C6-3', pl: 'F', name: '清洗', amount: 32, status: '生产中' },
+ { id: 'C6-4', pl: 'F', name: '打孔', amount: 32, status: '生产中' },
+ { id: 'C6-5', pl: 'F', name: '清洗', amount: 32, status: '生产中' },
+ { id: 'C6-6', pl: 'F', name: '丝印', amount: 32, status: '生产中' },
+ { id: 'C6-7', pl: 'F', name: '固化', amount: 32, status: '故障' },
+ { id: 'C6-8', pl: 'F', name: '储片', amount: 32, status: '故障' },
+ // { id: 'C6-9', pl: 'F', name: '清洗', amount: 32, status: '生产中' },
+ // { id: 'C6-10', pl: 'F', name: '下片', amount: 32, status: '生产中' },
+]
\ No newline at end of file
diff --git a/src/views/EquipmentManager/HomePage.vue b/src/views/EquipmentManager/HomePage.vue
index 9baf2da..8b4bda8 100644
--- a/src/views/EquipmentManager/HomePage.vue
+++ b/src/views/EquipmentManager/HomePage.vue
@@ -54,7 +54,7 @@
lineHeight: '18px',
fontSize: '0.85vw'
}"
- >
+ >
各产线稼动率
-->
各产线稼动率
@@ -96,19 +96,19 @@
突发性维护
-
+
计划内保养
-
+
防御性维护
-
+
点检工单
-
+
@@ -136,8 +136,14 @@ import {
equipmentAnalysisData,
sparepartsProps,
sparepartsDatalist,
- rightSideProps,
- rightSideDatalist
+ suddenMaintainProps,
+ inPlanMaintainProps,
+ defenceMaintainProps,
+ wwwOrderProps,
+ rightSideDatalist,
+ rightSideDatalist2,
+ rightSideDatalist3,
+ rightSideDatalist4
} from './mockData'
import { mapGetters } from 'vuex'
@@ -171,8 +177,14 @@ export default {
equipmentAnalysisData,
sparepartsProps,
sparepartsDatalist,
- rightSideProps,
- rightSideDatalist
+ suddenMaintainProps,
+ inPlanMaintainProps,
+ defenceMaintainProps,
+ wwwOrderProps,
+ rightSideDatalist,
+ rightSideDatalist2,
+ rightSideDatalist3,
+ rightSideDatalist4
// refreshKey: 0
}
},
@@ -268,13 +280,13 @@ export default {
.techy-container__inner {
display: flex;
flex-direction: column;
- gap: calc(8px * var(--beilv));
- height: calc(100% - 4vh);
+ gap: calc(32px * var(--beilv));
+ height: calc(100% - 3vh);
/* overflow-y: scroll; */
overflow-y: auto;
}
.techy-container__inner > div {
- flex: 1 1;
+ flex: 0;
}
.row-1,
@@ -346,7 +358,7 @@ export default {
.grid-2-3 {
grid-template-columns: repeat(3, 1fr);
grid-template-rows: 1fr 1fr;
- gap: calc(8px * var(--beilv)) calc(4px * var(--beilv));
+ gap: calc(8px * var(--beilv)) calc(8px * var(--beilv));
}
.product-line-selection {
diff --git a/src/views/EquipmentManager/components/EquipmentAnalysisBox.vue b/src/views/EquipmentManager/components/EquipmentAnalysisBox.vue
index b1bbca4..dd76a69 100644
--- a/src/views/EquipmentManager/components/EquipmentAnalysisBox.vue
+++ b/src/views/EquipmentManager/components/EquipmentAnalysisBox.vue
@@ -14,16 +14,16 @@
MTBR
-
{{ mtbr | noDecimalFilter }}%
+
{{ mtbr }}min
MTBF
-
{{ mtbf | noDecimalFilter }}%
+
{{ mtbf }}h
@@ -39,6 +39,10 @@ const ProgreeBar = {
type: Number,
default: 0
},
+ max: {
+ type: Number,
+ default: 100
+ },
colors: {
type: Array,
default: () => ['#1295FF', '#9DD5FF']
@@ -68,7 +72,7 @@ const ProgreeBar = {
position: 'absolute',
left: 0,
top: 0,
- width: this.process + '%',
+ width: this.process / this.max * 100 + '%',
height: '100%',
borderRadius: 'calc(8px * var(--beilv))',
background: `linear-gradient(to right, ${this.colors[0]}, ${this.colors[1]})`
@@ -141,7 +145,7 @@ export default {
width: 24px; */
font-size: calc(12px * var(--beilv));
line-height: calc(14px * var(--beilv));
- width: 15%;
+ width: 18%;
}
.param-list::before {
diff --git a/src/views/EquipmentManager/components/TechyAnalysisHeader.vue b/src/views/EquipmentManager/components/TechyAnalysisHeader.vue
index bdb6258..8ad3ede 100644
--- a/src/views/EquipmentManager/components/TechyAnalysisHeader.vue
+++ b/src/views/EquipmentManager/components/TechyAnalysisHeader.vue
@@ -1,17 +1,29 @@
@@ -271,4 +327,8 @@ export default {
.chartContainer >>> div {
width: 100% !important;
}
+
+.diy-linestack-tooltip {
+ color: red;
+}
diff --git a/src/views/QualityManager/mockData.js b/src/views/QualityManager/mockData.js
index 5dcac77..6bdbbdb 100644
--- a/src/views/QualityManager/mockData.js
+++ b/src/views/QualityManager/mockData.js
@@ -38,34 +38,35 @@ const PriorityComponent = {
console.log('is component?', PriorityComponent)
export const qualityTableProps = [
- { label: '工序名称', width: 130, prop: 'wsName', align: 'center' },
- { label: '所属产线', width: 130, prop: 'pl', align: 'center' },
- { label: '异常内容', align: 'center', prop: 'content' },
- { label: '报告人', width: 120, prop: 'creator', align: 'center' },
+ { label: '工序名称', prop: 'wsName', align: 'center', 'min-width': 55 },
+ { label: '所属产线', prop: 'pl', align: 'center', 'min-width': 55 },
+ { label: '异常内容', align: 'center', prop: 'content', 'min-width': 50 },
+ { label: '班组', prop: 'team', align: 'center', 'min-width': 45 },
{ label: '时间', prop: 'time', align: 'center' },
- { label: '优先级', width: 100, prop: 'priority', align: 'center', subcomponent: PriorityComponent }
+ { label: '优先级', prop: 'priority', align: 'center', subcomponent: PriorityComponent, 'min-width': 55 }
]
export const qualityDatalist = [
- { 'wsName': '工序0', 'pl': '产线1', 'content': '争近才百子', 'creator': '毛刚', 'time': '1995-03-10 22:06:23', 'priority': 3 },
- { 'wsName': '工序1', 'pl': '产线10', 'content': '确规面这又间级', 'creator': '毛勇', 'time': '1997-11-26 16:27:32', 'priority': 1 },
- { 'wsName': '工序2', 'pl': '产线8', 'content': '成思体高原法厂清', 'creator': '林平', 'time': '1990-09-18 03:16:44', 'priority': 2 },
- { 'wsName': '工序3', 'pl': '产线6', 'content': '社色增设长放统展', 'creator': '叶静', 'time': '1970-12-02 09:44:01', 'priority': 4 },
- { 'wsName': '工序4', 'pl': '产线10', 'content': '今西', 'creator': '罗磊', 'time': '2017-10-21 00:00:27', 'priority': 2 },
- { 'wsName': '工序5', 'pl': '产线4', 'content': '却称老节再始', 'creator': '郝秀兰', 'time': '2018-06-04 20:34:53', 'priority': 1 },
- { 'wsName': '工序6', 'pl': '产线4', 'content': '志矿正算片大料水断特', 'creator': '熊磊', 'time': '1999-07-20 19:13:32', 'priority': 3 },
- { 'wsName': '工序7', 'pl': '产线3', 'content': '目式却属采精国', 'creator': '马磊', 'time': '2001-07-16 03:50:54', 'priority': 4 },
- { 'wsName': '工序8', 'pl': '产线7', 'content': '做较代你', 'creator': '曾敏', 'time': '1986-01-07 03:20:21', 'priority': 3 },
- { 'wsName': '工序9', 'pl': '产线3', 'content': '与子专前求农说', 'creator': '谭艳', 'time': '1978-07-29 22:49:11', 'priority': 2 },
- { 'wsName': '工序11', 'pl': '产线3', 'content': '与子专前求农说', 'creator': '谭艳', 'time': '1978-07-29 22:49:11', 'priority': 3 },
- { 'wsName': '工序11', 'pl': '产线3', 'content': '与子专前求农说', 'creator': '谭艳', 'time': '1978-07-29 22:49:11', 'priority': 4 },
- { 'wsName': '工序11', 'pl': '产线3', 'content': '与子专前求农说', 'creator': '谭艳', 'time': '1978-07-29 22:49:11', 'priority': 2 },
- { 'wsName': '工序11', 'pl': '产线3', 'content': '与子专前求农说', 'creator': '谭艳', 'time': '1978-07-29 22:49:11', 'priority': 1 },
- { 'wsName': '工序11', 'pl': '产线3', 'content': '与子专前求农说', 'creator': '谭艳', 'time': '1978-07-29 22:49:11', 'priority': 1 },
- { 'wsName': '工序11', 'pl': '产线3', 'content': '与子专前求农说', 'creator': '谭艳', 'time': '1978-07-29 22:49:11', 'priority': 1 },
- { 'wsName': '工序11', 'pl': '产线3', 'content': '与子专前求农说', 'creator': '谭艳', 'time': '1978-07-29 22:49:11', 'priority': 3 },
- { 'wsName': '工序11', 'pl': '产线3', 'content': '与子专前求农说', 'creator': '谭艳', 'time': '1978-07-29 22:49:11', 'priority': 2 }
-]
+ { 'wsName': '原片', 'pl': 'B', 'content': '透过率', 'team': '白班', 'time': '2022-11-18 13:36:26', 'priority': 3 },
+ { 'wsName': '下片铺纸', 'pl': 'B', 'content': '完整性', 'team': '白班', 'time': '2022-11-18 11:35:02', 'priority': 2 },
+ { 'wsName': '镀膜', 'pl': 'A', 'content': '完整性', 'team': '夜班', 'time': '2022-11-18 13:10:02', 'priority': 1 },
+ { 'wsName': '丝印', 'pl': 'A', 'content': '透过率', 'team': '白班', 'time': '2022-11-18 02:16:20', 'priority': 2 },
+ { 'wsName': '上片磨边', 'pl': 'A', 'content': '透过率', 'team': '夜班', 'time': '2022-11-18 00:03:54', 'priority': 3 },
+ { 'wsName': '丝印', 'pl': 'B', 'content': '完整性', 'team': '夜班', 'time': '2022-11-18 09:25:49', 'priority': 1 },
+ { 'wsName': '上片磨边', 'pl': 'A', 'content': '完整性', 'team': '夜班', 'time': '2022-11-18 13:54:45', 'priority': 3 },
+ { 'wsName': '包装', 'pl': 'B', 'content': '完整性', 'team': '白班', 'time': '2022-11-18 03:47:23', 'priority': 1 },
+ { 'wsName': '包装', 'pl': 'B', 'content': '透过率', 'team': '夜班', 'time': '2022-11-18 02:46:21', 'priority': 1 },
+ { 'wsName': '上片磨边', 'pl': 'B', 'content': '完整性', 'team': '夜班', 'time': '2022-11-18 06:31:10', 'priority': 1 },
+ { 'wsName': '下片铺纸', 'pl': 'A', 'content': '完整性', 'team': '白班', 'time': '2022-11-18 10:22:55', 'priority': 3 },
+ { 'wsName': '原片', 'pl': 'A', 'content': '完整性', 'team': '白班', 'time': '2022-11-18 03:29:08', 'priority': 2 },
+ { 'wsName': '丝印', 'pl': 'B', 'content': '透过率', 'team': '白班', 'time': '2022-11-18 09:47:06', 'priority': 1 },
+ { 'wsName': '包装', 'pl': 'B', 'content': '完整性', 'team': '夜班', 'time': '2022-11-18 06:17:27', 'priority': 1 },
+ { 'wsName': '原片', 'pl': 'A', 'content': '完整性', 'team': '夜班', 'time': '2022-11-18 00:29:26', 'priority': 2 },
+ { 'wsName': '清洗', 'pl': 'B', 'content': '完整性', 'team': '白班', 'time': '2022-11-18 10:14:27', 'priority': 2 },
+ { 'wsName': '包装', 'pl': 'A', 'content': '透过率', 'team': '白班', 'time': '2022-11-18 13:50:39', 'priority': 3 },
+ { 'wsName': ' 物流仓储', 'pl': 'A', 'content': '完整性', 'team': '夜班', 'time': '2022-11-18 09:37:44', 'priority': 2 },
+ { 'wsName': '清洗', 'pl': 'A', 'content': '透过率', 'team': '白班', 'time': '2022-11-18 03:53:47', 'priority': 2 },
+ { 'wsName': '原片', 'pl': 'A', 'content': '透过率', 'team': '白班', 'time': '2022-11-18 08:01:02', 'priority': 3 }]
/** 质量异常报警 */
@@ -104,32 +105,32 @@ const StatusComponent = {
}
export const qualityExceptionTableProps = [
- { label: '工序名称', prop: 'wsName', align: 'center', width: 120 },
- { label: '所属产线', prop: 'pl', align: 'center', width: 120 },
- { label: '异常内容', prop: 'content', align: 'center' },
- { label: '发现人', prop: 'creator', align: 'center', width: 100 },
- { label: '时间', prop: 'time', align: 'center' },
- { label: '优先级', prop: 'priority', align: 'center', subcomponent: PriorityComponent, width: 100 },
- // { label: '处理人', prop: 'charger', align: 'center', width: 100 },
- // { label: '完成情况', prop: 'status', align: 'center', subcomponent: StatusComponent, width: 150 }
+ { label: '工序名称', prop: 'wsName', align: 'center', 'min-width': 55 },
+ { label: '所属产线', prop: 'pl', align: 'center', 'min-width': 50 },
+ { label: '异常内容', prop: 'content', align: 'center', 'min-width': 50 },
+ { label: '设备', prop: 'eq', align: 'center', 'min-width': 55 },
+ { label: '时间', prop: 'time', align: 'center', 'min-width': 80 },
+ { label: '优先级', prop: 'priority', align: 'center', subcomponent: PriorityComponent, 'min-width': 55 },
]
export const qualityExceptionDatalist = [
- { 'wsName': '工序0', 'pl': '产线1', 'content': '说红要称或各眼华家书', 'creator': '罗霞', 'time': '2013-04-08 15:23:55', 'priority': 1, 'charger': '冯敏', 'status': 4 },
- { 'wsName': '工序1', 'pl': '产线9', 'content': '积已反老支人后条办', 'creator': '龚芳', 'time': '1984-06-22 09:44:24', 'priority': 2, 'charger': '万静', 'status': 2 },
- { 'wsName': '工序2', 'pl': '产线10', 'content': '铁收王', 'creator': '黎艳', 'time': '2006-10-25 19:20:41', 'priority': 2, 'charger': '徐秀兰', 'status': 1 },
- { 'wsName': '工序3', 'pl': '产线10', 'content': '过又条政理质系', 'creator': '郝强', 'time': '2020-03-06 12:11:52', 'priority': 3, 'charger': '白秀兰', 'status': 2 },
- { 'wsName': '工序4', 'pl': '产线3', 'content': '特适院', 'creator': '魏超', 'time': '1982-12-26 16:19:57', 'priority': 1, 'charger': '姚静', 'status': 3 },
- { 'wsName': '工序5', 'pl': '产线1', 'content': '快准很问无', 'creator': '于桂英', 'time': '1976-09-26 21:53:11', 'priority': 4, 'charger': '白刚', 'status': 2 },
- { 'wsName': '工序6', 'pl': '产线7', 'content': '研开', 'creator': '何桂英', 'time': '1977-04-23 05:34:45', 'priority': 3, 'charger': '秦涛', 'status': 4 },
- { 'wsName': '工序7', 'pl': '产线2', 'content': '四取各广水儿强想华', 'creator': '唐军', 'time': '1988-03-11 22:40:42', 'priority': 2, 'charger': '龙艳', 'status': 1 },
- { 'wsName': '工序8', 'pl': '产线7', 'content': '样无商口', 'creator': '高娟', 'time': '2012-03-14 06:40:16', 'priority': 3, 'charger': '沈涛', 'status': 1 },
- { 'wsName': '工序9', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 4, 'charger': '侯磊', 'status': 4 },
- { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 2, 'charger': '侯磊', 'status': 3 },
- { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 1, 'charger': '侯磊', 'status': 1 },
- { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 1, 'charger': '侯磊', 'status': 2 },
- { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 2, 'charger': '侯磊', 'status': 3 },
- { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 3, 'charger': '侯磊', 'status': 2 },
- { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 3, 'charger': '侯磊', 'status': 1 },
- { 'wsName': '工序10', 'pl': '产线4', 'content': '克质问般集却片土', 'creator': '谭敏', 'time': '2016-04-14 00:41:46', 'priority': 4, 'charger': '侯磊', 'status': 4 }
-]
+ { 'pl': 'A', 'eq': '打孔', 'wsName': '打孔', 'content': '完整性', 'time': '2022-11-18 11:30:01', 'priority': 3 },
+ { 'pl': 'B', 'eq': '固化', 'wsName': '固化', 'content': '透过率', 'time': '2022-11-18 07:20:35', 'priority': 1 },
+ { 'pl': 'B', 'eq': '钢后清洗机', 'wsName': '钢后清洗机', 'content': '透过率', 'time': '2022-11-18 09:16:21', 'priority': 2 },
+ { 'pl': 'A', 'eq': '一镀', 'wsName': '一镀', 'content': '透过率', 'time': '2022-11-18 04:57:10', 'priority': 3 },
+ { 'pl': 'B', 'eq': '固化', 'wsName': '固化', 'content': '完整性', 'time': '2022-11-18 08:26:43', 'priority': 2 },
+ { 'pl': 'B', 'eq': '磨边后清洗机', 'wsName': '磨边后清洗机', 'content': '完整性', 'time': '2022-11-18 04:09:39', 'priority': 2 },
+ { 'pl': 'B', 'eq': '下片', 'wsName': '下片', 'content': '透过率', 'time': '2022-11-18 01:06:05', 'priority': 2 },
+ { 'pl': 'A', 'eq': '一镀', 'wsName': '一镀', 'content': '透过率', 'time': '2022-11-18 05:06:36', 'priority': 1 },
+ { 'pl': 'B', 'eq': '冷却', 'wsName': '冷却', 'content': '完整性', 'time': '2022-11-18 07:11:45', 'priority': 3 },
+ { 'pl': 'A', 'eq': '磨边后清洗机', 'wsName': '磨边后清洗机', 'content': '完整性', 'time': '2022-11-18 11:40:37', 'priority': 3 },
+ { 'pl': 'A', 'eq': '冷却', 'wsName': '冷却', 'content': '完整性', 'time': '2022-11-18 10:41:54', 'priority': 1 },
+ { 'pl': 'B', 'eq': '预热', 'wsName': '预热', 'content': '透过率', 'time': '2022-11-18 04:10:00', 'priority': 1 },
+ { 'pl': 'B', 'eq': '钢化', 'wsName': '钢化', 'content': '完整性', 'time': '2022-11-18 09:23:40', 'priority': 1 },
+ { 'pl': 'A', 'eq': '冷却', 'wsName': '冷却', 'content': '透过率', 'time': '2022-11-18 05:28:05', 'priority': 2 },
+ { 'pl': 'B', 'eq': '上片', 'wsName': '上片', 'content': '完整性', 'time': '2022-11-18 06:24:57', 'priority': 3 },
+ { 'pl': 'B', 'eq': '固化', 'wsName': '固化', 'content': '完整性', 'time': '2022-11-18 02:48:28', 'priority': 3 },
+ { 'pl': 'B', 'eq': '磨边后清洗机', 'wsName': '磨边后清洗机', 'content': '完整性', 'time': '2022-11-18 13:06:35', 'priority': 1 },
+ { 'pl': 'B', 'eq': '打孔', 'wsName': '打孔', 'content': '透过率', 'time': '2022-11-18 11:49:59', 'priority': 1 },
+ { 'pl': 'B', 'eq': '一镀', 'wsName': '一镀', 'content': '透过率', 'time': '2022-11-18 12:32:20', 'priority': 2 },
+ { 'pl': 'B', 'eq': '丝印', 'wsName': '丝印', 'content': '完整性', 'time': '2022-11-18 12:45:49', 'priority': 3 }]
diff --git a/src/views/UserPage/TestTree.vue b/src/views/UserPage/TestTree.vue
index b0ee9e3..b5cb23a 100644
--- a/src/views/UserPage/TestTree.vue
+++ b/src/views/UserPage/TestTree.vue
@@ -142,4 +142,8 @@ export default {
.routes-area >>> .el-menu-item span {
}
*/
+
+#app .hideSidebar .routes-area >>> .el-submenu>.el-submenu__title {
+ padding: 0 20px !important;
+}
diff --git a/src/views/report-manage/ReportSortChoise.vue b/src/views/report-manage/ReportSortChoise.vue
index 0d1e00e..fc7af8d 100644
--- a/src/views/report-manage/ReportSortChoise.vue
+++ b/src/views/report-manage/ReportSortChoise.vue
@@ -27,14 +27,18 @@
-
- 暂无报表
+ 暂无报表
- -
+
-
+
+ {{ n }}
+
+
@@ -212,7 +216,21 @@ export default {
init() {
list({}).then(res => {
this.allNum = 0
- this.sortList = res.data
+ this.sortList = res.data.map(item => {
+ if (item.name === '能源') {
+ return { ...item, reportNames: ['产线电量日能耗统计'] }
+ } else if (item.name === '订单') {
+ return { ...item, reportNames: ['订单历史记录', '在线订单进度'] }
+ } else if (item.name === '设备') {
+ return { ...item, reportNames: ['设备报警', '设备加工数量统计', '设备OEE'] }
+ } else if (item.name === '人员') {
+ return { ...item, reportNames: ['班组加工数量统计'] }
+ } else if (item.name === '产线') {
+ return { ...item, reportNames: ['产线日产量统计', '产线历史产量记录'] }
+ } else {
+ return item
+ }
+ })
res.data.forEach(item => {
this.allNum += item.quantity
})