diff --git a/src/assets/images/logo-b1.png b/src/assets/images/logo-b1.png new file mode 100644 index 0000000..57ce112 Binary files /dev/null and b/src/assets/images/logo-b1.png differ diff --git a/src/assets/images/logo-small1.png b/src/assets/images/logo-small1.png new file mode 100644 index 0000000..ab080eb Binary files /dev/null and b/src/assets/images/logo-small1.png differ diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index e327f14..5129612 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -2,10 +2,16 @@
+ + + + + +
diff --git a/src/views/abnormalityAlarm/AGValarm/abnormalAGV.vue b/src/views/abnormalityAlarm/AGValarm/abnormalAGV.vue index cdc1952..ce1ce33 100644 --- a/src/views/abnormalityAlarm/AGValarm/abnormalAGV.vue +++ b/src/views/abnormalityAlarm/AGValarm/abnormalAGV.vue @@ -17,7 +17,7 @@ /> - + - + /> --> - + @@ -336,7 +336,7 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - machineryTypeId: 229, + machineryTypeId: "AGV", }, // 表单参数 form: { diff --git a/src/views/abnormalityAlarm/AGValarm/historicalAGV.vue b/src/views/abnormalityAlarm/AGValarm/historicalAGV.vue index 2ff1005..7ce09fe 100644 --- a/src/views/abnormalityAlarm/AGValarm/historicalAGV.vue +++ b/src/views/abnormalityAlarm/AGValarm/historicalAGV.vue @@ -17,7 +17,7 @@ /> - + - + /> --> - + @@ -242,7 +242,7 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - machineryTypeId: 229, + machineryTypeId: "AGV", }, // 表单参数 form: { diff --git a/src/views/abnormalityAlarm/liku/abnormalLiku.vue b/src/views/abnormalityAlarm/liku/abnormalLiku.vue index 7528b71..e9adad8 100644 --- a/src/views/abnormalityAlarm/liku/abnormalLiku.vue +++ b/src/views/abnormalityAlarm/liku/abnormalLiku.vue @@ -17,7 +17,7 @@ /> - + - + /> --> - + @@ -336,7 +336,7 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - machineryTypeId: 230, + machineryTypeId: "STORE", }, // 表单参数 form: { diff --git a/src/views/abnormalityAlarm/liku/historicalLiku.vue b/src/views/abnormalityAlarm/liku/historicalLiku.vue index 8b64fb9..0c2d15b 100644 --- a/src/views/abnormalityAlarm/liku/historicalLiku.vue +++ b/src/views/abnormalityAlarm/liku/historicalLiku.vue @@ -17,7 +17,7 @@ /> - + - + /> --> - + @@ -242,7 +242,7 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - machineryTypeId: 230, + machineryTypeId: "STORE", }, // 表单参数 form: { diff --git a/src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue b/src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue index bcccb6e..9f24647 100644 --- a/src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue +++ b/src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue @@ -17,7 +17,7 @@ /> - + - + /> --> - + @@ -336,7 +336,7 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - machineryTypeId: 227, + machineryTypeId: "CNC", }, // 表单参数 form: { diff --git a/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue b/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue index c4adfd2..c565ec0 100644 --- a/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue +++ b/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue @@ -17,7 +17,7 @@ /> - + - + /> --> - + @@ -242,7 +242,7 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - machineryTypeId: 227, + machineryTypeId: "CNC", }, // 表单参数 form: { diff --git a/src/views/abnormalityAlarm/robotic/historicalAlarm.vue b/src/views/abnormalityAlarm/robotic/historicalAlarm.vue index 95c720c..6a880fa 100644 --- a/src/views/abnormalityAlarm/robotic/historicalAlarm.vue +++ b/src/views/abnormalityAlarm/robotic/historicalAlarm.vue @@ -17,7 +17,7 @@ /> - + - + /> --> - + @@ -242,7 +242,7 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - machineryTypeId: 228, + machineryTypeId: "ROBOT", }, // 表单参数 form: { diff --git a/src/views/abnormalityAlarm/robotic/roboticAlarm.vue b/src/views/abnormalityAlarm/robotic/roboticAlarm.vue index a42e5bb..87d7de7 100644 --- a/src/views/abnormalityAlarm/robotic/roboticAlarm.vue +++ b/src/views/abnormalityAlarm/robotic/roboticAlarm.vue @@ -17,7 +17,7 @@ /> - + - + /> --> - + @@ -336,7 +336,7 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - machineryTypeId: 228, + machineryTypeId: "ROBOT", }, // 表单参数 form: { diff --git a/src/views/mes/dv/largeScreen/components/AGVrate.vue b/src/views/mes/dv/largeScreen/components/AGVrate.vue index 8b680e2..d49ff3f 100644 --- a/src/views/mes/dv/largeScreen/components/AGVrate.vue +++ b/src/views/mes/dv/largeScreen/components/AGVrate.vue @@ -43,7 +43,7 @@ export default { // 基于准备好的dom，初始化echarts实例 var myChart = echarts.init(document.getElementById("AGVrate")); - let value = "10%"; + let value = "0%"; let title = "设备在线率"; var option = { title: [ @@ -98,7 +98,7 @@ export default { backgroundStyle: { color: "rgba(66, 66, 66, .3)", }, - data: [10], + // data: [10], coordinateSystem: "polar", itemStyle: { diff --git a/src/views/mes/dv/largeScreen/components/fault.vue b/src/views/mes/dv/largeScreen/components/fault.vue index b2c82ed..4f5c308 100644 --- a/src/views/mes/dv/largeScreen/components/fault.vue +++ b/src/views/mes/dv/largeScreen/components/fault.vue @@ -46,7 +46,7 @@ export default { var option = { title: [ { - text: "1%", + text: "0%", x: "center", top: "35%", textStyle: { @@ -89,7 +89,7 @@ export default { backgroundStyle: { color: "rgba(66, 66, 66, .3)", }, - data: [1], + // data: [1], coordinateSystem: "polar", itemStyle: { diff --git a/src/views/mes/dv/largeScreen/components/offline.vue b/src/views/mes/dv/largeScreen/components/offline.vue index e498ade..0edccc2 100644 --- a/src/views/mes/dv/largeScreen/components/offline.vue +++ b/src/views/mes/dv/largeScreen/components/offline.vue @@ -46,7 +46,7 @@ export default { var option = { title: [ { - text: "5%", + text: "0%", x: "center", top: "35%", textStyle: { @@ -89,7 +89,7 @@ export default { backgroundStyle: { color: "rgba(66, 66, 66, .3)", }, - data: [5], + // data: [5], coordinateSystem: "polar", itemStyle: { diff --git a/src/views/mes/dv/largeScreen/components/online.vue b/src/views/mes/dv/largeScreen/components/online.vue index 0b3391e..2dea9b1 100644 --- a/src/views/mes/dv/largeScreen/components/online.vue +++ b/src/views/mes/dv/largeScreen/components/online.vue @@ -46,7 +46,7 @@ export default { var option = { title: [ { - text: "10%", + text: "0%", x: "center", top: "35%", textStyle: { @@ -89,7 +89,7 @@ export default { backgroundStyle: { color: "rgba(66, 66, 66, .3)", }, - data: [10], + // data: [10], coordinateSystem: "polar", itemStyle: { diff --git a/src/views/mes/dv/largeScreen/components/onlineRate.vue b/src/views/mes/dv/largeScreen/components/onlineRate.vue index d337424..5d94c8e 100644 --- a/src/views/mes/dv/largeScreen/components/onlineRate.vue +++ b/src/views/mes/dv/largeScreen/components/onlineRate.vue @@ -43,7 +43,7 @@ export default { // 基于准备好的dom，初始化echarts实例 var myChart = echarts.init(document.getElementById("onlineRate")); - let value = "50%"; + let value = "0%"; let title = "设备在线率"; var option = { title: [ @@ -98,7 +98,7 @@ export default { backgroundStyle: { color: "rgba(66, 66, 66, .3)", }, - data: [50], + // data: [50], coordinateSystem: "polar", itemStyle: { diff --git a/src/views/mes/dv/largeScreen/components/roboticRate.vue b/src/views/mes/dv/largeScreen/components/roboticRate.vue index f564c9f..188df48 100644 --- a/src/views/mes/dv/largeScreen/components/roboticRate.vue +++ b/src/views/mes/dv/largeScreen/components/roboticRate.vue @@ -43,7 +43,7 @@ export default { // 基于准备好的dom，初始化echarts实例 var myChart = echarts.init(document.getElementById("roboticRate")); - let value = "30%"; + let value = "0%"; let title = "设备在线率"; var option = { title: [ @@ -98,7 +98,7 @@ export default { backgroundStyle: { color: "rgba(66, 66, 66, .3)", }, - data: [30], + // data: [30], coordinateSystem: "polar", itemStyle: { diff --git a/src/views/mes/dv/largeScreen/index.vue b/src/views/mes/dv/largeScreen/index.vue index 1465f8c..b49c8b6 100644 --- a/src/views/mes/dv/largeScreen/index.vue +++ b/src/views/mes/dv/largeScreen/index.vue @@ -69,7 +69,7 @@ >
-
12
+
0
当前在线
 @@ -88,7 +88,7 @@ >
-
12
+
0
当前离线
 @@ -107,7 +107,7 @@ >
-
12
+
0
当前故障
 @@ -144,16 +144,16 @@
2
0
- 3 + 0
- 4 + 0
@@ -163,15 +163,15 @@
2
0
- 3 + 0
4
0
@@ -180,21 +180,21 @@
1
0
- 2 + 0
- 3 + 0
- 4 + 0
@@ -226,16 +226,16 @@
2
0
- 3 + 0
- 4 + 0
@@ -245,15 +245,15 @@
2
0
- 3 + 0
4
0
@@ -262,21 +262,21 @@
1
0
- 2 + 0
- 3 + 0
- 4 + 0
@@ -308,16 +308,16 @@
2
0
- 3 + 0
- 4 + 0
@@ -327,15 +327,15 @@
2
0
- 3 + 0
4
0
diff --git a/src/views/mes/pro/production/components/complete.vue b/src/views/mes/pro/production/components/complete.vue index cd9eef5..ea11ccc 100644 --- a/src/views/mes/pro/production/components/complete.vue +++ b/src/views/mes/pro/production/components/complete.vue @@ -97,16 +97,16 @@ export default { type: "category", boundaryGap: true, //坐标轴两边留白 data: [ - "2023-07", - "2023-08", - "2023-09", - "2023-10", - "2023-11", - "2023-12", - "2024-01", - "2024-02", - "2024-03", - "2024-04", + // "2023-07", + // "2023-08", + // "2023-09", + // "2023-10", + // "2023-11", + // "2023-12", + // "2024-01", + // "2024-02", + // "2024-03", + // "2024-04", ], axisLabel: { //坐标轴刻度标签的相关设置。 @@ -167,7 +167,7 @@ export default { { name: "实际完成工单数", type: "bar", - data: [4.9, 7.3, 9.2, 5.6, 7.7, 5.6, 4.2, 3.6, 6, 6.4], + // data: [4.9, 7.3, 9.2, 5.6, 7.7, 5.6, 4.2, 3.6, 6, 6.4], barWidth: 10, barGap: 0, //柱间距离 label: { @@ -222,7 +222,7 @@ export default { { name: "计划工单数", type: "bar", - data: [2.9, 5, 4.4, 2.7, 5.7, 4.6, 1.2, 2.7, 4.8, 6.0], + // data: [2.9, 5, 4.4, 2.7, 5.7, 4.6, 1.2, 2.7, 4.8, 6.0], barWidth: 10, barGap: 0.2, //柱间距离 label: { diff --git a/src/views/mes/pro/production/components/defective.vue b/src/views/mes/pro/production/components/defective.vue index ca95b7e..6eb5fe1 100644 --- a/src/views/mes/pro/production/components/defective.vue +++ b/src/views/mes/pro/production/components/defective.vue @@ -45,22 +45,22 @@ export default { var scale = 1; var echartData = [ - { - value: 5, - name: "材料不良", - }, - { - value: 1, - name: "工序不良", - }, - { - value: 2, - name: "尺寸不良", - }, - { - value: 1, - name: "其他不良", - }, + // { + // value: 5, + // name: "材料不良", + // }, + // { + // value: 1, + // name: "工序不良", + // }, + // { + // value: 2, + // name: "尺寸不良", + // }, + // { + // value: 1, + // name: "其他不良", + // }, ]; var rich = { yellow: { diff --git a/src/views/mes/pro/production/components/ticket.vue b/src/views/mes/pro/production/components/ticket.vue index c48575c..195e186 100644 --- a/src/views/mes/pro/production/components/ticket.vue +++ b/src/views/mes/pro/production/components/ticket.vue @@ -147,11 +147,11 @@ export default { ], dataset: { source: [ - { status: "今飞智造2.1订单", value1: 33, value2: 93 }, - { status: "今飞餐达1.15订单", value1: 53, value2: 32 }, - { status: "今飞智造1.1订单", value1: 78, value2: 65 }, - { status: "今飞智适12.15打单", value1: 12, value2: 35 }, - { status: "今飞智适12.1订单", value1: 90, value2: 52 }, + // { status: "今飞智造2.1订单", value1: 33, value2: 93 }, + // { status: "今飞餐达1.15订单", value1: 53, value2: 32 }, + // { status: "今飞智造1.1订单", value1: 78, value2: 65 }, + // { status: "今飞智适12.15打单", value1: 12, value2: 35 }, + // { status: "今飞智适12.1订单", value1: 90, value2: 52 }, ], }, }; diff --git a/src/views/mes/pro/production/index.vue b/src/views/mes/pro/production/index.vue index be4fb1e..756ace1 100644 --- a/src/views/mes/pro/production/index.vue +++ b/src/views/mes/pro/production/index.vue @@ -90,7 +90,7 @@ class="grid-content bg-purple" style="margin: 10% 10% 10% 27%" > - 21 + 0 - 30 + 0 - 80% + 0 - 9 + 0 - 1651 + 0 - 1% + 0 @@ -278,7 +278,6 @@ export default { ], timer: null, - rtSp1: "", screenfull: false, title: "生产监控分析", diff --git a/src/views/mes/pro/schedule/index.vue b/src/views/mes/pro/schedule/index.vue index 4a0bf05..24eeade 100644 --- a/src/views/mes/pro/schedule/index.vue +++ b/src/views/mes/pro/schedule/index.vue @@ -533,7 +533,7 @@ export default { tasks: { data: [], links: [], - }, + }, // 表单参数 form: {}, ids: "", @@ -665,18 +665,25 @@ export default { // 执行生产 handleproductione(row) { const routeId = row.workorderId || this.ids; - axios - .get("http://192.168.2.104:8077/manage/task/execute?ids=" + routeId) - // .get("http://192.168.50.191:8077/manage/task/execute?ids=" + routeId) - // .get("http://127.0.0.1:8077/manage/task/execute?ids=" + routeId) - .then((res) => { - if (res.data.code === 200) { - this.getList(); - this.$modal.msgSuccess("执行成功"); - } else { - this.$message.error(res.data.msg); - } + if (routeId !== "") { + axios + .get("http://192.168.2.104:8077/manage/task/execute?ids=" + routeId) + // .get("http://192.168.50.191:8077/manage/task/execute?ids=" + routeId) + // .get("http://127.0.0.1:8077/manage/task/execute?ids=" + routeId) + .then((res) => { + if (res.data.code === 200) { + this.getList(); + this.$modal.msgSuccess("执行成功"); + } else { + this.$message.error(res.data.msg); + } + }); + } else { + this.$message({ + message: "请选择要执行的工单", + type: "warning", }); + } }, // 暂停生产 @@ -701,7 +708,7 @@ export default { this.$modal .confirm("确认删除数据项？") .then(() => { - deleteShopFace({workorderId:workorderId}).then((response) => { + deleteShopFace({ workorderId: workorderId }).then((response) => { console.log(response); if (response.code === 200) { this.getList();