diff --git a/public/models/01changfang/addition/4a1183172be4466586f0aba659cfaa0e.mrmb b/public/models/01changfang/addition/220530f3157f46188e043490d520c4ad.mrmb
similarity index 100%
rename from public/models/01changfang/addition/4a1183172be4466586f0aba659cfaa0e.mrmb
rename to public/models/01changfang/addition/220530f3157f46188e043490d520c4ad.mrmb
diff --git a/public/models/01changfang/fileList.json b/public/models/01changfang/fileList.json
index f855e46..87b2a6c 100644
--- a/public/models/01changfang/fileList.json
+++ b/public/models/01changfang/fileList.json
@@ -1 +1 @@
-{"sky":{"a":"sky/a/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr","b":"sky/b/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg"},"mat":["mat/mat.json"],"instance":["instance/ac2ab7084a284ec7a8e423e549fde6e9.mrmb"],"box":{"max":[1643.9346923828125,36.417999267578125,656.109375],"min":[-1077.169921875,-6.0707221031188965,-843.8449096679688]},"m":["m/89497d03d6654f0da05752e164f91ee7.mrmb"],"scene":"scene/scene.json","sceneData":"sceneData/sceneData.json","addition":["addition/4a1183172be4466586f0aba659cfaa0e.mrmb"]}
\ No newline at end of file
+{"sky":{"a":"sky/a/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr","b":"sky/b/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg"},"mat":["mat/mat.json"],"instance":["instance/46d48a67aa554c4983cb0d191c1c0af1.mrmb"],"box":{"max":[1643.9346923828125,36.417999267578125,656.109375],"min":[-1077.169921875,-6.0707221031188965,-843.8449096679688]},"m":["m/3ded9fbaeb94477ea21aba9d79e2b7cc.mrmb"],"scene":"scene/scene.json","sceneData":"sceneData/sceneData.json","addition":["addition/220530f3157f46188e043490d520c4ad.mrmb"]}
\ No newline at end of file
diff --git a/public/models/01changfang/instance/ac2ab7084a284ec7a8e423e549fde6e9.mrmb b/public/models/01changfang/instance/46d48a67aa554c4983cb0d191c1c0af1.mrmb
similarity index 100%
rename from public/models/01changfang/instance/ac2ab7084a284ec7a8e423e549fde6e9.mrmb
rename to public/models/01changfang/instance/46d48a67aa554c4983cb0d191c1c0af1.mrmb
diff --git a/public/models/01changfang/m/89497d03d6654f0da05752e164f91ee7.mrmb b/public/models/01changfang/m/3ded9fbaeb94477ea21aba9d79e2b7cc.mrmb
similarity index 60%
rename from public/models/01changfang/m/89497d03d6654f0da05752e164f91ee7.mrmb
rename to public/models/01changfang/m/3ded9fbaeb94477ea21aba9d79e2b7cc.mrmb
index 5c6e226..15a2c47 100644
Binary files a/public/models/01changfang/m/89497d03d6654f0da05752e164f91ee7.mrmb and b/public/models/01changfang/m/3ded9fbaeb94477ea21aba9d79e2b7cc.mrmb differ
diff --git a/src/assets/board/foamingMachine1.png b/src/assets/board/foamingMachine1.png
index 255a28d..4529c86 100644
Binary files a/src/assets/board/foamingMachine1.png and b/src/assets/board/foamingMachine1.png differ
diff --git a/src/assets/board/foamingMachine2.png b/src/assets/board/foamingMachine2.png
deleted file mode 100644
index 6f3fb85..0000000
Binary files a/src/assets/board/foamingMachine2.png and /dev/null differ
diff --git a/src/assets/board/foamingMachine3.png b/src/assets/board/foamingMachine3.png
deleted file mode 100644
index c114e24..0000000
Binary files a/src/assets/board/foamingMachine3.png and /dev/null differ
diff --git a/src/assets/board/model1.png b/src/assets/board/model1.png
index a667ef1..3085471 100644
Binary files a/src/assets/board/model1.png and b/src/assets/board/model1.png differ
diff --git a/src/assets/model/equipment/bg.jpg b/src/assets/model/equipment/bg.jpg
new file mode 100644
index 0000000..5b040b2
Binary files /dev/null and b/src/assets/model/equipment/bg.jpg differ
diff --git a/src/assets/model/factoryIntroduction/img.png b/src/assets/model/factoryIntroduction/img.png
index 8b2ec28..5618f9d 100644
Binary files a/src/assets/model/factoryIntroduction/img.png and b/src/assets/model/factoryIntroduction/img.png differ
diff --git a/src/views/board/foaming/index.vue b/src/views/board/foaming/index.vue
index 04554a4..de07b61 100644
--- a/src/views/board/foaming/index.vue
+++ b/src/views/board/foaming/index.vue
@@ -2045,20 +2045,20 @@ export default {
   }
 }
 .left2{
-  background-image: url("../../../assets/board/left.png");
+  background-image: url("../../../assets/board/right.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
   position: absolute;
   transform: translate(-50%,-50%);
-  top: 44%;
-  left: 43%;
+  top: 49%;
+  left: 55%;
   width: 5vw;
-  height: 4.05vw;
+  height: 2.86vw;
   span{
     position: absolute;
     transform: translate(-50%,-50%);
-    top: 28%;
-    left: 43%;
+    top: 37%;
+    left: 57%;
     font-size: 1vw;
     color: #fff;
   }
diff --git a/src/views/board/foaming/index2.vue b/src/views/board/foaming/index2.vue
index 4679141..f740631 100644
--- a/src/views/board/foaming/index2.vue
+++ b/src/views/board/foaming/index2.vue
@@ -796,10 +796,10 @@ export default {
   background-size: 100% 100%;
   position: absolute;
   transform: translateX(-50%);
-  top: 35%;
+  top: 21%;
   left: 50%;
-  width: 36vw;
-  height: 8.7vw;
+  width: 40vw;
+  height: 20vw;
 }
 
 .app-container {
diff --git a/src/views/board/liner/index.vue b/src/views/board/liner/index.vue
index b9b19c1..e7ba365 100644
--- a/src/views/board/liner/index.vue
+++ b/src/views/board/liner/index.vue
@@ -632,7 +632,7 @@ export default {
   top: 54.5%;
   left: 50%;
   width: 93%;
-  height: 8.71vw;
+  height: 10.34vw;
 }
 
 .headTitle {
diff --git a/src/views/board/scanDown/index.vue b/src/views/board/scanDown/index.vue
index a759064..b37715e 100644
--- a/src/views/board/scanDown/index.vue
+++ b/src/views/board/scanDown/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="headTitle">{{ line }}线成品入库数据监控平台</div>
+    <div class="headTitle">{{ line }}{{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 }}
@@ -1043,6 +1043,11 @@ export default {
         mixData(val)
       })
       this.line = '二'
+    }else if (this.$route.query.id === '3' || this.id === '3') {
+      this.RequestDataSet1.forEach(val => {
+        mixData(val)
+      })
+      this.line = ''
     }else{
       this.RequestDataSet.forEach(val => {
         mixData(val)
diff --git a/src/views/model/boardIndex.vue b/src/views/model/boardIndex.vue
index 0acf599..9527dad 100644
--- a/src/views/model/boardIndex.vue
+++ b/src/views/model/boardIndex.vue
@@ -7,7 +7,7 @@
       <foaming2 v-if="show === 'foaming2'"/>
       <pourInto f v-if="show === 'pourInto'"/>
       <finalAssembly v-if="show === 'finalAssembly'"/>
-      <scanDown v-if="show === 'scanDown'" id="1"/>
+      <scanDown v-if="show === 'scanDown'" id="3"/>
       <week v-if="show === 'week'"/>
     </div>
     <div class="time" id="time">{{ time }}</div>
diff --git a/src/views/model/dataCentre.vue b/src/views/model/dataCentre.vue
index f265d1f..5763673 100644
--- a/src/views/model/dataCentre.vue
+++ b/src/views/model/dataCentre.vue
@@ -79,16 +79,7 @@ export default {
   },
   data() {
     return {
-      chartData: [...(chinaMap.features.map(e => {
-        return {
-          name: e.properties.name,
-          value: Math.random() * 200
-        }
-      })), {
-        name: '南海诸岛',
-        value: Math.random() * 200
-      }],
-      hj:1000,
+      hj: 1000,
       title: [
         '三日清单',
         '产品发布',
@@ -194,380 +185,256 @@ export default {
       {value: [115.179594, 34.647758]},
     ];
 
-    let option = {
 
-      geo: {
-        map: "china",
-        aspectScale: 0.75, //长宽比
-        zoom: 1.1,
-        roam: false,
+    let plantCap = [
+      {
+        name: "外观时尚",
+        value: "24231",
+      },
+      {
+        name: "低碳环保",
+        value: "36232",
+      },
+      {
+        name: "高端智能",
+        value: "45423",
+      },
+      {
+        name: "老品牌",
+        value: "24542",
+      },
+    ];
+
+    let datalist = [
+      {
+        offset: [56, 48],
+        symbolSize: 120,
+        opacity: 0.95,
+        color: "#f467ce",
+      },
+      {
+        offset: [35, 80],
+        symbolSize: 95,
+        opacity: 0.88,
+        color: "#7aabe2",
+      },
+      {
+        offset: [20, 43],
+        symbolSize: 90,
+        opacity: 0.84,
+        color: "#ff7123",
+      },
+      {
+        offset: [83, 30],
+        symbolSize: 90,
+        opacity: 0.8,
+        color: "#ffc400",
+      },
+      {
+        offset: [36, 20],
+        symbolSize: 65,
+        opacity: 0.75,
+        color: "#5e333f",
+      },
+      {
+        offset: [64, 10],
+        symbolSize: 70,
+        opacity: 0.7,
+        color: "#6b3442",
+      },
+      {
+        offset: [75, 75],
+        symbolSize: 60,
+        opacity: 0.68,
+        color: "#8a3647",
+      },
+      {
+        offset: [88, 62],
+        symbolSize: 50,
+        opacity: 0.6,
+        color: "#68333f",
+      },
+    ];
+    let datas = [];
+    for (var i = 0; i < plantCap.length; i++) {
+      var item = plantCap[i];
+      var itemToStyle = datalist[i];
+      datas.push({
+        name: item.value + "\n" + item.name,
+        value: itemToStyle.offset,
+        symbolSize: itemToStyle.symbolSize,
         label: {
           normal: {
-            show: false,
+            textStyle: {
+              fontSize: 11,
+            },
           },
         },
         itemStyle: {
           normal: {
-            areaColor: {
-              type: "radial",
-              x: 0.5,
-              y: 0.5,
-              r: 0.8,
-              colorStops: [
-                {
-                  offset: 0,
-                  color: "#09132c", // 0% 处的颜色
-                },
-                {
-                  offset: 1,
-                  color: "#274d68", // 100% 处的颜色
-                },
-              ],
-              globalCoord: true, // 缺省为 false
-            },
-            shadowColor: "rgb(58,115,192)",
-            shadowOffsetX: 2,
-            shadowOffsetY: 2.3,
-          },
-          emphasis: {
-            areaColor: "#2AB8FF",
-            borderWidth: 0,
-            color: "green",
-            label: {
-              show: false,
-            },
+            color: itemToStyle.color,
+            opacity: itemToStyle.opacity,
           },
         },
-        regions: [
-          {
-            name: "南海诸岛",
-            itemStyle: {
-              areaColor: "rgba(0, 10, 52, 1)",
+      });
+    }
 
-              borderColor: "rgba(0, 10, 52, 1)",
-              normal: {
-                opacity: 0,
-                label: {
-                  show: false,
-                  color: "#009cc9",
-                },
-              },
-            },
-          },
-        ],
+    echarts.registerMap('china', chinaMap);
+    this.$refs.chart1 && this.$refs.chart1.setData(this.chart1Option());
+    this.$refs.chart4.setData({
+      tooltip: {},
+      grid: {
+        top: "25%",
+        left: "5%",
+        right: "5%",
+        bottom: "8%",
+        containLabel: true,
       },
-      series: [
+      legend: {
+        itemGap: 50,
+        top: "2%",
+        textStyle: {
+          color: "#f9f9f9",
+          borderColor: "#fff",
+        },
+      },
+      xAxis: [
         {
-          type: "map",
-          roam: false,
-          label: {
-            normal: {
-              show: false,
+          type: "category",
+          boundaryGap: true,
+          axisLine: {
+            //坐标轴轴线相关设置。数学上的x轴
+            show: true,
+            lineStyle: {
+              color: "#f9f9f9",
             },
           },
-
-          itemStyle: {
-            normal: {
-              borderColor: "rgb(147, 235, 248)",
-              borderWidth: 1,
-              areaColor: {
-                type: "radial",
-                x: 0.5,
-                y: 0.5,
-                r: 0.8,
-                colorStops: [
-                  {
-                    offset: 0,
-                    color: "#09132c", // 0% 处的颜色
-                  },
-                  {
-                    offset: 1,
-                    color: "#274d68", // 100% 处的颜色
-                  },
-                ],
-                globalCoord: true, // 缺省为 false
-              },
-            },
-            emphasis: {
-              areaColor: "rgb(46,229,206)",
-              //    shadowColor: 'rgb(12,25,50)',
-              borderWidth: 0.1,
+          axisLabel: {
+            interval: 0,
+            //坐标轴刻度标签的相关设置
+            textStyle: {
+              color: "#d1e6eb",
+              margin: 15,
             },
           },
-          zoom: 1.1,
-          //     roam: false,
-          map: "china", //使用
-          // data: this.difficultData //热力图数据   不同区域 不同的底色
+          axisTick: {
+            show: false,
+          },
+          data: ["预装检漏", "发泡质检", "电检", "低压捡漏", "高压捡漏", "制冷性能"],
         },
+      ],
+      yAxis: [
         {
-          type: "effectScatter",
-          coordinateSystem: "geo",
-          showEffectOn: "render",
-          zlevel: 1,
-          rippleEffect: {
-            period: 15,
-            scale: 4,
-            brushType: "fill",
-          },
-          hoverAnimation: true,
-          label: {
-            normal: {
-              formatter: "{b}",
-              position: "right",
-              offset: [15, 0],
-              color: "#1DE9B6",
-              show: true,
+          type: "value",
+          min: 0,
+          // max: 140,
+          splitNumber: 7,
+          splitLine: {
+            show: true,
+            lineStyle: {
+              color: "#0a3256",
             },
           },
-          itemStyle: {
-            normal: {
-              color: "#1DE9B6",
-              shadowBlur: 10,
-              shadowColor: "#333",
+          axisLine: {
+            show: false,
+          },
+          axisLabel: {
+            margin: 5,
+            textStyle: {
+              fontSize: 0.5 * vw,
+              color: "#d1e6eb",
             },
           },
-          symbolSize: 2,
-          data: points,
+          axisTick: {
+            show: false,
+          },
         },
         {
-          type: "lines",
-          zlevel: 2,
-          effect: {
+          type: "value",
+          min: 90,
+          max: 100,
+          splitLine: {
             show: true,
-            period: 2, //箭头指向速度，值越小速度越快
-            trailLength: 0.4, //特效尾迹长度[0,1]值越大，尾迹越长重
-            symbol: "arrow", //箭头图标
-            symbolSize: 5, //图标大小
-          },
-          lineStyle: {
-            normal: {
-              color: "#1DE9B6",
-              width: 1, //线条宽度
-              opacity: 0.1, //尾迹线条透明度
-              curveness: 0.3, //尾迹线条曲直度
+            lineStyle: {
+              color: "#0a3256",
             },
           },
-          data: [
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [118.8062, 31.9208],
-              ],
-              lineStyle: {color: "#4ab2e5"},
-            },
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [127.9688, 45.368],
-              ],
-              lineStyle: {color: "#4fb6d2"},
-            },
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [110.3467, 41.4899],
-              ],
-              lineStyle: {color: "#52b9c7"},
-            },
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [125.8154, 44.2584],
-              ],
-              lineStyle: {color: "#5abead"},
-            },
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [116.4551, 40.2539],
-              ],
-              lineStyle: {color: "#f34e2b"},
-            },
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [123.1238, 42.1216],
-              ],
-              lineStyle: {color: "#f56321"},
-            },
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [114.4995, 38.1006],
-              ],
-              lineStyle: {color: "#f56f1c"},
-            },
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [117.4219, 39.4189],
-              ],
-              lineStyle: {color: "#f58414"},
-            },
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [112.3352, 37.9413],
-              ],
-              lineStyle: {color: "#f58f0e"},
-            },
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [109.1162, 34.2004],
-              ],
-              lineStyle: {color: "#f5a305"},
-            },
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [103.5901, 36.3043],
-              ],
-              lineStyle: {color: "#e7ab0b"},
-            },
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [106.3586, 38.1775],
-              ],
-              lineStyle: {color: "#dfae10"},
-            },
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [101.4038, 36.8207],
-              ],
-              lineStyle: {color: "#d5b314"},
-            },
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [103.9526, 30.7617],
-              ],
-              lineStyle: {color: "#c1bb1f"},
-            },
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [108.384366, 30.439702],
-              ],
-              lineStyle: {color: "#b9be23"},
-            },
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [113.0823, 28.2568],
-              ],
-              lineStyle: {color: "#a6c62c"},
-            },
-            {
-              coords: [
-                [115.179594, 34.647758],
-                [102.9199, 25.46639],
-              ],
-              lineStyle: {color: "#96cc34"},
+          axisLine: {
+            show: false,
+          },
+          axisLabel: {
+            margin: 5,
+            textStyle: {
+              fontSize: 0.5 * vw,
+              color: "#d1e6eb",
             },
-          ],
+            formatter: '{value}%'
+          },
+          axisTick: {
+            show: false,
+          },
         },
       ],
-    };
-
-    let plantCap = [
-      {
-        name: "外观时尚",
-        value: "222",
-      },
-      {
-        name: "低碳环保",
-        value: "115",
-      },
-      {
-        name: "高端智能",
-        value: "113",
-      },
-      {
-        name: "老品牌",
-        value: "95",
-      },
-    ];
-
-    let datalist = [
-      {
-        offset: [56, 48],
-        symbolSize: 120,
-        opacity: 0.95,
-        color: "#f467ce",
-      },
-      {
-        offset: [35, 80],
-        symbolSize: 95,
-        opacity: 0.88,
-        color: "#7aabe2",
-      },
-      {
-        offset: [20, 43],
-        symbolSize: 90,
-        opacity: 0.84,
-        color: "#ff7123",
-      },
-      {
-        offset: [83, 30],
-        symbolSize: 90,
-        opacity: 0.8,
-        color: "#ffc400",
-      },
-      {
-        offset: [36, 20],
-        symbolSize: 65,
-        opacity: 0.75,
-        color: "#5e333f",
-      },
-      {
-        offset: [64, 10],
-        symbolSize: 70,
-        opacity: 0.7,
-        color: "#6b3442",
-      },
-      {
-        offset: [75, 75],
-        symbolSize: 60,
-        opacity: 0.68,
-        color: "#8a3647",
-      },
-      {
-        offset: [88, 62],
-        symbolSize: 50,
-        opacity: 0.6,
-        color: "#68333f",
-      },
-    ];
-    let datas = [];
-    for (var i = 0; i < plantCap.length; i++) {
-      var item = plantCap[i];
-      var itemToStyle = datalist[i];
-      datas.push({
-        name: item.value + "\n" + item.name,
-        value: itemToStyle.offset,
-        symbolSize: itemToStyle.symbolSize,
-        label: {
-          normal: {
+      series: [
+        {
+          name: "质检数量",
+          type: "bar",
+          barWidth: 20,
+          tooltip: {
+            show: false,
+          },
+          label: {
+            show: true,
+            position: "top",
             textStyle: {
-              fontSize: 11,
+              fontSize: 0.5 * vw,
+              color: "#fff",
             },
           },
+          itemStyle: {
+            normal: {
+              color: '#72b3fe'
+            },
+          },
+          data: [200, 382, 102, 267, 186, 315],
         },
-        itemStyle: {
-          normal: {
-            color: itemToStyle.color,
-            opacity: itemToStyle.opacity,
+        {
+          name: "合格率",
+          type: "line",
+          yAxisIndex: 1,
+          // smooth: true, //是否平滑曲线显示
+          // 			symbol:'circle',  // 默认是空心圆（中间是白色的），改成实心圆
+          showAllSymbol: true,
+          symbol: "emptyCircle",
+          symbolSize: 6,
+          lineStyle: {
+            normal: {
+              color: "#ecf3ff", // 线条颜色
+            },
+            borderColor: "#6d88bf",
+          },
+          label: {
+            show: true,
+            position: "top",
+            textStyle: {
+              fontSize: 0.5 * vw,
+              color: "#fff",
+            },
+            formatter: '{c}%'
+          },
+          itemStyle: {
+            normal: {
+              color: "#28ffb3",
+            },
+          },
+          tooltip: {
+            show: false,
           },
+          data: [96.74, 96.68, 98.76, 99.75, 98.58, 98.57, 98.43],
         },
-      });
-    }
-
-    echarts.registerMap('china', chinaMap);
-    this.$refs.chart1 && this.$refs.chart1.setData(this.chart1Option());
-    this.$refs.chart4.setData({
+      ],
+    })
+    this.$refs.chart5.setData({
       tooltip: {},
       grid: {
         top: "25%",
@@ -596,7 +463,6 @@ export default {
             },
           },
           axisLabel: {
-            interval: 0,
             //坐标轴刻度标签的相关设置
             textStyle: {
               color: "#d1e6eb",
@@ -606,7 +472,7 @@ export default {
           axisTick: {
             show: false,
           },
-          data: ["预装检漏", "发泡质检", "电检", "低压捡漏", "高压捡漏", "制冷性能"],
+          data: ["1日", "2日", "3日", "4日", "5日", "6日", "7日"],
         },
       ],
       yAxis: [
@@ -663,7 +529,7 @@ export default {
       ],
       series: [
         {
-          name: "质检数量",
+          name: "产量",
           type: "bar",
           barWidth: 20,
           tooltip: {
@@ -679,13 +545,13 @@ export default {
           },
           itemStyle: {
             normal: {
-              color: '#72b3fe'
+              color: '#9fe080'
             },
           },
-          data: [200, 382, 102, 267, 186, 315],
+          data: [200, 382, 102, 267, 186, 315, 316],
         },
         {
-          name: "合格率",
+          name: "订单履约率",
           type: "line",
           yAxisIndex: 1,
           // smooth: true, //是否平滑曲线显示
@@ -720,159 +586,283 @@ export default {
         },
       ],
     })
-    this.$refs.chart5.setData({
-      tooltip: {},
-      grid: {
-        top: "25%",
-        left: "5%",
-        right: "5%",
-        bottom: "8%",
-        containLabel: true,
-      },
-      legend: {
-        itemGap: 50,
-        top: "2%",
-        textStyle: {
-          color: "#f9f9f9",
-          borderColor: "#fff",
-        },
-      },
-      xAxis: [
-        {
-          type: "category",
-          boundaryGap: true,
-          axisLine: {
-            //坐标轴轴线相关设置。数学上的x轴
-            show: true,
-            lineStyle: {
-              color: "#f9f9f9",
-            },
-          },
-          axisLabel: {
-            //坐标轴刻度标签的相关设置
-            textStyle: {
-              color: "#d1e6eb",
-              margin: 15,
-            },
-          },
-          axisTick: {
+    this.$refs.chart6.setData({
+
+      geo: {
+        map: "china",
+        aspectScale: 0.75, //长宽比
+        zoom: 1.1,
+        roam: false,
+        label: {
+          normal: {
             show: false,
           },
-          data: ["1日", "2日", "3日", "4日", "5日", "6日", "7日"],
         },
-      ],
-      yAxis: [
-        {
-          type: "value",
-          min: 0,
-          // max: 140,
-          splitNumber: 7,
-          splitLine: {
-            show: true,
-            lineStyle: {
-              color: "#0a3256",
+        itemStyle: {
+          normal: {
+            areaColor: {
+              type: "radial",
+              x: 0.5,
+              y: 0.5,
+              r: 0.8,
+              colorStops: [
+                {
+                  offset: 0,
+                  color: "#09132c", // 0% 处的颜色
+                },
+                {
+                  offset: 1,
+                  color: "#274d68", // 100% 处的颜色
+                },
+              ],
+              globalCoord: true, // 缺省为 false
             },
+            shadowColor: "rgb(58,115,192)",
+            shadowOffsetX: 2,
+            shadowOffsetY: 2.3,
           },
-          axisLine: {
-            show: false,
+          emphasis: {
+            areaColor: "#2AB8FF",
+            borderWidth: 0,
+            color: "green",
+            label: {
+              show: false,
+            },
           },
-          axisLabel: {
-            margin: 5,
-            textStyle: {
-              fontSize: 0.5 * vw,
-              color: "#d1e6eb",
+        },
+        regions: [
+          {
+            name: "南海诸岛",
+            itemStyle: {
+              areaColor: "rgba(0, 10, 52, 1)",
+
+              borderColor: "rgba(0, 10, 52, 1)",
+              normal: {
+                opacity: 0,
+                label: {
+                  show: false,
+                  color: "#009cc9",
+                },
+              },
             },
           },
-          axisTick: {
-            show: false,
-          },
-        },
+        ],
+      },
+      series: [
         {
-          type: "value",
-          min: 90,
-          max: 100,
-          splitLine: {
-            show: true,
-            lineStyle: {
-              color: "#0a3256",
+          type: "map",
+          roam: false,
+          label: {
+            normal: {
+              show: false,
             },
           },
-          axisLine: {
-            show: false,
-          },
-          axisLabel: {
-            margin: 5,
-            textStyle: {
-              fontSize: 0.5 * vw,
-              color: "#d1e6eb",
+
+          itemStyle: {
+            normal: {
+              borderColor: "rgb(147, 235, 248)",
+              borderWidth: 1,
+              areaColor: {
+                type: "radial",
+                x: 0.5,
+                y: 0.5,
+                r: 0.8,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#09132c", // 0% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "#274d68", // 100% 处的颜色
+                  },
+                ],
+                globalCoord: true, // 缺省为 false
+              },
+            },
+            emphasis: {
+              areaColor: "rgb(46,229,206)",
+              //    shadowColor: 'rgb(12,25,50)',
+              borderWidth: 0.1,
             },
-            formatter: '{value}%'
-          },
-          axisTick: {
-            show: false,
           },
+          zoom: 1.1,
+          //     roam: false,
+          map: "china", //使用
+          // data: this.difficultData //热力图数据   不同区域 不同的底色
         },
-      ],
-      series: [
         {
-          name: "产量",
-          type: "bar",
-          barWidth: 20,
-          tooltip: {
-            show: false,
+          type: "effectScatter",
+          coordinateSystem: "geo",
+          showEffectOn: "render",
+          zlevel: 1,
+          rippleEffect: {
+            period: 15,
+            scale: 4,
+            brushType: "fill",
           },
+          hoverAnimation: true,
           label: {
-            show: true,
-            position: "top",
-            textStyle: {
-              fontSize: 0.5 * vw,
-              color: "#fff",
+            normal: {
+              formatter: "{b}",
+              position: "right",
+              offset: [15, 0],
+              color: "#1DE9B6",
+              show: true,
             },
           },
           itemStyle: {
             normal: {
-              color: '#9fe080'
+              color: "#1DE9B6",
+              shadowBlur: 10,
+              shadowColor: "#333",
             },
           },
-          data: [200, 382, 102, 267, 186, 315, 316],
+          symbolSize: 2,
+          data: points,
         },
         {
-          name: "订单履约率",
-          type: "line",
-          yAxisIndex: 1,
-          // smooth: true, //是否平滑曲线显示
-          // 			symbol:'circle',  // 默认是空心圆（中间是白色的），改成实心圆
-          showAllSymbol: true,
-          symbol: "emptyCircle",
-          symbolSize: 6,
+          type: "lines",
+          zlevel: 2,
+          effect: {
+            show: true,
+            period: 2, //箭头指向速度，值越小速度越快
+            trailLength: 0.4, //特效尾迹长度[0,1]值越大，尾迹越长重
+            symbol: "arrow", //箭头图标
+            symbolSize: 5, //图标大小
+          },
           lineStyle: {
             normal: {
-              color: "#ecf3ff", // 线条颜色
+              color: "#1DE9B6",
+              width: 1, //线条宽度
+              opacity: 0.1, //尾迹线条透明度
+              curveness: 0.3, //尾迹线条曲直度
             },
-            borderColor: "#6d88bf",
           },
-          label: {
-            show: true,
-            position: "top",
-            textStyle: {
-              fontSize: 0.5 * vw,
-              color: "#fff",
+          data: [
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [118.8062, 31.9208],
+              ],
+              lineStyle: {color: "#4ab2e5"},
             },
-            formatter: '{c}%'
-          },
-          itemStyle: {
-            normal: {
-              color: "#28ffb3",
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [127.9688, 45.368],
+              ],
+              lineStyle: {color: "#4fb6d2"},
             },
-          },
-          tooltip: {
-            show: false,
-          },
-          data: [96.74, 96.68, 98.76, 99.75, 98.58, 98.57, 98.43],
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [110.3467, 41.4899],
+              ],
+              lineStyle: {color: "#52b9c7"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [125.8154, 44.2584],
+              ],
+              lineStyle: {color: "#5abead"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [116.4551, 40.2539],
+              ],
+              lineStyle: {color: "#f34e2b"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [123.1238, 42.1216],
+              ],
+              lineStyle: {color: "#f56321"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [114.4995, 38.1006],
+              ],
+              lineStyle: {color: "#f56f1c"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [117.4219, 39.4189],
+              ],
+              lineStyle: {color: "#f58414"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [112.3352, 37.9413],
+              ],
+              lineStyle: {color: "#f58f0e"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [109.1162, 34.2004],
+              ],
+              lineStyle: {color: "#f5a305"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [103.5901, 36.3043],
+              ],
+              lineStyle: {color: "#e7ab0b"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [106.3586, 38.1775],
+              ],
+              lineStyle: {color: "#dfae10"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [101.4038, 36.8207],
+              ],
+              lineStyle: {color: "#d5b314"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [103.9526, 30.7617],
+              ],
+              lineStyle: {color: "#c1bb1f"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [108.384366, 30.439702],
+              ],
+              lineStyle: {color: "#b9be23"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [113.0823, 28.2568],
+              ],
+              lineStyle: {color: "#a6c62c"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [102.9199, 25.46639],
+              ],
+              lineStyle: {color: "#96cc34"},
+            },
+          ],
         },
       ],
     })
-    this.$refs.chart6.setData(option)
     this.$refs.chart7.setData({
       grid: {
         show: false,
@@ -1053,7 +1043,7 @@ export default {
         containLabel: true,
       },
       xAxis: {
-        data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+        data: ['2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月', '1月'],
         axisLine: {
           lineStyle: {
             color: "#0177d4",
diff --git a/src/views/model/equipment.vue b/src/views/model/equipment.vue
index caa0bff..b54f13f 100644
--- a/src/views/model/equipment.vue
+++ b/src/views/model/equipment.vue
@@ -1,189 +1,40 @@
 <template>
   <div class="app-container">
-    <div class="headTitle">设备运营中心</div>
+    <div class="headTitle">仓库</div>
     <div class="exit" @click="exitFun"></div>
 
 
-    <div class="box1">
-      <div class="boxTitle">点检统计分析</div>
-      <div class="chart1">
-        <Chart ref="chart1"></Chart>
-      </div>
-    </div>
-    <div class="box2">
-      <div class="boxTitle">保养统计分析</div>
-      <div class="chart2">
-        <Chart ref="chart2"></Chart>
-      </div>
-    </div>
-    <div class="box3">
-      <div class="boxTitle">设备状态</div>
+    <div class="chart1">
+      <Chart ref="chart1"></Chart>
     </div>
-    <div class="box4">
-      <div class="boxTitle">故障类型统计</div>
-      <div class="chart4">
-        <Chart ref="chart4"></Chart>
-      </div>
-    </div>
-    <div class="box5">
-      <div class="boxTitle">单台能耗</div>
-      <div class="chart5">
-        <Chart ref="chart5"></Chart>
-      </div>
+    <div class="chart2">
+      <Chart ref="chart2"></Chart>
     </div>
-    <div class="box6">
-      <div class="boxTitle">故障统计分析</div>
-      <div class="chart6">
-        <Chart ref="chart6"></Chart>
-      </div>
+    <div class="chart3">
+      <Chart ref="chart3"></Chart>
     </div>
-    <div class="box7">
-      <div class="boxTitle">保养看板</div>
-      <div class="scrollTable">
-        <div style="background-color: #09417066">
-          <div class="scrollTableItem" style="font-weight: bold;">
-            序号
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            设备编号
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            设备名称
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            保养项目
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            指派人
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            当前状态
-          </div>
-        </div>
-        <vue-seamless-scroll
-          :class-option="scrollTableOption"
-          :data="scrollTableData"
-          class="case-item"
-          style="height: 84%;overflow: hidden;"
-        >
-          <div
-            v-for="(item, index) in scrollTableData"
-            :key="index"
-          >
-            <div :style='"background-color:" + ((index % 2 === 0)? "#05346066":"#032d5766") '>
-              <div
-                class="scrollTableItem">
-                {{ item.value1 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value1 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value2 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value3 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value4 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value5 }}
-              </div>
-            </div>
-          </div>
-        </vue-seamless-scroll>
+    <div class="chart4">
+      <div class="title">
+        <div class="titleSpan1">排行</div>
+        <div class="titleSpan2">商品名</div>
+        <div class="titleSpan3">库存量</div>
       </div>
-    </div>
-    <div class="box8">
-      <div class="boxTitle">异常看板</div>
-      <div class="scrollTable">
-        <div style="background-color: #09417066">
-          <div class="scrollTableItem" style="font-weight: bold;">
-            设备编号
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            设备名称
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            报警时间
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            报警描述
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            状态持续时间
+      <div class="chart4Info">
+        <div class="info" v-for="i in 100">
+          <div class="infoSpan1">
+            <div class="num">{{ i }}</div>
           </div>
+          <div class="infoSpan2">SC-500Y,YZ怡宝24YP,C</div>
+          <div class="infoSpan3">666666</div>
         </div>
-        <vue-seamless-scroll
-          :class-option="scrollTableOption"
-          :data="scrollTableData"
-          class="case-item"
-          style="height: 84%;overflow: hidden;"
-        >
-          <div
-            v-for="(item, index) in scrollTableData"
-            :key="index"
-          >
-            <div :style='"background-color:" + ((index % 2 === 0)? "#05346066":"#032d5766") '>
-              <div
-                class="scrollTableItem">
-                {{ item.value1 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value1 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value2 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value3 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value4 }}
-              </div>
-            </div>
-          </div>
-        </vue-seamless-scroll>
       </div>
     </div>
-
-    <div class="chart11">
-      <Chart ref="chart11"></Chart>
-    </div>
-    <div class="chart12">
-      <Chart ref="chart12"></Chart>
+    <div class="chart5">
+      <Chart ref="chart5"></Chart>
     </div>
-    <div class="chart13">
-      <Chart ref="chart13"></Chart>
+    <div class="chart6">
+      <Chart ref="chart6"></Chart>
     </div>
-    <div class="chart14">
-      <Chart ref="chart14"></Chart>
-    </div>
-    <div class="chart15">
-      <Chart ref="chart15"></Chart>
-    </div>
-    <div class="chart16">
-      <Chart ref="chart16"></Chart>
-    </div>
-    <div class="electricity">
-      <div class="span1">用电消耗</div>
-      <div class="span2">11111kw·h</div>
-      <div class="span3">当日总耗电量</div>
-      <div class="span4">环比：
-        <div class="span5">57.00% ↑</div>
-      </div>
-    </div>
-
   </div>
 </template>
 
@@ -192,7 +43,10 @@ import vueSeamlessScroll from "vue-seamless-scroll";
 import Chart from "@/components/board/Chart";
 import {getData} from "@/api/board/getData";
 import * as echarts from 'echarts'
+import chinaMap from "@/views/model/china2.json";
 
+
+const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
 export default {
   name: "Liner",
   components: {
@@ -209,8 +63,421 @@ export default {
     return {}
   },
   mounted() {
-    const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
+    echarts.registerMap('china', chinaMap);
+    let points = [
+      {value: [118.8062, 31.9208], itemStyle: {color: "#4ab2e5"}},
+      {value: [127.9688, 45.368], itemStyle: {color: "#4fb6d2"}},
+      {value: [110.3467, 41.4899], itemStyle: {color: "#52b9c7"}},
+      {value: [125.8154, 44.2584], itemStyle: {color: "#5abead"}},
+      {value: [116.4551, 40.2539], itemStyle: {color: "#f34e2b"}},
+      {value: [123.1238, 42.1216], itemStyle: {color: "#f56321"}},
+      {value: [114.4995, 38.1006], itemStyle: {color: "#f56f1c"}},
+      {value: [117.4219, 39.4189], itemStyle: {color: "#f58414"}},
+      {value: [112.3352, 37.9413], itemStyle: {color: "#f58f0e"}},
+      {value: [109.1162, 34.2004], itemStyle: {color: "#f5a305"}},
+      {value: [103.5901, 36.3043], itemStyle: {color: "#e7ab0b"}},
+      {value: [106.3586, 38.1775], itemStyle: {color: "#dfae10"}},
+      {value: [101.4038, 36.8207], itemStyle: {color: "#d5b314"}},
+      {value: [103.9526, 30.7617], itemStyle: {color: "#c1bb1f"}},
+      {value: [108.384366, 30.439702], itemStyle: {color: "#b9be23"}},
+      {value: [113.0823, 28.2568], itemStyle: {color: "#a6c62c"}},
+      {value: [102.9199, 25.46639], itemStyle: {color: "#96cc34"}},
+      {value: [115.179594, 34.647758]},
+    ];
     this.$refs.chart1.setData({
+      tooltip: {
+        trigger: "item",
+        formatter: "{b} : {c} ({d}%)",
+      },
+      polar: {},
+      angleAxis: {
+        interval: 1,
+        type: "category",
+        data: [],
+        z: 10,
+        axisLine: {
+          show: false,
+          lineStyle: {
+            color: "#0B4A6B",
+            width: 1,
+            type: "solid",
+          },
+        },
+        axisLabel: {
+          interval: 0,
+          show: true,
+          color: "#0B4A6B00",
+          margin: 8,
+          fontSize: 16,
+        },
+      },
+      radiusAxis: {
+        min: 40,
+        max: 120,
+        interval: 20,
+        axisLine: {
+          show: false,
+          lineStyle: {
+            color: "#0B3E5E",
+            width: 1,
+            type: "solid",
+          },
+        },
+        axisLabel: {
+          formatter: "{value} %",
+          show: false,
+          padding: [0, 0, 20, 0],
+          color: "#0B3E5E",
+          fontSize: 16,
+        },
+        splitLine: {
+          lineStyle: {
+            color: "#0B3E5E00",
+            width: 2,
+            type: "solid",
+          },
+        },
+      },
+      calculable: true,
+      series: [
+        {
+          stack: "a",
+          type: "pie",
+          radius: ["0%", "80%"],
+          roseType: "area",
+          zlevel: 10,
+          label: {
+            normal: {
+              show: true,
+              formatter: "{b}\n{c}",
+              textStyle: {
+                fontSize: 12,
+                color: '#fff'
+              },
+              position: "outside",
+            },
+            emphasis: {
+              show: true,
+            },
+          },
+          labelLine: {
+            normal: {
+              show: true,
+              length: 20,
+              length2: 55,
+            },
+            emphasis: {
+              show: false,
+            },
+          },
+          data: [
+            {
+              value: 10,
+              name: "问题1",
+            },
+            {
+              value: 5,
+              name: "问题2",
+            },
+            {
+              value: 15,
+              name: "问题3",
+            },
+            {
+              value: 25,
+              name: "问题4",
+            },
+            {
+              value: 20,
+              name: "问题5",
+            },
+            {
+              value: 35,
+              name: "问题6",
+            },
+          ],
+        },
+      ],
+    })
+    this.$refs.chart3 && this.$refs.chart3.setData(this.chart1Option());
+    this.$refs.chart2.setData({
+
+      geo: {
+        map: "china",
+        aspectScale: 0.75, //长宽比
+        zoom: 1.1,
+        roam: false,
+        label: {
+          normal: {
+            show: false,
+          },
+        },
+        itemStyle: {
+          normal: {
+            areaColor: {
+              type: "radial",
+              x: 0.5,
+              y: 0.5,
+              r: 0.8,
+              colorStops: [
+                {
+                  offset: 0,
+                  color: "#09132c", // 0% 处的颜色
+                },
+                {
+                  offset: 1,
+                  color: "#274d68", // 100% 处的颜色
+                },
+              ],
+              globalCoord: true, // 缺省为 false
+            },
+            shadowColor: "rgb(58,115,192)",
+            shadowOffsetX: 2,
+            shadowOffsetY: 2.3,
+          },
+          emphasis: {
+            areaColor: "#2AB8FF",
+            borderWidth: 0,
+            color: "green",
+            label: {
+              show: false,
+            },
+          },
+        },
+        regions: [
+          {
+            name: "南海诸岛",
+            itemStyle: {
+              areaColor: "rgba(0, 10, 52, 1)",
+
+              borderColor: "rgba(0, 10, 52, 1)",
+              normal: {
+                opacity: 0,
+                label: {
+                  show: false,
+                  color: "#009cc9",
+                },
+              },
+            },
+          },
+        ],
+      },
+      series: [
+        {
+          type: "map",
+          roam: false,
+          label: {
+            normal: {
+              show: false,
+            },
+          },
+
+          itemStyle: {
+            normal: {
+              borderColor: "rgb(147, 235, 248)",
+              borderWidth: 1,
+              areaColor: {
+                type: "radial",
+                x: 0.5,
+                y: 0.5,
+                r: 0.8,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#09132c", // 0% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "#274d68", // 100% 处的颜色
+                  },
+                ],
+                globalCoord: true, // 缺省为 false
+              },
+            },
+            emphasis: {
+              areaColor: "rgb(46,229,206)",
+              //    shadowColor: 'rgb(12,25,50)',
+              borderWidth: 0.1,
+            },
+          },
+          zoom: 1.1,
+          //     roam: false,
+          map: "china", //使用
+          // data: this.difficultData //热力图数据   不同区域 不同的底色
+        },
+        {
+          type: "effectScatter",
+          coordinateSystem: "geo",
+          showEffectOn: "render",
+          zlevel: 1,
+          rippleEffect: {
+            period: 15,
+            scale: 4,
+            brushType: "fill",
+          },
+          hoverAnimation: true,
+          label: {
+            normal: {
+              formatter: "{b}",
+              position: "right",
+              offset: [15, 0],
+              color: "#1DE9B6",
+              show: true,
+            },
+          },
+          itemStyle: {
+            normal: {
+              color: "#1DE9B6",
+              shadowBlur: 10,
+              shadowColor: "#333",
+            },
+          },
+          symbolSize: 2,
+          data: points,
+        },
+        {
+          type: "lines",
+          zlevel: 2,
+          effect: {
+            show: true,
+            period: 2, //箭头指向速度，值越小速度越快
+            trailLength: 0.4, //特效尾迹长度[0,1]值越大，尾迹越长重
+            symbol: "arrow", //箭头图标
+            symbolSize: 5, //图标大小
+          },
+          lineStyle: {
+            normal: {
+              color: "#1DE9B6",
+              width: 1, //线条宽度
+              opacity: 0.1, //尾迹线条透明度
+              curveness: 0.3, //尾迹线条曲直度
+            },
+          },
+          data: [
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [118.8062, 31.9208],
+              ],
+              lineStyle: {color: "#4ab2e5"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [127.9688, 45.368],
+              ],
+              lineStyle: {color: "#4fb6d2"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [110.3467, 41.4899],
+              ],
+              lineStyle: {color: "#52b9c7"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [125.8154, 44.2584],
+              ],
+              lineStyle: {color: "#5abead"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [116.4551, 40.2539],
+              ],
+              lineStyle: {color: "#f34e2b"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [123.1238, 42.1216],
+              ],
+              lineStyle: {color: "#f56321"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [114.4995, 38.1006],
+              ],
+              lineStyle: {color: "#f56f1c"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [117.4219, 39.4189],
+              ],
+              lineStyle: {color: "#f58414"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [112.3352, 37.9413],
+              ],
+              lineStyle: {color: "#f58f0e"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [109.1162, 34.2004],
+              ],
+              lineStyle: {color: "#f5a305"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [103.5901, 36.3043],
+              ],
+              lineStyle: {color: "#e7ab0b"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [106.3586, 38.1775],
+              ],
+              lineStyle: {color: "#dfae10"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [101.4038, 36.8207],
+              ],
+              lineStyle: {color: "#d5b314"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [103.9526, 30.7617],
+              ],
+              lineStyle: {color: "#c1bb1f"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [108.384366, 30.439702],
+              ],
+              lineStyle: {color: "#b9be23"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [113.0823, 28.2568],
+              ],
+              lineStyle: {color: "#a6c62c"},
+            },
+            {
+              coords: [
+                [115.179594, 34.647758],
+                [102.9199, 25.46639],
+              ],
+              lineStyle: {color: "#96cc34"},
+            },
+          ],
+        },
+      ],
+    })
+    this.$refs.chart5.setData({
       tooltip: {
         trigger: "axis",
         axisPointer: {
@@ -264,6 +531,7 @@ export default {
       ],
       yAxis: [
         {
+          name: '库存数',
           type: "value",
           splitLine: {
             show: false,
@@ -284,85 +552,24 @@ export default {
             show: false,
           },
         },
-        {
-          type: "value",
-          splitLine: {
-            show: false,
-          },
-          axisLine: {
-            lineStyle: {
-              color: "#90979c",
-            },
-          },
-          axisTick: {
-            show: false,
-          },
-          axisLabel: {
-            interval: 0,
-            fontSize: 0.5 * vw,
-            formatter: "{value}%"
-          },
-          splitArea: {
-            show: false,
-          },
-        },
       ],
       series: [
         {
-          name: "需点检",
+          name: "库存数",
           type: "bar",
           borderWidth: '15%',
           itemStyle: {
             normal: {
-              color: "#3fd498",
+              color: "#62aafe",
             },
           },
           data: [
             709, 1917, 2455, 2610, 1719, 1433, 1544, 3285, 5208
           ],
         },
-
-        {
-          name: "已点检",
-          type: "bar",
-          borderWidth: '15%',
-          barGap: "-100%",
-          itemStyle: {
-            normal: {
-              color: "#78b4fe",
-              barBorderRadius: 0,
-            },
-          },
-          data: [327, 1776, 507, 1200, 800, 482, 204, 1390, 1001],
-        },
-        {
-          name: "点检率",
-          type: "line",
-          symbolSize: 10,
-          symbol: "circle",
-          yAxisIndex: 1,
-          itemStyle: {
-            normal: {
-              color: "#885576",
-              barBorderRadius: 0,
-              label: {
-                show: true,
-                position: "top",
-                color: "#fff",
-                fontSize: 0.6 * vw,
-                formatter: function (p) {
-                  return (p.value > 0 ? p.value : "") + '%';
-                },
-              },
-            },
-          },
-          data: [
-            96, 91, 96, 65, 86, 96, 91, 94, 100
-          ],
-        },
       ],
     })
-    this.$refs.chart2.setData({
+    this.$refs.chart6.setData({
       tooltip: {
         trigger: "axis",
         axisPointer: {
@@ -416,6 +623,7 @@ export default {
       ],
       yAxis: [
         {
+          name: '库存数',
           type: "value",
           splitLine: {
             show: false,
@@ -438,740 +646,183 @@ export default {
         },
         {
           type: "value",
+          name: "周转率",
+          nameTextStyle: {
+            color: "#ffffff66",
+          },
+          position: "right",
           splitLine: {
             show: false,
           },
-          axisLine: {
-            lineStyle: {
-              color: "#90979c",
-            },
-          },
           axisTick: {
             show: false,
           },
-          axisLabel: {
-            interval: 0,
-            fontSize: 0.5 * vw,
-            formatter: "{value}%"
-          },
-          splitArea: {
+          axisLine: {
             show: false,
           },
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#ffffff66",
+            },
+          },
         },
       ],
       series: [
         {
-          name: "需保养",
+          name: "库存数",
           type: "bar",
           borderWidth: '15%',
           itemStyle: {
             normal: {
-              color: "#f27f2b",
+              color: "#62aafe",
             },
           },
           data: [
             709, 1917, 2455, 2610, 1719, 1433, 1544, 3285, 5208
           ],
         },
-
-        {
-          name: "已保养",
-          type: "bar",
-          borderWidth: '15%',
-          barGap: "-100%",
-          itemStyle: {
-            normal: {
-              color: "#78b4fe",
-              barBorderRadius: 0,
-            },
-          },
-          data: [327, 1776, 507, 1200, 800, 482, 204, 1390, 1001],
-        },
         {
-          name: "点检率",
+          name: "周转率",
           type: "line",
-          symbolSize: 10,
-          symbol: "circle",
-          yAxisIndex: 1,
-          itemStyle: {
+          yAxisIndex:1,
+          label: {
             normal: {
-              color: "#885576",
-              barBorderRadius: 0,
-              label: {
-                show: true,
-                position: "top",
-                color: "#fff",
-                fontSize: 0.6 * vw,
-                formatter: function (p) {
-                  return (p.value > 0 ? p.value : "") + '%';
-                },
+              show: true,
+              position: "bottom",
+              textStyle: {
+                color: "#a8aab0",
+                fontStyle: "normal",
+                fontFamily: "微软雅黑",
+                fontSize: 0.75 * vw,
               },
             },
           },
-          data: [
-            96, 91, 96, 65, 86, 96, 91, 94, 100
-          ],
-        },
-      ],
-    })
-    this.$refs.chart4.setData({
-      grid: {
-        top: "15%",
-        bottom: "10%", //也可设置left和right设置距离来控制图表的大小
-      },
-      tooltip: {
-        trigger: "axis",
-        axisPointer: {
-          type: "shadow",
-          label: {
-            show: true,
-          },
-        },
-      },
-      legend: {
-        data: ["占比"],
-        top: "3%",
-        textStyle: {
-          color: "#ffffff",
-        },
-      },
-      xAxis: {
-        data: [
-          "测温",
-          "捡漏",
-          "后板",
-          "系统件",
-        ],
-        axisLine: {
-          show: true, //隐藏X轴轴线
-          lineStyle: {
-            color: "#ffffff66",
-          },
-        },
-        axisTick: {
-          show: true, //隐藏X轴刻度
-        },
-        axisLabel: {
-          show: true,
-          textStyle: {
-            color: "#ffffff66", //X轴文字颜色
-          },
-        },
-      },
-      yAxis: [
-        {
-          type: "value",
-          name: "缺陷占比",
-          nameTextStyle: {
-            color: "#ffffff66",
-          },
-          position: "left",
-          splitLine: {
-            show: false,
-          },
-          axisTick: {
-            show: false,
-          },
-          axisLine: {
-            show: false,
-          },
-          axisLabel: {
-            show: true,
-            textStyle: {
-              color: "#ffffff66",
-            },
-          },
-        },
-      ],
-      series: [
-        {
-          name: "占比",
-          type: "line",
-          label: {
-            normal: {
-              show: true,
-              position: "bottom",
-              textStyle: {
-                color: "#a8aab0",
-                fontStyle: "normal",
-                fontFamily: "微软雅黑",
-                fontSize: 0.75 * vw,
-              },
-            },
-          },
-          showAllSymbol: true, //显示所有图形。
-          symbol: "circle", //标记的图形为实心圆
-          symbolSize: 5, //标记的大小
-          itemStyle: {
-            //折线拐点标志的样式
-            color: "#ffffff",
-          },
-          lineStyle: {
-            color: "#ffffff",
-          },
-          data: [94.7, 93.2, 94.7, 93.4],
-        },
-      ],
-    })
-    this.$refs.chart5.setData({
-      grid: {
-        top: "15%",
-        bottom: "10%", //也可设置left和right设置距离来控制图表的大小
-      },
-      tooltip: {
-        trigger: "axis",
-        axisPointer: {
-          type: "shadow",
-          label: {
-            show: true,
-          },
-        },
-      },
-      legend: {
-        data: ["能耗"],
-        top: "3%",
-        textStyle: {
-          color: "#ffffff",
-        },
-      },
-      xAxis: {
-        data: [
-          "01",
-          "02",
-          "03",
-          "04",
-        ],
-        axisLine: {
-          show: true, //隐藏X轴轴线
-          lineStyle: {
-            color: "#ffffff66",
-          },
-        },
-        axisTick: {
-          show: true, //隐藏X轴刻度
-        },
-        axisLabel: {
-          show: true,
-          textStyle: {
-            color: "#ffffff66", //X轴文字颜色
-          },
-        },
-      },
-      yAxis: [
-        {
-          type: "value",
-          name: "能耗/kw·h",
-          nameTextStyle: {
-            color: "#ffffff66",
-          },
-          position: "left",
-          splitLine: {
-            show: false,
-          },
-          axisTick: {
-            show: false,
-          },
-          axisLine: {
-            show: false,
-          },
-          axisLabel: {
-            show: true,
-            textStyle: {
-              color: "#ffffff66",
-            },
-          },
-        },
-      ],
-      series: [
-        {
-          name: "能耗",
-          type: "line",
-          label: {
-            normal: {
-              show: true,
-              position: "bottom",
-              formatter: '{c}kw·h',
-              textStyle: {
-                color: "#a8aab0",
-                fontStyle: "normal",
-                fontFamily: "微软雅黑",
-                fontSize: 0.75 * vw,
-              },
-            },
-          },
-          showAllSymbol: true, //显示所有图形。
-          symbol: "circle", //标记的图形为实心圆
-          symbolSize: 5, //标记的大小
-          itemStyle: {
-            //折线拐点标志的样式
-            color: "#ffffff",
-          },
-          lineStyle: {
-            color: "#ffffff",
-          },
-          data: [94.7, 93.2, 94.7, 93.4],
-        },
-      ],
-    })
-    this.$refs.chart6.setData({
-      tooltip: {
-        trigger: "axis",
-        axisPointer: {
-          type: "shadow",
-          textStyle: {
-            color: "#fff",
-          },
-        },
-      },
-      grid: {
-        borderWidth: 0,
-        top: 2 * vw,
-        bottom: 1.5 * vw,
-        left: 2.5 * vw,
-        right: 2.5 * vw,
-        textStyle: {
-          color: "#fff",
-        },
-      },
-      legend: {
-        x: "center",
-        top: "0",
-        textStyle: {
-          fontSize: 0.6 * vw,
-          color: "#90979c",
-        },
-      },
-      xAxis: [
-        {
-          type: "category",
-          axisLine: {
-            lineStyle: {
-              color: "#90979c",
-            },
-          },
-          splitLine: {
-            show: false,
-          },
-          axisTick: {
-            show: false,
-          },
-          splitArea: {
-            show: false,
-          },
-          axisLabel: {
-            interval: 0,
-            fontSize: 0.5 * vw,
-          },
-          data: [1, 2, 3, 4, 5, 6, 7, 8, 9],
-        },
-      ],
-      yAxis: [
-        {
-          name: '故障数',
-          type: "value",
-          splitLine: {
-            show: false,
-          },
-          axisLine: {
-            lineStyle: {
-              color: "#90979c",
-            },
-          },
-          axisTick: {
-            show: false,
-          },
-          axisLabel: {
-            interval: 0,
-            fontSize: 0.5 * vw,
-          },
-          splitArea: {
-            show: false,
-          },
-        },
-      ],
-      series: [
-        {
-          name: "故障数",
-          type: "bar",
-          borderWidth: '15%',
-          itemStyle: {
-            normal: {
-              color: "#62aafe",
-            },
-          },
-          data: [
-            709, 1917, 2455, 2610, 1719, 1433, 1544, 3285, 5208
-          ],
+          showAllSymbol: true, //显示所有图形。
+          symbol: "circle", //标记的图形为实心圆
+          symbolSize: 5, //标记的大小
+          itemStyle: {
+            //折线拐点标志的样式
+            color: "#ffffff",
+          },
+          lineStyle: {
+            color: "#ffffff",
+          },
+          data: [94.7, 93.2, 94.7, 93.4, 94.4, 99.4, 92.4,96.2,97.2],
         },
       ],
     })
 
-    this.$refs.chart11.setData({
-      tooltip: {
-        trigger: "item",
-        formatter: "{a} <br/>{b} : {c} ({d}%)",
-      },
-      series: [
-        {
-          name: "",
-          type: "pie",
-          center: ["50%", "50%"],
-          radius: ["85%", "100%"],
-          data: [
-            {value: 280, name: "设备总数"},
-          ],
-          label: {
-            normal: {
-              rich: {
-                a: {
-                  color: "#fff",
-                  align: "center",
-                  fontSize: 1.5 * vw,
-                  fontWeight: "bold",
-                },
-                b: {
-                  color: "#fff",
-                  align: "center",
-                  fontSize: 0.8 * vw,
-                },
-              },
-              formatter: function (params) {
-                return (
-                  "{a|" +
-                  params.value +
-                  "}" +
-                  "\n{b|" +
-                  params.name +
-                  "}"
-                );
-              },
-              position: "center",
-              show: true,
-              textStyle: {
-                fontSize: "14",
-                fontWeight: "normal",
-                color: "#fff",
-              },
+  },
+  methods: {
+    exitFun() {
+      this.exit()
+    },
+    chart1Option(data, id) {
+      if (!data) {
+        data = {
+          yNameOne: ["订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001"],
+          yData: [41, 99, 41, 99, 32, 41, 24, 4, 16, 64, 18],
+          xDataName: "达成率",
+          status: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
+        }
+      }
+      let myColor = ["green", "red", "yellow", "blue", "#8B78F6"];
+      let bgBar = []
+      data.yData.forEach(() => {
+        bgBar.push(100)
+      })
+      let option = {
+        grid: {
+          // left: "-10%",
+          left: "0%",
+          right: "8%",
+          bottom: "0%",
+          top: "0%",
+          containLabel: true,
+        },
+        dataZoom: [],
+        xAxis: {
+          show: false,
+        },
+        yAxis: [
+          {
+            show: true,
+            data: data.yNameOne,
+            inverse: true,
+            axisLine: {
+              show: false,
             },
-          },
-          itemStyle: {
-            normal: {
-              color: "#fa2f5a",
-              label: {
-                show: false,
-                formatter: "{b} : {c} ({d}%)",
-                color: "#fff"
-              },
+            splitLine: {
+              show: false,
             },
-            labelLine: {show: true},
-          },
-        },
-      ],
-    })
-    this.$refs.chart12.setData({
-      tooltip: {
-        trigger: "item",
-      },
-      color: ['#5470c6', '#0000'],
-      series: [
-        {
-          name: "在线设备数",
-          type: "pie",
-          center: ["50%", "50%"],
-          radius: ["85%", "100%"],
-          data: [
-            {value: 254, name: "在线设备数"},
-            {value: 26, name: "0"},
-          ],
-          label: {
-            normal: {
-              rich: {
-                a: {
-                  color: "#fff",
-                  align: "center",
-                  fontSize: 1.5 * vw,
-                  fontWeight: "bold",
-                },
-                b: {
-                  color: "#fff",
-                  align: "center",
-                  fontSize: 0.8 * vw,
-                },
-              },
-              formatter: function (params) {
-                return (
-                  "{a|" +
-                  params.value +
-                  "}" +
-                  "\n{b|" +
-                  params.name +
-                  "}"
-                );
-              },
-              position: "center",
-              show: true,
-              textStyle: {
-                fontSize: "14",
-                fontWeight: "normal",
-                color: "#fff",
-              },
+            axisTick: {
+              show: false,
             },
-          },
-          itemStyle: {
-            normal: {
-              // color: "#62aafe",
-              label: {
-                show: false,
-                formatter: "{b} : {c} ({d}%)",
-                color: "#fff"
-              },
-            },
-            labelLine: {show: true},
-          },
-        },
-      ],
-    })
-    this.$refs.chart13.setData({
-      tooltip: {
-        trigger: "item",
-      },
-      color: ['#fae92f', '#0000'],
-      series: [
-        {
-          name: "",
-          type: "pie",
-          center: ["50%", "50%"],
-          radius: ["85%", "100%"],
-          data: [
-            {value: 26, name: "离线设备数"},
-            {value: 254, name: "0"},
-          ],
-          label: {
-            normal: {
-              rich: {
-                a: {
-                  color: "#fff",
-                  align: "center",
-                  fontSize: 1.5 * vw,
-                  fontWeight: "bold",
-                },
-                b: {
-                  color: "#fff",
-                  align: "center",
-                  fontSize: 0.8 * vw,
-                },
-              },
-              formatter: function (params) {
-                return (
-                  "{a|" +
-                  26 +
-                  "}" +
-                  "\n{b|" +
-                  '离线设备数' +
-                  "}"
-                );
-              },
-              position: "center",
-              show: true,
+            axisLabel: {
+              color: "#fff",
+              // margin:150,
+              fontSize: 0.75 * vw,
               textStyle: {
-                fontSize: "14",
-                fontWeight: "normal",
-                color: "#fff",
-              },
-            },
-          },
-          itemStyle: {
-            normal: {
-              label: {
-                show: false,
-                formatter: "{b} : {c} ({d}%)",
-                color: "#fff"
+                textAlign: 'center'
               },
             },
-            labelLine: {show: true},
           },
-        },
-      ],
-    })
-    this.$refs.chart14.setData({
-      tooltip: {
-        trigger: "item",
-      },
-      color: ['#2ffae0', '#0000'],
-      series: [
-        {
-          name: "",
-          type: "pie",
-          center: ["50%", "50%"],
-          radius: ["85%", "100%"],
-          data: [
-            {value: 4, name: "吸附设备OEE"},
-            {value: 96, name: "0"},
-          ],
-          label: {
-            normal: {
-              rich: {
-                a: {
-                  color: "#fff",
-                  align: "center",
-                  fontSize: 1.5 * vw,
-                  fontWeight: "bold",
-                },
-                b: {
-                  color: "#fff",
-                  align: "center",
-                  fontSize: 0.8 * vw,
+        ],
+        series: [
+          {
+            name: "条",
+            type: "bar",
+            yAxisIndex: 0,
+            data: data.yData,
+            barWidth: '80%',
+            itemStyle: {
+              normal: {
+                barBorderRadius: 30,
+                color: function (params) {
+                  return myColor[data.status[params.dataIndex]];
                 },
               },
-              formatter: function (params) {
-                return (
-                  "{a|" +
-                  4 +
-                  "%}" +
-                  "\n{b|" +
-                  '吸附设备OEE' +
-                  "}"
-                );
-              },
-              position: "center",
-              show: true,
-              textStyle: {
-                fontSize: "14",
-                fontWeight: "normal",
-                color: "#fff",
-              },
             },
           },
-          itemStyle: {
-            normal: {},
-            labelLine: {show: true},
-          },
-        },
-      ],
-    })
-    this.$refs.chart15.setData({
-      tooltip: {
-        trigger: "item",
-      },
-      color: ['#2ffae0', '#0000'],
-      series: [
-        {
-          name: "",
-          type: "pie",
-          center: ["50%", "50%"],
-          radius: ["85%", "100%"],
-          data: [
-            {value: 0, name: "箱壳设备OEE"},
-            {value: 100, name: "0"},
-          ],
-          label: {
-            normal: {
-              rich: {
-                a: {
-                  color: "#fff",
-                  align: "center",
-                  fontSize: 1.5 * vw,
-                  fontWeight: "bold",
-                },
-                b: {
-                  color: "#fff",
-                  align: "center",
-                  fontSize: 0.8 * vw,
-                },
-              },
-              formatter: function (params) {
-                return (
-                  "{a|" +
-                  0 +
-                  "%}" +
-                  "\n{b|" +
-                  '箱壳设备OEE' +
-                  "}"
-                );
-              },
-              position: "center",
+          {
+            name: "框",
+            type: "bar",
+            yAxisIndex: 0,
+            barGap: "-100%",
+            data: bgBar,
+            barWidth: '80%',
+            label: {
               show: true,
+              position: "right",
               textStyle: {
-                fontSize: "14",
-                fontWeight: "normal",
                 color: "#fff",
+                fontSize: 0.75 * vw
               },
+              formatter: function (val, index, e) {
+                return data.yData[val.dataIndex] + '%'
+              }
             },
-          },
-          itemStyle: {
-            normal: {},
-            labelLine: {show: true},
-          },
-        },
-      ],
-    })
-    this.$refs.chart16.setData({
-      tooltip: {
-        trigger: "item",
-      },
-      color: ['#2ffae0', '#0000'],
-      series: [
-        {
-          name: "",
-          type: "pie",
-          center: ["50%", "50%"],
-          radius: ["85%", "100%"],
-          data: [
-            {value: 0, name: "铝侧板设备OEE"},
-            {value: 96, name: "0"},
-          ],
-          label: {
-            normal: {
-              rich: {
-                a: {
-                  color: "#fff",
-                  align: "center",
-                  fontSize: 1.5 * vw,
-                  fontWeight: "bold",
-                },
-                b: {
-                  color: "#fff",
-                  align: "center",
-                  fontSize: 0.8 * vw,
-                },
-              },
-              formatter: function (params) {
-                return (
-                  "{a|" +
-                  0 +
-                  "%}" +
-                  "\n{b|" +
-                  '铝侧板设备OEE' +
-                  "}"
-                );
-              },
-              position: "center",
-              show: true,
-              textStyle: {
-                fontSize: "14",
-                fontWeight: "normal",
-                color: "#fff",
+            itemStyle: {
+              normal: {
+                color: "none",
+                borderColor: "#00c1de",
+                borderWidth: 1,
+                barBorderRadius: 15,
               },
             },
           },
-          itemStyle: {
-            normal: {},
-            labelLine: {show: true},
-          },
-        },
-      ],
-    })
-  },
-  methods: {
-    exitFun() {
-      this.exit()
+        ],
+      };
+
+      return option
     }
   }
 }
 </script>
 <style lang="less" scoped>
 .app-container {
-  background-image: url("~@/assets/model/quality/bg.jpg");
+  background-image: url("~@/assets/model/equipment/bg.jpg");
   background-repeat: no-repeat;
   background-size: 100% 100%;
   background-color: #021e31;
@@ -1206,284 +857,146 @@ export default {
   letter-spacing: 10px;
 }
 
-.boxTitle {
+.chart1 {
   position: absolute;
-  top: 0;
-  width: 100%;
-  height: 2vw;
-  line-height: 2vw;
-  background: linear-gradient(to right, #152049, #184680);
-  color: #fff;
-  font-size: 1vw;
-  text-align: center;
-}
-
-.box1 {
-  position: absolute;
-  top: 7%;
-  left: 1%;
-  width: 29%;
-  height: 35%;
-  border: 1px solid #123061;
-
-  .chart1 {
-    position: absolute;
-    top: 2vw;
-    width: 100%;
-    height: calc(100% - 2vw);
-  }
+  top: 14.5%;
+  left: 3.5%;
+  width: 23.5%;
+  height: 20%;
 }
 
-.box2 {
+.chart2 {
   position: absolute;
-  top: 43%;
-  left: 1%;
-  width: 29%;
-  height: 35%;
-  border: 1px solid #123061;
-
-  .chart2 {
-    position: absolute;
-    top: 2vw;
-    width: 100%;
-    height: calc(100% - 2vw);
-  }
+  top: 9%;
+  left: 39%;
+  width: 32.5%;
+  height: 48.5%;
 }
 
-.box3 {
+.chart3 {
   position: absolute;
-  top: 7%;
-  left: 31%;
-  width: 38%;
-  height: 40%;
-  border: 1px solid #123061;
-
-  .chart3 {
-    position: absolute;
-    top: 0;
-    width: 100%;
-    height: 100%;
-  }
+  top: 14.5%;
+  left: 73%;
+  width: 23.5%;
+  height: 43%;
 }
 
-.box4 {
+.chart4 {
   position: absolute;
-  top: 48%;
-  left: 31%;
-  width: 38%;
-  height: 30%;
-  border: 1px solid #123061;
-
-  .chart4 {
-    position: absolute;
-    top: 2vw;
-    width: 100%;
-    height: calc(100% - 2vw);
-  }
+  top: 42.5%;
+  left: 3.5%;
+  width: 23.5%;
+  height: 52%;
 }
 
-.box5 {
+.chart5 {
   position: absolute;
-  top: 7%;
-  left: 70%;
-  width: 29%;
-  height: 35%;
-  border: 1px solid #123061;
-
-  .chart5 {
-    position: absolute;
-    top: 2vw;
-    width: 100%;
-    height: calc(100% - 2vw);
-  }
+  top: 66%;
+  left: 28.5%;
+  width: 43%;
+  height: 29%;
 }
 
-.box6 {
+.chart6 {
   position: absolute;
-  top: 43%;
-  left: 70%;
-  width: 29%;
-  height: 35%;
-  border: 1px solid #123061;
-
-  .chart6 {
-    position: absolute;
-    top: 2vw;
-    width: 100%;
-    height: calc(100% - 2vw);
-  }
+  top: 66%;
+  left: 73%;
+  width: 23.5%;
+  height: 29%;
 }
-
-.box7 {
+.title{
   position: absolute;
-  top: 79%;
-  left: 1%;
-  width: 37%;
-  height: 20%;
-  border: 1px solid #123061;
-
-  .scrollTable {
+  top: 0;
+  left: 2.5%;
+  width: 95%;
+  height: 2vw;
+  border-bottom: 3px solid #efd108;
+  .titleSpan1{
     position: absolute;
-    top: 2vw;
-    width: 100%;
-    height: calc(100% - 2vw);
-  }
-
-  .scrollTableItem {
-    color: rgb(185, 186, 192);
-    margin: auto 0px;
-    padding: 4px 0;
+    top: 0;
+    width: 2.5vw;
     white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    left: 0;
+    height: 2vw;
+    line-height: 2vw;
     text-align: center;
-    display: inline-block;
-    width: calc(100% / 6);
+    color: #efd108;
+    font-size: 1vw;
   }
-}
-
-.box8 {
-  position: absolute;
-  top: 79%;
-  left: 62%;
-  width: 37%;
-  height: 20%;
-  border: 1px solid #123061;
-
-
-  .scrollTable {
+  .titleSpan2{
     position: absolute;
-    top: 2vw;
-    width: 100%;
-    height: calc(100% - 2vw);
-  }
-
-  .scrollTableItem {
-    color: rgb(185, 186, 192);
-    margin: auto 0px;
-    padding: 4px 0;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    top: 0;
+    width: calc(100% - 2.5vw - 5vw);
     text-align: center;
-    display: inline-block;
-    width: calc(100% / 5);
-  }
-}
-
-.chart11 {
-  position: absolute;
-  top: 20%;
-  left: 37%;
-  width: 9%;
-  height: 15%;
-  transform: translate(-50%, -50%);
-}
-
-.chart12 {
-  position: absolute;
-  top: 20%;
-  left: 50%;
-  width: 9%;
-  height: 15%;
-  transform: translate(-50%, -50%);
-}
-
-.chart13 {
-  position: absolute;
-  top: 20%;
-  left: 64%;
-  width: 9%;
-  height: 15%;
-  transform: translate(-50%, -50%);
-}
-
-.chart14 {
-  position: absolute;
-  top: 38%;
-  left: 37%;
-  width: 9%;
-  height: 15%;
-  transform: translate(-50%, -50%);
-}
-
-.chart15 {
-  position: absolute;
-  top: 38%;
-  left: 50%;
-  width: 9%;
-  height: 15%;
-  transform: translate(-50%, -50%);
-}
-
-.chart16 {
-  position: absolute;
-  top: 38%;
-  left: 64%;
-  width: 9%;
-  height: 15%;
-  transform: translate(-50%, -50%);
-}
-
-.centerTitle {
-  position: absolute;
-  top: 15%;
-  left: 50%;
-  transform: translateX(-50%);
-  color: #fff;
-  font-size: 1.4vw;
-}
-
-.electricity {
-  position: absolute;
-  bottom: 1%;
-  left: 50%;
-  width: 40vh;
-  height: 20vh;
-  transform: translateX(-50%);
-  background-image: url("~@/assets/model/equipment/bg2.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-
-  .span1 {
-    position: absolute;
-    top: 2%;
-    left: 50%;
-    transform: translateX(-50%);
-    color:#FFF;
+    white-space: nowrap;
+    left: 2.5vw;
+    height: 2vw;
+    line-height: 2vw;
+    color: #efd108;
     font-size: 1vw;
   }
-
-  .span2 {
-    position: absolute;
-    bottom: 52%;
-    left: 50%;
-    transform: translateX(-50%);
-    color:#FFF;
-    font-size: 2vw;
-  }
-
-  .span3 {
+  .titleSpan3{
     position: absolute;
-    top: 52%;
-    left: 50%;
-    transform: translateX(-50%);
-    color:#2ffae0;
-    font-size: 0.8vw;
+    text-align: center;
+    top: 0;
+    width: 5vw;
+    white-space: nowrap;
+    right: 0;
+    height: 2vw;
+    line-height: 2vw;
+    color: #efd108;
+    font-size: 1vw;
   }
+}
+.chart4Info{
+  position: absolute;
+  top: calc(2vw + 3px);
+  left: 2.5%;
+  width: 95%;
+  height: calc(100% - 2vw - 3px);
+  overflow: hidden;
+  .info{
+    width: 100%;
+    height: 2vw;
+    border-bottom: 1px solid #ffffff7F;
+    margin-bottom: 2px;
+    position: relative;
+    .infoSpan1{
+      position: absolute;
+      top: 0;
+      width: 2.5vw;
+      white-space: nowrap;
+      left: 0;
+      height: 2vw;
+      line-height: 2vw;
+      text-align: center;
+      color: #FFFFFFDD;
+      font-size: 1vw;
 
-  .span4 {
-    position: absolute;
-    bottom: 2%;
-    left: 50%;
-    transform: translateX(-50%);
-    color:#fff;
-    font-size: 1vw;
-    display: inline-block;
-    .span5 {
-      display: inline-block;
-      font-size: 1.5vw;
-      color:#edbc37;
+    }
+    .infoSpan2{
+      position: absolute;
+      top: 0;
+      width: calc(100% - 2.5vw - 5vw);
+      text-align: center;
+      white-space: nowrap;
+      left: 2.5vw;
+      height: 2vw;
+      line-height: 2vw;
+      color: #FFFFFFDD;
+      font-size: 1vw;
+    }
+    .infoSpan3{
+      position: absolute;
+      text-align: center;
+      top: 0;
+      width: 5vw;
+      white-space: nowrap;
+      right: 0;
+      height: 2vw;
+      line-height: 2vw;
+      color: #FFFFFFDD;
+      font-size: 1vw;
     }
   }
 }
diff --git a/src/views/model/model.vue b/src/views/model/model.vue
index d522dd4..137deb1 100644
--- a/src/views/model/model.vue
+++ b/src/views/model/model.vue
@@ -11,28 +11,34 @@
       <div class="currentPosition"><span>当前位置</span></div>
       <div class="tool">
         <el-row>
-          <el-col :span="5">
+          <el-col :span="4">
             <div class="toolItem" @click="click1('companyIntroduction')">
               <img class="icon" src="@/assets/model/model/companyIntroduction.png"/>
               <div class="whiteSpan grid-content bg-purple">公司介绍</div>
             </div>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="4">
             <div class="toolItem" @click="click1('factoryIntroduction')">
               <img class="icon" src="@/assets/model/model/factoryIntroduction.png"/>
               <div class="whiteSpan grid-content bg-purple">工厂介绍</div>
             </div>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="4">
             <div class="toolItem" @click="click1('dataCentre')">
               <img class="icon" src="@/assets/model/model/dataCentre.png"/>
               <div class="whiteSpan grid-content bg-purple">大数据中心</div>
             </div>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="4">
             <div class="toolItem" @click="click2()">
               <img class="icon" src="@/assets/model/model/process.png"/>
-              <div class="whiteSpan grid-content bg-purple-light">工艺流程</div>
+              <div class="whiteSpan grid-content bg-purple-light">智慧管控</div>
+            </div>
+          </el-col>
+          <el-col :span="4">
+            <div class="toolItem" @click="click1('equipment')">
+              <img class="icon" src="@/assets/model/model/process.png"/>
+              <div class="whiteSpan grid-content bg-purple-light">仓储物流</div>
             </div>
           </el-col>
           <el-col :span="4">
@@ -208,7 +214,7 @@ export default {
           height: 4,
           bgColor: '#ed7d31',
           text: '箱壳预装',
-          link: 'foaming',
+          link: 'caseShell',
         },
         {
           top: 35,
@@ -217,7 +223,7 @@ export default {
           height: 4,
           bgColor: '#7f7f7f',
           text: '箱壳<br>集存库',
-          link: 'foaming',
+          link: 'caseShell',
         },
 
         // 一二合
@@ -228,7 +234,6 @@ export default {
           height: 4,
           bgColor: '#f4b183',
           text: '壳胆<br>组装',
-          link: 'caseShell',
         },
         {
           top: 17,
@@ -264,6 +269,7 @@ export default {
           height: 4,
           bgColor: '#7f7f7f',
           text: '发泡<br>箱体库',
+          link: 'finalAssembly',
         },
         {
           top: 17,
@@ -272,7 +278,6 @@ export default {
           height: 4,
           bgColor: '#ffc000',
           text: '焊接',
-          link: 'pourInto',
         },
         {
           top: 17,
@@ -309,7 +314,6 @@ export default {
           height: 4,
           bgColor: '#2f5597',
           text: '门壳<br>自动成型',
-          link: 'liner',
         },
         {
           top: 68,
@@ -318,7 +322,6 @@ export default {
           height: 4,
           bgColor: '#ed7d31',
           text: '门壳预装',
-          link: 'liner',
         },
         {
           top: 68,
@@ -855,7 +858,7 @@ export default {
         toLoad(val)
       })
     }
-    setModel(0, 10)
+    // setModel(0, 10)
 
     // viewer.operator.enabled = true