diff --git a/public/data.json b/public/data.json
index f4466ed..cfeda6d 100644
--- a/public/data.json
+++ b/public/data.json
@@ -1031,6 +1031,288 @@
       "value6": "100%"
     }
   ],
+  "table9": [
+    {
+      "value1": "1",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "2",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "3",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "4",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "5",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "6",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "7",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "8",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "9",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "10",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "11",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "12",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "13",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "14",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "15",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "16",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "1"
+    },
+    {
+      "value1": "17",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "18",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "19",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "20",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "21",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "22",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "23",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "2"
+    },
+    {
+      "value1": "24",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "25",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "26",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "27",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "28",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "29",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "30",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "31",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "32",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "33",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "34",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "3"
+    },
+    {
+      "value1": "35",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "36",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "37",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "38",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "39",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    },
+    {
+      "value1": "40",
+      "value2": "487JFY",
+      "value3": "15",
+      "value4": "15",
+      "value5": "0"
+    }
+  ],
   "chart1": {
     "x": [
       "01:00",
@@ -1454,6 +1736,51 @@
       ]
     }
   },
+  "chart15": {
+    "x": [
+      "1日",
+      "2日",
+      "3日",
+      "4日",
+      "5日",
+      "6日",
+      "7日"
+    ],
+    "y": [
+      {
+        "name": "计划",
+        "data": [
+          22,
+          52,
+          55,
+          12,
+          35,
+          44,
+          66
+        ]
+      },
+      {
+        "name": "实际",
+        "data": [
+          32,
+          42,
+          50,
+          22,
+          30,
+          40,
+          52
+        ]
+      }
+    ]
+  },
+  "chart16": {
+    "x": ["组A", "组B", "组C", "组D", "组E", "组F", "组G", "组H"],
+    "y": [60, 55, 45, 42, 40, 40, 39, 38]
+  },
+  "chart17": {
+    "x": ["A-1", "A-2", "A-3", "A-4", "A-5", "A-6", "A-7"],
+    "y": [12, 20, 11, 30, 14, 80, 50]
+  },
   "liner": {
     "plan": [
       {
@@ -1865,5 +2192,17 @@
         }
       ]
     }
+  },
+  "a": {
+    "fpx": {
+      "A1": 0,
+      "A2": 0,
+      "B1": 0,
+      "B2": 0
+    },
+    "fpj": {
+      "A": 0,
+      "B": 0
+    }
   }
 }
diff --git a/src/views/base/customData/boardIndex.vue b/src/views/base/customData/boardIndex.vue
index 807a358..bed082d 100644
--- a/src/views/base/customData/boardIndex.vue
+++ b/src/views/base/customData/boardIndex.vue
@@ -135,7 +135,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="自定义功能" prop="customFunction">
-          <el-input v-model="form.customFunction" placeholder="请输入自定义功能" :disabled="editDisabled"/>
+          <el-input v-model="form.customFunction" placeholder="请输入自定义功能" />
         </el-form-item>
         <el-form-item label="自定义编号" prop="customCode">
           <el-input v-model="form.customCode" placeholder="请输入自定义编号" />
diff --git a/src/views/board/finalAssembly/index.vue b/src/views/board/finalAssembly/index.vue
index 40eec9f..8c61064 100644
--- a/src/views/board/finalAssembly/index.vue
+++ b/src/views/board/finalAssembly/index.vue
@@ -8,23 +8,23 @@
     <div class="title1">班组</div>
     <div class="title2">上线数量</div>
 
-    <div class="nowClass">总装</div>
-    <div class="num">1122</div>
+    <div class="nowClass">{{ info.bz }}</div>
+    <div class="num">{{ info.sxsl }}</div>
 
     <div class="info1Title">产品条码</div>
-    <div class="info1">B23120783055009802101</div>
+    <div class="info1">{{ info.tm }}</div>
     <div class="info2Title">扫描时间</div>
-    <div class="info2">2023/12/7 12:01:53</div>
+    <div class="info2">{{ info.sj }}</div>
     <div class="info3Title">产品型号</div>
-    <div class="info3">发泡箱体,BCD-530WPG,标准白</div>
+    <div class="info3">{{ info.xh }}</div>
     <div class="info4Title">订单编号</div>
-    <div class="info4">11232394</div>
+    <div class="info4">{{ info.bh }}</div>
     <div class="info5Title">订单数量</div>
-    <div class="info5">300</div>
+    <div class="info5">{{ info.ddsl }}</div>
     <div class="info6Title">上线数量</div>
-    <div class="info6">63</div>
+    <div class="info6">{{ info.sxsl2 }}</div>
     <div class="info7Title">提示信息</div>
-    <div class="info7">扫描成功</div>
+    <div class="info7">{{ info.tsxx }}</div>
 
     <div class="scrollTable">
       <div style="background-color: #094170">
@@ -102,6 +102,7 @@ import vueSeamlessScroll from "vue-seamless-scroll";
 import Chart from "../../../components/board/Chart";
 import * as echarts from 'echarts'
 import {getData} from "@/api/board/getData";
+import {mixData} from "@/api/board/mixData";
 
 export default {
   components: {
@@ -130,6 +131,7 @@ export default {
           left: 5.5
         },
       ],
+      info: {},
       scrollTableOption: {
         step: 0.5, // 数值越大速度滚动越快
         limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
@@ -141,162 +143,190 @@ export default {
         waitTime: 0,
       },
       scrollTableData: [],
-
-    }
-  },
-  mounted() {
-    getData().then(e => {
-      this.scrollTableData = e.table7
-      this.$refs.chart1.setData({
-        tooltip: {
-          trigger: "axis",
-          axisPointer: {
-            // 坐标轴指示器，坐标轴触发有效
-            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
-          },
-        },
-        grid: {
-          left: "0",
-          right: "4%",
-          bottom: "0",
-          top: 20,
-          containLabel: true,
-        },
-        xAxis: {
-          type: "category",
-          data: e.chart4.x,
-          axisLine: {
-            lineStyle: {
-              color: "white",
-            },
-          },
-          axisLabel: {
-            // interval: 0,
-            // rotate: 40,
-            textStyle: {
-              fontFamily: "Microsoft YaHei",
-            },
-          },
+      RequestDataSet: [
+        {
+          e: 'zzsc-01',
+          i: "",
+          f: (e) => {
+            this.info = e
+          }
         },
+        {
+          e: 'zzsc-02',
+          i: "",
+          f: (e) => {
+            this.$refs.chart1.setData({
+              tooltip: {
+                trigger: "axis",
+                axisPointer: {
+                  // 坐标轴指示器，坐标轴触发有效
+                  type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+                },
+              },
+              grid: {
+                left: "0",
+                right: "4%",
+                bottom: "0",
+                top: 20,
+                containLabel: true,
+              },
+              xAxis: {
+                type: "category",
+                data: e.x,
+                axisLine: {
+                  lineStyle: {
+                    color: "white",
+                  },
+                },
+                axisLabel: {
+                  // interval: 0,
+                  // rotate: 40,
+                  textStyle: {
+                    fontFamily: "Microsoft YaHei",
+                  },
+                },
+              },
 
-        yAxis: {
-          type: "value",
-          axisLine: {
-            show: false,
-            lineStyle: {
-              color: "white",
-            },
-          },
-          splitLine: {
-            show: false,
-          },
-          axisLabel: {},
+              yAxis: {
+                type: "value",
+                axisLine: {
+                  show: false,
+                  lineStyle: {
+                    color: "white",
+                  },
+                },
+                splitLine: {
+                  show: false,
+                },
+                axisLabel: {},
+              },
+              series: [
+                {
+                  name: "数量",
+                  type: "bar",
+                  barWidth: "30%",
+                  barMaxWidth: 50,
+                  itemStyle: {
+                    normal: {
+                      color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                        {
+                          offset: 0,
+                          color: "#0bca98",
+                        },
+                        {
+                          offset: 1,
+                          color: "#16a144",
+                        },
+                      ]),
+                    },
+                  },
+                  data: e.y.data,
+                },
+              ],
+            })
+          }
         },
-        series: [
-          {
-            name: "数量",
-            type: "bar",
-            barWidth: "30%",
-            barMaxWidth: 50,
-            itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: "#0bca98",
+        {
+          e: 'zzsc-03',
+          i: "",
+          f: (e) => {
+            this.$refs.chart2.setData({
+              grid: {
+                left: "0",
+                right: "4%",
+                bottom: '2%',
+                top: "10%",
+                containLabel: true,
+              },
+              xAxis: {
+                data: e.x,
+                axisLine: {
+                  lineStyle: {
+                    color: "#3d5269",
                   },
-                  {
-                    offset: 1,
-                    color: "#16a144",
+                },
+                axisLabel: {
+                  interval: 0,
+                  color: "#fff",
+                  fontSize: 14,
+                },
+              },
+              yAxis: {
+                nameTextStyle: {
+                  color: "#fff",
+                  fontSize: 16,
+                },
+                axisLine: {
+                  lineStyle: {
+                    color: "#3d5269",
+                  },
+                },
+                axisLabel: {
+                  color: "#fff",
+                  fontSize: 10,
+                },
+                splitLine: {
+                  show: true,
+                  lineStyle: {
+                    color: "#2d3d53",
                   },
-                ]),
+                },
+                interval: 500,
               },
-            },
-            data: e.chart4.y.data,
-          },
-        ],
-      })
-      this.$refs.chart2.setData({
-        grid: {
-          left: "0",
-          right: "4%",
-          bottom: '2%',
-          top: "10%",
-          containLabel: true,
-        },
-        xAxis: {
-          data: e.chart3.x,
-          axisLine: {
-            lineStyle: {
-              color: "#3d5269",
-            },
-          },
-          axisLabel: {
-            interval: 0,
-            color: "#fff",
-            fontSize: 14,
-          },
-        },
-        yAxis: {
-          nameTextStyle: {
-            color: "#fff",
-            fontSize: 16,
-          },
-          axisLine: {
-            lineStyle: {
-              color: "#3d5269",
-            },
-          },
-          axisLabel: {
-            color: "#fff",
-            fontSize: 10,
-          },
-          splitLine: {
-            show: true,
-            lineStyle: {
-              color: "#2d3d53",
-            },
-          },
-          interval: 500,
-        },
-        series: [
-          {
-            type: "bar",
-            barWidth: '40%',
-            itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(
-                  0,
-                  0,
-                  0,
-                  1,
-                  [
-                    {
-                      offset: 0,
-                      color: "#5ef3ff",
+              series: [
+                {
+                  type: "bar",
+                  barWidth: '40%',
+                  itemStyle: {
+                    normal: {
+                      color: new echarts.graphic.LinearGradient(
+                        0,
+                        0,
+                        0,
+                        1,
+                        [
+                          {
+                            offset: 0,
+                            color: "#5ef3ff",
+                          },
+                          {
+                            offset: 1,
+                            color: "#06a4f4",
+                          },
+                        ],
+                        false
+                      ),
                     },
-                    {
-                      offset: 1,
-                      color: "#06a4f4",
+                  },
+                  label: {
+                    normal: {
+                      show: true,
+                      fontSize: 12,
+                      fontWeight: "bold",
+                      color: "#ffffff",
+                      position: "top",
                     },
-                  ],
-                  false
-                ),
-              },
-            },
-            label: {
-              normal: {
-                show: true,
-                fontSize: 12,
-                fontWeight: "bold",
-                color: "#ffffff",
-                position: "top",
-              },
-            },
-            data: e.chart3.y.data,
-          },
-        ],
-      })
+                  },
+                  data: e.y.data,
+                },
+              ],
+            })
+          }
+        },
+        {
+          e: 'zzsc-04',
+          i: "",
+          f: (e) => {
+            this.scrollTableData = e
+          }
+        },
+      ]
+
+    }
+  },
+  mounted() {
+    this.RequestDataSet.forEach(val => {
+      mixData(val)
     })
   },
   methods: {}
@@ -447,7 +477,6 @@ export default {
 }
 
 
-
 .info3Title {
   position: absolute;
   top: 13.5%;
@@ -489,7 +518,6 @@ export default {
 }
 
 
-
 .info5Title {
   position: absolute;
   top: 18%;
diff --git a/src/views/board/foaming/index2.vue b/src/views/board/foaming/index2.vue
index f1ce43a..38582a5 100644
--- a/src/views/board/foaming/index2.vue
+++ b/src/views/board/foaming/index2.vue
@@ -1,9 +1,16 @@
 <template>
   <div class="app-container">
     <div class="headTitle">箱、门匹配生产数据监控平台</div>
-    <div class="topNum planNum">{{ planNum }}</div>
-    <div class="topNum practicalNum">{{ practicalNum }}</div>
-    <div class="topNum differenceValue">{{ differenceValue }}</div>
+    <div class="topNum planNum">{{
+        planNum.toString().split('').concat(['0', '0', '0', '0']).slice(0, 4).join('')
+      }}
+    </div>
+    <div class="topNum practicalNum">
+      {{ practicalNum.toString().split('').concat(['0', '0', '0', '0']).slice(0, 4).join('') }}
+    </div>
+    <div class="topNum differenceValue">
+      {{ (practicalNum - planNum).toString().split('').concat(['0', '0', '0', '0']).slice(0, 4).join('') }}
+    </div>
     <div class="title" v-for="(i,k) in title"
          :style="'top:'+(titlePosition[k]&&titlePosition[k].top||0)+'%;left:'+(titlePosition[k]&&titlePosition[k].left||0)+'%'">
       {{ i }}
@@ -23,10 +30,14 @@
     <div class="supplementInfo">注射压力标准范围：10.0-14.0Mpa A、B组份枪头压力差＜1Mpa</div>
     <div class="supplementInfo1">发泡料温度标准范围:18.0-24.0℃</div>
     <div style="position: absolute;top: 62%; left: 40%;color:#FFF">
-      <div style="width: 12px;height: 12px;background-color:  #1be409;display: inline-block;margin: 0 8px;"></div> 启用
-      <div style="width: 12px;height: 12px;background-color:  #8a8e96;display: inline-block;margin: 0 8px;"></div>停用
-      <div style="width: 12px;height: 12px;background-color:  #ff0000;display: inline-block;margin: 0 8px;"></div> 注料位
-      <div style="width: 12px;height: 12px;background-color:  #ff8000;display: inline-block;margin: 0 8px;"></div>出模位
+      <div style="width: 12px;height: 12px;background-color:  #1be409;display: inline-block;margin: 0 8px;"></div>
+      启用
+      <div style="width: 12px;height: 12px;background-color:  #8a8e96;display: inline-block;margin: 0 8px;"></div>
+      停用
+      <div style="width: 12px;height: 12px;background-color:  #ff0000;display: inline-block;margin: 0 8px;"></div>
+      注料位
+      <div style="width: 12px;height: 12px;background-color:  #ff8000;display: inline-block;margin: 0 8px;"></div>
+      出模位
     </div>
 
     <div class="scrollTable">
@@ -42,7 +53,7 @@
         </div>
       </div>
       <vue-seamless-scroll :class-option="scrollTableOption" :data="scrollTableData" class="case-item"
-        style="height: 84%;overflow: hidden;">
+                           style="height: 84%;overflow: hidden;">
         <div v-for="(item, index) in scrollTableData" :key="index">
           <div :style='"background-color:" + ((index % 2 === 0) ? "#053460" : "#032d57")'>
             <div class="scrollTableItem" style="width: 33%;padding:4px 0 ">
@@ -76,11 +87,11 @@
         <div style="width: 33%;display: inline-block">型号</div>
         <div style="width: 33%;display: inline-block">产量</div>
       </div>
-      <div v-for="i in 10"
-        :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color: '+ (i === 2 ? '#bed4ce' : '#1be409')+';text-align: center;background-color:' + (i === 2 ? '#053460' : '#053460')">
-        <div style="width: 33%;display: inline-block">{{ i }}</div>
-        <div style="width: 33%;display: inline-block">487JFY</div>
-        <div style="width: 33%;display: inline-block">15-15</div>
+      <div v-for="i in bottomTableData.slice(0,10)"
+           :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color: '+ setColor(i.value5)+';text-align: center;background-color:' + (i === 2 ? '#053460' : '#053460')">
+        <div style="width: 33%;display: inline-block">{{ i.value1 }}</div>
+        <div style="width: 33%;display: inline-block">{{ i.value2 }}</div>
+        <div style="width: 33%;display: inline-block">{{ i.value3 }}-{{ i.value4 }}</div>
       </div>
     </div>
     <div class="tableTwo">
@@ -89,11 +100,11 @@
         <div style="width: 33%;display: inline-block">型号</div>
         <div style="width: 33%;display: inline-block">产量</div>
       </div>
-      <div v-for="i in 10"
-        :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ (i === 2 ? '#ff5959' : '#1be409')+';text-align: center;background-color:' + (i === 2 ? '#053460' : '#053460')">
-        <div style="width: 33%;display: inline-block">{{ i }}</div>
-        <div style="width: 33%;display: inline-block">487JFY</div>
-        <div style="width: 33%;display: inline-block">15-15</div>
+      <div v-for="i in bottomTableData.slice(10,20)"
+           :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ setColor(i.value5)+';text-align: center;background-color:' + (i === 2 ? '#053460' : '#053460')">
+        <div style="width: 33%;display: inline-block">{{ i.value1 }}</div>
+        <div style="width: 33%;display: inline-block">{{ i.value2 }}</div>
+        <div style="width: 33%;display: inline-block">{{ i.value3 }}-{{ i.value4 }}</div>
       </div>
     </div>
     <div class="tableThree">
@@ -102,11 +113,11 @@
         <div style="width: 33%;display: inline-block">型号</div>
         <div style="width: 33%;display: inline-block">产量</div>
       </div>
-      <div v-for="i in 10"
-        :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ (i === 2 ? '#ffb769' : '#1be409')+';text-align: center;background-color:' + (i === 2 ? '#053460' : '#053460')">
-        <div style="width: 33%;display: inline-block">{{ i }}</div>
-        <div style="width: 33%;display: inline-block">487JFY</div>
-        <div style="width: 33%;display: inline-block">15-15</div>
+      <div v-for="i in bottomTableData.slice(20,30)"
+           :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ setColor(i.value5)+';text-align: center;background-color:' + (i === 2 ? '#053460' : '#053460')">
+        <div style="width: 33%;display: inline-block">{{ i.value1 }}</div>
+        <div style="width: 33%;display: inline-block">{{ i.value2 }}</div>
+        <div style="width: 33%;display: inline-block">{{ i.value3 }}-{{ i.value4 }}</div>
       </div>
     </div>
     <div class="tableFour">
@@ -115,11 +126,11 @@
         <div style="width: 33%;display: inline-block">型号</div>
         <div style="width: 33%;display: inline-block">产量</div>
       </div>
-      <div v-for="i in 10"
-        :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ (i === 2 ? '#bed4ce' : '#1be409')+';text-align: center;background-color:' + (i === 2 ? '#053460' : '#053460')">
-        <div style="width: 33%;display: inline-block">{{ i }}</div>
-        <div style="width: 33%;display: inline-block">487JFY</div>
-        <div style="width: 33%;display: inline-block">15-15</div>
+      <div v-for="i in bottomTableData.slice(30,40)"
+           :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ setColor(i.value5)+';text-align: center;background-color:' + (i === 2 ? '#053460' : '#053460')">
+        <div style="width: 33%;display: inline-block">{{ i.value1 }}</div>
+        <div style="width: 33%;display: inline-block">{{ i.value2 }}</div>
+        <div style="width: 33%;display: inline-block">{{ i.value3 }}-{{ i.value4 }}</div>
       </div>
     </div>
   </div>
@@ -129,7 +140,8 @@
 import vueSeamlessScroll from "vue-seamless-scroll";
 import Chart from "../../../components/board/Chart";
 import * as echarts from 'echarts'
-import { getData } from "@/api/board/getData";
+import {getData} from "@/api/board/getData";
+import {mixData} from "@/api/board/mixData";
 
 export default {
   components: {
@@ -188,486 +200,565 @@ export default {
         waitTime: 0,
       },
       scrollTableData: [],
-    }
-  },
-  mounted() {
-    let timeInter = setInterval(() => {
-      this.show = (this.show + 1) % 4
-    }, 10 * 1000)
-    getData().then(e => {
-      this.scrollTableData = e.table33
-      this.$refs.chart1.setData({
-        tooltip: {
-          trigger: "axis",
-          axisPointer: {
-            // 坐标轴指示器，坐标轴触发有效
-            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
-          },
-        },
-        grid: {
-          left: "0",
-          right: "4%",
-          bottom: "0",
-          top: 35,
-          containLabel: true,
-        },
-        legend: {
-          data: e.chart5.y.map(val => val.name),
-          right: 'center',
-          top: 0,
-          textStyle: {
-            color: "#fff",
-          },
-          itemWidth: 12,
-          itemHeight: 10,
-          // itemGap: 35
-        },
-        xAxis: {
-          type: "category",
-          data: e.chart5.x,
-          axisLine: {
-            lineStyle: {
-              color: "white",
-            },
-          },
-          axisLabel: {
-            // interval: 0,
-            // rotate: 40,
-            textStyle: {
-              fontFamily: "Microsoft YaHei",
-            },
-          },
-        },
-
-        yAxis: {
-          type: "value",
-          axisLine: {
-            show: false,
-            lineStyle: {
-              color: "white",
-            },
-          },
-          splitLine: {
-            show: false,
-          },
-          axisLabel: {},
+      bottomTableData: [],
+      RequestDataSet: [
+        {
+          e: 'xm-01',
+          i: "",
+          f: (e) => {
+            this.scrollTableData = e
+          }
         },
-        series: [
-          {
-            name: e.chart5.y[0].name,
-            type: "bar",
-            barWidth: "30%",
-            label: {
-              show: true,
-              position: "top",
-              textStyle: {
-                color: "#49d9ff",
-              },
-            },
-            itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: "#39ffff",
-                  },
-                  {
-                    offset: 1,
-                    color: "#f5804d",
-                  },
-                ]),
-                borderRadius: 2,
+        {
+          e: 'xm-02',
+          i: "",
+          f: (e) => {
+            this.$refs.chart2.setData({
+              tooltip: {
+                trigger: "axis",
+                axisPointer: {
+                  // 坐标轴指示器，坐标轴触发有效
+                  type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+                },
               },
-            },
-            data: e.chart5.y[0].data,
-          },
-          {
-            name: e.chart5.y[1].name,
-            type: "bar",
-            barWidth: "30%",
-            barGap: '40%',
-            label: {
-              show: true,
-              position: "top",
-              textStyle: {
-                color: "#49d9ff",
+              grid: {
+                left: "0",
+                right: "4%",
+                bottom: 0,
+                top: 20,
+                containLabel: true,
               },
-            },
-            itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: "#47cbfd",
-                  },
-                  {
-                    offset: 1,
-                    color: "#3e8aff",
-                  },
-                ]),
-                borderRadius: 2,
+              xAxis: {
+                type: "category",
+                data: e.x,
+                axisLine: {
+                  lineStyle: {
+                    color: "white",
+                  },
+                },
+                axisLabel: {
+                  interval: 0,
+                  // rotate: 40,
+                  textStyle: {
+                    fontFamily: "Microsoft YaHei",
+                  },
+                },
               },
-            },
-            data: e.chart5.y[1].data,
-          },
-        ],
-      })
-      this.$refs.chart2.setData({
-        tooltip: {
-          trigger: "axis",
-          axisPointer: {
-            // 坐标轴指示器，坐标轴触发有效
-            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
-          },
-        },
-        grid: {
-          left: "0",
-          right: "4%",
-          bottom: 0,
-          top: 20,
-          containLabel: true,
-        },
-        xAxis: {
-          type: "category",
-          data: e.chart3.x,
-          axisLine: {
-            lineStyle: {
-              color: "white",
-            },
-          },
-          axisLabel: {
-            interval: 0,
-            // rotate: 40,
-            textStyle: {
-              fontFamily: "Microsoft YaHei",
-            },
-          },
-        },
 
-        yAxis: {
-          type: "value",
-          axisLine: {
-            show: false,
-            lineStyle: {
-              color: "white",
-            },
-          },
-          splitLine: {
-            show: false,
-          },
-          axisLabel: {},
+              yAxis: {
+                type: "value",
+                axisLine: {
+                  show: false,
+                  lineStyle: {
+                    color: "white",
+                  },
+                },
+                splitLine: {
+                  show: false,
+                },
+                axisLabel: {},
+              },
+              series: [
+                {
+                  name: e.y.name,
+                  type: "bar",
+                  barWidth: "40%",
+                  label: {
+                    show: true,
+                    position: "top",
+                    textStyle: {
+                      color: "#49d9ff",
+                    },
+                  },
+                  itemStyle: {
+                    normal: {
+                      color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                        {
+                          offset: 0,
+                          color: "#47cbfd",
+                        },
+                        {
+                          offset: 1,
+                          color: "#3e8aff",
+                        },
+                      ]),
+                      borderRadius: 3,
+                    },
+                  },
+                  data: e.y.data,
+                },
+              ],
+            })
+          }
         },
-        series: [
-          {
-            name: e.chart3.y.name,
-            type: "bar",
-            barWidth: "40%",
-            label: {
-              show: true,
-              position: "top",
-              textStyle: {
-                color: "#49d9ff",
+        {
+          e: 'xm-03',
+          i: "",
+          f: (e) => {
+            this.$refs.chart1.setData({
+              tooltip: {
+                trigger: "axis",
+                axisPointer: {
+                  // 坐标轴指示器，坐标轴触发有效
+                  type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+                },
               },
-            },
-            itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: "#47cbfd",
-                  },
-                  {
-                    offset: 1,
-                    color: "#3e8aff",
-                  },
-                ]),
-                borderRadius: 3,
+              grid: {
+                left: "0",
+                right: "4%",
+                bottom: "0",
+                top: 35,
+                containLabel: true,
               },
-            },
-            data: e.chart3.y.data,
-          },
-        ],
-      })
-      this.$refs.chart3.setData({
-        legend: {
-          data: e.chart6.y.map(val => val.name),
-          right: 'center',
-          top: 0,
-          textStyle: {
-            color: "#fff",
-          },
-          itemWidth: 12,
-          itemHeight: 10,
-          // itemGap: 35
-        },
-        tooltip: {
-          trigger: "axis",
-          axisPointer: {
-            lineStyle: {
-              color: {
-                type: "linear",
-                x: 0,
-                y: 0,
-                x2: 0,
-                y2: 1,
-                colorStops: [
-                  {
-                    offset: 0,
-                    color: "rgba(0, 255, 233,0)",
-                  },
-                  {
-                    offset: 0.5,
-                    color: "rgba(255, 255, 255,1)",
-                  },
-                  {
-                    offset: 1,
-                    color: "rgba(0, 255, 233,0)",
-                  },
-                ],
-                global: false,
+              legend: {
+                data: e.y.map(val => val.name),
+                right: 'center',
+                top: 0,
+                textStyle: {
+                  color: "#fff",
+                },
+                itemWidth: 12,
+                itemHeight: 10,
+                // itemGap: 35
               },
-            },
-          },
-        },
-        grid: {
-          top: "15%",
-          left: 40,
-          right: "5%",
-          bottom: "15%",
-          // containLabel: true
-        },
-        xAxis: [
-          {
-            show: false,
-            type: "category",
-            axisLine: {
-              show: true,
-            },
-            splitArea: {
-              // show: true,
-              color: "#f00",
-              lineStyle: {
-                color: "#f00",
+              xAxis: {
+                type: "category",
+                data: e.x,
+                axisLine: {
+                  lineStyle: {
+                    color: "white",
+                  },
+                },
+                axisLabel: {
+                  // interval: 0,
+                  // rotate: 40,
+                  textStyle: {
+                    fontFamily: "Microsoft YaHei",
+                  },
+                },
               },
-            },
-            axisLabel: {
-              color: "#fff",
-            },
-            splitLine: {
-              show: false,
-            },
-            boundaryGap: false,
-            data: e.chart6.x,
-          },
-        ],
-
-        yAxis: [
-          {
-            type: "value",
-            min: 18,
-            max: 24,
-            splitNumber: 4,
-            splitLine: {
-              show: true,
-              lineStyle: {
-                color: "rgba(255,255,255,0.1)",
+
+              yAxis: {
+                type: "value",
+                axisLine: {
+                  show: false,
+                  lineStyle: {
+                    color: "white",
+                  },
+                },
+                splitLine: {
+                  show: false,
+                },
+                axisLabel: {},
               },
-            },
-            axisLine: {
-              show: true,
-            },
-            axisLabel: {
-              show: true,
-              margin: 20,
-              textStyle: {
-                color: "#d1e6eb",
+              series: [
+                {
+                  name: e.y[0].name,
+                  type: "bar",
+                  barWidth: "30%",
+                  label: {
+                    show: true,
+                    position: "top",
+                    textStyle: {
+                      color: "#49d9ff",
+                    },
+                  },
+                  itemStyle: {
+                    normal: {
+                      color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                        {
+                          offset: 0,
+                          color: "#39ffff",
+                        },
+                        {
+                          offset: 1,
+                          color: "#f5804d",
+                        },
+                      ]),
+                      borderRadius: 2,
+                    },
+                  },
+                  data: e.y[0].data,
+                },
+                {
+                  name: e.y[1].name,
+                  type: "bar",
+                  barWidth: "30%",
+                  barGap: '40%',
+                  label: {
+                    show: true,
+                    position: "top",
+                    textStyle: {
+                      color: "#49d9ff",
+                    },
+                  },
+                  itemStyle: {
+                    normal: {
+                      color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                        {
+                          offset: 0,
+                          color: "#47cbfd",
+                        },
+                        {
+                          offset: 1,
+                          color: "#3e8aff",
+                        },
+                      ]),
+                      borderRadius: 2,
+                    },
+                  },
+                  data: e.y[1].data,
+                },
+              ],
+            })
+          }
+        },
+        {
+          e: 'xm-04',
+          i: "",
+          f: (e) => {
+            this.$refs.chart3.setData({
+              legend: {
+                data: e.y.map(val => val.name),
+                right: 'center',
+                top: 0,
+                textStyle: {
+                  color: "#fff",
+                },
+                itemWidth: 12,
+                itemHeight: 10,
+                // itemGap: 35
               },
-            },
-            axisTick: {
-              show: true,
-            },
-          },
-        ],
-        series: [
-          {
-            name: e.chart6.y[0].name,
-            type: "line",
-            showAllSymbol: true,
-            symbol: "circle",
-            symbolSize: 5,
-            lineStyle: {
-              normal: {
-                color: "#49d9ff",
+              tooltip: {
+                trigger: "axis",
+                axisPointer: {
+                  lineStyle: {
+                    color: {
+                      type: "linear",
+                      x: 0,
+                      y: 0,
+                      x2: 0,
+                      y2: 1,
+                      colorStops: [
+                        {
+                          offset: 0,
+                          color: "rgba(0, 255, 233,0)",
+                        },
+                        {
+                          offset: 0.5,
+                          color: "rgba(255, 255, 255,1)",
+                        },
+                        {
+                          offset: 1,
+                          color: "rgba(0, 255, 233,0)",
+                        },
+                      ],
+                      global: false,
+                    },
+                  },
+                },
               },
-            },
-            label: {
-              show: true,
-              position: "top",
-              textStyle: {
-                color: "#49d9ff",
+              grid: {
+                top: "15%",
+                left: 40,
+                right: "5%",
+                bottom: "15%",
+                // containLabel: true
               },
-            },
-            itemStyle: {
-              color: "#49d9ff",
-            },
-            areaStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(
-                  0,
-                  0,
-                  0,
-                  1,
-                  [
-                    {
-                      offset: 0,
-                      color: "rgba(108,80,243,0.3)",
+              xAxis: [
+                {
+                  show: false,
+                  type: "category",
+                  axisLine: {
+                    show: true,
+                  },
+                  splitArea: {
+                    // show: true,
+                    color: "#f00",
+                    lineStyle: {
+                      color: "#f00",
                     },
-                    {
-                      offset: 1,
-                      color: "rgba(108,80,243,0)",
+                  },
+                  axisLabel: {
+                    color: "#fff",
+                  },
+                  splitLine: {
+                    show: false,
+                  },
+                  boundaryGap: false,
+                  data: e.x,
+                },
+              ],
+
+              yAxis: [
+                {
+                  type: "value",
+                  min: 18,
+                  max: 24,
+                  splitNumber: 4,
+                  splitLine: {
+                    show: true,
+                    lineStyle: {
+                      color: "rgba(255,255,255,0.1)",
                     },
-                  ],
-                  false
-                ),
-                shadowColor: "rgba(108,80,243, 0.9)",
-                shadowBlur: 20,
+                  },
+                  axisLine: {
+                    show: true,
+                  },
+                  axisLabel: {
+                    show: true,
+                    margin: 20,
+                    textStyle: {
+                      color: "#d1e6eb",
+                    },
+                  },
+                  axisTick: {
+                    show: true,
+                  },
+                },
+              ],
+              series: [
+                {
+                  name: e.y[0].name,
+                  type: "line",
+                  showAllSymbol: true,
+                  symbol: "circle",
+                  symbolSize: 5,
+                  lineStyle: {
+                    normal: {
+                      color: "#49d9ff",
+                    },
+                  },
+                  label: {
+                    show: true,
+                    position: "top",
+                    textStyle: {
+                      color: "#49d9ff",
+                    },
+                  },
+                  itemStyle: {
+                    color: "#49d9ff",
+                  },
+                  areaStyle: {
+                    normal: {
+                      color: new echarts.graphic.LinearGradient(
+                        0,
+                        0,
+                        0,
+                        1,
+                        [
+                          {
+                            offset: 0,
+                            color: "rgba(108,80,243,0.3)",
+                          },
+                          {
+                            offset: 1,
+                            color: "rgba(108,80,243,0)",
+                          },
+                        ],
+                        false
+                      ),
+                      shadowColor: "rgba(108,80,243, 0.9)",
+                      shadowBlur: 20,
+                    },
+                  },
+                  data: e.y[0].data,
+                },
+                {
+                  name: e.y[1].name,
+                  type: "line",
+                  // smooth: true, //是否平滑
+                  showAllSymbol: true,
+                  // symbol: 'image://./static/images/guang-circle.png',
+                  symbol: "circle",
+                  symbolSize: 5,
+                  lineStyle: {
+                    normal: {
+                      color: "#668e84",
+                    },
+                  },
+                  label: {
+                    show: true,
+                    position: "top",
+                    textStyle: {
+                      color: "#668e84",
+                    },
+                  },
+
+                  itemStyle: {
+                    color: "#00ca95",
+                  },
+                  areaStyle: {
+                    normal: {
+                      color: new echarts.graphic.LinearGradient(
+                        0,
+                        0,
+                        0,
+                        1,
+                        [
+                          {
+                            offset: 0,
+                            color: "rgba(0,202,149,0.3)",
+                          },
+                          {
+                            offset: 1,
+                            color: "rgba(0,202,149,0)",
+                          },
+                        ],
+                        false
+                      ),
+                      shadowColor: "rgba(0,202,149, 0.9)",
+                      shadowBlur: 20,
+                    },
+                  },
+                  data: e.y[1].data,
+                },
+              ],
+            })
+          }
+        },
+        {
+          e: 'xm-05',
+          i: "",
+          f: (e) => {
+            this.$refs.chart4.setData({
+              tooltip: {
+                trigger: "axis",
+                axisPointer: {
+                  // 坐标轴指示器，坐标轴触发有效
+                  type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+                },
               },
-            },
-            data: e.chart6.y[0].data,
-          },
-          {
-            name: e.chart6.y[1].name,
-            type: "line",
-            // smooth: true, //是否平滑
-            showAllSymbol: true,
-            // symbol: 'image://./static/images/guang-circle.png',
-            symbol: "circle",
-            symbolSize: 5,
-            lineStyle: {
-              normal: {
-                color: "#668e84",
+              grid: {
+                left: "0",
+                right: "4%",
+                bottom: "0",
+                top: "10%",
+                containLabel: true,
               },
-            },
-            label: {
-              show: true,
-              position: "top",
-              textStyle: {
-                color: "#668e84",
+              xAxis: {
+                type: "category",
+                data: e.x,
+                axisLine: {
+                  lineStyle: {
+                    color: "white",
+                  },
+                },
+                axisLabel: {
+                  // interval: 0,
+                  // rotate: 40,
+                  textStyle: {
+                    fontFamily: "Microsoft YaHei",
+                  },
+                },
+              },
+              yAxis: {
+                type: "value",
+                axisLine: {
+                  show: false,
+                  lineStyle: {
+                    color: "white",
+                  },
+                },
+                splitLine: {
+                  show: false,
+                },
+                axisLabel: {},
               },
-            },
-
-            itemStyle: {
-              color: "#00ca95",
-            },
-            areaStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(
-                  0,
-                  0,
-                  0,
-                  1,
-                  [
-                    {
-                      offset: 0,
-                      color: "rgba(0,202,149,0.3)",
+              series: [
+                {
+                  name: e.y.name,
+                  type: "bar",
+                  barWidth: "33%",
+                  label: {
+                    show: true,
+                    position: "top",
+                    textStyle: {
+                      color: "#49d9ff",
                     },
-                    {
-                      offset: 1,
-                      color: "rgba(0,202,149,0)",
+                  },
+                  itemStyle: {
+                    normal: {
+                      color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                        {
+                          offset: 0,
+                          color: "#39ffff",
+                        },
+                        {
+                          offset: 1,
+                          color: "#f5804d",
+                        },
+                      ]),
+                      borderRadius: 2,
                     },
-                  ],
-                  false
-                ),
-                shadowColor: "rgba(0,202,149, 0.9)",
-                shadowBlur: 20,
-              },
-            },
-            data: e.chart6.y[1].data,
-          },
-        ],
-      })
-      this.$refs.chart4.setData({
-        tooltip: {
-          trigger: "axis",
-          axisPointer: {
-            // 坐标轴指示器，坐标轴触发有效
-            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
-          },
+                  },
+                  data: e.y.data,
+                },
+              ],
+            })
+          }
         },
-        grid: {
-          left: "0",
-          right: "4%",
-          bottom: "0",
-          top: "10%",
-          containLabel: true,
+        {
+          e: 'xm-06',
+          i: "",
+          f: (e) => {
+            this.bottomTableData = e
+          }
         },
-        xAxis: {
-          type: "category",
-          data: e.chart3.x,
-          axisLine: {
-            lineStyle: {
-              color: "white",
-            },
-          },
-          axisLabel: {
-            // interval: 0,
-            // rotate: 40,
-            textStyle: {
-              fontFamily: "Microsoft YaHei",
-            },
-          },
+        {
+          e: 'xm-07',
+          i: "SCADA_INV_STATS_01('')",
+          f: (e) => {
+            this.planNum = e.db
+            this.practicalNum = e.sj
+          }
         },
-        yAxis: {
-          type: "value",
-          axisLine: {
-            show: false,
-            lineStyle: {
-              color: "white",
-            },
-          },
-          splitLine: {
-            show: false,
-          },
-          axisLabel: {},
+        {
+          e: 'xm-08',
+          i: "SCADA_INV_STATS_SUM('')",
+          f: (e) => {
+            // this.linerNum = e
+          }
         },
-        series: [
-          {
-            name: e.chart3.y.name,
-            type: "bar",
-            barWidth: "33%",
-            label: {
-              show: true,
-              position: "top",
-              textStyle: {
-                color: "#49d9ff",
-              },
-            },
-            itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: "#39ffff",
-                  },
-                  {
-                    offset: 1,
-                    color: "#f5804d",
-                  },
-                ]),
-                borderRadius: 2,
-              },
-            },
-            data: e.chart3.y.data,
-          },
-        ],
-      })
+        {
+          e: 'xm-09',
+          i: "",
+          f: (e) => {
+            // this.caseNum = e
+          }
+        }
+      ]
+    }
+  },
+  mounted() {
+    let timeInter = setInterval(() => {
+      this.show = (this.show + 1) % 4
+    }, 10 * 1000)
+
+    this.RequestDataSet.forEach(val => {
+      mixData(val)
     })
   },
-  methods: {}
+  methods: {
+    setColor: (e) => {
+      if (e === '0') {
+        return '#1be409'
+      }
+      if (e === '1') {
+        return '#bed4ce'
+      }
+      if (e === '2') {
+        return '#ff5959'
+      }
+      if (e === '3') {
+        return '#ffb769'
+      }
+    }
+  }
 };
 </script>
 <style scoped>
-.foamingMachine{
+.foamingMachine {
   background-image: url("../../../assets/board/foamingMachine.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
@@ -678,6 +769,7 @@ export default {
   width: 36vw;
   height: 12vw;
 }
+
 .app-container {
   background-image: url("../../../assets/board/foaming1.jpg");
   background-repeat: no-repeat;
@@ -860,6 +952,7 @@ export default {
   width: 16.8%;
   height: 29%;
 }
+
 .title {
   position: absolute;
   transform: translateY(-50%);
diff --git a/src/views/board/liner/index.vue b/src/views/board/liner/index.vue
index 673ff5f..6ce0f3f 100644
--- a/src/views/board/liner/index.vue
+++ b/src/views/board/liner/index.vue
@@ -172,7 +172,6 @@ export default {
           i: "",
           f: (e) => {
             this.practicalNum = e
-            console.log(e)
           }
         },
         {
@@ -409,7 +408,7 @@ export default {
         },
         {
           e: 'nd-08',
-          i: "",
+          i: "SCADA_INV_STATS_SUM('')",
           f: (e) => {
             this.linerNum = e
           }
@@ -506,7 +505,6 @@ export default {
                 },
               ],
             })
-            console.log(e)
           }
         },
         {
@@ -605,7 +603,6 @@ export default {
                 }
               ]
             })
-            console.log(e)
           }
         },
       ]
diff --git a/src/views/board/pourInto/index2.vue b/src/views/board/pourInto/index2.vue
index 3c7eb66..407ec8d 100644
--- a/src/views/board/pourInto/index2.vue
+++ b/src/views/board/pourInto/index2.vue
@@ -13,7 +13,7 @@
           条码:
         </span>
         <span>
-          1
+          {{ gz.value1 }}
         </span>
       </p>
       <p>
@@ -21,7 +21,7 @@
           型号:
         </span>
         <span>
-          1
+          {{ gz.value2 }}
         </span>
       </p>
       <p>
@@ -29,7 +29,7 @@
           灌注类型:
         </span>
         <span>
-          1
+          {{ gz.value3 }}
         </span>
       </p>
       <p>
@@ -37,7 +37,7 @@
           灌注量:
         </span>
         <span>
-          1
+          {{ gz.value4 }}
         </span>
       </p>
       <p>
@@ -45,7 +45,7 @@
           灌注结果:
         </span>
         <span>
-          1
+          {{ gz.value5 }}
         </span>
       </p>
     </div>
@@ -55,7 +55,7 @@
           条码:
         </span>
         <span>
-          1
+          {{ dj.value1 }}
         </span>
       </p>
       <p>
@@ -63,7 +63,7 @@
           型号:
         </span>
         <span>
-          1
+          {{ dj.value2 }}
         </span>
       </p>
       <p>
@@ -72,7 +72,7 @@
           接地电阻:
         </span>
         <span>
-          1
+          {{ dj.value3 }}
         </span>
       </div>
       <div style="display: inline-block;width: 50%">
@@ -80,7 +80,7 @@
           交耐电流:
         </span>
         <span>
-          1
+          {{ dj.value4 }}
         </span>
       </div>
       </p>
@@ -90,7 +90,7 @@
           低压启动:
         </span>
         <span>
-          1
+          {{ dj.value5 }}
         </span>
       </div>
       <div style="display: inline-block;width: 50%">
@@ -98,7 +98,7 @@
           动态泄露:
         </span>
         <span>
-          1
+          {{ dj.value6 }}
         </span>
       </div>
       </p>
@@ -107,7 +107,7 @@
           检测结果:
         </span>
         <span>
-          1
+          {{ dj.value7 }}
         </span>
       </p>
     </div>
@@ -117,7 +117,7 @@
           条码:
         </span>
         <span>
-          1
+          {{ zl.value1 }}
         </span>
       </p>
       <p>
@@ -125,7 +125,7 @@
           型号:
         </span>
         <span>
-          1
+          {{ zl.value2 }}
         </span>
       </p>
       <p>
@@ -133,7 +133,7 @@
           环境温度:
         </span>
         <span>
-          1
+          {{ zl.value3 }}
         </span>
       </p>
       <p>
@@ -141,7 +141,7 @@
           检测结果:
         </span>
         <span>
-          1
+          {{ zl.value4 }}
         </span>
       </p>
     </div>
@@ -151,7 +151,7 @@
           条码:
         </span>
         <span>
-          1
+          {{ gdy.value1 }}
         </span>
       </p>
       <p>
@@ -159,7 +159,7 @@
           型号:
         </span>
         <span>
-          1
+          {{ gdy.value2 }}
         </span>
       </p>
       <p>
@@ -167,7 +167,7 @@
           检测结果:
         </span>
         <span>
-          1
+          {{ gdy.value3 }}
         </span>
       </p>
     </div>
@@ -194,12 +194,12 @@
         </div>
         <vue-seamless-scroll
           :class-option="scrollTableOption"
-          :data="scrollTableData"
+          :data="scrollTableData1"
           class="case-item"
           style="height: 84%;overflow: hidden;"
         >
           <div
-            v-for="(item, index) in scrollTableData"
+            v-for="(item, index) in scrollTableData1"
             :key="index"
             style="height:4.8vh;"
           >
@@ -239,12 +239,12 @@
         </div>
         <vue-seamless-scroll
           :class-option="scrollTableOption"
-          :data="scrollTableData"
+          :data="scrollTableData2"
           class="case-item"
           style="height: 84%;overflow: hidden;"
         >
           <div
-            v-for="(item, index) in scrollTableData"
+            v-for="(item, index) in scrollTableData2"
             :key="index"
             style="height:4.8vh;"
           >
@@ -284,12 +284,12 @@
         </div>
         <vue-seamless-scroll
           :class-option="scrollTableOption"
-          :data="scrollTableData"
+          :data="scrollTableData3"
           class="case-item"
           style="height: 84%;overflow: hidden;"
         >
           <div
-            v-for="(item, index) in scrollTableData"
+            v-for="(item, index) in scrollTableData3"
             :key="index"
             style="height:4.8vh;"
           >
@@ -329,12 +329,12 @@
         </div>
         <vue-seamless-scroll
           :class-option="scrollTableOption"
-          :data="scrollTableData"
+          :data="scrollTableData4"
           class="case-item"
           style="height: 84%;overflow: hidden;"
         >
           <div
-            v-for="(item, index) in scrollTableData"
+            v-for="(item, index) in scrollTableData4"
             :key="index"
             style="height:4.8vh;"
           >
@@ -411,7 +411,9 @@ import vueSeamlessScroll from "vue-seamless-scroll";
 import Chart from "../../../components/board/Chart";
 import * as echarts from 'echarts'
 import {getData} from "@/api/board/getData";
+import {mixData} from "@/api/board/mixData";
 
+const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
 export default {
   components: {
     vueSeamlessScroll,
@@ -484,1002 +486,1096 @@ export default {
         singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
         waitTime: 0,
       },
+      gz: {},
+      dj: {},
+      zl: {},
+      gdy: {},
       scrollTableData: [],
+      scrollTableData1: [],
+      scrollTableData2: [],
+      scrollTableData3: [],
+      scrollTableData4: [],
 
-    }
-  },
-  mounted() {
-    getData().then(e => {
-      const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
-      this.scrollTableData = e.table6
-      this.$refs.chart1.setData({
-        tooltip: {
-          trigger: "item",
-          formatter: "{a} <br/>{b} : {c} ({d}%)",
+      RequestDataSet: [
+        {
+          e: 'zzgx-01',
+          i: "",
+          f: (e) => {
+            this.gz = e
+          }
         },
-        series: [
-          {
-            name: "签到比例分析",
-            type: "pie",
-            radius: "70%",
-            center: ["50%", "50%"],
-            data: [
-              { value: 335, name: "问题1" },
-              { value: 310, name: "问题2" },
-              { value: 234, name: "问题3" },
-              { value: 135, name: "问题4" },
-            ],
-            itemStyle: {
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)",
-              },
-              normal: {
-                label: {
-                  show: true,
-                  //	                            position:'inside',
-                  formatter: "{b} : {c} ({d}%)",
-                  color:'#fff'
-                },
+        {
+          e: 'zzgx-02',
+          i: "",
+          f: (e) => {
+            this.dj = e
+          }
+        },
+        {
+          e: 'zzgx-03',
+          i: "",
+          f: (e) => {
+            this.zl = e
+          }
+        },
+        {
+          e: 'zzgx-04',
+          i: "",
+          f: (e) => {
+            this.gdy = e
+          }
+        },
+        {
+          e: 'zzgx-05',
+          i: "SCADA_INV_STATS_01('')",
+          f: (e) => {
+            this.scrollTableData = e
+          }
+        },
+        {
+          e: 'zzgx-06',
+          i: "",
+          f: (e) => {
+            this.$refs.chart1.setData({
+              tooltip: {
+                trigger: "item",
+                formatter: "{a} <br/>{b} : {c} ({d}%)",
               },
-              labelLine: { show: true },
-            },
-          },
-        ],
-      })
-
-      this.$refs.chart11.setData({
-        series: [
-          {
-            type: "pie",
-            clockWise: false,
-            radius: ['60%', '75%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false,
-                },
-                labelLine: {
-                  show: false,
+              series: [
+                {
+                  name: "异常比例",
+                  type: "pie",
+                  radius: "70%",
+                  center: ["50%", "50%"],
+                  data: e,
+                  itemStyle: {
+                    emphasis: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: "rgba(0, 0, 0, 0.5)",
+                    },
+                    normal: {
+                      label: {
+                        show: true,
+                        //	                            position:'inside',
+                        formatter: "{b} : {c} ({d}%)",
+                        color: '#fff'
+                      },
+                    },
+                    labelLine: {show: true},
+                  },
                 },
-                shadowBlur: 0,
-                shadowColor: "#389af4",
-              },
-            },
-            hoverAnimation: false,
-            center: ["50%", "50%"],
-            data: [
-              {
-                value: 100,
-                label: {
-                  normal: {
-                    rich: {
-                      a: {
-                        color: "#389af4",
-                        align: "center",
-                        fontSize: 0.9 * vw,
-                        fontWeight: "bold",
+              ],
+            })
+          }
+        },
+        {
+          e: 'zzgx-07',
+          i: "",
+          f: (e) => {
+            this.$refs.chart11.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
                       },
-                      b: {
-                        color: "#fff",
-                        align: "center",
-                        fontSize: 0.9 * vw,
+                      labelLine: {
+                        show: false,
                       },
+                      shadowBlur: 0,
+                      shadowColor: "#389af4",
                     },
-                    formatter: function (params) {
-                      return (
-                        "{a|" +
-                        1000 +
-                        "}" +
-                        "\n{b|总数}"
-                      );
+                  },
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: e.value1,
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#389af4",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              1000 +
+                              "}" +
+                              "\n{b|总数}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#389af4",
+                          shadowColor: "#389af4",
+                          shadowBlur: 0,
+                        },
+                      },
                     },
-                    position: "center",
-                    show: true,
-                    textStyle: {
-                      fontSize: "14",
-                      fontWeight: "normal",
-                      color: "#fff",
+                    {
+                      value: 0,
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
                     },
-                  },
+                  ],
                 },
-                itemStyle: {
-                  normal: {
-                    color: "#389af4",
-                    shadowColor: "#389af4",
-                    shadowBlur: 0,
-                  },
-                },
-              },
-              {
-                value: 0,
-                name: "invisible",
-                itemStyle: {
-                  normal: {
-                    color: "#412a4e",
-                  },
-                  emphasis: {
-                    color: "#412a4e",
-                  },
-                },
-              },
-            ],
-          },
-        ],
-      })
-      this.$refs.chart12.setData({
-        series: [
-          {
-            type: "pie",
-            clockWise: false,
-            radius: ['60%', '75%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false,
-                },
-                labelLine: {
-                  show: false,
-                },
-                shadowBlur: 0,
-                shadowColor: "#ff8c37",
-              },
-            },
-            hoverAnimation: false,
-            center: ["50%", "50%"],
-            data: [
-              {
-                value: 100,
-                label: {
-                  normal: {
-                    rich: {
-                      a: {
-                        color: "#ff8c37",
-                        align: "center",
-                        fontSize: 0.9 * vw,
-                        fontWeight: "bold",
+              ],
+            })
+            this.$refs.chart12.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
                       },
-                      b: {
-                        color: "#fff",
-                        align: "center",
-                        fontSize: 0.8 * vw,
+                      labelLine: {
+                        show: false,
                       },
+                      shadowBlur: 0,
+                      shadowColor: "#ff8c37",
                     },
-                    formatter: function (params) {
-                      return (
-                        "{a|" +
-                        1000 +
-                        "}" +
-                        "\n{b|合格数}"
-                      );
+                  },
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: e.value2,
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#ff8c37",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.8 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              1000 +
+                              "}" +
+                              "\n{b|合格数}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#ff8c37",
+                          shadowColor: "#ff8c37",
+                          shadowBlur: 0,
+                        },
+                      },
                     },
-                    position: "center",
-                    show: true,
-                    textStyle: {
-                      fontSize: "14",
-                      fontWeight: "normal",
-                      color: "#fff",
+                    {
+                      value: 0,
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
                     },
-                  },
-                },
-                itemStyle: {
-                  normal: {
-                    color: "#ff8c37",
-                    shadowColor: "#ff8c37",
-                    shadowBlur: 0,
-                  },
-                },
-              },
-              {
-                value: 0,
-                name: "invisible",
-                itemStyle: {
-                  normal: {
-                    color: "#412a4e",
-                  },
-                  emphasis: {
-                    color: "#412a4e",
-                  },
-                },
-              },
-            ],
-          },
-        ],
-      })
-      this.$refs.chart13.setData({
-        series: [
-          {
-            type: "pie",
-            clockWise: false,
-            radius: ['60%', '75%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false,
+                  ],
                 },
-                labelLine: {
-                  show: false,
-                },
-                shadowBlur: 0,
-                shadowColor: "#ffc257",
-              },
-            },
-            hoverAnimation: false,
-            center: ["50%", "50%"],
-            data: [
-              {
-                value: 100,
-                label: {
-                  normal: {
-                    rich: {
-                      a: {
-                        color: "#ffc257",
-                        align: "center",
-                        fontSize: 0.9 * vw,
-                        fontWeight: "bold",
+              ],
+            })
+            this.$refs.chart13.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
                       },
-                      b: {
-                        color: "#fff",
-                        align: "center",
-                        fontSize: 0.8 * vw,
+                      labelLine: {
+                        show: false,
                       },
+                      shadowBlur: 0,
+                      shadowColor: "#ffc257",
                     },
-                    formatter: function (params) {
-                      return (
-                        "{a|" +
-                        100 +
-                        "%}" +
-                        "\n{b|合格率}"
-                      );
+                  },
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: parseFloat(e.value3),
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#ffc257",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.8 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              100 +
+                              "%}" +
+                              "\n{b|合格率}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#ffc257",
+                          shadowColor: "#ffc257",
+                          shadowBlur: 0,
+                        },
+                      },
                     },
-                    position: "center",
-                    show: true,
-                    textStyle: {
-                      fontSize: "14",
-                      fontWeight: "normal",
-                      color: "#fff",
+                    {
+                      value: parseFloat((100 - parseFloat(e.value3)).toFixed(2)),
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
                     },
-                  },
-                },
-                itemStyle: {
-                  normal: {
-                    color: "#ffc257",
-                    shadowColor: "#ffc257",
-                    shadowBlur: 0,
-                  },
-                },
-              },
-              {
-                value: 0,
-                name: "invisible",
-                itemStyle: {
-                  normal: {
-                    color: "#412a4e",
-                  },
-                  emphasis: {
-                    color: "#412a4e",
-                  },
-                },
-              },
-            ],
-          },
-        ],
-      })
-
-      this.$refs.chart21.setData({
-        series: [
-          {
-            type: "pie",
-            clockWise: false,
-            radius: ['60%', '75%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false,
-                },
-                labelLine: {
-                  show: false,
+                  ],
                 },
-                shadowBlur: 0,
-                shadowColor: "#389af4",
-              },
-            },
-            hoverAnimation: false,
-            center: ["50%", "50%"],
-            data: [
-              {
-                value: 100,
-                label: {
-                  normal: {
-                    rich: {
-                      a: {
-                        color: "#389af4",
-                        align: "center",
-                        fontSize: 0.9 * vw,
-                        fontWeight: "bold",
+              ],
+            })
+          }
+        },
+        {
+          e: 'zzgx-08',
+          i: "",
+          f: (e) => {
+            this.scrollTableData1 = e
+          }
+        },
+        {
+          e: 'zzgx-09',
+          i: "",
+          f: (e) => {
+            this.$refs.chart21.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
                       },
-                      b: {
-                        color: "#fff",
-                        align: "center",
-                        fontSize: 0.9 * vw,
+                      labelLine: {
+                        show: false,
                       },
+                      shadowBlur: 0,
+                      shadowColor: "#389af4",
                     },
-                    formatter: function (params) {
-                      return (
-                        "{a|" +
-                        1000 +
-                        "}" +
-                        "\n{b|总数}"
-                      );
+                  },
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: e.value1,
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#389af4",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              1000 +
+                              "}" +
+                              "\n{b|总数}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#389af4",
+                          shadowColor: "#389af4",
+                          shadowBlur: 0,
+                        },
+                      },
                     },
-                    position: "center",
-                    show: true,
-                    textStyle: {
-                      fontSize: "14",
-                      fontWeight: "normal",
-                      color: "#fff",
+                    {
+                      value: 0,
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
                     },
-                  },
-                },
-                itemStyle: {
-                  normal: {
-                    color: "#389af4",
-                    shadowColor: "#389af4",
-                    shadowBlur: 0,
-                  },
-                },
-              },
-              {
-                value: 0,
-                name: "invisible",
-                itemStyle: {
-                  normal: {
-                    color: "#412a4e",
-                  },
-                  emphasis: {
-                    color: "#412a4e",
-                  },
-                },
-              },
-            ],
-          },
-        ],
-      })
-      this.$refs.chart22.setData({
-        series: [
-          {
-            type: "pie",
-            clockWise: false,
-            radius: ['60%', '75%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false,
+                  ],
                 },
-                labelLine: {
-                  show: false,
-                },
-                shadowBlur: 0,
-                shadowColor: "#ff8c37",
-              },
-            },
-            hoverAnimation: false,
-            center: ["50%", "50%"],
-            data: [
-              {
-                value: 100,
-                label: {
-                  normal: {
-                    rich: {
-                      a: {
-                        color: "#ff8c37",
-                        align: "center",
-                        fontSize: 0.9 * vw,
-                        fontWeight: "bold",
+              ],
+            })
+            this.$refs.chart22.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
                       },
-                      b: {
-                        color: "#fff",
-                        align: "center",
-                        fontSize: 0.8 * vw,
+                      labelLine: {
+                        show: false,
                       },
+                      shadowBlur: 0,
+                      shadowColor: "#ff8c37",
                     },
-                    formatter: function (params) {
-                      return (
-                        "{a|" +
-                        1000 +
-                        "}" +
-                        "\n{b|合格数}"
-                      );
+                  },
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: e.value2,
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#ff8c37",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.8 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              1000 +
+                              "}" +
+                              "\n{b|合格数}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#ff8c37",
+                          shadowColor: "#ff8c37",
+                          shadowBlur: 0,
+                        },
+                      },
                     },
-                    position: "center",
-                    show: true,
-                    textStyle: {
-                      fontSize: "14",
-                      fontWeight: "normal",
-                      color: "#fff",
+                    {
+                      value: 0,
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
                     },
-                  },
-                },
-                itemStyle: {
-                  normal: {
-                    color: "#ff8c37",
-                    shadowColor: "#ff8c37",
-                    shadowBlur: 0,
-                  },
-                },
-              },
-              {
-                value: 0,
-                name: "invisible",
-                itemStyle: {
-                  normal: {
-                    color: "#412a4e",
-                  },
-                  emphasis: {
-                    color: "#412a4e",
-                  },
+                  ],
                 },
-              },
-            ],
-          },
-        ],
-      })
-      this.$refs.chart23.setData({
-        series: [
-          {
-            type: "pie",
-            clockWise: false,
-            radius: ['60%', '75%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false,
-                },
-                labelLine: {
-                  show: false,
-                },
-                shadowBlur: 0,
-                shadowColor: "#ffc257",
-              },
-            },
-            hoverAnimation: false,
-            center: ["50%", "50%"],
-            data: [
-              {
-                value: 100,
-                label: {
-                  normal: {
-                    rich: {
-                      a: {
-                        color: "#ffc257",
-                        align: "center",
-                        fontSize: 0.9 * vw,
-                        fontWeight: "bold",
+              ],
+            })
+            this.$refs.chart23.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
                       },
-                      b: {
-                        color: "#fff",
-                        align: "center",
-                        fontSize: 0.8 * vw,
+                      labelLine: {
+                        show: false,
                       },
+                      shadowBlur: 0,
+                      shadowColor: "#ffc257",
                     },
-                    formatter: function (params) {
-                      return (
-                        "{a|" +
-                        100 +
-                        "%}" +
-                        "\n{b|合格率}"
-                      );
+                  },
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: parseFloat(e.value3),
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#ffc257",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.8 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              100 +
+                              "%}" +
+                              "\n{b|合格率}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#ffc257",
+                          shadowColor: "#ffc257",
+                          shadowBlur: 0,
+                        },
+                      },
                     },
-                    position: "center",
-                    show: true,
-                    textStyle: {
-                      fontSize: "14",
-                      fontWeight: "normal",
-                      color: "#fff",
+                    {
+                      value: parseFloat((100 - parseFloat(e.value3)).toFixed(2)),
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
                     },
-                  },
-                },
-                itemStyle: {
-                  normal: {
-                    color: "#ffc257",
-                    shadowColor: "#ffc257",
-                    shadowBlur: 0,
-                  },
-                },
-              },
-              {
-                value: 0,
-                name: "invisible",
-                itemStyle: {
-                  normal: {
-                    color: "#412a4e",
-                  },
-                  emphasis: {
-                    color: "#412a4e",
-                  },
+                  ],
                 },
-              },
-            ],
-          },
-        ],
-      })
-
-      this.$refs.chart31.setData({
-        series: [
-          {
-            type: "pie",
-            clockWise: false,
-            radius: ['60%', '75%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false,
-                },
-                labelLine: {
-                  show: false,
-                },
-                shadowBlur: 0,
-                shadowColor: "#389af4",
-              },
-            },
-            hoverAnimation: false,
-            center: ["50%", "50%"],
-            data: [
-              {
-                value: 100,
-                label: {
-                  normal: {
-                    rich: {
-                      a: {
-                        color: "#389af4",
-                        align: "center",
-                        fontSize: 0.9 * vw,
-                        fontWeight: "bold",
+              ],
+            })
+          }
+        },
+        {
+          e: 'zzgx-10',
+          i: "",
+          f: (e) => {
+            this.scrollTableData2 = e
+          }
+        },
+        {
+          e: 'zzgx-11',
+          i: "SCADA_INV_STATS_01('')",
+          f: (e) => {
+            this.$refs.chart31.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
                       },
-                      b: {
-                        color: "#fff",
-                        align: "center",
-                        fontSize: 0.9 * vw,
+                      labelLine: {
+                        show: false,
                       },
+                      shadowBlur: 0,
+                      shadowColor: "#389af4",
                     },
-                    formatter: function (params) {
-                      return (
-                        "{a|" +
-                        1000 +
-                        "}" +
-                        "\n{b|总数}"
-                      );
+                  },
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: e.value1,
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#389af4",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              1000 +
+                              "}" +
+                              "\n{b|总数}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#389af4",
+                          shadowColor: "#389af4",
+                          shadowBlur: 0,
+                        },
+                      },
                     },
-                    position: "center",
-                    show: true,
-                    textStyle: {
-                      fontSize: "14",
-                      fontWeight: "normal",
-                      color: "#fff",
+                    {
+                      value: 0,
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
                     },
-                  },
-                },
-                itemStyle: {
-                  normal: {
-                    color: "#389af4",
-                    shadowColor: "#389af4",
-                    shadowBlur: 0,
-                  },
-                },
-              },
-              {
-                value: 0,
-                name: "invisible",
-                itemStyle: {
-                  normal: {
-                    color: "#412a4e",
-                  },
-                  emphasis: {
-                    color: "#412a4e",
-                  },
+                  ],
                 },
-              },
-            ],
-          },
-        ],
-      })
-      this.$refs.chart32.setData({
-        series: [
-          {
-            type: "pie",
-            clockWise: false,
-            radius: ['60%', '75%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false,
-                },
-                labelLine: {
-                  show: false,
-                },
-                shadowBlur: 0,
-                shadowColor: "#ff8c37",
-              },
-            },
-            hoverAnimation: false,
-            center: ["50%", "50%"],
-            data: [
-              {
-                value: 100,
-                label: {
-                  normal: {
-                    rich: {
-                      a: {
-                        color: "#ff8c37",
-                        align: "center",
-                        fontSize: 0.9 * vw,
-                        fontWeight: "bold",
+              ],
+            })
+            this.$refs.chart32.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
                       },
-                      b: {
-                        color: "#fff",
-                        align: "center",
-                        fontSize: 0.8 * vw,
+                      labelLine: {
+                        show: false,
                       },
+                      shadowBlur: 0,
+                      shadowColor: "#ff8c37",
                     },
-                    formatter: function (params) {
-                      return (
-                        "{a|" +
-                        1000 +
-                        "}" +
-                        "\n{b|合格数}"
-                      );
+                  },
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: e.value2,
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#ff8c37",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.8 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              1000 +
+                              "}" +
+                              "\n{b|合格数}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#ff8c37",
+                          shadowColor: "#ff8c37",
+                          shadowBlur: 0,
+                        },
+                      },
                     },
-                    position: "center",
-                    show: true,
-                    textStyle: {
-                      fontSize: "14",
-                      fontWeight: "normal",
-                      color: "#fff",
+                    {
+                      value: 0,
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
                     },
-                  },
-                },
-                itemStyle: {
-                  normal: {
-                    color: "#ff8c37",
-                    shadowColor: "#ff8c37",
-                    shadowBlur: 0,
-                  },
-                },
-              },
-              {
-                value: 0,
-                name: "invisible",
-                itemStyle: {
-                  normal: {
-                    color: "#412a4e",
-                  },
-                  emphasis: {
-                    color: "#412a4e",
-                  },
-                },
-              },
-            ],
-          },
-        ],
-      })
-      this.$refs.chart33.setData({
-        series: [
-          {
-            type: "pie",
-            clockWise: false,
-            radius: ['60%', '75%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false,
+                  ],
                 },
-                labelLine: {
-                  show: false,
-                },
-                shadowBlur: 0,
-                shadowColor: "#ffc257",
-              },
-            },
-            hoverAnimation: false,
-            center: ["50%", "50%"],
-            data: [
-              {
-                value: 100,
-                label: {
-                  normal: {
-                    rich: {
-                      a: {
-                        color: "#ffc257",
-                        align: "center",
-                        fontSize: 0.9 * vw,
-                        fontWeight: "bold",
+              ],
+            })
+            this.$refs.chart33.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
                       },
-                      b: {
-                        color: "#fff",
-                        align: "center",
-                        fontSize: 0.8 * vw,
+                      labelLine: {
+                        show: false,
                       },
+                      shadowBlur: 0,
+                      shadowColor: "#ffc257",
                     },
-                    formatter: function (params) {
-                      return (
-                        "{a|" +
-                        100 +
-                        "%}" +
-                        "\n{b|合格率}"
-                      );
+                  },
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: parseFloat(e.value3),
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#ffc257",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.8 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              100 +
+                              "%}" +
+                              "\n{b|合格率}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#ffc257",
+                          shadowColor: "#ffc257",
+                          shadowBlur: 0,
+                        },
+                      },
                     },
-                    position: "center",
-                    show: true,
-                    textStyle: {
-                      fontSize: "14",
-                      fontWeight: "normal",
-                      color: "#fff",
+                    {
+                      value: parseFloat((100 - parseFloat(e.value3)).toFixed(2)),
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
                     },
-                  },
-                },
-                itemStyle: {
-                  normal: {
-                    color: "#ffc257",
-                    shadowColor: "#ffc257",
-                    shadowBlur: 0,
-                  },
-                },
-              },
-              {
-                value: 0,
-                name: "invisible",
-                itemStyle: {
-                  normal: {
-                    color: "#412a4e",
-                  },
-                  emphasis: {
-                    color: "#412a4e",
-                  },
+                  ],
                 },
-              },
-            ],
-          },
-        ],
-      })
-
-      this.$refs.chart41.setData({
-        series: [
-          {
-            type: "pie",
-            clockWise: false,
-            radius: ['60%', '75%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false,
-                },
-                labelLine: {
-                  show: false,
-                },
-                shadowBlur: 0,
-                shadowColor: "#389af4",
-              },
-            },
-            hoverAnimation: false,
-            center: ["50%", "50%"],
-            data: [
-              {
-                value: 100,
-                label: {
-                  normal: {
-                    rich: {
-                      a: {
-                        color: "#389af4",
-                        align: "center",
-                        fontSize: 0.9 * vw,
-                        fontWeight: "bold",
+              ],
+            })
+          }
+        },
+        {
+          e: 'zzgx-12',
+          i: "",
+          f: (e) => {
+            this.scrollTableData3 = e
+          }
+        },
+        {
+          e: 'zzgx-13',
+          i: "",
+          f: (e) => {
+            this.$refs.chart41.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
                       },
-                      b: {
-                        color: "#fff",
-                        align: "center",
-                        fontSize: 0.9 * vw,
+                      labelLine: {
+                        show: false,
                       },
+                      shadowBlur: 0,
+                      shadowColor: "#389af4",
                     },
-                    formatter: function (params) {
-                      return (
-                        "{a|" +
-                        1000 +
-                        "}" +
-                        "\n{b|总数}"
-                      );
+                  },
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: e.value1,
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#389af4",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              1000 +
+                              "}" +
+                              "\n{b|总数}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#389af4",
+                          shadowColor: "#389af4",
+                          shadowBlur: 0,
+                        },
+                      },
                     },
-                    position: "center",
-                    show: true,
-                    textStyle: {
-                      fontSize: "14",
-                      fontWeight: "normal",
-                      color: "#fff",
+                    {
+                      value: 0,
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
                     },
-                  },
-                },
-                itemStyle: {
-                  normal: {
-                    color: "#389af4",
-                    shadowColor: "#389af4",
-                    shadowBlur: 0,
-                  },
-                },
-              },
-              {
-                value: 0,
-                name: "invisible",
-                itemStyle: {
-                  normal: {
-                    color: "#412a4e",
-                  },
-                  emphasis: {
-                    color: "#412a4e",
-                  },
-                },
-              },
-            ],
-          },
-        ],
-      })
-      this.$refs.chart42.setData({
-        series: [
-          {
-            type: "pie",
-            clockWise: false,
-            radius: ['60%', '75%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false,
+                  ],
                 },
-                labelLine: {
-                  show: false,
-                },
-                shadowBlur: 0,
-                shadowColor: "#ff8c37",
-              },
-            },
-            hoverAnimation: false,
-            center: ["50%", "50%"],
-            data: [
-              {
-                value: 100,
-                label: {
-                  normal: {
-                    rich: {
-                      a: {
-                        color: "#ff8c37",
-                        align: "center",
-                        fontSize: 0.9 * vw,
-                        fontWeight: "bold",
+              ],
+            })
+            this.$refs.chart42.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
                       },
-                      b: {
-                        color: "#fff",
-                        align: "center",
-                        fontSize: 0.8 * vw,
+                      labelLine: {
+                        show: false,
                       },
+                      shadowBlur: 0,
+                      shadowColor: "#ff8c37",
                     },
-                    formatter: function (params) {
-                      return (
-                        "{a|" +
-                        1000 +
-                        "}" +
-                        "\n{b|合格数}"
-                      );
+                  },
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: e.value2,
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#ff8c37",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.8 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              1000 +
+                              "}" +
+                              "\n{b|合格数}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#ff8c37",
+                          shadowColor: "#ff8c37",
+                          shadowBlur: 0,
+                        },
+                      },
                     },
-                    position: "center",
-                    show: true,
-                    textStyle: {
-                      fontSize: "14",
-                      fontWeight: "normal",
-                      color: "#fff",
+                    {
+                      value: 0,
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
                     },
-                  },
-                },
-                itemStyle: {
-                  normal: {
-                    color: "#ff8c37",
-                    shadowColor: "#ff8c37",
-                    shadowBlur: 0,
-                  },
-                },
-              },
-              {
-                value: 0,
-                name: "invisible",
-                itemStyle: {
-                  normal: {
-                    color: "#412a4e",
-                  },
-                  emphasis: {
-                    color: "#412a4e",
-                  },
-                },
-              },
-            ],
-          },
-        ],
-      })
-      this.$refs.chart43.setData({
-        series: [
-          {
-            type: "pie",
-            clockWise: false,
-            radius: ['60%', '75%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false,
+                  ],
                 },
-                labelLine: {
-                  show: false,
-                },
-                shadowBlur: 0,
-                shadowColor: "#ffc257",
-              },
-            },
-            hoverAnimation: false,
-            center: ["50%", "50%"],
-            data: [
-              {
-                value: 100,
-                label: {
-                  normal: {
-                    rich: {
-                      a: {
-                        color: "#ffc257",
-                        align: "center",
-                        fontSize: 0.9 * vw,
-                        fontWeight: "bold",
+              ],
+            })
+            this.$refs.chart43.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
                       },
-                      b: {
-                        color: "#fff",
-                        align: "center",
-                        fontSize: 0.8 * vw,
+                      labelLine: {
+                        show: false,
                       },
+                      shadowBlur: 0,
+                      shadowColor: "#ffc257",
                     },
-                    formatter: function (params) {
-                      return (
-                        "{a|" +
-                        100 +
-                        "%}" +
-                        "\n{b|合格率}"
-                      );
+                  },
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: parseFloat(e.value3),
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#ffc257",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.8 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              100 +
+                              "%}" +
+                              "\n{b|合格率}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#ffc257",
+                          shadowColor: "#ffc257",
+                          shadowBlur: 0,
+                        },
+                      },
                     },
-                    position: "center",
-                    show: true,
-                    textStyle: {
-                      fontSize: "14",
-                      fontWeight: "normal",
-                      color: "#fff",
+                    {
+                      value: parseFloat((100 - parseFloat(e.value3)).toFixed(2)),
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
                     },
-                  },
-                },
-                itemStyle: {
-                  normal: {
-                    color: "#ffc257",
-                    shadowColor: "#ffc257",
-                    shadowBlur: 0,
-                  },
+                  ],
                 },
-              },
-              {
-                value: 0,
-                name: "invisible",
-                itemStyle: {
-                  normal: {
-                    color: "#412a4e",
-                  },
-                  emphasis: {
-                    color: "#412a4e",
-                  },
-                },
-              },
-            ],
-          },
-        ],
-      })
+              ],
+            })
+          }
+        },
+        {
+          e: 'zzgx-14',
+          i: "",
+          f: (e) => {
+            this.scrollTableData4 = e
+          }
+        },
+      ],
+
+    }
+  },
+  mounted() {
+    this.RequestDataSet.forEach(val => {
+      mixData(val)
     })
   },
   methods: {
@@ -1662,6 +1758,7 @@ export default {
   display: inline-block;
   width: 14.2%;
 }
+
 .scrollTableItem {
   color: rgb(185, 186, 192);
   margin: auto 0px;
diff --git a/src/views/board/scanDown/index.vue b/src/views/board/scanDown/index.vue
index efb8f52..6e496c0 100644
--- a/src/views/board/scanDown/index.vue
+++ b/src/views/board/scanDown/index.vue
@@ -1,15 +1,23 @@
 <template>
   <div class="app-container">
-    <div class="headTitle">{{line}}线成品入库数据监控平台</div>
+    <div class="headTitle">{{ line }}线成品入库数据监控平台</div>
     <div class="title" v-for="(i,k) in title"
          :style="'top:'+(titlePosition[k]&&titlePosition[k].top||0)+'%;left:'+(titlePosition[k]&&titlePosition[k].left||0)+'%'">
       {{ i }}
     </div>
-    <div class="loss">{{loss}}</div>
-    <div class="meter">{{meter}}</div>
-    <span style="position: absolute;top: 10%;left: 14%;color: #fff;font-size: 0.9vw;">目标：1000&nbsp;&nbsp;进度目标：1000&nbsp;&nbsp;实际：1000&nbsp;&nbsp;差异：0&nbsp;&nbsp;达成率：100% </span>
-    <span style="position: absolute;top: 54.3%;left: 19%;color: #fff;font-size: 0.9vw">目标：3% &nbsp;&nbsp;&nbsp;实际：1% &nbsp;&nbsp;&nbsp;累计不良数：1</span>
-    <span style="position: absolute;top: 54.3%;left: 66.7%;color: #CFD2D0;font-size: 0.9vw">合计：111</span>
+    <div class="loss">{{ loss }}</div>
+    <div class="meter">{{ meter }}</div>
+    <span style="position: absolute;top: 10%;left: 14%;color: #fff;font-size: 0.9vw;">目标：{{ finishedProductOutput.mb }}&nbsp;&nbsp;进度目标：{{
+        finishedProductOutput.jdmb
+      }};&nbsp;实际：{{
+        finishedProductOutput.sj
+      }}&nbsp;&nbsp;差异：{{
+        finishedProductOutput.mb - finishedProductOutput.sj
+      }};&nbsp;达成率：{{ ((finishedProductOutput.sj / finishedProductOutput.mb) * 100).toFixed(2) }}% </span>
+    <span style="position: absolute;top: 54.3%;left: 19%;color: #fff;font-size: 0.9vw">目标：{{ finalInspection.mb }}% &nbsp;&nbsp;&nbsp;实际：{{
+        finalInspection.sj
+      }}% &nbsp;&nbsp;&nbsp;累计不良数：{{ finalInspection.bls }}</span>
+    <span style="position: absolute;top: 54.3%;left: 66.7%;color: #CFD2D0;font-size: 0.9vw">合计：{{ zhddhj }}</span>
 
     <div class="scrollTable">
       <div style="background-color: #094170">
@@ -66,7 +74,7 @@
             </div>
             <div
               class="scrollTableItem">
-             2023-01-01 00:00:00
+              2023-01-01 00:00:00
             </div>
           </div>
         </div>
@@ -90,7 +98,9 @@ import vueSeamlessScroll from "vue-seamless-scroll";
 import Chart from "../../../components/board/Chart";
 import * as echarts from 'echarts'
 import {getData} from "@/api/board/getData";
+import {mixData} from "@/api/board/mixData";
 
+const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
 export default {
   components: {
     vueSeamlessScroll,
@@ -99,9 +109,10 @@ export default {
   name: "Liner",
   data() {
     return {
-      line:'一',
-      loss:100,
-      meter:30,
+      line: '一',
+      loss: 0,
+      meter: 0,
+      zhddhj: 0,
       title: [
         '成品产量',
         '终检一次不合格率',
@@ -136,6 +147,8 @@ export default {
           left: 52.7
         },
       ],
+      finishedProductOutput: {},
+      finalInspection: {},
       scrollTableOption: {
         step: 0.5, // 数值越大速度滚动越快
         limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
@@ -147,390 +160,885 @@ export default {
         waitTime: 0,
       },
       scrollTableData: [],
-
-    }
-  },
-  mounted() {
-    console.log(this.$route.query.id)
-    if(this.$route.query.id === '1'){
-      this.line = '一'
-    }
-    if(this.$route.query.id === '2'){
-      this.line = '二'
-    }
-    const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
-    getData().then(e => {
-      this.scrollTableData = e.table8
-      this.$refs.chart1.setData({
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            crossStyle: {
-              color: '#999',
-            },
-          },
-        },
-        grid: {
-          top: "15%",
-          left: "1%",
-          right: "1%",
-          bottom: "8%",
-          containLabel: true,
-        },
-        legend: {
-          show: true,
-          itemGap: 50,
-          data: e.chart11.y.map(val => val.name),
-          textStyle: {
-            color: "#f9f9f9",
-            borderColor: "#fff",
-            fontSize: 16
-          },
-        },
-        dataZoom: [],
-        xAxis: [
-          {
-            type: "category",
-            boundaryGap: true,
-            axisLine: {
-              show: true,
-              lineStyle: {
-                color: '#fff',
-                opacity: 0.3,
-              },
-            },
-            axisLabel: {
-              interval: 0,
-              //坐标轴刻度标签的相关设置
-              textStyle: {
-                color: "#d1e6eb",
-                margin: 15,
-                fontSize: 16
+      RequestDataSet: [
+        {
+          e: 'cp-1-01',
+          i: "",
+          f: (e) => {
+            this.$refs.chart1.setData({
+              tooltip: {
+                trigger: 'axis',
+                axisPointer: {
+                  crossStyle: {
+                    color: '#999',
+                  },
+                },
               },
-            },
-            axisTick: {
-              show: false,
-            },
-            splitLine: {
-              show: true,
-              lineStyle: {
-                type: 'dashed',
-                color: '#777777',
-                opacity: 0.3,
+              grid: {
+                top: "15%",
+                left: "1%",
+                right: "1%",
+                bottom: "8%",
+                containLabel: true,
               },
-            },
-            data: e.chart11.x,
-          },
-        ],
-        yAxis: [
-          {
-            type: "value",
-            min: 0,
-            // max: 140,
-            splitNumber: 7,
-            splitLine: {
-              show: true,
-              lineStyle: {
-                type: 'dashed',
-                color: '#777777',
-                opacity: 0.3,
+              legend: {
+                show: true,
+                itemGap: 50,
+                data: e.y.map(val => val.name),
+                textStyle: {
+                  color: "#f9f9f9",
+                  borderColor: "#fff",
+                  fontSize: 16
+                },
               },
-            },
-            axisLine: {
-              show: true,
-              lineStyle: {
-                color: '#fff',
-                opacity: 0.3,
+              dataZoom: [],
+              xAxis: [
+                {
+                  type: "category",
+                  boundaryGap: true,
+                  axisLine: {
+                    show: true,
+                    lineStyle: {
+                      color: '#fff',
+                      opacity: 0.3,
+                    },
+                  },
+                  axisLabel: {
+                    interval: 0,
+                    //坐标轴刻度标签的相关设置
+                    textStyle: {
+                      color: "#d1e6eb",
+                      margin: 15,
+                      fontSize: 16
+                    },
+                  },
+                  axisTick: {
+                    show: false,
+                  },
+                  splitLine: {
+                    show: true,
+                    lineStyle: {
+                      type: 'dashed',
+                      color: '#777777',
+                      opacity: 0.3,
+                    },
+                  },
+                  data: e.x,
+                },
+              ],
+              yAxis: [
+                {
+                  type: "value",
+                  min: 0,
+                  // max: 140,
+                  splitNumber: 7,
+                  splitLine: {
+                    show: true,
+                    lineStyle: {
+                      type: 'dashed',
+                      color: '#777777',
+                      opacity: 0.3,
+                    },
+                  },
+                  axisLine: {
+                    show: true,
+                    lineStyle: {
+                      color: '#fff',
+                      opacity: 0.3,
+                    },
+                  },
+                  axisLabel: {
+                    margin: 20,
+                    textStyle: {
+                      color: "#d1e6eb",
+                      fontSize: 16
+                    },
+                  },
+                  axisTick: {
+                    show: false,
+                  },
+                },
+              ],
+              series: [
+                {
+                  name: e.y[0].name,
+                  type: "bar",
+                  barWidth: '70%',
+                  label: {
+                    show: true,
+                    position: "top",
+                    textStyle: {
+                      color: "#fff",
+                      fontSize: 16
+                    },
+                  },
+                  itemStyle: {
+                    normal: {
+                      barBorderRadius: 5,
+                      color: function (val) {
+                        console.log()
+                        if (e.y[0].data[val.dataIndex] >= e.y[1].data[val.dataIndex]) {
+                          return '#30e391'
+                        } else {
+                          return '#FE70A6'
+                        }
+                        // return "#0D81ED"
+                      },
+                    },
+                  },
+                  data: e.y[0].data,
+                },
+                {
+                  name: e.y[1].name,
+                  type: "line",
+                  // smooth: true, //是否平滑曲线显示
+                  // 			symbol:'circle',  // 默认是空心圆（中间是白色的），改成实心圆
+                  showAllSymbol: true,
+                  symbol: "emptyCircle",
+                  symbolSize: 6,
+                  lineStyle: {
+                    normal: {
+                      width: 3,
+                      color: '#fff',
+                    },
+                    borderColor: "#f0f",
+                  },
+                  label: {
+                    show: true,
+                    position: "top",
+                    textStyle: {
+                      color: "#fff",
+                      fontSize: 16
+                    },
+                  },
+                  itemStyle: {
+                    color: '#F2D770',
+                    border: 0,
+                  },
+                  // tooltip: {
+                  //     show: false
+                  // },
+                  data: e.y[1].data,
+                },
+              ],
+            })
+          }
+        },
+        {
+          e: 'cp-1-02',
+          i: "",
+          f: (e) => {
+            this.finishedProductOutput = e
+          }
+        },
+        {
+          e: 'cp-1-03',
+          i: "",
+          f: (e) => {
+            this.$refs.chart2.setData({
+              grid: {
+                top: "15%",
+                left: "1%",
+                right: "1%",
+                bottom: "2%",
+                containLabel: true,
               },
-            },
-            axisLabel: {
-              margin: 20,
-              textStyle: {
-                color: "#d1e6eb",
-                fontSize: 16
+              tooltip: {
+                trigger: 'axis',
+                axisPointer: {
+                  type: 'cross',
+                  crossStyle: {
+                    color: '#999',
+                  },
+                },
               },
-            },
-            axisTick: {
-              show: false,
-            },
-          },
-        ],
-        series: [
-          {
-            name: e.chart11.y[0].name,
-            type: "bar",
-            barWidth: '70%',
-            label: {
-              show: true,
-              position: "top",
-              textStyle: {
-                color: "#fff",
-                fontSize: 16
+              legend: {
+                itemWidth: 3 * vw,
+                data: e.y.map(val => val.name),
+                textStyle: {
+                  color: "#d1e6eb",
+                  margin: 15,
+                  fontSize: 0.75 * vw
+                },
               },
-            },
-            itemStyle: {
-              normal: {
-                barBorderRadius: 5,
-                color: function (val) {
-                  console.log()
-                  if (e.chart11.y[0].data[val.dataIndex] >= e.chart11.y[1].data[val.dataIndex]) {
-                    return '#30e391'
-                  } else {
-                    return '#FE70A6'
+              xAxis: [
+                {
+                  axisLabel: {
+                    //坐标轴刻度标签的相关设置
+                    textStyle: {
+                      color: "#d1e6eb",
+                      margin: 15,
+                      fontSize: 0.75 * vw
+                    },
+                  },
+                  type: 'category',
+                  data: e.x,
+                  axisPointer: {
+                    type: 'shadow'
                   }
-                  // return "#0D81ED"
+                }
+              ],
+              yAxis: [
+                {
+                  type: 'value',
+                  splitLine: {
+                    lineStyle: {
+                      color: "rgba(255,255,255,0.1)",
+                    },
+                  },
+                  axisLabel: {
+                    //坐标轴刻度标签的相关设置
+                    textStyle: {
+                      color: "#d1e6eb",
+                      margin: 15,
+                      fontSize: 0.75 * vw
+                    },
+                    formatter: '{value}'
+                  }
+                },
+                {
+                  type: 'value',
+                  splitLine: {
+                    show: false,
+                  },
+                  axisLabel: {
+                    //坐标轴刻度标签的相关设置
+                    textStyle: {
+                      color: "#d1e6eb",
+                      margin: 15,
+                      fontSize: 0.75 * vw
+                    },
+                    formatter: '{value}% '
+                  }
+                }
+              ],
+              series: [
+                {
+                  name: e.y[0].name,
+                  type: 'bar',
+                  itemStyle: {
+                    normal: {
+                      color: function (val) {
+                        console.log()
+                        if (e.y[1].data[val.dataIndex] < e.y[2].data[val.dataIndex]) {
+                          return '#30e391'
+                        } else {
+                          return '#FE70A6'
+                        }
+                        // return "#0D81ED"
+                      },
+                    },
+                  },
+                  data: e.y[0].data,
+                  label: {
+                    show: true,
+                    position: 'top',
+                    textStyle: {
+                      color: "rgba(255,255,255,0.5)",
+                      fontSize: 0.75 * vw
+                    },
+                  },
+                },
+                {
+                  name: e.y[1].name,
+                  type: 'line',
+                  yAxisIndex: 1,
+                  data: e.y[1].data,
+                  itemStyle: {
+                    normal: {
+                      color: '#F9A25B',
+                    },
+                  },
                 },
+                {
+                  name: e.y[2].name,
+                  type: 'line',
+                  yAxisIndex: 1,
+                  data: e.y[2].data,
+                  itemStyle: {
+                    normal: {
+                      color: '#0DB99D',
+                    },
+                  },
+                }
+              ]
+            })
+          }
+        },
+        {
+          e: 'cp-1-04',
+          i: "",
+          f: (e) => {
+            this.finalInspection = e
+          }
+        },
+        {
+          e: 'cp-1-05',
+          i: "",
+          f: (e) => {
+            this.loss = e
+          }
+        },
+        {
+          e: 'cp-1-06',
+          i: "",
+          f: (e) => {
+            this.meter = e
+          }
+        },
+        {
+          e: 'cp-1-07',
+          i: "",
+          f: (e) => {
+            this.$refs.chart3.setData({
+              tooltip: {
+                textStyle: {
+                  fontSize: 0.8 * vw
+                }
               },
-            },
-            data: e.chart11.y[0].data,
-          },
-          {
-            name: e.chart11.y[1].name,
-            type: "line",
-            // smooth: true, //是否平滑曲线显示
-            // 			symbol:'circle',  // 默认是空心圆（中间是白色的），改成实心圆
-            showAllSymbol: true,
-            symbol: "emptyCircle",
-            symbolSize: 6,
-            lineStyle: {
-              normal: {
-                width: 3,
-                color: '#fff',
+              grid: {
+                top: "10%",
+                left: "1%",
+                right: "1%",
+                bottom: "1%",
+                containLabel: true,
               },
-              borderColor: "#f0f",
-            },
-            label: {
-              show: true,
-              position: "top",
-              textStyle: {
-                color: "#fff",
-                fontSize: 16
+              xAxis: {
+                data: e.x,
+                axisLine: {
+                  lineStyle: {
+                    color: "#0177d4",
+                  },
+                },
+                axisLabel: {
+                  color: "#fff",
+                  fontSize: 0.8 * vw,
+                  interval: 0,
+                },
               },
-            },
-            itemStyle: {
-              color: '#F2D770',
-              border: 0,
-            },
-            // tooltip: {
-            //     show: false
-            // },
-            data: e.chart11.y[1].data,
-          },
-        ],
-      })
-      this.$refs.chart2.setData({
-        grid: {
-          top: "15%",
-          left: "1%",
-          right: "1%",
-          bottom: "2%",
-          containLabel: true,
+              yAxis: {
+                nameTextStyle: {
+                  color: "#fff",
+                  fontSize: 0.8 * vw,
+                },
+                axisLine: {
+                  lineStyle: {
+                    color: "#0177d4",
+                  },
+                },
+                axisLabel: {
+                  color: "#fff",
+                  fontSize: 0.8 * vw,
+                },
+                splitLine: {
+                  show: false,
+                  lineStyle: {
+                    color: "#0177d4",
+                  },
+                },
+              },
+              series: [
+                {
+                  type: "bar",
+                  barWidth: 2 * vw,
+                  label: {
+                    show: true,
+                    position: 'top',
+                    textStyle: {
+                      fontSize: 0.8 * vw,
+                      color: '#fff'
+                    },
+                  },
+                  itemStyle: {
+                    normal: {
+                      color: new echarts.graphic.LinearGradient(
+                        0,
+                        0,
+                        0,
+                        1,
+                        [
+                          {
+                            offset: 0,
+                            color: "#00b0ff",
+                          },
+                          {
+                            offset: 0.8,
+                            color: "#7052f4",
+                          },
+                        ],
+                        false
+                      ),
+                    },
+                  },
+                  data: e.y.data,
+                },
+              ],
+            })
+          }
         },
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'cross',
-            crossStyle: {
-              color: '#999',
-            },
-          },
+        {
+          e: 'cp-1-08',
+          i: "",
+          f: (e) => {
+            this.scrollTableData = e
+          }
         },
-        legend: {
-          itemWidth: 3 * vw,
-          data: e.chart12.y.map(val => val.name),
-          textStyle: {
-            color: "#d1e6eb",
-            margin: 15,
-            fontSize: 0.75 * vw
-          },
+        {
+          e: 'cp-1-09',
+          i: "",
+          f: (e) => {
+            this.zhddhj = e
+          }
         },
-        xAxis: [
-          {
-            axisLabel: {
-              //坐标轴刻度标签的相关设置
-              textStyle: {
-                color: "#d1e6eb",
-                margin: 15,
-                fontSize: 0.75 * vw
+      ],
+      RequestDataSet1: [
+        {
+          e: 'cp-2-01',
+          i: "",
+          f: (e) => {
+            this.$refs.chart1.setData({
+              tooltip: {
+                trigger: 'axis',
+                axisPointer: {
+                  crossStyle: {
+                    color: '#999',
+                  },
+                },
               },
-            },
-            type: 'category',
-            data: e.chart12.x,
-            axisPointer: {
-              type: 'shadow'
-            }
+              grid: {
+                top: "15%",
+                left: "1%",
+                right: "1%",
+                bottom: "8%",
+                containLabel: true,
+              },
+              legend: {
+                show: true,
+                itemGap: 50,
+                data: e.y.map(val => val.name),
+                textStyle: {
+                  color: "#f9f9f9",
+                  borderColor: "#fff",
+                  fontSize: 16
+                },
+              },
+              dataZoom: [],
+              xAxis: [
+                {
+                  type: "category",
+                  boundaryGap: true,
+                  axisLine: {
+                    show: true,
+                    lineStyle: {
+                      color: '#fff',
+                      opacity: 0.3,
+                    },
+                  },
+                  axisLabel: {
+                    interval: 0,
+                    //坐标轴刻度标签的相关设置
+                    textStyle: {
+                      color: "#d1e6eb",
+                      margin: 15,
+                      fontSize: 16
+                    },
+                  },
+                  axisTick: {
+                    show: false,
+                  },
+                  splitLine: {
+                    show: true,
+                    lineStyle: {
+                      type: 'dashed',
+                      color: '#777777',
+                      opacity: 0.3,
+                    },
+                  },
+                  data: e.x,
+                },
+              ],
+              yAxis: [
+                {
+                  type: "value",
+                  min: 0,
+                  // max: 140,
+                  splitNumber: 7,
+                  splitLine: {
+                    show: true,
+                    lineStyle: {
+                      type: 'dashed',
+                      color: '#777777',
+                      opacity: 0.3,
+                    },
+                  },
+                  axisLine: {
+                    show: true,
+                    lineStyle: {
+                      color: '#fff',
+                      opacity: 0.3,
+                    },
+                  },
+                  axisLabel: {
+                    margin: 20,
+                    textStyle: {
+                      color: "#d1e6eb",
+                      fontSize: 16
+                    },
+                  },
+                  axisTick: {
+                    show: false,
+                  },
+                },
+              ],
+              series: [
+                {
+                  name: e.y[0].name,
+                  type: "bar",
+                  barWidth: '70%',
+                  label: {
+                    show: true,
+                    position: "top",
+                    textStyle: {
+                      color: "#fff",
+                      fontSize: 16
+                    },
+                  },
+                  itemStyle: {
+                    normal: {
+                      barBorderRadius: 5,
+                      color: function (val) {
+                        console.log()
+                        if (e.y[0].data[val.dataIndex] >= e.y[1].data[val.dataIndex]) {
+                          return '#30e391'
+                        } else {
+                          return '#FE70A6'
+                        }
+                        // return "#0D81ED"
+                      },
+                    },
+                  },
+                  data: e.y[0].data,
+                },
+                {
+                  name: e.y[1].name,
+                  type: "line",
+                  // smooth: true, //是否平滑曲线显示
+                  // 			symbol:'circle',  // 默认是空心圆（中间是白色的），改成实心圆
+                  showAllSymbol: true,
+                  symbol: "emptyCircle",
+                  symbolSize: 6,
+                  lineStyle: {
+                    normal: {
+                      width: 3,
+                      color: '#fff',
+                    },
+                    borderColor: "#f0f",
+                  },
+                  label: {
+                    show: true,
+                    position: "top",
+                    textStyle: {
+                      color: "#fff",
+                      fontSize: 16
+                    },
+                  },
+                  itemStyle: {
+                    color: '#F2D770',
+                    border: 0,
+                  },
+                  // tooltip: {
+                  //     show: false
+                  // },
+                  data: e.y[1].data,
+                },
+              ],
+            })
+          }
+        },
+        {
+          e: 'cp-2-02',
+          i: "",
+          f: (e) => {
+            this.finishedProductOutput = e
           }
-        ],
-        yAxis: [
-          {
-            type: 'value',
-            splitLine: {
-              lineStyle: {
-                color: "rgba(255,255,255,0.1)",
+        },
+        {
+          e: 'cp-2-03',
+          i: "",
+          f: (e) => {
+            this.$refs.chart2.setData({
+              grid: {
+                top: "15%",
+                left: "1%",
+                right: "1%",
+                bottom: "2%",
+                containLabel: true,
               },
-            },
-            axisLabel: {
-              //坐标轴刻度标签的相关设置
-              textStyle: {
-                color: "#d1e6eb",
-                margin: 15,
-                fontSize: 0.75 * vw
+              tooltip: {
+                trigger: 'axis',
+                axisPointer: {
+                  type: 'cross',
+                  crossStyle: {
+                    color: '#999',
+                  },
+                },
               },
-              formatter: '{value}'
-            }
-          },
-          {
-            type: 'value',
-            splitLine: {
-              show: false,
-            },
-            axisLabel: {
-              //坐标轴刻度标签的相关设置
-              textStyle: {
-                color: "#d1e6eb",
-                margin: 15,
-                fontSize: 0.75 * vw
+              legend: {
+                itemWidth: 3 * vw,
+                data: e.y.map(val => val.name),
+                textStyle: {
+                  color: "#d1e6eb",
+                  margin: 15,
+                  fontSize: 0.75 * vw
+                },
               },
-              formatter: '{value}% '
-            }
-          }
-        ],
-        series: [
-          {
-            name: e.chart12.y[0].name,
-            type: 'bar',
-            itemStyle: {
-              normal: {
-                color: function (val) {
-                  console.log()
-                  if (e.chart12.y[1].data[val.dataIndex] < e.chart12.y[2].data[val.dataIndex]) {
-                    return '#30e391'
-                  } else {
-                    return '#FE70A6'
+              xAxis: [
+                {
+                  axisLabel: {
+                    //坐标轴刻度标签的相关设置
+                    textStyle: {
+                      color: "#d1e6eb",
+                      margin: 15,
+                      fontSize: 0.75 * vw
+                    },
+                  },
+                  type: 'category',
+                  data: e.x,
+                  axisPointer: {
+                    type: 'shadow'
+                  }
+                }
+              ],
+              yAxis: [
+                {
+                  type: 'value',
+                  splitLine: {
+                    lineStyle: {
+                      color: "rgba(255,255,255,0.1)",
+                    },
+                  },
+                  axisLabel: {
+                    //坐标轴刻度标签的相关设置
+                    textStyle: {
+                      color: "#d1e6eb",
+                      margin: 15,
+                      fontSize: 0.75 * vw
+                    },
+                    formatter: '{value}'
+                  }
+                },
+                {
+                  type: 'value',
+                  splitLine: {
+                    show: false,
+                  },
+                  axisLabel: {
+                    //坐标轴刻度标签的相关设置
+                    textStyle: {
+                      color: "#d1e6eb",
+                      margin: 15,
+                      fontSize: 0.75 * vw
+                    },
+                    formatter: '{value}% '
                   }
-                  // return "#0D81ED"
+                }
+              ],
+              series: [
+                {
+                  name: e.y[0].name,
+                  type: 'bar',
+                  itemStyle: {
+                    normal: {
+                      color: function (val) {
+                        console.log()
+                        if (e.y[1].data[val.dataIndex] < e.y[2].data[val.dataIndex]) {
+                          return '#30e391'
+                        } else {
+                          return '#FE70A6'
+                        }
+                        // return "#0D81ED"
+                      },
+                    },
+                  },
+                  data: e.y[0].data,
+                  label: {
+                    show: true,
+                    position: 'top',
+                    textStyle: {
+                      color: "rgba(255,255,255,0.5)",
+                      fontSize: 0.75 * vw
+                    },
+                  },
+                },
+                {
+                  name: e.y[1].name,
+                  type: 'line',
+                  yAxisIndex: 1,
+                  data: e.y[1].data,
+                  itemStyle: {
+                    normal: {
+                      color: '#F9A25B',
+                    },
+                  },
                 },
+                {
+                  name: e.y[2].name,
+                  type: 'line',
+                  yAxisIndex: 1,
+                  data: e.y[2].data,
+                  itemStyle: {
+                    normal: {
+                      color: '#0DB99D',
+                    },
+                  },
+                }
+              ]
+            })
+          }
+        },
+        {
+          e: 'cp-2-04',
+          i: "",
+          f: (e) => {
+            this.finalInspection = e
+          }
+        },
+        {
+          e: 'cp-2-05',
+          i: "",
+          f: (e) => {
+            this.loss = e
+          }
+        },
+        {
+          e: 'cp-2-06',
+          i: "",
+          f: (e) => {
+            this.meter = e
+          }
+        },
+        {
+          e: 'cp-2-07',
+          i: "",
+          f: (e) => {
+            this.$refs.chart3.setData({
+              tooltip: {
+                textStyle: {
+                  fontSize: 0.8 * vw
+                }
               },
-            },
-            data: e.chart12.y[0].data,
-            label: {
-              show: true,
-              position: 'top',
-              textStyle: {
-                color: "rgba(255,255,255,0.5)",
-                fontSize: 0.75 * vw
+              grid: {
+                top: "10%",
+                left: "1%",
+                right: "1%",
+                bottom: "1%",
+                containLabel: true,
               },
-            },
-          },
-          {
-            name: e.chart12.y[1].name,
-            type: 'line',
-            yAxisIndex: 1,
-            data: e.chart12.y[1].data,
-            itemStyle: {
-              normal: {
-                color: '#F9A25B',
+              xAxis: {
+                data: e.x,
+                axisLine: {
+                  lineStyle: {
+                    color: "#0177d4",
+                  },
+                },
+                axisLabel: {
+                  color: "#fff",
+                  fontSize: 0.8 * vw,
+                  interval: 0,
+                },
               },
-            },
-          },
-          {
-            name: e.chart12.y[2].name,
-            type: 'line',
-            yAxisIndex: 1,
-            data: e.chart12.y[2].data,
-            itemStyle: {
-              normal: {
-                color: '#0DB99D',
+              yAxis: {
+                nameTextStyle: {
+                  color: "#fff",
+                  fontSize: 0.8 * vw,
+                },
+                axisLine: {
+                  lineStyle: {
+                    color: "#0177d4",
+                  },
+                },
+                axisLabel: {
+                  color: "#fff",
+                  fontSize: 0.8 * vw,
+                },
+                splitLine: {
+                  show: false,
+                  lineStyle: {
+                    color: "#0177d4",
+                  },
+                },
               },
-            },
-          }
-        ]
-      })
-      this.$refs.chart3.setData({
-        tooltip: {
-          textStyle: {
-            fontSize: 0.8 * vw
+              series: [
+                {
+                  type: "bar",
+                  barWidth: 2 * vw,
+                  label: {
+                    show: true,
+                    position: 'top',
+                    textStyle: {
+                      fontSize: 0.8 * vw,
+                      color: '#fff'
+                    },
+                  },
+                  itemStyle: {
+                    normal: {
+                      color: new echarts.graphic.LinearGradient(
+                        0,
+                        0,
+                        0,
+                        1,
+                        [
+                          {
+                            offset: 0,
+                            color: "#00b0ff",
+                          },
+                          {
+                            offset: 0.8,
+                            color: "#7052f4",
+                          },
+                        ],
+                        false
+                      ),
+                    },
+                  },
+                  data: e.y.data,
+                },
+              ],
+            })
           }
         },
-        grid: {
-          top: "10%",
-          left: "1%",
-          right: "1%",
-          bottom: "1%",
-          containLabel: true,
-        },
-        xAxis: {
-          data: e.chart13.x,
-          axisLine: {
-            lineStyle: {
-              color: "#0177d4",
-            },
-          },
-          axisLabel: {
-            color: "#fff",
-            fontSize: 0.8 * vw,
-            interval: 0,
-          },
+        {
+          e: 'cp-2-08',
+          i: "",
+          f: (e) => {
+            this.scrollTableData = e
+          }
         },
-        yAxis: {
-          nameTextStyle: {
-            color: "#fff",
-            fontSize: 0.8 * vw,
-          },
-          axisLine: {
-            lineStyle: {
-              color: "#0177d4",
-            },
-          },
-          axisLabel: {
-            color: "#fff",
-            fontSize: 0.8 * vw,
-          },
-          splitLine: {
-            show: false,
-            lineStyle: {
-              color: "#0177d4",
-            },
-          },
+        {
+          e: 'cp-2-09',
+          i: "",
+          f: (e) => {
+            this.zhddhj = e
+          }
         },
-        series: [
-          {
-            type: "bar",
-            barWidth: 2 * vw,
-            label: {
-              show: true,
-              position: 'top',
-              textStyle: {
-                fontSize: 0.8 * vw,
-                color: '#fff'
-              },
-            },
-            itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(
-                  0,
-                  0,
-                  0,
-                  1,
-                  [
-                    {
-                      offset: 0,
-                      color: "#00b0ff",
-                    },
-                    {
-                      offset: 0.8,
-                      color: "#7052f4",
-                    },
-                  ],
-                  false
-                ),
-              },
-            },
-            data: e.chart13.y.data,
-          },
-        ],
+      ]
+
+    }
+  },
+  mounted() {
+    console.log(this.$route.query.id)
+    if (this.$route.query.id === '1') {
+      this.RequestDataSet.forEach(val => {
+        mixData(val)
+      })
+      this.line = '一'
+    }
+    if (this.$route.query.id === '2') {
+      this.RequestDataSet1.forEach(val => {
+        mixData(val)
       })
-    })
+      this.line = '二'
+    }
   },
   methods: {}
 };
@@ -546,24 +1054,27 @@ export default {
   top: 0;
   left: 0;
 }
-.loss{
+
+.loss {
   position: absolute;
-  transform: translate(-50%,-50%);
+  transform: translate(-50%, -50%);
   top: 18.1%;
   left: 62%;
   font-size: 1.5vw;
   letter-spacing: 2px;
   color: #cccccc;
 }
-.meter{
+
+.meter {
   position: absolute;
-  transform: translate(-50%,-50%);
+  transform: translate(-50%, -50%);
   top: 18.1%;
   left: 85.6%;
   font-size: 1.5vw;
   letter-spacing: 2px;
   color: #cccccc;
 }
+
 .headTitle {
   position: absolute;
   top: 5%;
diff --git a/src/views/board/week/index.vue b/src/views/board/week/index.vue
index 4cd60e9..b492a0b 100644
--- a/src/views/board/week/index.vue
+++ b/src/views/board/week/index.vue
@@ -109,7 +109,7 @@
 
     <div v-html="safeDayHtml"></div>
     <div class="totalNum">合计：{{ totalNum }}台</div>
-    <div class="info1">订单数量:1000 完成数量:1000 清单率:100%</div>
+    <div class="info1">订单数量:{{ info1.ddsl }} 完成数量:{{ info1.wcsl }} 清单率:{{ ((info1.wcsl / info1.ddsl) * 100) .toFixed(2) }}%</div>
   </div>
 </template>
 
@@ -118,7 +118,9 @@ import vueSeamlessScroll from "vue-seamless-scroll";
 import Chart from "../../../components/board/Chart";
 import * as echarts from 'echarts'
 import {getData} from "@/api/board/getData";
+import {mixData} from "@/api/board/mixData";
 
+const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
 export default {
   components: {
     vueSeamlessScroll,
@@ -129,6 +131,10 @@ export default {
     return {
       nowLine: 1,
       nowWeek: "",
+      info1:{
+        "ddsl":1000,
+        "wcsl":1000
+      },
       title: [
         '产量统计',
         '三日订单执行情况',
@@ -164,6 +170,14 @@ export default {
           left: 73.6
         },
       ],
+      qualityInspectionProcessMonitoring:{
+        "nd":99,
+        "gz":99,
+        "dy":99,
+        "ag":99,
+        "cw":99,
+        "zj":99,
+      },
       scrollTableOption: {
         step: 0.5, // 数值越大速度滚动越快
         limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
@@ -175,852 +189,897 @@ export default {
         waitTime: 0,
       },
       scrollTableData: [],
-      safeDayHtml: null
-    }
-  },
-  mounted() {
-    getData().then(e => {
-      this.scrollTableData = e.table8
-    })
-    let min = Math.ceil(Math.min(...[61, 25, 57, 83, 87, 73, 17, 25, 57, 83, 87, 73],))
-    let max = Math.ceil(Math.max(...[61, 25, 57, 83, 87, 73, 17, 25, 57, 83, 87, 73],))
-    const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
-
-    this.$refs.manpowerAttendance.setData({
-      color: ['#33a2fe', '#33a2fe', '#33a2fe', '#33a2fe', '#33a2fe'],
-      grid: {
-        top: "20%",
-        bottom: "15%",
-        right: "5%"
-      },
-      dataZoom: [],
-      xAxis: {
-        margin: 10,
-        nameTextStyle: {
-          color: '#c0c3cd',
-          padding: [0, 0, -10, 0],
-          fontSize: 14,
-        },
-        axisLabel: {
-          color: '#c0c3cd', //X轴文字
-          fontSize: 14,
-          interval: 0,
-          margin: 20,
-          rotate: -20,
-        },
-        axisTick: {
-          lineStyle: {
-            color: '#0B1535',
-            width: 1,
-          },
-          show: false,
-        },
-        splitLine: {
-          show: false,
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#384267',
-            width: 1,
-            type: 'dashed',
-          },
-          show: true,
-        },
-        data: ['组A', '组B', '组C', '组D', '组E', '组F', '组G', '组H'],
-        type: 'category',
-      },
-      yAxis: {
-        type: 'value',
-        nameTextStyle: {
-          color: '#c0c3cd',
-          padding: [0, 0, -10, 0],
-          fontSize: 14,
-        },
-        axisLabel: {
-          color: '#c0c3cd', //Y轴文字
-          fontSize: 14,
-        },
-        axisTick: {
-          lineStyle: {
-            color: '#384267',
-            width: 1,
-          },
-          show: true,
-        },
-        splitLine: {
-          show: true,
-          lineStyle: {
-            color: '#384267',
-            type: 'line',
-          },
-        },
-        axisLine: {
-          lineStyle: {
-            color: '#fff',
-            width: 1,
-            type: 'line',
-          },
-          show: false,
-        },
-      },
-      series: [
+      safeDayHtml: null,
+      RequestDataSet: [
         {
-          data: [60, 55, 45, 42, 40, 40, 39, 38],
-          type: 'pictorialBar',
-          barMaxWidth: 'auto',
-          barWidth: 1.5 * vw,
-          symbol: 'rect',
-          itemStyle: {
-            color: function (val) {
-              if ([60, 55, 45, 42, 40, 40, 39, 38].length - val.dataIndex === 1) {
-                return 'red'
-              } else if ([60, 55, 45, 42, 40, 40, 39, 38].length - val.dataIndex === 2) {
-                return 'yellow'
-
-              } else {
-                return '#35AAFE'
-              }
-            }
-          },
-          label: {
-            normal: {
-              show: true,
-              position: "top",
-              textStyle: {
-                color: "#a8aab0",
-                fontStyle: "normal",
-                fontFamily: "微软雅黑",
-                fontSize: 0.75 * vw,
+          e: 'zh-1-01',
+          i: "",
+          f: (e) => {
+            this.$refs.topLeft.setData({
+              grid: {
+                top: "20%",
+                left: "1%",
+                right: "5%",
+                bottom: "1%",
+                containLabel: true,
+              },
+              tooltip: {
+                trigger: 'axis',
+                axisPointer: {
+                  type: 'shadow'
+                }
+              },
+              legend: {
+                right: '0',
+                data: e.y.map(e => e.name),
+                textStyle: {
+                  fontSize: 0.75 * vw,
+                  color: "#F1F1F3",
+                },
               },
-            },
+              xAxis: [
+                {
+                  type: 'category',
+                  axisTick: {show: false},
+                  axisLabel: {
+                    rotate: -20,
+                    margin: 20,
+                    textStyle: {
+                      fontSize: 0.75 * vw,
+                      color: "#F1F1F3",
+                    },
+                  },
+                  data: e.x
+                }
+              ],
+              yAxis: [
+                {
+                  axisLabel: {
+                    textStyle: {
+                      fontSize: 0.75 * vw,
+                      color: "#F1F1F3",
+                    },
+                  },
+                  splitLine: {
+                    lineStyle: {
+                      color: "rgba(255,255,255,0.1)",
+                    },
+                  },
+                  type: 'value'
+                }
+              ],
+              series: [
+                {
+                  name: e.y[0].name,
+                  type: 'bar',
+                  barGap: 0,
+                  emphasis: {
+                    focus: 'series'
+                  },
+                  barWidth: '30%',
+                  barMaxWidth: '50px',
+                  itemStyle: {
+                    //图形样式
+                    normal: {
+                      color: true ? '#db8151' : "#64BCEC",
+                    },
+                  },
+                  label: {
+                    show: true,
+                    position: "top",
+                    formatter: `{c}${''}`,
+                    textStyle: {
+                      color: "rgba(255,255,255,0.5)",
+                      fontSize: 0.75 * vw
+                    },
+                  },
+                  data: e.y[0].data,
+                },
+                {
+                  name: e.y[1].name,
+                  type: 'bar',
+                  emphasis: {
+                    focus: 'series'
+                  },
+                  barWidth: '30%',
+                  barMaxWidth: '50px',
+                  barGap: '40%',
+                  label: {
+                    show: true,
+                    position: "top",
+                    formatter: `{c}${''}`,
+                    textStyle: {
+                      color: "rgba(255,255,255,0.5)",
+                      fontSize: 0.75 * vw
+                    },
+                  },
+                  itemStyle: {
+                    //图形样式
+                    normal: {
+                      color: true ? '#9ce375' : "#4FD3B9",
+                    },
+                  },
+                  data: e.y[1].data,
+                },
+              ]
+            })
           }
         },
         {
-          data: [60, 55, 45, 42, 40, 40, 39, 38],
-          type: 'pictorialBar',
-          barWidth: 1.5 * vw,
-          symbolPosition: 'end',
-          symbol: 'diamond',
-          itemStyle: {
-            color: function (val) {
-              if ([60, 55, 45, 42, 40, 40, 39, 38].length - val.dataIndex === 1) {
-                return 'red'
-              } else if ([60, 55, 45, 42, 40, 40, 39, 38].length - val.dataIndex === 2) {
-                return 'yellow'
-              } else {
-                return '#66c8ff'
-              }
-            }
-          },
-          symbolOffset: ['0%', '-50%'],
-          symbolSize: [1.5 * vw, 10],
-          zlevel: 4,
-        },
-        {
-          data: [60, 55, 45, 42, 40, 40, 39, 38].map(val => 1),
-          type: 'pictorialBar',
-          barWidth: 1.5 * vw,
-          symbolPosition: 'end',
-          symbol: 'diamond',
-          itemStyle: {
-            color: function (val) {
-              if ([60, 55, 45, 42, 40, 40, 39, 38].length - val.dataIndex === 1) {
-                return 'red'
-              } else if ([60, 55, 45, 42, 40, 40, 39, 38].length - val.dataIndex === 2) {
-                return 'yellow'
+          e: 'zh-1-02',
+          i: "",
+          f: (e) => {
 
-              } else {
-                return '#66c8ff'
-              }
-            }
-          },
-          symbolOffset: ['0%', '-20%'],
-          symbolSize: [1.5 * vw, 10],
-          zlevel: 4,
-        },
-        // {
-        //   type: 'pictorialBar',
-        //   name: 'pictorial element',
-        //   symbol: function (val, index) {
-        //     // return 'image://' + 'http://10.100.70.5:9090/' + data.yImg[index.dataIndex]
-        //   },
-        //   symbolSize: [40, 40],
-        //   z: 10,
-        //   data: [60, 55, 45, 42, 40, 40, 39, 38].map(val => {
-        //     return {
-        //       value: val,
-        //       symbolPosition: 'end',
-        //       symbolOffset: [0, '-190%']
-        //     }
-        //   })
-        // },
-      ]
-    })
-    this.$refs.topLeft.setData({
-      grid: {
-        top: "20%",
-        left: "1%",
-        right: "5%",
-        bottom: "1%",
-        containLabel: true,
-      },
-      tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-          type: 'shadow'
-        }
-      },
-      legend: {
-        right: '0',
-        data: ['计划', '实际'],
-        textStyle: {
-          fontSize: 0.75 * vw,
-          color: "#F1F1F3",
-        },
-      },
-      xAxis: [
-        {
-          type: 'category',
-          axisTick: {show: false},
-          axisLabel: {
-            rotate: -20,
-            margin: 20,
-            textStyle: {
-              fontSize: 0.75 * vw,
-              color: "#F1F1F3",
-            },
-          },
-          data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日']
-        }
-      ],
-      yAxis: [
-        {
-          axisLabel: {
-            textStyle: {
-              fontSize: 0.75 * vw,
-              color: "#F1F1F3",
-            },
-          },
-          splitLine: {
-            lineStyle: {
-              color: "rgba(255,255,255,0.1)",
-            },
-          },
-          type: 'value'
-        }
-      ],
-      series: [
-        {
-          name: '计划',
-          type: 'bar',
-          barGap: 0,
-          emphasis: {
-            focus: 'series'
-          },
-          barWidth: '30%',
-          barMaxWidth: '50px',
-          itemStyle: {
-            //图形样式
-            normal: {
-              color: true ? '#db8151' : "#64BCEC",
-            },
-          },
-          label: {
-            show: true,
-            position: "top",
-            formatter: `{c}${''}`,
-            textStyle: {
-              color: "rgba(255,255,255,0.5)",
-              fontSize: 0.75 * vw
-            },
-          },
-          data: [22, 52, 55, 12, 35, 44, 66],
+          }
         },
         {
-          name: '实际',
-          type: 'bar',
-          emphasis: {
-            focus: 'series'
-          },
-          barWidth: '30%',
-          barMaxWidth: '50px',
-          barGap: '40%',
-          label: {
-            show: true,
-            position: "top",
-            formatter: `{c}${''}`,
-            textStyle: {
-              color: "rgba(255,255,255,0.5)",
-              fontSize: 0.75 * vw
-            },
-          },
-          itemStyle: {
-            //图形样式
-            normal: {
-              color: true ? '#9ce375' : "#4FD3B9",
-            },
-          },
-          data: [32, 42, 50, 22, 30, 40, 52],
-        },
-      ]
-    })
-    this.$refs.productionEfficiency.setData({
-      grid: {
-        top: "10%",
-        left: '10%',
-        right: "5%",
-        bottom: '15%',
-        // containLabel: true
-      },
-      dataZoom: [],
-      xAxis: {
-        data: ["A-1", "A-2", "A-3", "A-4", "A-5", "A-6", "A-7"],
-        axisLine: {
-          lineStyle: {
-            color: "#0177d4",
-          },
-        },
-        axisLabel: {
-          color: "#fff",
-          fontSize: 0.5 * vw,
-          interval: 0,
-          rotate: -20,
-        },
-      },
-      yAxis: {
-        nameTextStyle: {
-          color: "#fff",
-          fontSize: 16,
-        },
-        axisLine: {
-          lineStyle: {
-            color: "#0177d4",
-          },
-        },
-        axisLabel: {
-          color: "#fff",
-          fontSize: 16,
-        },
-        splitLine: {
-          show: false,
-          lineStyle: {
-            color: "#0177d4",
-          },
+          e: 'zh-1-03',
+          i: "",
+          f: (e) => {
+            this.scrollTableData = e
+          }
         },
-      },
-      series: [
         {
-          type: "bar",
-          barWidth: 1 * vw,
-          itemStyle: {
-            normal: {
-              color: new echarts.graphic.LinearGradient(
-                0,
-                0,
-                0,
-                1,
-                [
-                  {
-                    offset: 0,
-                    color: "#00b0ff",
-                  },
-                  {
-                    offset: 0.8,
-                    color: "#7052f4",
-                  },
-                ],
-                false
-              ),
-            },
-          },
-          label: {
-            show: true,
-            position: "top",
-            textStyle: {
-              color: "#fff",
-              fontSize: 0.75 * vw
-            },
-          },
-          data: [12, 20, 11, 30, 14, 80, 50].sort().reverse(),
+          e: 'zh-1-04',
+          i: "",
+          f: (e) => {
+            this.info1 = e
+          }
         },
-      ],
-    })
-
-
-    this.$refs.equipmentPowerOne.setData({
-      series: [
         {
-          type: "pie",
-          clockWise: false,
-          radius: ['60%', '75%'],
-          itemStyle: {
-            normal: {
-              label: {
-                show: false,
-              },
-              labelLine: {
-                show: false,
+          e: 'zh-1-05',
+          i: "",
+          f: (e) => {
+            this.$refs.manpowerAttendance.setData({
+              color: ['#33a2fe', '#33a2fe', '#33a2fe', '#33a2fe', '#33a2fe'],
+              grid: {
+                top: "20%",
+                bottom: "15%",
+                right: "5%"
               },
-              shadowBlur: 0,
-              shadowColor: "#389af4",
-            },
-          },
-          hoverAnimation: false,
-          center: ["50%", "50%"],
-          data: [
-            {
-              value: 99,
-              label: {
-                normal: {
-                  rich: {
-                    a: {
-                      color: "#389af4",
-                      align: "center",
-                      fontSize: 1.1 * vw,
-                      fontWeight: "bold",
-                    },
-                    b: {
-                      color: "#fff",
-                      align: "center",
-                      fontSize: 0.9 * vw,
-                    },
-                  },
-                  formatter: function (params) {
-                    return (
-                      "{a|" +
-                      params.value +
-                      "%}" +
-                      "\n{b|内胆检漏}"
-                    );
-                  },
-                  position: "center",
-                  show: true,
-                  textStyle: {
-                    fontSize: "14",
-                    fontWeight: "normal",
-                    color: "#fff",
-                  },
+              dataZoom: [],
+              xAxis: {
+                margin: 10,
+                nameTextStyle: {
+                  color: '#c0c3cd',
+                  padding: [0, 0, -10, 0],
+                  fontSize: 14,
                 },
-              },
-              itemStyle: {
-                normal: {
-                  color: "#389af4",
-                  shadowColor: "#389af4",
-                  shadowBlur: 0,
+                axisLabel: {
+                  color: '#c0c3cd', //X轴文字
+                  fontSize: 14,
+                  interval: 0,
+                  margin: 20,
+                  rotate: -20,
                 },
-              },
-            },
-            {
-              value: 1,
-              name: "invisible",
-              itemStyle: {
-                normal: {
-                  color: "#412a4e",
+                axisTick: {
+                  lineStyle: {
+                    color: '#0B1535',
+                    width: 1,
+                  },
+                  show: false,
                 },
-                emphasis: {
-                  color: "#412a4e",
+                splitLine: {
+                  show: false,
                 },
-              },
-            },
-          ],
-        },
-      ],
-    })
-    this.$refs.equipmentPowerTwo.setData({
-      series: [
-        {
-          type: "pie",
-          clockWise: false,
-          radius: ['60%', '75%'],
-          itemStyle: {
-            normal: {
-              label: {
-                show: false,
-              },
-              labelLine: {
-                show: false,
-              },
-              shadowBlur: 0,
-              shadowColor: "#ff8c37",
-            },
-          },
-          hoverAnimation: false,
-          center: ["50%", "50%"],
-          data: [
-            {
-              value: 99,
-              label: {
-                normal: {
-                  rich: {
-                    a: {
-                      color: "#ff8c37",
-                      align: "center",
-                      fontSize: 1.1 * vw,
-                      fontWeight: "bold",
-                    },
-                    b: {
-                      color: "#fff",
-                      align: "center",
-                      fontSize: 0.9 * vw,
-                    },
-                  },
-                  formatter: function (params) {
-                    return (
-                      "{a|" +
-                      params.value +
-                      "%}" +
-                      "\n{b|灌注}"
-                    );
+                axisLine: {
+                  lineStyle: {
+                    color: '#384267',
+                    width: 1,
+                    type: 'dashed',
                   },
-                  position: "center",
                   show: true,
-                  textStyle: {
-                    fontSize: "14",
-                    fontWeight: "normal",
-                    color: "#fff",
-                  },
-                },
-              },
-              itemStyle: {
-                normal: {
-                  color: "#ff8c37",
-                  shadowColor: "#ff8c37",
-                  shadowBlur: 0,
                 },
+                data: e.x,
+                type: 'category',
               },
-            },
-            {
-              value: 1,
-              name: "invisible",
-              itemStyle: {
-                normal: {
-                  color: "#412a4e",
+              yAxis: {
+                type: 'value',
+                nameTextStyle: {
+                  color: '#c0c3cd',
+                  padding: [0, 0, -10, 0],
+                  fontSize: 14,
                 },
-                emphasis: {
-                  color: "#412a4e",
+                axisLabel: {
+                  color: '#c0c3cd', //Y轴文字
+                  fontSize: 14,
                 },
-              },
-            },
-          ],
-        },
-      ],
-    })
-    this.$refs.equipmentPowerThree.setData({
-      series: [
-        {
-          type: "pie",
-          clockWise: false,
-          radius: ['60%', '75%'],
-          itemStyle: {
-            normal: {
-              label: {
-                show: false,
-              },
-              labelLine: {
-                show: false,
-              },
-              shadowBlur: 0,
-              shadowColor: "#ffc257",
-            },
-          },
-          hoverAnimation: false,
-          center: ["50%", "50%"],
-          data: [
-            {
-              value: 99,
-              label: {
-                normal: {
-                  rich: {
-                    a: {
-                      color: "#ffc257",
-                      align: "center",
-                      fontSize: 1.1 * vw,
-                      fontWeight: "bold",
-                    },
-                    b: {
-                      color: "#fff",
-                      align: "center",
-                      fontSize: 0.9 * vw,
-                    },
+                axisTick: {
+                  lineStyle: {
+                    color: '#384267',
+                    width: 1,
                   },
-                  formatter: function (params) {
-                    return (
-                      "{a|" +
-                      params.value +
-                      "%}" +
-                      "\n{b|低压检漏}"
-                    );
-                  },
-                  position: "center",
                   show: true,
-                  textStyle: {
-                    fontSize: "14",
-                    fontWeight: "normal",
-                    color: "#fff",
+                },
+                splitLine: {
+                  show: true,
+                  lineStyle: {
+                    color: '#384267',
+                    type: 'line',
                   },
                 },
-              },
-              itemStyle: {
-                normal: {
-                  color: "#ffc257",
-                  shadowColor: "#ffc257",
-                  shadowBlur: 0,
+                axisLine: {
+                  lineStyle: {
+                    color: '#fff',
+                    width: 1,
+                    type: 'line',
+                  },
+                  show: false,
                 },
               },
-            },
-            {
-              value: 1,
-              name: "invisible",
-              itemStyle: {
-                normal: {
-                  color: "#412a4e",
+              series: [
+                {
+                  data: e.y,
+                  type: 'pictorialBar',
+                  barMaxWidth: 'auto',
+                  barWidth: 1.5 * vw,
+                  symbol: 'rect',
+                  itemStyle: {
+                    color: function (val) {
+                      if (e.y.length - val.dataIndex === 1) {
+                        return 'red'
+                      } else if (e.y.length - val.dataIndex === 2) {
+                        return 'yellow'
+
+                      } else {
+                        return '#35AAFE'
+                      }
+                    }
+                  },
+                  label: {
+                    normal: {
+                      show: true,
+                      position: "top",
+                      textStyle: {
+                        color: "#a8aab0",
+                        fontStyle: "normal",
+                        fontFamily: "微软雅黑",
+                        fontSize: 0.75 * vw,
+                      },
+                    },
+                  }
                 },
-                emphasis: {
-                  color: "#412a4e",
+                {
+                  data: e.y,
+                  type: 'pictorialBar',
+                  barWidth: 1.5 * vw,
+                  symbolPosition: 'end',
+                  symbol: 'diamond',
+                  itemStyle: {
+                    color: function (val) {
+                      if (e.y.length - val.dataIndex === 1) {
+                        return 'red'
+                      } else if (e.y.length - val.dataIndex === 2) {
+                        return 'yellow'
+                      } else {
+                        return '#66c8ff'
+                      }
+                    }
+                  },
+                  symbolOffset: ['0%', '-50%'],
+                  symbolSize: [1.5 * vw, 10],
+                  zlevel: 4,
                 },
-              },
-            },
-          ],
+                {
+                  data: e.y.map(val => 1),
+                  type: 'pictorialBar',
+                  barWidth: 1.5 * vw,
+                  symbolPosition: 'end',
+                  symbol: 'diamond',
+                  itemStyle: {
+                    color: function (val) {
+                      if (e.y.length - val.dataIndex === 1) {
+                        return 'red'
+                      } else if (e.y.length - val.dataIndex === 2) {
+                        return 'yellow'
+
+                      } else {
+                        return '#66c8ff'
+                      }
+                    }
+                  },
+                  symbolOffset: ['0%', '-20%'],
+                  symbolSize: [1.5 * vw, 10],
+                  zlevel: 4,
+                },
+                // {
+                //   type: 'pictorialBar',
+                //   name: 'pictorial element',
+                //   symbol: function (val, index) {
+                //     // return 'image://' + 'http://10.100.70.5:9090/' + data.yImg[index.dataIndex]
+                //   },
+                //   symbolSize: [40, 40],
+                //   z: 10,
+                //   data: e.y.map(val => {
+                //     return {
+                //       value: val,
+                //       symbolPosition: 'end',
+                //       symbolOffset: [0, '-190%']
+                //     }
+                //   })
+                // },
+              ]
+            })
+          }
         },
-      ],
-    })
-    this.$refs.equipmentPowerFour.setData({
-      series: [
         {
-          type: "pie",
-          clockWise: false,
-          radius: ['60%', '75%'],
-          itemStyle: {
-            normal: {
-              label: {
-                show: false,
+          e: 'zh-1-06',
+          i: "",
+          f: (e) => {
+            this.$refs.productionEfficiency.setData({
+              grid: {
+                top: "10%",
+                left: '10%',
+                right: "5%",
+                bottom: '15%',
+                // containLabel: true
               },
-              labelLine: {
-                show: false,
-              },
-              shadowBlur: 0,
-              shadowColor: "#fd6f97",
-            },
-          },
-          hoverAnimation: false,
-          center: ["50%", "50%"],
-          data: [
-            {
-              value: 99,
-              label: {
-                normal: {
-                  rich: {
-                    a: {
-                      color: "#fd6f97",
-                      align: "center",
-                      fontSize: 1.1 * vw,
-                      fontWeight: "bold",
-                    },
-                    b: {
-                      color: "#fff",
-                      align: "center",
-                      fontSize: 0.9 * vw,
-                    },
-                  },
-                  formatter: function (params) {
-                    return (
-                      "{a|" +
-                      params.value +
-                      "%}" +
-                      "\n{b|安规检}"
-                    );
-                  },
-                  position: "center",
-                  show: true,
-                  textStyle: {
-                    fontSize: "14",
-                    fontWeight: "normal",
-                    color: "#fff",
+              dataZoom: [],
+              xAxis: {
+                data: e.x,
+                axisLine: {
+                  lineStyle: {
+                    color: "#0177d4",
                   },
                 },
-              },
-              itemStyle: {
-                normal: {
-                  color: "#fd6f97",
-                  shadowColor: "#fd6f97",
-                  shadowBlur: 0,
+                axisLabel: {
+                  color: "#fff",
+                  fontSize: 0.5 * vw,
+                  interval: 0,
+                  rotate: -20,
                 },
               },
-            },
-            {
-              value: 1,
-              name: "invisible",
-              itemStyle: {
-                normal: {
-                  color: "#412a4e",
+              yAxis: {
+                nameTextStyle: {
+                  color: "#fff",
+                  fontSize: 16,
                 },
-                emphasis: {
-                  color: "#412a4e",
+                axisLine: {
+                  lineStyle: {
+                    color: "#0177d4",
+                  },
+                },
+                axisLabel: {
+                  color: "#fff",
+                  fontSize: 16,
+                },
+                splitLine: {
+                  show: false,
+                  lineStyle: {
+                    color: "#0177d4",
+                  },
                 },
               },
-            },
-          ],
-        },
-      ],
-    })
-    this.$refs.equipmentPowerFive.setData({
-      series: [
-        {
-          type: "pie",
-          clockWise: false,
-          radius: ['60%', '75%'],
-          itemStyle: {
-            normal: {
-              label: {
-                show: false,
-              },
-              labelLine: {
-                show: false,
-              },
-              shadowBlur: 0,
-              shadowColor: "#a181fc",
-            },
-          },
-          hoverAnimation: false,
-          center: ["50%", "50%"],
-          data: [
-            {
-              value: 99,
-              label: {
-                normal: {
-                  rich: {
-                    a: {
-                      color: "#a181fc",
-                      align: "center",
-                      fontSize: 1.1 * vw,
-                      fontWeight: "bold",
+              series: [
+                {
+                  type: "bar",
+                  barWidth: 1 * vw,
+                  itemStyle: {
+                    normal: {
+                      color: new echarts.graphic.LinearGradient(
+                        0,
+                        0,
+                        0,
+                        1,
+                        [
+                          {
+                            offset: 0,
+                            color: "#00b0ff",
+                          },
+                          {
+                            offset: 0.8,
+                            color: "#7052f4",
+                          },
+                        ],
+                        false
+                      ),
                     },
-                    b: {
+                  },
+                  label: {
+                    show: true,
+                    position: "top",
+                    textStyle: {
                       color: "#fff",
-                      align: "center",
-                      fontSize: 0.9 * vw,
+                      fontSize: 0.75 * vw
                     },
                   },
-                  formatter: function (params) {
-                    return (
-                      "{a|" +
-                      params.value +
-                      "%}" +
-                      "\n{b|测温}"
-                    );
-                  },
-                  position: "center",
-                  show: true,
-                  textStyle: {
-                    fontSize: "14",
-                    fontWeight: "normal",
-                    color: "#fff",
-                  },
-                },
-              },
-              itemStyle: {
-                normal: {
-                  color: "#a181fc",
-                  shadowColor: "#a181fc",
-                  shadowBlur: 0,
+                  data: e.y.sort().reverse(),
                 },
-              },
-            },
-            {
-              value: 1,
-              name: "invisible",
-              itemStyle: {
-                normal: {
-                  color: "#412a4e",
-                },
-                emphasis: {
-                  color: "#412a4e",
-                },
-              },
-            },
-          ],
+              ],
+            })
+          }
         },
-      ],
-    })
-    this.$refs.equipmentPowerSix.setData({
-      series: [
         {
-          type: "pie",
-          clockWise: false,
-          radius: ['60%', '75%'],
-          itemStyle: {
-            normal: {
-              label: {
-                show: false,
-              },
-              labelLine: {
-                show: false,
-              },
-              shadowBlur: 0,
-              shadowColor: "#5d73ff",
-            },
-          },
-          hoverAnimation: false,
-          center: ["50%", "50%"],
-          data: [
-            {
-              value: 99,
-              label: {
-                normal: {
-                  rich: {
-                    a: {
-                      color: "#5d73ff",
-                      align: "center",
-                      fontSize: 1.1 * vw,
-                      fontWeight: "bold",
-                    },
-                    b: {
-                      color: "#fff",
-                      align: "center",
-                      fontSize: 0.9 * vw,
+          e: 'zh-1-06',
+          i: "",
+          f: (e) => {
+            this.$refs.equipmentPowerOne.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
+                      },
+                      labelLine: {
+                        show: false,
+                      },
+                      shadowBlur: 0,
+                      shadowColor: "#389af4",
                     },
                   },
-                  formatter: function (params) {
-                    return (
-                      "{a|" +
-                      params.value +
-                      "%}" +
-                      "\n{b|终检}"
-                    );
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: e.nd,
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#389af4",
+                              align: "center",
+                              fontSize: 1.1 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              params.value +
+                              "%}" +
+                              "\n{b|内胆检漏}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#389af4",
+                          shadowColor: "#389af4",
+                          shadowBlur: 0,
+                        },
+                      },
+                    },
+                    {
+                      value: 100 - e.nd,
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
+                    },
+                  ],
+                },
+              ],
+            })
+            this.$refs.equipmentPowerTwo.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
+                      },
+                      labelLine: {
+                        show: false,
+                      },
+                      shadowBlur: 0,
+                      shadowColor: "#ff8c37",
+                    },
                   },
-                  position: "center",
-                  show: true,
-                  textStyle: {
-                    fontSize: "14",
-                    fontWeight: "normal",
-                    color: "#fff",
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: e.gz,
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#ff8c37",
+                              align: "center",
+                              fontSize: 1.1 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              params.value +
+                              "%}" +
+                              "\n{b|灌注}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#ff8c37",
+                          shadowColor: "#ff8c37",
+                          shadowBlur: 0,
+                        },
+                      },
+                    },
+                    {
+                      value: 1,
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
+                    },
+                  ],
+                },
+              ],
+            })
+            this.$refs.equipmentPowerThree.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
+                      },
+                      labelLine: {
+                        show: false,
+                      },
+                      shadowBlur: 0,
+                      shadowColor: "#ffc257",
+                    },
                   },
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: 99,
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#ffc257",
+                              align: "center",
+                              fontSize: 1.1 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              params.value +
+                              "%}" +
+                              "\n{b|低压检漏}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#ffc257",
+                          shadowColor: "#ffc257",
+                          shadowBlur: 0,
+                        },
+                      },
+                    },
+                    {
+                      value: 1,
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
+                    },
+                  ],
                 },
-              },
-              itemStyle: {
-                normal: {
-                  color: "#5d73ff",
-                  shadowColor: "#5d73ff",
-                  shadowBlur: 0,
+              ],
+            })
+            this.$refs.equipmentPowerFour.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
+                      },
+                      labelLine: {
+                        show: false,
+                      },
+                      shadowBlur: 0,
+                      shadowColor: "#fd6f97",
+                    },
+                  },
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: 99,
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#fd6f97",
+                              align: "center",
+                              fontSize: 1.1 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              params.value +
+                              "%}" +
+                              "\n{b|安规检}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#fd6f97",
+                          shadowColor: "#fd6f97",
+                          shadowBlur: 0,
+                        },
+                      },
+                    },
+                    {
+                      value: 1,
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
+                    },
+                  ],
                 },
-              },
-            },
-            {
-              value: 1,
-              name: "invisible",
-              itemStyle: {
-                normal: {
-                  color: "#412a4e",
+              ],
+            })
+            this.$refs.equipmentPowerFive.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
+                      },
+                      labelLine: {
+                        show: false,
+                      },
+                      shadowBlur: 0,
+                      shadowColor: "#a181fc",
+                    },
+                  },
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: 99,
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#a181fc",
+                              align: "center",
+                              fontSize: 1.1 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              params.value +
+                              "%}" +
+                              "\n{b|测温}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#a181fc",
+                          shadowColor: "#a181fc",
+                          shadowBlur: 0,
+                        },
+                      },
+                    },
+                    {
+                      value: 1,
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
+                    },
+                  ],
                 },
-                emphasis: {
-                  color: "#412a4e",
+              ],
+            })
+            this.$refs.equipmentPowerSix.setData({
+              series: [
+                {
+                  type: "pie",
+                  clockWise: false,
+                  radius: ['60%', '75%'],
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: false,
+                      },
+                      labelLine: {
+                        show: false,
+                      },
+                      shadowBlur: 0,
+                      shadowColor: "#5d73ff",
+                    },
+                  },
+                  hoverAnimation: false,
+                  center: ["50%", "50%"],
+                  data: [
+                    {
+                      value: 99,
+                      label: {
+                        normal: {
+                          rich: {
+                            a: {
+                              color: "#5d73ff",
+                              align: "center",
+                              fontSize: 1.1 * vw,
+                              fontWeight: "bold",
+                            },
+                            b: {
+                              color: "#fff",
+                              align: "center",
+                              fontSize: 0.9 * vw,
+                            },
+                          },
+                          formatter: function (params) {
+                            return (
+                              "{a|" +
+                              params.value +
+                              "%}" +
+                              "\n{b|终检}"
+                            );
+                          },
+                          position: "center",
+                          show: true,
+                          textStyle: {
+                            fontSize: "14",
+                            fontWeight: "normal",
+                            color: "#fff",
+                          },
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: "#5d73ff",
+                          shadowColor: "#5d73ff",
+                          shadowBlur: 0,
+                        },
+                      },
+                    },
+                    {
+                      value: 1,
+                      name: "invisible",
+                      itemStyle: {
+                        normal: {
+                          color: "#412a4e",
+                        },
+                        emphasis: {
+                          color: "#412a4e",
+                        },
+                      },
+                    },
+                  ],
                 },
-              },
-            },
-          ],
+              ],
+            })
+          }
         },
-      ],
+      ]
+    }
+  },
+  mounted() {
+
+    this.RequestDataSet.forEach(val => {
+      mixData(val)
     })
+    let min = Math.ceil(Math.min(...[61, 25, 57, 83, 87, 73, 17, 25, 57, 83, 87, 73],))
+    let max = Math.ceil(Math.max(...[61, 25, 57, 83, 87, 73, 17, 25, 57, 83, 87, 73],))
+
     this.curWeek()
     this.day()
   },