+
差异值
-
@@ -151,7 +91,7 @@
:class-option="scrollTableOption"
:data="scrollTableData"
class="case-item"
- style="height: calc(100% - 30px);overflow: hidden;"
+ style="height: calc(100% - 50px);overflow: hidden;"
>
{b} : {c} ({d}%)",
+ trigger: "axis",
+ axisPointer: {
+ type: "shadow",
+ },
+ formatter: "{b}
合格率: {c}%",
},
- legend: {
- type: "scroll",
- orient: "vertical",
- left: "70%",
- align: "left",
- top: "middle",
- textStyle: {
- color: "#8C8C8C",
+ /*legend: {
+ data: [date]
+ },*/
+ grid: {
+ top:'30',
+ left: "4%",
+ right: "4%",
+ bottom: "2%",
+ containLabel: true,
+ },
+ xAxis: {
+ type: "value",
+ boundaryGap: [0, 0.01],
+ min: 0,
+ max: 100,
+ interval: 20,
+ axisLabel: {
+ formatter: "{value}%",
+ textStyle: {
+ color: '#fff',
+ fontWeight: "80",
+ },
+ },
+ },
+ yAxis: {
+ type: "category",
+ data: [
+ "人员1",
+ "人员2",
+ "人员3",
+ "人员4",
+ "人员5",
+ "人员6",
+ "人员7",
+ ],
+ axisLabel: {
+ show: true,
+ interval: 0,
+ rotate: 0,
+ margin: 10,
+ inside: false,
+ textStyle: {
+ color: '#fff',
+ fontWeight: "50",
+ },
},
- height: 250,
},
series: [
{
- name: "库存情况",
- type: "pie",
- radius: ["20%", "70%"],
- center: ["35%", "50%"],
- clockwise: false,
- data: [
- {
- value: 45,
- name: "已过期",
- },
- {
- value: 25,
- name: "半年内",
- },
- {
- value: 15,
- name: "三个月内",
- },
- {
- value: 8,
- name: "一个月内",
- },
- ],
+ type: "bar",
label: {
normal: {
- position: "inner",
- textStyle: {
- color: "#fff",
- fontSize: 14,
+ show: true,
+ // formatter: '{c}',
+ formatter: function (v) {
+ var val = v.data;
+ if (val === 0) {
+ return "";
+ }
+ return val;
},
- formatter: (e) => {
- return e.percent.toFixed(2) + '%'
- }
- },
- },
- labelLine: {
- normal: {
- show: false,
+ color: "#fff",
},
},
+ data: [22, 33, 44, 55, 66, 77, 88],
},
],
})
this.$refs.chart2.setData({
+ tooltip: {
+ trigger: "axis",
+ axisPointer: {
+ type: "shadow",
+ },
+ },
grid: {
- top: 30,
- left: "2%",
- right: "5%",
- bottom: "2%",
+ top:'5%',
+ left: "3%",
+ right: "4%",
+ bottom: "3%",
containLabel: true,
},
- xAxis: {
- type: "category",
- boundaryGap: false,
- data: ["14", "15", "16", "17", "18", "19", "20", "21", "22", "23"],
- axisLabel: {
- margin: 10,
- color: "#ffffff63",
- },
- axisLine: {
- show: false,
- },
- axisTick: {
- show: true,
- lineStyle: {
- color: "#ffffff1f",
- },
+ yAxis: [
+ {
+ type: "value",
+ name: "次数",
+ position: "left",
},
- splitLine: {
+ {
show: false,
- lineStyle: {
- type: 'dashed',
- color: "#ffffff1f",
- },
},
+ ],
+ xAxis: {
+ type: "category",
+ data: [
+ "员工1",
+ "员工2",
+ "员工3",
+ "员工4",
+ "员工5",
+ "员工6",
+ "员工7",
+ "员工8",
+ "员工9",
+ "员工10",
+ "员工11",
+ "员工12",
+ ],
},
- yAxis: [
+ series: [
{
- type: "value",
- axisLabel: {
- margin: 10,
- color: "#ffffff63",
- },
-
- axisTick: {
- show: true,
- lineStyle: {
- color: "#ffffff1f",
- },
- },
- splitLine: {
- show: false,
- lineStyle: {
- type: 'dashed',
- color: "#ffffff1f",
+ name: "流程1",
+ type: "bar",
+ stack: "次数",
+ label: {
+ normal: {
+ show: true,
},
},
- axisLine: {
- lineStyle: {
- color: "#fff",
- width: 2,
+ itemStyle: {
+ normal: {
+ color: "rgb(249,18,243)",
},
},
+ data: [197, 134, 138, 167, 160, 174, 164, 0, 0, 0, 0, 0],
},
- ],
- series: [
{
- name: "产量",
- type: "line",
- smooth: true, //是否平滑曲线显示
- showAllSymbol: true,
- symbol: "circle",
- symbolSize: 6,
- lineStyle: {
+ name: "流程2",
+ type: "bar",
+ stack: "次数",
+ label: {
normal: {
- color: "#fff", // 线条颜色
+ show: true,
},
},
+ itemStyle: {
+ normal: {
+ color: "rgb(249,205,30)",
+ },
+ },
+ data: [325, 191, 315, 400, 407, 448, 417, 0, 0, 0, 0, 0],
+ },
+ {
+ name: "流程3",
+ type: "bar",
+ stack: "次数",
label: {
- show: true,
- position: "top",
- textStyle: {
- color: "#fff",
+ normal: {
+ show: true,
},
},
itemStyle: {
- color: "red",
- borderColor: "#fff",
- borderWidth: 3,
- },
- tooltip: {
- show: false,
- },
- areaStyle: {
normal: {
- color: new echarts.graphic.LinearGradient(
- 0,
- 0,
- 0,
- 1,
- [
- {
- offset: 0,
- color: "#eb64fb",
- },
- {
- offset: 1,
- color: "#3fbbff0d",
- },
- ],
- false
- ),
+ color: "rgb(0, 137, 239)",
},
},
- data: [393, 438, 485, 631, 689, 824, 987, 1000, 1100, 1200],
+ data: [138, 111, 156, 139, 116, 151, 154, 0, 0, 0, 0, 0],
},
],
})
@@ -527,7 +466,7 @@ export default {
top: 44.5%;
left: 67.3%;
width: 29.5%;
- height: 19.5%;
+ height: 50.5%;
color: #fff;
}
@@ -551,16 +490,16 @@ export default {
.chart1 {
position: absolute;
top: 16%;
- left: 30%;
- width: 35.5%;
+ left: 3.4%;
+ width: 46%;
height: 21.5%;
}
.chart2 {
position: absolute;
- top: 16%;
- left: 67.3%;
- width: 29%;
+ top: 16.2%;
+ left: 50.7%;
+ width: 45.9%;
height: 21%;
}
diff --git a/hw-ui/src/views/board/production/fifthFloor1.vue b/hw-ui/src/views/board/production/fifthFloor1.vue
new file mode 100644
index 00000000..d9d1bbaa
--- /dev/null
+++ b/hw-ui/src/views/board/production/fifthFloor1.vue
@@ -0,0 +1,568 @@
+
+
+
京源生产监控平台
+
+ {{ i }}
+
+
+
+
+ 编号
+
+
+ 生产工单
+
+
+ 计划数量
+
+
+ 实际数量
+
+
+ 差异值
+
+
+ 完成率
+
+
+
+
+
+
+ {{ item.value1 }}
+
+
+ {{ item.value2 }}
+
+
+ {{ item.value3 }}
+
+
+ {{ item.value4 }}
+
+
+ {{ item.value5 }}
+
+
+ {{ item.value6 }}
+
+
+
+
+
+
+
+ 编号
+
+
+ 生产工单
+
+
+ 计划数量
+
+
+ 实际数量
+
+
+ 差异值
+
+
+ 完成率
+
+
+
+
+
+
+ {{ item.value1 }}
+
+
+ {{ item.value2 }}
+
+
+ {{ item.value3 }}
+
+
+ {{ item.value4 }}
+
+
+ {{ item.value5 }}
+
+
+ {{ item.value6 }}
+
+
+
+
+
+
+
+ 编号
+
+
+ 生产工单
+
+
+ 计划数量
+
+
+ 实际数量
+
+
+ 差异值
+
+
+ 完成率
+
+
+
+
+
+
+ {{ item.value1 }}
+
+
+ {{ item.value2 }}
+
+
+ {{ item.value3 }}
+
+
+ {{ item.value4 }}
+
+
+ {{ item.value5 }}
+
+
+ {{ item.value6 }}
+
+
+
+
+
+
+
+
+
+
+
1
+
0
+
0
+
0
+
1
+
0
+
0
+
0
+
1
+
0
+
0
+
0
+
1
+
0
+
0
+
0
+
+
+
+
diff --git a/hw-ui/src/views/board/warehouse/fifthFloor.vue b/hw-ui/src/views/board/warehouse/fifthFloor.vue
index 0a59ba1e..1b8e1b30 100644
--- a/hw-ui/src/views/board/warehouse/fifthFloor.vue
+++ b/hw-ui/src/views/board/warehouse/fifthFloor.vue
@@ -1,65 +1,12 @@
-
京源智能仓储监控平台
+ class="title"
+ >
{{ i }}
-
-
-
- 任务编号
-
-
- 任务类型
-
-
- 物料名称
-
-
- 库位编号
-
-
- 时间
-
-
-
-
-
-
- {{ item.value1 }}
-
-
- {{ item.value2 }}
-
-
- {{ item.value3 }}
-
-
- {{ item.value4 }}
-
-
- {{ item.value5 }}
-
-
-
-
@@ -72,30 +19,40 @@
-
-
-
-
-
-
-
1
-
0
-
0
-
0
-
1
-
0
-
0
-
0
+
1
+
0
+
0
+
0
+
+
1
+
0
+
0
+
0
+
1
0
0
0
+
+
1
+
0
+
0
+
0
+
+
1
+
0
+
0
+
0
+
+
+
+
+
diff --git a/hw-ui/src/views/board/warehouse/firstFloor.vue b/hw-ui/src/views/board/warehouse/firstFloor.vue
new file mode 100644
index 00000000..a5a5afb7
--- /dev/null
+++ b/hw-ui/src/views/board/warehouse/firstFloor.vue
@@ -0,0 +1,672 @@
+
+
+
京源智能仓储监控平台
+
+ {{ i }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 任务编号
+
+
+ 任务类型
+
+
+ 物料名称
+
+
+ 库位编号
+
+
+ 时间
+
+
+
+
+
+
+ {{ item.value1 }}
+
+
+ {{ item.value2 }}
+
+
+ {{ item.value3 }}
+
+
+ {{ item.value4 }}
+
+
+ {{ item.value5 }}
+
+
+
+
+
+
+
+
+ 订单
+
+
+ 物料
+
+
+ 物料需求
+
+
+ Bom分解
+
+
+ 时间
+
+
+
+
+
+
+ {{ item.value1 }}
+
+
+ {{ item.value2 }}
+
+
+ {{ item.value3 }}
+
+
+ {{ item.value4 }}
+
+
+ {{ item.value5 }}
+
+
+
+
+
+
1
+
0
+
0
+
0
+
+
1
+
0
+
0
+
0
+
+
1
+
0
+
0
+
0
+
+
1
+
0
+
0
+
0
+
+
1
+
0
+
0
+
0
+
+
+
+
+
+
+
+
diff --git a/hw-ui/src/views/login.vue b/hw-ui/src/views/login.vue
index d8792a4a..0fa80e14 100644
--- a/hw-ui/src/views/login.vue
+++ b/hw-ui/src/views/login.vue
@@ -1,7 +1,8 @@
- 京源环保MES系统
+ 京源环保MES系统
+ 京源环保车间MES系统