diff --git a/src/api/kanban/Packagingline.js b/src/api/kanban/Packagingline.js
index 832925c7..9041e474 100644
--- a/src/api/kanban/Packagingline.js
+++ b/src/api/kanban/Packagingline.js
@@ -30,4 +30,12 @@ export function getProductionLineInfo(data) {
 		method: 'post',
 		data: data
 	});
+}
+// 产线信息
+export function getPorOrderList(data) {
+	return request({
+		url: '/mes/mesborad/getPorOrderList',
+		method: 'post',
+		data: data
+	});
 }
\ No newline at end of file
diff --git a/src/api/kanban/quality.js b/src/api/kanban/quality.js
index 4e9d7c09..83545106 100644
--- a/src/api/kanban/quality.js
+++ b/src/api/kanban/quality.js
@@ -93,4 +93,4 @@ export function getMonthOfYearContrast(data) {
 		method: 'post',
 		data: data
 	});
-}
\ No newline at end of file
+}
diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js
index 065bce68..cfa39b24 100644
--- a/src/api/mes/reportWork.js
+++ b/src/api/mes/reportWork.js
@@ -81,7 +81,29 @@ export function getLineChartData() {
 		method: 'get'
 	});
 }
-
+// 首页-各线体当日计划产量(横向柱状图)
+export function getLineProData(data) {
+	return request({
+		url: '/mes/reportWork/getLineProData',
+		method: 'post',
+		params: data
+	});
+}
+// 首页-当月各日实际产量(单折线图，
+export function getMonthProData() {
+	return request({
+		url: '/mes/reportWork/getMonthProData',
+		method: 'get',
+	});
+}
+// 首页-当日产品产量(饼图)
+export function getProductProData(data) {
+	return request({
+		url: '/mes/reportWork/getProductProData',
+		method: 'post',
+		params: data,
+	});
+}
 // 获取组线每月设备故障数
 export function getGroupLineEquInfo() {
   return request({
diff --git a/src/api/technology/proroute.js b/src/api/technology/proroute.js
index 4f222501..18995d4c 100644
--- a/src/api/technology/proroute.js
+++ b/src/api/technology/proroute.js
@@ -59,3 +59,15 @@ export function syncSAP() {
 		method: 'post'
 	});
 }
+
+//同步制定产品的sap工艺
+export function syncProductSAP(productCodes) {
+  const data = {
+    productCodes
+  }
+  return request({
+    url: '/technology/pro/proroute/syncProductSAP',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 0bae3692..5ce0f2de 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -135,7 +135,7 @@ export const constantRoutes = [
   // 包装线产线生产看板
   {
     path: "/kanban/Packagingline",
-    component: () => import("@/views/kanban/Packagingline/index"),
+    component: () => import("@/views/kanban/Packagingline/index2"),
     hidden: true,
   },
 
diff --git a/src/views/dashboard/DeviceChartLine.vue b/src/views/dashboard/DeviceChartLine.vue
index 7ee95078..934b8cfa 100644
--- a/src/views/dashboard/DeviceChartLine.vue
+++ b/src/views/dashboard/DeviceChartLine.vue
@@ -1,7 +1,7 @@
 
 <template>
   <div>
-    <div ref="chart" style="width:90%;height:300px"></div>
+    <div ref="chart" style="width:90%;height:260px"></div>
   </div>
 
 </template>
diff --git a/src/views/dashboard/LineChart copy.vue b/src/views/dashboard/LineChart copy.vue
deleted file mode 100644
index 8e002588..00000000
--- a/src/views/dashboard/LineChart copy.vue	
+++ /dev/null
@@ -1,136 +0,0 @@
-<template>
-  <div :class="className" :style="{height:height,width:width}" />
-</template>
-
-<script>
-import * as echarts from 'echarts'
-require('echarts/theme/macarons') // echarts theme
-import resize from './mixins/resize'
-
-export default {
-  mixins: [resize],
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
-    },
-    width: {
-      type: String,
-      default: '100%'
-    },
-    height: {
-      type: String,
-      default: '350px'
-    },
-    autoResize: {
-      type: Boolean,
-      default: true
-    },
-    chartData: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-      chart: null,
-       lineChartData: lineChartData
-    }
-  },
-  watch: {
-    chartData: {
-      deep: true,
-      handler(val) {
-        this.setOptions(val)
-      }
-    }
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.initChart()
-    })
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(this.$el, 'macarons')
-      this.setOptions(this.chartData)
-    },
-    setOptions({ expectedData, actualData } = {}) {
-      this.chart.setOption({
-        xAxis: {
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-          boundaryGap: false,
-          axisTick: {
-            show: false
-          }
-        },
-        grid: {
-          left: 10,
-          right: 10,
-          bottom: 20,
-          top: 30,
-          containLabel: true
-        },
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'cross'
-          },
-          padding: [5, 10]
-        },
-        yAxis: {
-          axisTick: {
-            show: false
-          }
-        },
-        legend: {
-          data: ['expected', 'actual']
-        },
-        series: [{
-          name: 'expected', itemStyle: {
-            normal: {
-              color: '#FF005A',
-              lineStyle: {
-                color: '#FF005A',
-                width: 2
-              }
-            }
-          },
-          smooth: true,
-          type: 'line',
-          data: expectedData,
-          animationDuration: 2800,
-          animationEasing: 'cubicInOut'
-        },
-        {
-          name: 'actual',
-          smooth: true,
-          type: 'line',
-          itemStyle: {
-            normal: {
-              color: '#3888fa',
-              lineStyle: {
-                color: '#3888fa',
-                width: 2
-              },
-              areaStyle: {
-                color: '#f3f8ff'
-              }
-            }
-          },
-          data: actualData,
-          animationDuration: 2800,
-          animationEasing: 'quadraticOut'
-        }]
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/dashboard/LineChart.vue b/src/views/dashboard/LineChart.vue
index 59455010..d0352323 100644
--- a/src/views/dashboard/LineChart.vue
+++ b/src/views/dashboard/LineChart.vue
@@ -30,7 +30,8 @@
       },
       chartData: {
         type: Object,
-        required: true
+        required: true,
+        default: {},
       }
     },
     data() {
diff --git a/src/views/dashboard/LineChartshadow.vue b/src/views/dashboard/LineChartshadow.vue
new file mode 100644
index 00000000..c3b70fa5
--- /dev/null
+++ b/src/views/dashboard/LineChartshadow.vue
@@ -0,0 +1,203 @@
+<template>
+  <div :class="className" :style="{ height: height, width: width }" />
+</template>
+
+<script>
+import * as echarts from "echarts";
+require("echarts/theme/macarons"); // echarts theme
+import resize from "./mixins/resize";
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: "chart",
+    },
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "300px",
+    },
+    autoResize: {
+      type: Boolean,
+      default: true,
+    },
+    chartData: {
+      type: Object,
+      // required: true,
+      default: {},
+    },
+  },
+  data() {
+    return {
+      chart: null,
+    };
+  },
+  watch: {
+    chartData: {
+      deep: true,
+      handler(newValue, oldValue) {
+        this.chart.dispose();
+        this.chartData = newValue;
+        this.initChart(); //值发生改变则渲染一次echarts
+      },
+    },
+  },
+  mounted() {
+    // debugger
+    this.$nextTick(() => {
+      this.initChart();
+    });
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return;
+    }
+    this.chart.dispose();
+    this.chart = null;
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, "macarons");
+      this.setOptions(this.chartData);
+    },
+
+    setOptions({ seriesNames, xAxisDatas, seriesDatas } = {}) {
+      var fontColor = "#30eee9";
+      var yDatas = [];
+      var xAxisDatas = [];
+      if (this.chartData) {
+        xAxisDatas = this.chartData.xAxisDatas;
+        yDatas = this.chartData.yDatas;
+      }
+      let max = Math.max(...yDatas);
+      this.chart.setOption({
+        grid: {
+          left: "5%",
+          right: "5%",
+          top: "10%",
+          bottom: "0%",
+          containLabel: true,
+        },
+        tooltip: {
+          show: true,
+          trigger: "item",
+        },
+        legend: {
+          show: true,
+          x: "center",
+          y: "35",
+          icon: "stack",
+          itemWidth: 10,
+          itemHeight: 10,
+          textStyle: {
+            color: "#1bb4f6",
+          },
+          data: ["已采纳", "已发布", "浏览量"],
+        },
+        xAxis: [
+          {
+            type: "category",
+            boundaryGap: false,
+            axisLabel: {
+              color: fontColor,
+            },
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: "#397cbc",
+              },
+            },
+            axisTick: {
+              show: false,
+            },
+            splitLine: {
+              show: false,
+              lineStyle: {
+                color: "#195384",
+              },
+            },
+            data: xAxisDatas,
+          },
+        ],
+        yAxis: [
+          {
+            type: "value",
+            name: "数量(箱)",
+            min: 0,
+            max: max + 100,
+            axisLabel: {
+              formatter: "{value}",
+              textStyle: {
+                color: "#2ad1d2",
+              },
+            },
+            axisLine: {
+              lineStyle: {
+                color: "#27b4c2",
+              },
+            },
+            axisTick: {
+              show: false,
+            },
+            splitLine: {
+              show: false,
+              lineStyle: {
+                color: "#11366e",
+              },
+            },
+          },
+        ],
+        series: [
+          {
+            name: "产量",
+            type: "line",
+            symbol: "circle",
+            symbolSize: 8,
+            smooth: false,
+            itemStyle: {
+              normal: {
+                color: "#0092f6",
+                lineStyle: {
+                  color: "#0092f6",
+                  width: 1,
+                },
+                areaStyle: {
+                  //color: '#94C9EC'
+                  color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                    {
+                      offset: 0,
+                      color: "rgba(7,44,90,0.3)",
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(0,146,246,0.9)",
+                    },
+                  ]),
+                },
+                label: {
+                  show: true,
+                  position: "top",
+                },
+              },
+            },
+            markPoint: {
+              itemStyle: {
+                normal: {
+                  color: "red",
+                },
+              },
+            },
+            data: yDatas,
+            // data:[]
+          },
+        ],
+      });
+    },
+  },
+};
+</script>
diff --git a/src/views/dashboard/PieChart3.vue b/src/views/dashboard/PieChart3.vue
new file mode 100644
index 00000000..f68bbc8f
--- /dev/null
+++ b/src/views/dashboard/PieChart3.vue
@@ -0,0 +1,210 @@
+<template>
+  <div :class="className" :style="{ height: height, width: width }" />
+</template>
+
+<script>
+import * as echarts from "echarts";
+require("echarts/theme/macarons"); // echarts theme
+import resize from "./mixins/resize";
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: "chart",
+    },
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "230px",
+    },
+    chartData: {
+      type: Array,
+      default: [],
+    },
+  },
+  data() {
+    return {
+      chart: null,
+    };
+  },
+
+  watch: {
+    chartData: {
+      deep: true,
+      handler(newValue, oldValue) {
+        this.chart.dispose();
+        this.chartData = newValue;
+        this.initChart(); //值发生改变则渲染一次echarts
+      },
+    },
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return;
+    }
+    this.chart.dispose();
+    this.chart = null;
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, "macarons");
+      var ydata = [];
+      var color = [
+        "#8d7fec",
+        "#5085f2",
+        "#e75fc3",
+        "#f87be2",
+        "#f2719a",
+        "#fca4bb",
+        "#f59a8f",
+        "#fdb301",
+        "#57e7ec",
+        "#cf9ef1",
+      ];
+      var xdata = [];
+      if (this.chartData) {
+        this.chartData.forEach((item) => {
+          let a = {};
+          a.name = item.productName;
+          a.value = item.quantitySplit;
+          xdata.push(item.productName);
+          ydata.push(a);
+        });
+      }
+      this.chart.setOption({
+        // backgroundColor: "rgba(255,255,255,1)",
+        color: color,
+        legend: {
+          orient: "vartical",
+          x: "left",
+          top: "0%",
+          left: "35%",
+          bottom: "0%",
+          data: xdata,
+          itemWidth: 8,
+          itemHeight: 8,
+          itemGap: 16,
+          textStyle: {
+            fontSize: 10, // 设置字体大小为14px
+          },
+          /*formatter:function(name){
+	      var oa = option.series[0].data;
+	      var num = oa[0].value + oa[1].value + oa[2].value + oa[3].value+oa[4].value + oa[5].value + oa[6].value + oa[7].value+oa[8].value + oa[9].value ;
+	      for(var i = 0; i < option.series[0].data.length; i++){
+              if(name==oa[i].name){
+              	return ' '+name + '    |    ' + oa[i].value + '    |    ' + (oa[i].value/num * 100).toFixed(2) + '%';
+              }
+	      }
+	    }*/
+
+          formatter: function (name) {
+            return "" + name;
+          },
+        },
+        series: [
+          {
+            type: "pie",
+            clockwise: false, //饼图的扇区是否是顺时针排布
+            minAngle: 2, //最小的扇区角度（0 ~ 360）
+            radius: ["50%", "85%"],
+            center: ["20%", "50%"],
+            avoidLabelOverlap: false,
+            itemStyle: {
+              //图形样式
+              normal: {
+                borderColor: "#ffffff",
+                borderWidth: 6,
+              },
+            },
+            label: {
+              normal: {
+                show: false,
+                position: "center",
+                formatter: "{text|{b}}\n{c} 箱({d}%)",
+                rich: {
+                  text: {
+                    color: "#666",
+                    fontSize: 14,
+                    align: "center",
+                    verticalAlign: "middle",
+                    padding: 8,
+                  },
+                  value: {
+                    color: "#8693F3",
+                    fontSize: 20,
+                    align: "center",
+                    verticalAlign: "middle",
+                  },
+                },
+              },
+              emphasis: {
+                show: true,
+                textStyle: {
+                  fontSize: 24,
+                },
+              },
+            },
+            data: ydata,
+          },
+        ],
+      });
+      let dataCount1 = ydata.length;
+      this.chart.on("mouseover", (e) => {
+        this.chart.dispatchAction({
+          type: "highlight",
+          seriesIndex: 0,
+          dataIndex: e.dataIndex,
+        });
+        // 根据当前option中data的length，遍历取消其他高亮
+        for (let i = 0; i < dataCount1; i++) {
+          if (i != e.dataIndex) {
+            this.chart.dispatchAction({
+              type: "downplay",
+              seriesIndex: 0,
+              dataIndex: i,
+            });
+          }
+        }
+      });
+      //鼠标移出后显示之前默认高亮的那块，其他取消高亮
+      this.chart.on("mouseout", (e) => {
+        this.chart.dispatchAction({
+          type: "highlight",
+          seriesIndex: 0,
+          dataIndex: 0,
+        });
+        if (e.dataIndex !== 0) {
+          this.chart.dispatchAction({
+            type: "downplay",
+            seriesIndex: 0,
+            dataIndex: e.dataIndex,
+          });
+        } else {
+          this.chart.dispatchAction({
+            type: "highlight",
+            seriesIndex: 0,
+            dataIndex: 0,
+          });
+        }
+      });
+      setTimeout(() => {
+        this.chart.dispatchAction({
+          type: "highlight",
+          seriesIndex: 0,
+          dataIndex: 1,
+        });
+      }, 500);
+    },
+  },
+};
+</script>
diff --git a/src/views/dashboard/QcChartLine.vue b/src/views/dashboard/QcChartLine.vue
index 20f10328..f95ee8cd 100644
--- a/src/views/dashboard/QcChartLine.vue
+++ b/src/views/dashboard/QcChartLine.vue
@@ -1,7 +1,7 @@
 
 <template>
   <div>
-    <div ref="chart" style="width:90%;height:300px"></div>
+    <div ref="chart" style="width:90%;height:260px"></div>
   </div>
 
 </template>
@@ -26,7 +26,7 @@
       },
       height: {
         type: String,
-        default: '260px'
+        default: '230px'
       },
       autoResize: {
         type: Boolean,
@@ -34,7 +34,8 @@
       },
       chartData: {
         type: Object,
-        required: true
+        required: true,
+        default: {},
       }
     },
     data() {
diff --git a/src/views/dashboard/crossBarChart.vue b/src/views/dashboard/crossBarChart.vue
new file mode 100644
index 00000000..655124f8
--- /dev/null
+++ b/src/views/dashboard/crossBarChart.vue
@@ -0,0 +1,190 @@
+<template>
+  <div :class="className" :style="{ height: height, width: width }" />
+</template>
+
+<script>
+import * as echarts from "echarts";
+require("echarts/theme/macarons"); // echarts theme
+import resize from "./mixins/resize";
+
+const animationDuration = 6000;
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: "chart",
+    },
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "250px",
+    },
+    chartData: {
+      type: Array,
+      default: [],
+    },
+  },
+  data() {
+    return {
+      chart: null,
+    };
+  },
+
+  watch: {
+    chartData: {
+      deep: true,
+      handler(newValue, oldValue) {
+        this.chart.dispose();
+        this.chartData = newValue;
+        this.initChart(); //值发生改变则渲染一次echarts
+      },
+    },
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return;
+    }
+    this.chart.dispose();
+    this.chart = null;
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, "macarons");   
+      let yLabel = [];
+      let yData = [];
+      let yRtData = [];
+      if(this.chartData.length>0){
+        this.chartData.forEach((item) => {
+          yLabel.push(item.machineName)
+          yData.push(item.quantitySplit)
+          yRtData.push(item.quantitySplit)
+        });
+      }
+      this.chart.setOption({
+        grid: {
+          left: "5%",
+          right: "5%",
+          bottom: "10%",
+          top: "5%",
+          containLabel: true,
+        },
+        tooltip: {
+          show: true,
+          trigger: "axis", //axis , item
+          backgroundColor: "RGBA(0, 49, 85, 1)",
+          borderColor: "rgba(0, 151, 251, 1)",
+          borderWidth: 1,
+          borderRadius: 0,
+          axisPointer: {
+            type: "none",
+            // show:false
+          },
+          textStyle: {
+            color: "#BCE9FC",
+            fontSize: 16,
+            align: "left",
+          },
+          formatter: function (a) {
+            return a[0].seriesName + "：" + a[0].value;
+          },
+        },
+        // backgroundColor: "#031d33",
+        xAxis: {
+          name:'箱',
+          show: true,
+          type: "value",
+          // data:xData
+          splitNumber: 7,
+          axisLabel: {
+            //坐标轴刻度标签的相关设置。
+            interval: 0, //设置为 1，表示『隔一个标签显示一个标签』
+            //	margin:15,
+            textStyle: {
+              // color: "rgba(128, 207, 240, 1)",
+              fontStyle: "normal",
+              fontSize: 16,
+              // fontWeight: 'bolder'
+            },
+          },
+        },
+        yAxis: [
+          {
+            type: "category",
+            inverse: true,
+            axisLabel: {
+              show: true,
+              margin: 15,
+              textStyle: {
+                fontSize: "16",
+                fontWeight: "bolder",
+              },
+            },
+            splitLine: {
+              show: false,
+            },
+            axisTick: {
+              show: false,
+            },
+            axisLine: {
+              show: false,
+            },
+            data: yLabel,
+          },
+          {
+            type: "category",
+            inverse: true,
+            axisTick: "none",
+            axisLine: "none",
+            show: true,
+            axisLabel: {
+              textStyle: {
+                color: "rgba(128, 207, 240, 1)",
+                fontSize: "16",
+              },
+              formatter: function (value) {
+                return  value;
+              },
+            },
+            data: yRtData,
+          },
+        ],
+        series: [
+          {
+            name: "数量",
+            type: "bar",
+            zlevel: 1,
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+                  {
+                    offset: 1,
+                    color: "#0097FB",
+                  },
+                  {
+                    offset: 0,
+                    color: "#30ECA6",
+                  },
+                ]),
+                // shadowBlur: 0,
+                // shadowColor: 'rgba(87,220,222,0.7)',
+              },
+            },
+            barWidth: 18,
+            data: yData,
+          },
+        ],
+      });
+    },
+  },
+};
+</script>
diff --git a/src/views/device/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue
index f4e42354..8271e281 100644
--- a/src/views/device/inspectionPlan/index.vue
+++ b/src/views/device/inspectionPlan/index.vue
@@ -904,7 +904,7 @@ export default {
         for (let i = 0; i < response.data.length; i++) {
           this.personList.push({
             label: response.data[i].nickName + '(' + response.data[i].userName + ')',
-            key: response.data[i].userId,
+            key: response.data[i].userName,
           })
         }
       });
diff --git a/src/views/device/spotCheckPlan/index.vue b/src/views/device/spotCheckPlan/index.vue
index 3af934db..47b5d03b 100644
--- a/src/views/device/spotCheckPlan/index.vue
+++ b/src/views/device/spotCheckPlan/index.vue
@@ -949,7 +949,7 @@ export default {
         for (let i = 0; i < response.data.length; i++) {
           this.personList.push({
             label: response.data[i].nickName + '(' + response.data[i].userName + ')',
-            key: response.data[i].userId,
+            key: response.data[i].userName,
           })
         }
       });
diff --git a/src/views/index.vue b/src/views/index.vue
index 0fcfcd1b..d64975b8 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,17 +1,72 @@
 <template>
   <div class="app-container home">
-    <el-row :gutter="20">
+    <div class="top">
+      <div class="echartsbox1">
+        <div class="titlename">各线体当日计划产量</div>
+        <crossBarChart :chart-data="crossBarChart" ref="crossBarChart" />
+        <div class="el-date-picker">
+          <el-date-picker
+            v-model="value1"
+            type="date"
+            format="yyyy-MM-dd"
+            placeholder="选择日期"
+            @change="changecrossBarChart"
+          >
+          </el-date-picker>
+        </div>
+      </div>
+      <div class="echartsbox1 echartsbox2">
+        <div class="titlename">当日产品产量</div>
+        <PieChart3 :chart-data="PieChart3Data" ref="PieChart3" />
+        <div class="el-date-picker">
+          <el-date-picker
+            v-model="value2"
+            format="yyyy-MM-dd"
+            type="date"
+            placeholder="选择日期"
+            @change="changePieChart3Data"
+          >
+          </el-date-picker>
+        </div>
+      </div>
+    </div>
+    <div class="content">
+      <div class="echartsbox3">
+        <div class="titlename">
+          {{ titlename }}
+        </div>
+        <div style="">
+          <LineChartshadow :chart-data="lineChartData" ref="lineChart" />
+        </div>
+      </div>
+    </div>
+    <div class="bottom">
+      <div class="echartsbox4">
+        <div class="titlename">各线体设备月故障数</div>
+        <DeviceChartLine
+          :chart-data="deviceChartLineData"
+          ref="DeviceChartLine"
+        />
+      </div>
+      <div class="echartsbox4 echartsbox5">
+        <div class="titlename">各车间生产不良率</div>
+        <QcChartLine :chart-data="qcChartLineData" ref="QcChartLine" />
+      </div>
+    </div>
+    <!-- <el-row :gutter="20">
       <el-col :sm="24" :lg="24">
-         <span style="font-size: 20px;margin: 40%;color: cadetblue;">{{title}}</span>
+        <span style="font-size: 20px; margin: 40%; color: cadetblue">{{
+          titlename
+        }}</span>
       </el-col>
     </el-row>
     <el-row :gutter="20">
       <el-col :span="24">
-        <div style="border: 1px solid #cfdee4;">
-        <line-chart :chart-data="lineChartData" ref="lineChart"/>
+        <div style="border: 1px solid #cfdee4">
+          <line-chart :chart-data="lineChartData" ref="lineChart" />
         </div>
       </el-col>
-    </el-row>
+    </el-row> -->
     <!--
      <el-row :gutter="20">
       <el-col :span="12">
@@ -21,30 +76,48 @@
         <pie-chart ref="pieChart2"/>
       </el-col>
     </el-row>-->
-    <el-row :gutter="20">
+    <!-- <el-row :gutter="20">
       <el-col :span="12">
-        <span style="font-size: 18px;padding: 1% 39%;color: cadetblue;">各线体设备月故障数</span>
+        <span style="font-size: 18px; padding: 1% 39%; color: cadetblue"
+          >各线体设备月故障数</span
+        >
       </el-col>
       <el-col :span="12">
-        <span style="font-size: 18px;padding: 1% 39%;color: cadetblue;">各车间生产不良率</span>
+        <span style="font-size: 18px; padding: 1% 39%; color: cadetblue"
+          >各车间生产不良率</span
+        >
       </el-col>
     </el-row>
     <el-row :gutter="20">
       <el-col :span="12">
-        <DeviceChartLine :chart-data="deviceChartLineData" ref="DeviceChartLine"/>
+        <DeviceChartLine
+          :chart-data="deviceChartLineData"
+          ref="DeviceChartLine"
+        />
       </el-col>
       <el-col :span="12">
-        <QcChartLine :chart-data="qcChartLineData" ref="QcChartLine"/>
+        <QcChartLine :chart-data="qcChartLineData" ref="QcChartLine" />
       </el-col>
-    </el-row>
+    </el-row> -->
   </div>
 </template>
 
 <script>
-import LineChart from './dashboard/LineChart';
-import PieChart from './dashboard/PieChart';
-import PieChart2 from './dashboard/PieChart2';
-import {getGroupLineEquInfo, getLineChartData,getLineQcData} from '@/api/mes/reportWork'
+import LineChart from "./dashboard/LineChart";
+import LineChartshadow from "./dashboard/LineChartshadow";
+import crossBarChart from "./dashboard/crossBarChart";
+import PieChart from "./dashboard/PieChart";
+import PieChart2 from "./dashboard/PieChart2";
+import PieChart3 from "./dashboard/PieChart3";
+import moment from "moment";
+import {
+  getGroupLineEquInfo,
+  getLineChartData,
+  getLineQcData,
+  getLineProData,
+  getMonthProData,
+  getProductProData,
+} from "@/api/mes/reportWork";
 import DeviceChartLine from "./dashboard/DeviceChartLine";
 import QcChartLine from "./dashboard/QcChartLine";
 export default {
@@ -52,30 +125,72 @@ export default {
   components: {
     DeviceChartLine,
     QcChartLine,
-    LineChart//,PieChart,PieChart2
+    LineChart, //,PieChart,PieChart2
+    crossBarChart,
+    PieChart3,
+    LineChartshadow,
   },
   data() {
     return {
       // 版本号
       version: "1.0.0",
       lineChartData: null,
-      deviceChartLineData:null,
-      qcChartLineData:null,
-      title:"本月工厂产量"
+      deviceChartLineData: null,
+      qcChartLineData: null,
+      titlename: "本月工厂产量",
+      crossBarChart: null,
+      PieChart3Data: null,
+      value1: null,
+      value2: null,
     };
   },
   created() {
-		this.getLineChartData();
-    
-	},
+    this.getLineChartData();
+  },
+
+  mounted() {
+    // this.datetime = moment().subtract(2, "day").format("yyyy-MM-DD");
+    this.value1 = moment().format("yyyy-MM-DD");
+    this.value2 = moment().format("yyyy-MM-DD");
+    this.getLineProData();
+    this.getProductProData();
+    this.getMonthProData();
+  },
   methods: {
     goTarget(href) {
       window.open(href, "_blank");
     },
-    getLineChartData(){
-        getLineChartData().then(data => {
-          this.lineChartData = data;
-        });
+    getLineChartData() {
+      getLineChartData().then((data) => {
+        this.lineChartData = data;
+      });
+    },
+    getLineProData() {
+      getLineProData({
+        productDate: this.value1,
+      }).then((data) => {
+        this.crossBarChart = data;
+      });
+    },
+    getMonthProData() {
+      getMonthProData().then((data) => {
+        this.lineChartData = data;
+      });
+    },
+    getProductProData() {
+      getProductProData({
+        productDate: this.value2,
+      }).then((data) => {
+        this.PieChart3Data = data;
+      });
+    },
+    changecrossBarChart() {
+      this.value1 = moment(this.value1).format("yyyy-MM-DD");
+      this.getLineProData();
+    },
+    changePieChart3Data() {
+      this.value2 = moment(this.value2).format("yyyy-MM-DD");
+      this.getProductProData();
     },
     /**
     getGroupLineEquInfo(){
@@ -150,5 +265,96 @@ export default {
     }
   }
 }
+.app-container {
+  background: #d8e9fd;
+  height: calc(100vh - 84px);
+  overflow-y: scroll;
+  .top {
+    width: 100%;
+    display: flex;
+    .echartsbox1 {
+      position: relative;
+      width: 49.5%;
+      height: 270px;
+      background: #ffffff;
+      border-radius: 15px;
+      margin-right: 10px;
+      .titlename {
+        padding: 10px;
+        font-size: 20px;
+        color: #ffffff;
+        background-color: #547bfe;
+        box-sizing: border-box;
+        border-radius: 15px 15px 0px 0px;
+      }
+    }
+    .echartsbox2 {
+      position: relative;
+      width: 49.5%;
+      background: #ffffff;
+      border-radius: 15px;
+      margin-right: 0px;
+      padding-bottom: 10px;
+      .titlename {
+        background-color: #42c6f3;
+      }
+    }
+  }
+  .content {
+    margin-top: 10px;
+    .echartsbox3 {
+      position: relative;
+      width: 100%;
+      height: 370px;
+      background: #ffffff;
+      border-radius: 15px;
+      margin-right: 10px;
+      .titlename {
+        padding: 10px;
+        font-size: 20px;
+        color: #ffffff;
+        background-color: #58dc91;
+        box-sizing: border-box;
+        border-radius: 15px 15px 0px 0px;
+      }
+    }
+  }
+  .bottom {
+    margin-top: 10px;
+    display: flex;
+    .echartsbox4 {
+      position: relative;
+      width: 50%;
+      height: 324px;
+      background: #ffffff;
+      border-radius: 15px;
+      margin-right: 10px;
+      .titlename {
+        padding: 10px;
+        font-size: 20px;
+        color: #ffffff;
+        background-color: #d4d52b;
+        box-sizing: border-box;
+        border-radius: 15px 15px 0px 0px;
+      }
+    }
+    .echartsbox5 {
+      position: relative;
+      margin-right: 0px;
+      .titlename {
+        background-color: #ff7168;
+      }
+    }
+  }
+}
+.el-date-picker {
+  position: absolute;
+  right: -90px;
+  top: 8px;
+  height: 60px;
+}
+::v-deep .el-input--medium .el-input__inner {
+  height: 32px;
+}
 </style>
 
diff --git a/src/views/kanban/Packagingline/index2.vue b/src/views/kanban/Packagingline/index2.vue
new file mode 100644
index 00000000..0402e0fd
--- /dev/null
+++ b/src/views/kanban/Packagingline/index2.vue
@@ -0,0 +1,1697 @@
+<template>
+  <v-scale-screen width="1920" height="1080" :fullScreen="false">
+    <div class="app-container home" style="">
+      <div class="head">
+        <div class="head-content">
+          <div class="title">包装线产线生产看板</div>
+        </div>
+        <div class="head-logo">
+          <img src="../../../assets/images/logo.png" alt="" />
+        </div>
+        <div class="back">
+          <el-button
+            @click="back()"
+            type="primary"
+            icon="el-icon-s-home"
+          ></el-button>
+        </div>
+      </div>
+      <div class="content-top">
+        <div class="factoryCode">
+          <div class="selectborder">
+            <select
+              v-model="selectxt"
+              class="select1"
+              @change="selectline(selectxt)"
+            >
+              <option
+                :key="index"
+                :value="x.parentName"
+                v-for="(x, index) in getLineList"
+              >
+                {{ x.deptName }}
+              </option>
+              <!-- <option :key="index" :value="x.seriesName" v-for="(x, index) in ceshib">{{ x.seriesName }}</option> -->
+            </select>
+          </div>
+          <div class="selectborder selectborder1">
+            <select
+              v-model="selectxtclasses"
+              class="select1"
+              @change="selectline2(selectxtclasses)"
+            >
+              <option
+                :key="index"
+                :value="x.equCode"
+                v-for="(x, index) in dictDatatype"
+              >
+                {{ x.equName }}
+              </option>
+            </select>
+          </div>
+        </div>
+        <div class="timebox">
+          <div class="time">
+            {{ gettimedata }}
+          </div>
+        </div>
+      </div>
+      <div class="content">
+        <div class="itemleft" style="margin-right: 10px">
+          <div class="item-table item-table1" style="margin-bottom: 10px">
+            <div class="yield">
+              <div class="yieldbox">
+                <div class="yieldtitle">
+                  <div class="yieldname">当日计划产量</div>
+                </div>
+                <div class="yieldnumber">
+                  <div
+                    class="numberbox"
+                    :key="index"
+                    v-for="(n, index) in planProduction"
+                  >
+                    <div class="number">{{ n }}</div>
+                  </div>
+                </div>
+              </div>
+              <div class="yieldbox">
+                <div class="yieldtitle">
+                  <div class="yieldname">产线目前产量</div>
+                </div>
+                <div class="yieldnumber">
+                  <div
+                    class="numberbox"
+                    :key="index"
+                    v-for="(n, index) in actProduction"
+                  >
+                    <div class="number">{{ n }}</div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="yield" style="margin-top: 10px">
+              <div class="yieldbox">
+                <div class="yieldtitle">
+                  <div class="yieldname">工单详情</div>
+                </div>
+              </div>
+            </div>
+            <div class="yieldtable" style="margin-top: 10px">
+              <table
+                class="table-thead"
+                border="0"
+                cellpadding="0"
+                cellspacing="0"
+              >
+                <thead>
+                  <tr style="height: 36px">
+                    <td style="width: 8%">工单号</td>
+                    <!-- <td style="width: 8%;">异常单号</td> -->
+                    <td style="width: 16%">产品名称</td>
+                    <td style="width: 14%">批次号</td>
+                    <td style="width: 8%">计划数量</td>
+                    <td style="width: 8%">完成数量</td>
+                  </tr>
+                </thead>
+              </table>
+              <div class="table-tbody">
+                <!-- 	{workorderCodeSap:订单编码
+	 productName：产品名称
+	 batchCode：批次编码
+	 quantitySplit：批次数量
+	 quantityProduced：已生产数量
+	} -->
+                <!-- <vue-seamless-scroll :data="getlistcx" :class-option="classOption" class="wrapscroll"> -->
+                <table border="0" cellpadding="0" cellspacing="0">
+                  <tbody>
+                    <tr
+                      :class="[index % 2 == 1 ? 'active1' : 'active2']"
+                      style="height: 44px"
+                      :key="index"
+                      v-for="(n, index) in orderdetail"
+                    >
+                      <td style="width: 8%">{{ n.workorderCodeSap }}</td>
+                      <!-- <td style="width: 8%;">{{ n.orderNo }}</td> -->
+                      <td style="width: 16%">{{ n.productName }}</td>
+                      <td style="width: 12%">{{ n.batchCode }}</td>
+                      <td style="width: 8%">{{ n.quantitySplit }}</td>
+                      <td style="width: 8%">{{ n.quantityProduced }}</td>
+                    </tr>
+                  </tbody>
+                </table>
+                <!-- </vue-seamless-scroll> -->
+              </div>
+            </div>
+          </div>
+          <div class="itemleft-bottom">
+            <div class="item-table1">
+              <div class="titlebox" style="margin-bottom: 14px">
+                <div class="titlename">近15日产线趋势图</div>
+              </div>
+              <div
+                id="echart6"
+                style="margin: auto; width: 1170px; height: 244.15px"
+              ></div>
+            </div>
+          </div>
+        </div>
+        <div class="itemright">
+          <div class="item-table item-table1">
+            <div class="titlebox" style="margin-bottom: 14px">
+              <div class="titlename">产线信息</div>
+            </div>
+            <div class="titlebox2" style="margin-bottom: 17px">
+              <div class="icon">
+                <img
+                  src="../../../assets/images/packagingline/bg-title3.png"
+                  alt=""
+                />
+              </div>
+              <div class="titlename">当前工单信息</div>
+            </div>
+            <div class="table-tbody">
+              <!-- <vue-seamless-scroll :data="getlistcx" :class-option="classOption" class="wrapscroll"> -->
+              <table border="0" cellpadding="0" cellspacing="0">
+                <tbody>
+                  <tr style="height: 48px">
+                    <td
+                      style="
+                        width: 4%;
+                        background-color: #081831;
+                        border-right: 1px solid #6c8097;
+                      "
+                    >
+                      工单号
+                    </td>
+                    <!-- <td style="width: 8%;">{{ n.orderNo }}</td> -->
+                    <td style="width: 8%">
+                      <span v-if="workOrder">{{
+                        workOrder.workorderCodeSap
+                      }}</span>
+                    </td>
+                  </tr>
+                  <tr style="height: 48px">
+                    <td
+                      style="
+                        width: 4%;
+                        background-color: #081831;
+                        border-right: 1px solid #6c8097;
+                      "
+                    >
+                      产品名称
+                    </td>
+                    <!-- <td style="width: 8%;">{{ n.orderNo }}</td> -->
+                    <td style="width: 8%">
+                      <span v-if="workOrder">{{ workOrder.productName }}</span>
+                    </td>
+                  </tr>
+                  <tr style="height: 48px">
+                    <td
+                      style="
+                        width: 4%;
+                        background-color: #081831;
+                        border-right: 1px solid #6c8097;
+                      "
+                    >
+                      产品编码
+                    </td>
+                    <!-- <td style="width: 8%;">{{ n.orderNo }}</td> -->
+                    <td style="width: 8%">
+                      <span v-if="workOrder">{{ workOrder.productCode }}</span>
+                    </td>
+                  </tr>
+                  <tr style="height: 48px">
+                    <td
+                      style="
+                        width: 4%;
+                        background-color: #081831;
+                        border-right: 1px solid #6c8097;
+                      "
+                    >
+                      产线编码/名称
+                    </td>
+                    <!-- <td style="width: 8%;">{{ n.orderNo }}</td> -->
+                    <td style="width: 8%">
+                      <span v-if="workOrder"
+                        >{{ workOrder.equCode }}/{{ workOrder.equName }}</span
+                      >
+                    </td>
+                  </tr>
+
+                  <tr style="height: 48px">
+                    <td
+                      style="
+                        width: 4%;
+                        background-color: #081831;
+                        border-right: 1px solid #6c8097;
+                      "
+                    >
+                      数量/单位
+                    </td>
+                    <!-- <td style="width: 8%;">{{ n.orderNo }}</td> -->
+                    <td style="width: 8%">
+                      <span v-if="workOrder"
+                        >{{ workOrder.totalNum }}/{{ workOrder.unit }}</span
+                      >
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+              <!-- </vue-seamless-scroll> -->
+            </div>
+            <div
+              class="titlebox2"
+              style="margin-bottom: 17px; margin-top: 19px"
+            >
+              <div class="icon">
+                <img
+                  src="../../../assets/images/packagingline/bg-title3.png"
+                  alt=""
+                />
+              </div>
+              <div class="titlename">产线质量信息</div>
+            </div>
+            <div class="Totalnumberbox">
+              <div class="Totalnumber">
+                <div class="number1">巡检次数</div>
+                <div v-if="taskNum" class="number2">{{ taskNum.taskNum }}</div>
+              </div>
+              <div class="Totalnumber Totalnumber1">
+                <div class="number1">巡检抽样数量</div>
+                <div v-if="taskSampleNum" class="number2">
+                  {{ taskSampleNum.taskSampleNum }}
+                </div>
+              </div>
+            </div>
+            <div
+              id="echart5"
+              style="margin: auto; width: 570px; height: 374.15px"
+            ></div>
+          </div>
+        </div>
+      </div>
+      <!-- <div class="item"></div> -->
+      <!-- <div class="item"></div> -->
+    </div>
+  </v-scale-screen>
+</template>
+
+<script>
+import {
+  getBoardFactory,
+  getProduceStaticInfo,
+  getProduceNoOkList,
+  getCheckProjectsPie,
+  getProMonthNoOk,
+  getLineDayNoOk,
+  getMonthOfYearContrast,
+} from "@/api/kanban/quality";
+import {
+  getDictData,
+  getProduction15Days,
+  getProductionLineInfo,
+  getPorOrderList,
+} from "@/api/kanban/Packagingline";
+import { getDeviceRefreshTime } from "@/api/kanban/equipment";
+import * as echarts from "echarts";
+import moment from "moment";
+// import Echarts3D from "./echarts3d.vue";
+// import Echarts3D2 from "./echarts3d2.vue";
+export default {
+  name: "Index",
+  components: {},
+  data() {
+    return {
+      gettimedata: "",
+      selectxt: null,
+      selectxtclasses: null,
+      getLineList: [],
+      classesList: [],
+      number1: 0,
+      number2: 0,
+      number3: 0,
+      number4: 0,
+      nameList: [],
+      valueList: [1639, 1422, 1306, 1131, 1040, 732, 1040, 732],
+      optionDatalist1: [],
+      optionDatalist2: [],
+      optionDatalist3: [],
+      optionDatalist4: [],
+      optionDatalist5: [],
+      optionDatalist6: [],
+      colorlist: ["#005aff", "#f8b551"],
+      datetime: null,
+      time1: null,
+      getlist: [],
+      repairlist: [],
+      orderdetail: [],
+      packaginglinerepairlist: [],
+      packaginglinestabilizelist: [],
+      packaginglineinfo: [],
+      ordermessage: [],
+      RefreshTime: null,
+      dictDatatype: [],
+      Realtimebox: [
+        { name: "发片数量", number: 888 },
+        { name: "理片数量", number: 888 },
+        { name: "支架数量", number: 888 },
+        { name: "包膜数量", number: 888 },
+      ],
+      Realtimebox2: [
+        { name: "发片数量", number: 888 },
+        { name: "理片数量", number: 888 },
+        { name: "支架数量", number: 888 },
+        { name: "包膜数量", number: 888 },
+      ],
+      workOrder: {},
+      piedata: {},
+      taskNum: {},
+      taskSampleNum: {},
+      // 当日计划产量
+      planProduction: [],
+      // 当日实际产量
+      actProduction: [],
+      ceshitable: [{}, {}, {}, {}, {}, {}],
+    };
+  },
+  created() {},
+  destroyed() {
+    clearInterval(this.time1);
+    this.time1 = null;
+  },
+  mounted() {
+    // this.datetime = moment().subtract(2, "day").format("yyyy-MM-DD");
+    //console.log('zhuanhuahou',this.dateRangeone)
+    // this.getdatalist(this.selectxt)
+    this.selectfactoryCodelist();
+
+    this.gettime();
+  },
+  methods: {
+    back() {
+      this.$router.push({ path: "/index" });
+    },
+    gettime() {
+      this.gettimedata = moment().format("YYYY-MM-DD HH:mm:ss ");
+      setInterval(() => {
+        this.gettimedata = moment().format("YYYY-MM-DD HH:mm:ss ");
+      }, 1000);
+    },
+    selectfactoryCodelist() {
+      const _this = this;
+      getBoardFactory({
+        factory: null,
+      }).then((response) => {
+        if (response.data) {
+          _this.getLineList = response.data;
+          _this.selectxt = _this.getLineList[0].parentName;
+          _this.getDictData();
+        }
+      });
+    },
+    getDeviceRefreshTime() {
+      const _this = this;
+      getDeviceRefreshTime().then((response) => {
+        if (response) {
+          this.RefreshTime = response.data;
+          this.time1 = setInterval(() => {
+            _this.getdatalist(_this.selectxt);
+          }, 1000 * 60 * this.RefreshTime);
+        }
+      });
+    },
+    getDictData() {
+      const _this = this;
+      getDictData({
+        factoryCode: "ds_" + _this.selectxt,
+        equipmentTypeCode: "equ_type_bzx",
+      }).then((response) => {
+        if (response) {
+          this.dictDatatype = response;
+          _this.selectxtclasses = _this.dictDatatype[0].equCode;
+          _this.getdatalist();
+          _this.getDeviceRefreshTime();
+        }
+      });
+    },
+    getdatalist() {
+      const _this = this;
+      _this.initChart1();
+      _this.piedata = [];
+      getProductionLineInfo({
+        equCode: _this.selectxtclasses,
+        factoryCode: "ds_" + _this.selectxt,
+      }).then((response) => {
+        if (response) {
+          _this.workOrder = response.data.workOrder;
+          _this.taskNum = response.data.taskNum;
+          _this.taskSampleNum = response.data.taskSampleNum;
+          if (response.data.piedata.checkList) {
+            response.data.piedata.checkList.forEach((item) => {
+              let a = {};
+              let b = {};
+              if (item.checkResult == "合格") {
+                a.name = item.checkResult;
+                a.value = item.quality;
+                _this.piedata[0] = a;
+              }
+              if (item.checkResult == "不合格") {
+                b.name = item.checkResult;
+                b.value = item.quality;
+                _this.piedata[1] = b;
+              }
+            });
+            _this.initChart2();
+          }else{
+            _this.initChart3();
+          }
+          
+        }
+      });
+      getPorOrderList({
+        equCode: _this.selectxtclasses,
+        factoryCode: "ds_" + _this.selectxt,
+      }).then((response) => {
+        if (response) {
+          _this.orderdetail = response.data;
+          if (_this.orderdetail.length == 0) {
+            _this.orderdetail = this.ceshitable;
+          }
+        }
+      });
+    },
+    // 订单异常信息
+    selectline() {
+      const _this = this;
+      this.optionDatalist1 = [];
+      this.optionDatalist5 = [];
+      this.optionDatalist6 = [];
+      _this.getDictData(_this.selectxt);
+    },
+    selectline2() {
+      const _this = this;
+      this.optionDatalist1 = [];
+      this.optionDatalist5 = [];
+      this.optionDatalist6 = [];
+      _this.getdatalist(_this.selectxt);
+    },
+    initChart1() {
+      const _this = this;
+      var fontColor = "#D0DEEE";
+      var myChart6 = echarts.init(document.querySelector("#echart6"));
+      var option6 = {
+        grid: {
+          left: "2%",
+          right: "4%",
+          top: "18%",
+          bottom: "1%",
+          containLabel: true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
+            crossStyle: {
+              color: "#999",
+            },
+          },
+        },
+        legend: {
+          show: true,
+          right: "120",
+          y: "10",
+          icon: "stack",
+          itemWidth: 10,
+          itemHeight: 10,
+          textStyle: {
+            color: "#D0DEEE",
+          },
+
+          // nameTextStyle:{
+          //         color: '#D0DEEE'
+          //     },
+          data: ["实际产量", "计划产量"],
+        },
+        xAxis: [
+          {
+            type: "category",
+            boundaryGap: true,
+            axisLabel: {
+              color: fontColor,
+            },
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: "#397cbc",
+              },
+            },
+            axisTick: {
+              show: false,
+            },
+            splitLine: {
+              show: false,
+              lineStyle: {
+                color: "#2B3241",
+              },
+            },
+            data: [],
+          },
+        ],
+        yAxis: [
+          {
+            type: "value",
+            name: "数量",
+            nameTextStyle: {
+              color: "#D0DEEE",
+            },
+            min: 0,
+            max: 1000,
+            axisLabel: {
+              formatter: "{value}",
+              textStyle: {
+                color: "#D0DEEE",
+              },
+            },
+            axisLine: {
+              lineStyle: {
+                color: "#27b4c2",
+              },
+            },
+            axisTick: {
+              show: false,
+            },
+            splitLine: {
+              show: true,
+              lineStyle: {
+                color: "#2B3241",
+              },
+            },
+          },
+        ],
+        series: [
+          {
+            name: "实际产量",
+            data: [],
+            type: "bar",
+            showBackground: true,
+            backgroundStyle: {
+              color: "rgba(180, 180, 180, 0.2)",
+            },
+            itemStyle: {
+              normal: {
+                barBorderRadius: 5,
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  { offset: 0, color: "#586AF2" },
+                  { offset: 1, color: "#1C293A" },
+                ]),
+              },
+            },
+          },
+          {
+            name: "计划产量",
+            type: "line",
+            stack: "总量",
+            symbol: "circle",
+            symbolSize: 8,
+            itemStyle: {
+              normal: {
+                color: "#88E4E3",
+                lineStyle: {
+                  color: "#88E4E3",
+                  width: 1,
+                },
+              },
+            },
+            data: [],
+          },
+          // {
+          //   name: "计划产量",
+          //   data: [],
+          //   type: "bar",
+          //   showBackground: true,
+          //   backgroundStyle: {
+          //     color: "rgba(180, 180, 180, 0.2)",
+          //   },
+          //   itemStyle: {
+          //     normal: {
+          //       barBorderRadius: 5,
+          //       color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          //         { offset: 0, color: "#66E1DF" },
+          //         { offset: 1, color: "#005954" },
+          //       ]),
+          //     },
+          //   },
+          // },
+        ],
+      };
+      myChart6.setOption(option6);
+      getProduction15Days({
+        equCode: _this.selectxtclasses,
+        factoryCode: "ds_" + _this.selectxt,
+      }).then((response) => {
+        if (response) {
+          if (response.data.planProduction.length < 6) {
+            response.data.planProduction = String(
+              response.data.planProduction
+            ).padStart(6, "0");
+          }
+          if (response.data.actProduction.length < 6) {
+            response.data.actProduction = String(
+              response.data.actProduction
+            ).padStart(6, "0");
+          }
+          this.planProduction = response.data.planProduction.split("");
+          this.actProduction = response.data.actProduction.split("");
+
+          let seriesdata1 = response.data.acts;
+          let seriesdata2 = response.data.plans;
+          let xAxisdata = response.data.days;
+          let max1 = Math.max(...seriesdata1) + 200;
+          let max3 = Math.max(...seriesdata2) + 200;
+          let yAxismax1 = 0;
+          if (max1 > max3) {
+            yAxismax1 = max1;
+          } else {
+            yAxismax1 = max3;
+          }
+          option6 = {
+            xAxis: [
+              {
+                data: xAxisdata,
+              },
+            ],
+            yAxis: [
+              {
+                max: yAxismax1,
+              },
+            ],
+            series: [
+              {
+                data: seriesdata1,
+              },
+              {
+                data: seriesdata2,
+              },
+            ],
+          };
+          myChart6.setOption(option6);
+        }
+      });
+    },
+    initChart2() {
+      const _this = this;
+      var data5 = this.piedata;
+      console.log(data5);
+      var myChart5 = echarts.init(document.querySelector("#echart5"));
+      
+      var option5 = {
+        tooltip: {
+          trigger: "item",
+          formatter: "{a} <br/>{b}: {c} ({d}%)",
+        },
+        color: ["#00E7E5", "#1DBEFF"],
+        legend: {
+          left: "left",
+          orient: "vertical",
+          bottom: 10,
+          textStyle: {
+            color: "black",
+            padding: [5, 5, 5, -50],
+            fontWeight: 600,
+          },
+          itemWidth: 50,
+          itemHeight: 22,
+        },
+        series: [
+          {
+            radius: 120,
+            name: "巡检",
+            type: "pie",
+            labelLine: {
+              length: 40,
+              length2: 85,
+            },
+            itemStyle: {
+              borderWidth: 1,
+              shadowBlur: 20,
+              shadowOffsetY: 5,
+            },
+            center: ["50%", "55%"],
+            avoidLabelOverlap: true,
+          
+            data: [
+              {
+                value:
+                  data5[0] && data5[0].name == "合格" ? data5[0].value : 0,
+                name:
+                  data5[0] && data5[0].name == "合格" ? data5[0].name : "合格",
+                selected: true,
+                itemStyle: {
+                  color: "#129E92",
+                  borderColor: "#3FFFE2",
+                  shadowColor: "rgba(63, 255, 226, 0.5)",
+                },
+                labelLine: {
+                  lineStyle: {
+                    color: "#00EAE8",
+                  },
+                },
+                label: {
+                  
+                  // formatter: "{e|}\n{a|}{b|{c}/" + (d !== undefined ? "{d}%" : "") + "}{c|}",
+                  formatter: "{e|}\n{a|}{b|{c}/{d}%}{c|}",
+                  
+                  rich: {
+                    a: {
+                      padding: -33,
+                    },
+                    c: {
+                      padding: [5, 0],
+                      lineHeight: 60,
+                      verticalAlign: "top",
+                      backgroundColor: "#00EAE8",
+                    },
+                    b: {
+                      color: "#00E7E5",
+                      backgroundColor: "rgba(63, 255, 226, 0.2)",
+                      height: 19,
+                      width: 40,
+                      borderRadius: 0,
+                      padding: [5, 25],
+                      verticalAlign: "top",
+                    },
+                    e: {
+                      padding: -10,
+                    },
+                  },
+                },
+              },
+              {
+                value:
+                  data5[1] && data5[1].name == "不合格" ? data5[1].value : 0,
+                name:
+                  data5[1] && data5[1].name == "不合格"
+                    ? data5[1].name
+                    : "不合格",
+                itemStyle: {
+                  color: "#105BA4",
+                  borderColor: "#31B4FF",
+                  shadowColor: "rgba(49, 180, 255, 0.8)",
+                },
+                labelLine: {
+                  lineStyle: {
+                    color: "#07D2FF",
+                  },
+                },
+                label: {
+                  
+                  formatter: "{e|}\n{c|}{b|{c}/{d}%}{a|}",
+                  rich: {
+                    c: {
+             
+                      padding: [5, 0],
+                      lineHeight: 60,
+                      verticalAlign: "top",
+                      backgroundColor: "#07D2FF",
+                    },
+                    a: {
+                      padding: -33,
+                    },
+                    b: {
+                      color: "#1DBEFF",
+                      backgroundColor: "rgba(49, 180, 255, 0.2)",
+                      height: 19,
+                      width: 20,
+                      borderRadius: 0,
+                      padding: [5, 25],
+                      align: "right",
+                      verticalAlign: "top",
+                    },
+                    e: {
+                      padding: -10,
+                    },
+                  },
+                },
+              },
+            ],
+          },
+        ],
+      };
+      myChart5.setOption(option5);
+    },
+    initChart3() {
+      const _this = this;
+      var data5 = this.piedata;
+      console.log(data5);
+      var myChart5 = echarts.init(document.querySelector("#echart5"));
+      
+      var option5 = {
+        tooltip: {
+          trigger: "item",
+          formatter: "{a} <br/>{b}: {c} ({d}%)",
+        },
+        color: ["#00E7E5", "#1DBEFF"],
+        legend: {
+          left: "left",
+          orient: "vertical",
+          bottom: 10,
+          textStyle: {
+            color: "black",
+            padding: [5, 5, 5, -50],
+            fontWeight: 600,
+          },
+          itemWidth: 50,
+          itemHeight: 22,
+        },
+        series: [
+          {
+            radius: 120,
+            name: "巡检",
+            type: "pie",
+            labelLine: {
+              length: 40,
+              length2: 85,
+            },
+            itemStyle: {
+              borderWidth: 1,
+              shadowBlur: 20,
+              shadowOffsetY: 5,
+            },
+            center: ["50%", "55%"],
+            avoidLabelOverlap: true,
+          
+            data: [
+              {
+                value:
+                  data5[0] && data5[0].name == "合格" ? data5[0].value : 0,
+                name:
+                  data5[0] && data5[0].name == "合格" ? data5[0].name : "合格",
+                selected: true,
+                itemStyle: {
+                  color: "#129E92",
+                  borderColor: "#3FFFE2",
+                  shadowColor: "rgba(63, 255, 226, 0.5)",
+                },
+                labelLine: {
+                  lineStyle: {
+                    color: "#00EAE8",
+                  },
+                },
+                label: {
+                  formatter: "{e|}\n{a|}{b|{c}%}{c|}",
+                  rich: {
+                    a: {
+                      padding: -33,
+                    },
+                    c: {
+                      padding: [5, 0],
+                      lineHeight: 60,
+                      verticalAlign: "top",
+                      backgroundColor: "#00EAE8",
+                    },
+                    b: {
+                      color: "#00E7E5",
+                      backgroundColor: "rgba(63, 255, 226, 0.2)",
+                      height: 19,
+                      width: 40,
+                      borderRadius: 0,
+                      padding: [5, 25],
+                      verticalAlign: "top",
+                    },
+                    e: {
+                      padding: -10,
+                    },
+                  },
+                },
+              },
+              {
+                value:
+                  data5[1] && data5[1].name == "不合格" ? data5[1].value : 0,
+                name:
+                  data5[1] && data5[1].name == "不合格"
+                    ? data5[1].name
+                    : "不合格",
+                itemStyle: {
+                  color: "#105BA4",
+                  borderColor: "#31B4FF",
+                  shadowColor: "rgba(49, 180, 255, 0.8)",
+                },
+                labelLine: {
+                  lineStyle: {
+                    color: "#07D2FF",
+                  },
+                },
+                label: {
+                  
+                  formatter: "{e|}\n{c|}{b|{c}%}{a|}",
+                  rich: {
+                    c: {
+             
+                      padding: [5, 0],
+                      lineHeight: 60,
+                      verticalAlign: "top",
+                      backgroundColor: "#07D2FF",
+                    },
+                    a: {
+                      padding: -33,
+                    },
+                    b: {
+                      color: "#1DBEFF",
+                      backgroundColor: "rgba(49, 180, 255, 0.2)",
+                      height: 19,
+                      width: 20,
+                      borderRadius: 0,
+                      padding: [5, 25],
+                      align: "right",
+                      verticalAlign: "top",
+                    },
+                    e: {
+                      padding: -10,
+                    },
+                  },
+                },
+              },
+            ],
+          },
+        ],
+      };
+      myChart5.setOption(option5);
+    },
+    //左侧第一个选择类型下拉框 回调函数
+  },
+};
+</script>
+<style lang="scss" scoped>
+.app-container {
+  padding: 0px 24px;
+}
+
+.home {
+  width: 100%;
+  height: 100vh;
+  background: url("../../../assets/images/bg-body.png") no-repeat;
+  background-size: 100% 100%;
+  background-color: #050711;
+
+  .head {
+    width: 100%;
+    height: 74px;
+    position: relative;
+
+    .head-content {
+      height: 74px;
+      background-image: url("../../../assets/images/bg-head.png");
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+
+      .title {
+        font-size: 42px;
+        font-weight: 400;
+        color: #ffffff;
+      }
+    }
+
+    .head-logo {
+      position: absolute;
+      left: 0px;
+      top: 1px;
+
+      img {
+        height: 38px;
+        // width: ;
+      }
+    }
+
+    .back {
+      position: absolute;
+      right: 0px;
+      top: 5px;
+    }
+  }
+
+  .content-top {
+    display: flex;
+    justify-content: space-between;
+    position: relative;
+
+    .factoryCode {
+      width: 540px;
+      height: 60px;
+      background: url("../../../assets/images/bg- border1.png") no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+      position: absolute;
+      top: -17px;
+      left: 0px;
+    }
+
+    .timebox {
+      width: 480px;
+      height: 60px;
+      background: url("../../../assets/images/bg-border2.png") no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+      position: absolute;
+      top: -17px;
+      right: 0px;
+
+      .time {
+        font-size: 30px;
+        font-weight: 400;
+        color: #ffffff;
+        line-height: 71px;
+      }
+    }
+  }
+
+  .content {
+    margin-top: 63px;
+    display: flex;
+
+    .itemleft {
+      .item-table {
+        width: 1243px;
+        height: 542px;
+        background: url("../../../assets/images/packagingline/bg-border1.png")
+          no-repeat;
+        background-size: 100% 100%;
+        padding: 27px 21px 30px 25px;
+        box-sizing: border-box;
+        box-sizing: border-box;
+
+        .yield {
+          display: flex;
+          align-items: center;
+
+          // justify-content: space-between;
+          .yieldbox {
+            .yieldtitle {
+              width: 401px;
+              height: 37px;
+              background: url("../../../assets/images/packagingline/bg-title1.png")
+                no-repeat;
+              background-size: 100% 100%;
+
+              .yieldname {
+                font-weight: bold;
+                font-size: 22px;
+                line-height: 37px;
+                color: #ffffff;
+                text-transform: none;
+                margin-left: 40px;
+              }
+            }
+
+            .yieldnumber {
+              margin-top: 13px;
+              display: flex;
+              justify-content: space-around;
+              .numberbox {
+                width: 80px;
+                height: 101px;
+                background: url("../../../assets/images/packagingline/bg-num.png")
+                  no-repeat;
+                background-size: 100% 100%;
+                margin-right: 10px;
+
+                .number {
+                  font-weight: 600;
+                  font-size: 60px;
+                  color: #ffffff;
+                  line-height: 101px;
+                  text-align: center;
+                }
+              }
+            }
+            .table-thead {
+              width: 100%;
+              height: 36px;
+              margin: auto;
+              background: #0a1a33;
+
+              td {
+                font-size: 19px;
+                font-family: NotoSansHans-Medium, NotoSansHans;
+                font-weight: 500;
+                color: #159aff;
+                text-align: center;
+                white-space: nowrap;
+              }
+            }
+
+            .table-tbody {
+              height: 117px;
+              // width: 1775px;
+              margin: auto;
+              overflow-y: scroll;
+
+              table {
+                width: 100%;
+
+                tbody {
+                  width: 100%;
+
+                  td {
+                    // font-size: 19px;
+                    font-family: NotoSansHans-Medium, NotoSansHans;
+                    font-weight: 500;
+                    color: #ffffff;
+                    text-align: center;
+                    border-bottom: 1px solid #6c8097;
+                    // border-left: 1px dashed #6C8097;
+                  }
+                }
+              }
+            }
+          }
+
+          .yieldbox:first-child {
+            margin-right: 90px;
+          }
+        }
+        .yieldtable {
+          // justify-content: space-between;
+          .yieldbox {
+            .yieldtitle {
+              // width: 401px;
+              height: 37px;
+              background: url("../../../assets/images/packagingline/bg-title1.png")
+                no-repeat;
+              background-size: 100% 100%;
+
+              .yieldname {
+                font-weight: bold;
+                font-size: 22px;
+                line-height: 37px;
+                color: #ffffff;
+                text-transform: none;
+                margin-left: 40px;
+              }
+            }
+          }
+
+          .yieldbox:first-child {
+            margin-right: 90px;
+          }
+          .table-thead {
+            width: 100%;
+            height: 36px;
+            margin: auto;
+            background: #0a1a33;
+
+            td {
+              font-size: 19px;
+              font-family: NotoSansHans-Medium, NotoSansHans;
+              font-weight: 500;
+              color: #159aff;
+              text-align: center;
+              white-space: nowrap;
+            }
+          }
+
+          .table-tbody {
+            height: 220px;
+            // width: 1775px;
+            margin: auto;
+            overflow-y: scroll;
+
+            table {
+              width: 100%;
+
+              tbody {
+                width: 100%;
+
+                td {
+                  // font-size: 19px;
+                  font-family: NotoSansHans-Medium, NotoSansHans;
+                  font-weight: 500;
+                  color: #ffffff;
+                  text-align: center;
+                  border-bottom: 1px dashed #6c8097;
+                  border-left: 1px dashed #6c8097;
+                  // border-left: 1px dashed #6C8097;
+                }
+              }
+            }
+          }
+        }
+      }
+
+      .itemleft-bottom {
+        display: flex;
+
+        .item-table1 {
+          width: 1243px;
+          height: 356px;
+          background: url("../../../assets/images/packagingline/bg-border3.png")
+            no-repeat;
+          background-size: 100% 100%;
+          padding: 27px 21px 30px 25px;
+          box-sizing: border-box;
+
+          .data-box {
+            display: flex;
+            align-items: center;
+            justify-content: space-around;
+            margin-bottom: 20px;
+
+            .box {
+              width: 176px;
+              height: 179px;
+              text-align: center;
+
+              .data1 {
+                font-weight: 500;
+                font-size: 48px;
+                color: #32c5ff;
+                text-align: center;
+                text-transform: none;
+                margin-top: 41px;
+              }
+
+              .data2 {
+                font-weight: 400;
+                font-size: 22px;
+                color: #ffffff;
+                text-align: center;
+                text-transform: none;
+                margin-top: 29px;
+              }
+            }
+
+            .box1 {
+              background: url("../../../assets/images/packagingline/bg-yichang1.png")
+                no-repeat;
+              background-size: 100% 100%;
+
+              .data1 {
+                color: #32c5ff;
+              }
+            }
+
+            .box2 {
+              background: url("../../../assets/images/packagingline/bg-yichang2.png")
+                no-repeat;
+              background-size: 100% 100%;
+
+              .data1 {
+                color: #66ffff;
+              }
+            }
+
+            .box3 {
+              background: url("../../../assets/images/packagingline/bg-yichang3.png")
+                no-repeat;
+              background-size: 100% 100%;
+
+              .data1 {
+                color: #edb83f;
+              }
+            }
+          }
+
+          .table-thead {
+            width: 100%;
+            height: 36px;
+            margin: auto;
+            background: #0a1a33;
+
+            td {
+              font-size: 19px;
+              font-family: NotoSansHans-Medium, NotoSansHans;
+              font-weight: 500;
+              color: #159aff;
+              text-align: center;
+              white-space: nowrap;
+            }
+          }
+
+          .table-tbody {
+            height: 117px;
+            // width: 1775px;
+            margin: auto;
+            overflow-y: scroll;
+
+            table {
+              width: 100%;
+
+              tbody {
+                width: 100%;
+
+                td {
+                  // font-size: 19px;
+                  font-family: NotoSansHans-Medium, NotoSansHans;
+                  font-weight: 500;
+                  color: #ffffff;
+                  text-align: center;
+                  border-bottom: 1px solid #6c8097;
+                  // border-left: 1px dashed #6C8097;
+                }
+              }
+            }
+          }
+          .Totalnumberbox {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            .Totalnumber {
+              width: 269px;
+              height: 37px;
+              background: url("../../../assets/images/packagingline/bg-title5.png")
+                no-repeat;
+              background-size: 100% 100%;
+              display: flex;
+              align-items: center;
+              justify-content: space-around;
+
+              .number1 {
+                font-size: 14px;
+                color: #ffffff;
+                line-height: 20px;
+              }
+
+              .number2 {
+                font-weight: 500;
+                font-size: 24px;
+                color: #2acfff;
+              }
+            }
+          }
+        }
+      }
+    }
+
+    .itemright {
+      .item-table1 {
+        width: 610px;
+        height: 912px;
+        background: url("../../../assets/images/packagingline/bg-border3.png")
+          no-repeat;
+        background-size: 100% 100%;
+        padding: 27px 21px 30px 25px;
+        box-sizing: border-box;
+        box-sizing: border-box;
+
+        .table-thead {
+          width: 100%;
+          height: 44px;
+          margin: auto;
+          background: #0a1a33;
+
+          td {
+            font-size: 19px;
+            font-family: NotoSansHans-Medium, NotoSansHans;
+            font-weight: 500;
+            color: #159aff;
+            text-align: center;
+            white-space: nowrap;
+          }
+        }
+
+        .table-tbody {
+          height: 240px;
+          // width: 1775px;
+          margin: auto;
+
+          table {
+            width: 100%;
+
+            tbody {
+              width: 100%;
+
+              td {
+                font-size: 19px;
+                font-family: NotoSansHans-Medium, NotoSansHans;
+                font-weight: 500;
+                color: #ffffff;
+                text-align: center;
+                border: 1px dashed #6c8097;
+              }
+            }
+          }
+        }
+      }
+
+      .item-table1:first-child {
+      }
+
+      .Realtime {
+        .Realtime-box {
+          display: flex;
+
+          .box {
+            display: flex;
+            align-items: flex-start;
+            margin-right: 19px;
+
+            .item {
+              font-weight: 500;
+              font-size: 15px;
+              color: #ffffff;
+              margin-left: 12px;
+
+              .itemtitle {
+              }
+
+              .itemnumber {
+                margin-top: 8px;
+                color: #1dbdf2;
+              }
+            }
+          }
+        }
+      }
+      .Totalnumberbox {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .Totalnumber:first-child {
+          margin-right: 10px;
+        }
+        .Totalnumber {
+          flex: 1;
+          height: 79px;
+          background: url("../../../assets/images/packagingline/bg-title5.png")
+            no-repeat;
+          background-size: 100% 100%;
+          display: flex;
+          align-items: center;
+          justify-content: space-around;
+
+          .number1 {
+            font-size: 18px;
+            color: #ffffff;
+            line-height: 20px;
+          }
+
+          .number2 {
+            font-weight: 500;
+            font-size: 24px;
+            color: #2acfff;
+          }
+        }
+      }
+    }
+  }
+}
+
+.titlebox {
+  width: 431px;
+  height: 38px;
+  background: url("../../../assets/images/bg-title.png") no-repeat;
+  background-size: 100% 100%;
+  //   text-align: center;
+  font-size: 20px;
+  font-weight: bold;
+  color: #ffffff;
+  line-height: 38px;
+  letter-spacing: 2px;
+  text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5);
+  padding-left: 60px;
+  //   .titlename{
+  //     position: relative;
+  //     left: 24px;
+  //   }
+}
+
+.titlebox2 {
+  display: flex;
+  align-items: center;
+
+  .icon {
+    margin-right: 10px;
+  }
+
+  .titlename {
+    font-weight: 400;
+    margin-right: 28px;
+    font-size: 17px;
+    color: #ffffff;
+    line-height: 26px;
+  }
+}
+
+.factoryCode {
+  display: flex;
+  // justify-content: space-around;
+}
+
+.selectborder {
+  background-color: transparent;
+  border-radius: 4px;
+  // border: 2px solid #27408c;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  width: 350px;
+  margin-left: 50px;
+}
+
+.selectborder1 {
+  background-color: transparent;
+  border-radius: 4px;
+  // border: 2px solid #27408c;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  width: 300px;
+  margin-left: 25px;
+}
+
+.selectborder select {
+  /*清除select的边框样式*/
+  border: none;
+  /*清除select聚焦时候的边框颜色*/
+  outline: none;
+  background-color: transparent;
+  /*将select的宽高等于div的宽高*/
+  width: 100%;
+  height: 50px;
+  /*隐藏select的下拉图标*/
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  font-size: 25px;
+  font-weight: 400;
+  color: #ffffff;
+  line-height: 42px;
+}
+
+.selectborder option {
+  /*清除select的边框样式*/
+  border: none;
+  /*清除select聚焦时候的边框颜色*/
+  outline: none;
+  background-color: transparent;
+  /*将select的宽高等于div的宽高*/
+  width: 100%;
+  height: 50px;
+  /*隐藏select的下拉图标*/
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  padding-left: 20px;
+  font-size: 25px;
+  font-weight: 500;
+  color: #3fa2ff;
+  border-radius: 0%;
+}
+
+.selectborder1 option {
+  /*清除select的边框样式*/
+  border: none;
+  /*清除select聚焦时候的边框颜色*/
+  outline: none;
+  background-color: transparent;
+  /*将select的宽高等于div的宽高*/
+  width: 200px;
+  height: 50px;
+  /*隐藏select的下拉图标*/
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  padding-left: 20px;
+  font-size: 25px;
+  font-weight: 500;
+  color: #3fa2ff;
+  border-radius: 0%;
+}
+
+.selectborder:after {
+  content: "";
+  width: 24px;
+  height: 24px;
+  background: url(../../../assets/images/xiala.png) no-repeat center;
+  /*通过定位将图标放在合适的位置*/
+  position: absolute;
+  right: 0px;
+  top: 25%;
+  /*给自定义的图标实现点击下来功能*/
+  pointer-events: none;
+}
+
+.selectborder1:after {
+  content: "";
+  width: 24px;
+  height: 24px;
+  background: url(../../../assets/images/xiala.png) no-repeat center;
+  /*通过定位将图标放在合适的位置*/
+  position: absolute;
+  right: 0px;
+  top: 25%;
+  /*给自定义的图标实现点击下来功能*/
+  pointer-events: none;
+}
+
+::v-deep .el-button--primary {
+  color: #ffffff;
+  background-color: #325e82;
+  border-color: #0a0f19;
+}
+
+.active1 {
+  background: url("../../../assets/images/quality/bgtable.png");
+}
+
+.active2 {
+}
+
+::-webkit-scrollbar {
+  width: 3px;
+  height: 0px;
+  background-color: #0c0642;
+}
+
+/*定义滚动条轨道 内阴影+圆角*/
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  border-radius: 8px;
+  background-color: #07356a;
+}
+
+/*定义滑块 内阴影+圆角*/
+::-webkit-scrollbar-thumb {
+  border-radius: 8px;
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  background-color: #0091ff;
+  // opacity: 0.1;
+}
+
+.progress {
+  width: 100px;
+  background-color: rgba(15, 182, 217, 0.3);
+  border-radius: 10px;
+
+  .bar {
+    background: linear-gradient(
+      90deg,
+      rgba(15, 182, 217, 1),
+      rgba(1, 255, 255, 1)
+    );
+    border-radius: 10px;
+  }
+}
+</style>
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 83d17b72..fa079434 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -584,7 +584,7 @@
 					</el-row>
 					<!-- 主数据 -->
 					<el-table v-if="refreshNewWorkerTable" v-loading="newWorkerLoading" class="my-print-table"
-						:data="printData.workTable" border style="width: 100%">
+						:data="printData.workTable" border style="width: 100%" :summary-method="getRKSummaries" show-summary>
 						<el-table-column type="index" label="序号" width="50"></el-table-column>
 						<el-table-column prop="workorderCodeSap" label="订单号" width="130"
 							:formatter="orderCodeFormate" />
@@ -1604,6 +1604,38 @@ export default {
         item.remark = remark;
       });
     },
+    getRKSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "";
+          return;
+        }
+        const values = data.map((item) => Number(item[column.property]));
+        if (!values.every((value) => isNaN(value))) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] += "";
+          if (sums[index] > 1000000) {
+            sums[index] = "";
+          }
+        } else{
+          sums[index] = ""; //N/A
+        }
+        if(column.label == "批次"){
+            sums[index] = "合计";
+        }
+      });
+
+      return sums;
+    },
   },
 };
 </script>
diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index e7eadd9e..1afb049e 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -170,7 +170,7 @@
           :disabled="single"
           @click="editMachine"
           v-hasPermi="['mes:pro:workorder:edit']"
-        >设备修改
+        >切线调拨
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
diff --git a/src/views/quality/checkTypeProject/index.vue b/src/views/quality/checkTypeProject/index.vue
index f0ec4192..3676f4a7 100644
--- a/src/views/quality/checkTypeProject/index.vue
+++ b/src/views/quality/checkTypeProject/index.vue
@@ -220,6 +220,10 @@
         <el-form-item label="排序" prop="sort">
             <el-input type="number" v-model="form.sort" placeholder="请输入排序" />
         </el-form-item>
+        <el-form-item label="是否称重" prop="weight">
+          <el-radio v-model="form.weight" label="1">是</el-radio>
+          <el-radio v-model="form.weight" label="0">否</el-radio>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
diff --git a/src/views/quality/defectType/index.vue b/src/views/quality/defectType/index.vue
index 00f0e394..de198156 100644
--- a/src/views/quality/defectType/index.vue
+++ b/src/views/quality/defectType/index.vue
@@ -95,6 +95,7 @@
 				</template>
 			</el-table-column>
 			<el-table-column width="150" label="不良名称" align="center" prop="defectSubclass" />
+      <el-table-column width="150" label="不良系数" align="center" prop="ratio" />
 			<el-table-column width="180" label="备注" align="center" prop="defectRemark" />
 			<el-table-column width="100" label="创建人" align="center" prop="createBy" />
 			<el-table-column width="180" label="创建时间" align="center" prop="createTime">
@@ -155,6 +156,9 @@
 				<el-form-item label="不良名称" prop="defectSubclass">
 					<el-input v-model="form.defectSubclass" placeholder="请输入不良名称" />
 				</el-form-item>
+        <el-form-item label="不良系数" prop="ratio">
+					<el-input type="number" v-model="form.ratio" placeholder="请输入不良系数" />
+				</el-form-item>
 				<el-form-item label="备注" prop="defectRemark">
 					<el-input v-model="form.defectRemark" placeholder="请输入备注" />
 				</el-form-item>
@@ -245,6 +249,15 @@ export default {
 			form: {},
 			// 表单校验
 			rules: {
+        defectType: [
+					{ required: true, message: "请选择不良类型", trigger: "blur" }
+				],
+        defectSubclass: [
+					{ required: true, message: "请输入不良名称", trigger: "blur" }
+				],
+				ratio: [
+					{ required: true, pattern: /^(0(?:\.\d{1,2})?|1(?:\.0{0,2})?)$/ ,message: "请输入(0-1)之间的两位小数", trigger: "blur" }
+				],
 			}
 		};
 	},
@@ -366,9 +379,8 @@ export default {
           }
         }
       }
-
 			this.$modal.confirm('是否确认删除不良类型维护编号为"' + defectCodes + '"的数据项？').then(function() {
-				return deldefectType(defectIds);
+				return delDefectType(defectIds);
 			}).then(() => {
 				this.getList();
 				this.$modal.msgSuccess("删除成功");
diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue
index c80efba0..860481ab 100644
--- a/src/views/quality/qcInventory/index.vue
+++ b/src/views/quality/qcInventory/index.vue
@@ -184,7 +184,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -244,9 +244,9 @@
 							</el-date-picker>
 						</el-form-item>
 					</el-col>
-				</el-row>	
+				</el-row>
 				<el-row>
-					<el-col :span="6">	
+					<el-col :span="6">
 						<el-form-item label="抽样数量" prop="sampleQuality">
 							<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量"/>
 						</el-form-item>
@@ -265,7 +265,7 @@
 							</el-input>
 						</el-form-item>
 					</el-col>
-				   <el-col :span="8">	
+				   <el-col :span="8">
 						<el-form-item label="仓库编码" prop="supplierCode">
 							<el-input v-model="form.supplierCode" placeholder="请输入供应商编码" disabled/>
 						</el-form-item>
@@ -284,7 +284,7 @@
 							<el-input v-model="form.checkManCode" placeholder="请输入检测人工号" disabled/>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">	
+					<el-col :span="8">
 						<el-form-item label="检测地点" prop="checkLoc">
 							<el-input v-model="form.checkLoc" placeholder="请输入检测地点" />
 						</el-form-item>
@@ -388,7 +388,7 @@ export default {
 			// 表单校验
 			rules: {
 				checkType:[
-                  { required: true, message: "检验类型不能为空", trigger: "blur" } 
+                  { required: true, message: "检验类型不能为空", trigger: "blur" }
 				],
 				incomeBatchNo: [
 					{ required: true, message: "批次号不能为空", trigger: "blur" }
@@ -452,12 +452,12 @@ export default {
 		/** 查询库存检验列表 */
 		getList() {
 			this.loading = true;
-
+      console.log("--------"+this.queryParams)
 			if(this.queryParams.incomeTimeArray!=null && this.queryParams.incomeTimeArray.length>0){
 				this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
 			}else{
-                this.queryParams.incomeTimeStart = null;
+        this.queryParams.incomeTimeStart = null;
 				this.queryParams.incomeTimeEnd = null;
 			}
 
@@ -619,7 +619,7 @@ export default {
            this.form.supplierCode = obj.code;
 		   this.form.supplierName = obj.name;
 		},
-		
+
 		/**人员选择弹出框**/
 		handleSelectUser() {
 		  this.$refs.itemSelectUser.showFlag = true;
diff --git a/src/views/quality/qcMarket/index.vue b/src/views/quality/qcMarket/index.vue
index 3e3d01e4..95be25df 100644
--- a/src/views/quality/qcMarket/index.vue
+++ b/src/views/quality/qcMarket/index.vue
@@ -185,7 +185,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -427,7 +427,7 @@ export default {
 			// 表单校验
 			rules: {
 				checkType:[
-                  { required: true, message: "检验类型不能为空", trigger: "blur" } 
+                  { required: true, message: "检验类型不能为空", trigger: "blur" }
 				],
 				incomeBatchNo: [
 					{ required: true, message: "批次号不能为空", trigger: "blur" }
@@ -498,7 +498,7 @@ export default {
 				this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
 			}else{
-                this.queryParams.incomeTimeStart = null;
+        this.queryParams.incomeTimeStart = null;
 				this.queryParams.incomeTimeEnd = null;
 			}
 
@@ -665,7 +665,7 @@ export default {
            this.form.supplierCode = obj.code;
 		   this.form.supplierName = obj.name;
 		},
-		
+
 		/**人员选择弹出框**/
 		handleSelectUser() {
 		  this.$refs.itemSelectUser.showFlag = true;
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index 9cdaee27..2abe4b3f 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -523,15 +523,21 @@ export default {
 		getList() {
 			this.loading = true;
 
-			if(this.queryParams.incomeTimeArray.length>0){
+			if(this.queryParams.incomeTimeArray != null && this.queryParams.incomeTimeArray.length>0){
 				this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
-			}
+			}else{
+        this.queryParams.incomeTimeStart = null;
+				this.queryParams.incomeTimeEnd = null;
+      }
 
-			if(this.queryParams.checkTimeArray.length>0){
+			if(this.queryParams.checkTimeArray != null && this.queryParams.checkTimeArray.length>0){
 				this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
-			}
+			}else{
+        this.queryParams.checkTimeStart = null;
+				this.queryParams.checkTimeEnd = null;
+      }
 
 			listWarehousing(this.queryParams).then(response => {
 				this.warehousingList = response.rows;
diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue
index a5c6ae88..78be986e 100644
--- a/src/views/quality/unqualified/index.vue
+++ b/src/views/quality/unqualified/index.vue
@@ -389,10 +389,13 @@ export default {
 		getList() {
 			this.loading = true;
 
-			if(this.queryParams.checkTimeArray.length>0){
+			if(this.queryParams.checkTimeArray != null && this.queryParams.checkTimeArray.length>0){
 				this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
-			}
+			}else {
+        this.queryParams.checkTimeStart = null;
+        this.queryParams.checkTimeEnd = null;
+      }
 
 			listUnqualified(this.queryParams).then(response => {
 				this.unqualifiedList = response.rows;
diff --git a/src/views/register.vue b/src/views/register.vue
index b61e3d59..910910ec 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -145,7 +145,7 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<style rel="stylesheet/scss" lang="scss" scoped>
 .register {
   display: flex;
   justify-content: center;
diff --git a/src/views/system/datasource/index.vue b/src/views/system/datasource/index.vue
index 13a7aa1d..5aea8d89 100644
--- a/src/views/system/datasource/index.vue
+++ b/src/views/system/datasource/index.vue
@@ -128,7 +128,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -172,6 +172,9 @@
         <el-form-item label="数据源名称" prop="parkName">
           <el-input v-model="form.parkName" placeholder="请输入数据源名称" disabled/>
         </el-form-item>
+        <el-form-item label="数据源名称" prop="parkName">
+          <el-input v-model="form.poolName" placeholder="请输入数据源标识"/>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
diff --git a/src/views/technology/proroute/index.vue b/src/views/technology/proroute/index.vue
index 035e8662..21cfc379 100644
--- a/src/views/technology/proroute/index.vue
+++ b/src/views/technology/proroute/index.vue
@@ -102,6 +102,18 @@
           v-hasPermi="['mes:pro:proroute:import']"
         >批量上传附件</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-download"
+          :disabled="multiple"
+          size="mini"
+          @click="handleSyncProductSAP"
+          v-hasPermi="['mes:pro:order:add']"
+        >同步物料工艺
+        </el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -116,7 +128,9 @@
           >{{scope.row.routeCode}}</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="产品编码" align="center" prop="productCode" width="250" v-if="false"/>
+      <el-table-column label="产品编码" align="center" prop="productCode" width="130"
+      :formatter="productCodeFormate"
+      />
       <el-table-column label="工艺路线名称" align="center" prop="routeName" width="250"/>
       <el-table-column label="工艺路线说明" align="center" prop="routeDesc" width="250"/>
       <el-table-column label="工艺路线版本" align="center" prop="routeVersion" width="100"/>
@@ -327,7 +341,7 @@
 </template>
 
 <script>
-import { listProroute, getProroute, delProroute, addProroute, updateProroute,syncSAP,importProroute } from "@/api/technology/proroute";
+import { listProroute, getProroute, delProroute, addProroute, updateProroute,syncSAP,importProroute,syncProductSAP } from "@/api/technology/proroute";
 import Routeprocess from "./routeprocess";
 import Routeprodproduct from "./routeprodproduct";
 export default {
@@ -341,6 +355,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      productCodes:[],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -391,6 +406,12 @@ export default {
     this.getList();
   },
   methods: {
+    //产品编码格式化
+		productCodeFormate(row, column, cellValue){
+      if(cellValue !=null){
+			  return cellValue.slice(7,18);  //返回值
+      }
+		},
     /** 查询工艺路线列表 */
     getList() {
       this.loading = true;
@@ -441,6 +462,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.routeId)
+      this.productCodes = selection.map(item => item.productCode)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -594,6 +616,11 @@ export default {
         this.$modal.msgSuccess('同步成功')
       }).catch(() => {
       })
+    },
+    /**选择产品进行工艺同步**/
+    handleSyncProductSAP(){
+      const productCodes = this.productCodes;
+      return syncProductSAP(productCodes);
     }
   }
 };
diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index 98dec511..037712b6 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -143,7 +143,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="报工汇率"
+        label="报工折算率"
         align="center"
         prop="reportRate"
         width="150"
@@ -344,7 +344,7 @@
 				<el-form-item label="工厂编码" prop="factoryCode">
 					<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
 				</el-form-item> -->
-        <el-form-item label="报工汇率" prop="reportRate">
+        <el-form-item label="报工折算率" prop="reportRate">
           <el-input-number
             :min="0"
             :step="1"
@@ -440,7 +440,7 @@
               <el-descriptions-item label="物料类别">{{
                 form.mtart
               }}</el-descriptions-item>
-              <el-descriptions-item label="报工汇率">{{
+              <el-descriptions-item label="报工折算率">{{
                 form.reportRate
               }}</el-descriptions-item>
               <el-descriptions-item label="品类">{{