diff --git a/src/assets/img/img17.png b/src/assets/img/img17.png new file mode 100644 index 00000000..58266f70 Binary files /dev/null and b/src/assets/img/img17.png differ diff --git a/src/assets/img/img25.png b/src/assets/img/img25.png new file mode 100644 index 00000000..9c03c12f Binary files /dev/null and b/src/assets/img/img25.png differ diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue index b6ba61f3..50e85d8d 100644 --- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue +++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue @@ -64,42 +64,42 @@
{{ OPNAME136 }}
-
- -
{{ OPNAME101 }}
-
- - -
-
+
{{ OPNAME102 }}
-
+
{{ OPNAME103 }}
-
+
{{ OPNAME104 }}
-
+
- -
{{ OPNAME105 }}
+
+
-
+
+ +
{{ OPNAME145 }}
+
+ + +
+
{{ OPNAME106 }}
@@ -162,153 +162,188 @@
-
+
+ +
{{ OPNAME101 }}
+
+ + +
+
+ +
{{ OPNAME149 }}
+
+ + +
+
{{ OPNAME115 }}
-
+
{{ OPNAME116 }}
-
+
{{ OPNAME117 }}
-
+
{{ OPNAME118 }}
-
+
{{ OPNAME119 }}
-
+
{{ OPNAME120 }}
-
+
{{ OPNAME121 }}
-
+
{{ OPNAME122 }}
-
+
{{ OPNAME123 }}
-
+
{{ OPNAME124 }}
-
+
{{ OPNAME125 }}
-
+
{{ OPNAME126 }}
-
+
{{ OPNAME127 }}
-
+
{{ OPNAME128 }}
-
+
{{ OPNAME129 }}
-
+
{{ OPNAME130 }}
-
+
{{ OPNAME131 }}
-
+
{{ OPNAME132 }}
-
+
{{ OPNAME133 }}
-
+
{{ OPNAME134 }}
-
+
{{ OPNAME135 }}
+
+ + +
+
{{ OPNAME146 }}
+ +
+
+ + +
+
{{ OPNAME148 }}
+ +
+
+ +
{{ OPNAME147 }}
+
+ + +
@@ -368,6 +403,11 @@ export default { OPNAME142: 'OP1420', OPNAME143: 'OP1430', OPNAME144: 'OP1440', + OPNAME145: 'OP1450', + OPNAME146: 'OP1460', + OPNAME147: 'OP1470', + OPNAME148: 'OP1480', + OPNAME149: 'OP1490', timer: null, opname: '' } @@ -562,7 +602,7 @@ export default { width: 1690px; height: 830px; /*border: 1px solid red;*/ - background: url('../../../assets/img/img24.png') repeat; + background: url('../../../assets/img/img25.png') repeat; background-repeat:no-repeat; background-size:100% 100%;-moz-background-size:100% 100%; } diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue index f9e57956..10066577 100644 --- a/src/views/TechnologyCenter/ImportParts/specificationData.vue +++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue @@ -2,8 +2,8 @@
- 机床名称: - + 机床图号: + { + console.log(response.data, 1111) this.machineName = response.data[0].机床名称 this.machineNum = response.data[0].机床数量 }) @@ -551,6 +552,7 @@ export default { this.err = 0 if (this.groupValue) { this.listLoading = true + alert(122) if (this.groupName.indexOf('MX') > -1) { for (let i = 0; i < this.tableDataAll.length; i++) { const data = this.tableDataAll[i]