diff --git a/src/assets/board/finalAssembly.jpg b/src/assets/board/finalAssembly.jpg
new file mode 100644
index 0000000..84bbdb2
Binary files /dev/null and b/src/assets/board/finalAssembly.jpg differ
diff --git a/src/assets/board/foamingMachine.png b/src/assets/board/foamingMachine.png
new file mode 100644
index 0000000..3671083
Binary files /dev/null and b/src/assets/board/foamingMachine.png differ
diff --git a/src/assets/images/login-background.png b/src/assets/images/login-background.png
new file mode 100644
index 0000000..40909f9
Binary files /dev/null and b/src/assets/images/login-background.png differ
diff --git a/src/views/board/door/index2.vue b/src/views/board/door/index2.vue
index f84bbf6..f1b677f 100644
--- a/src/views/board/door/index2.vue
+++ b/src/views/board/door/index2.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="headTitle">京源生产监控平台</div>
+    <div class="headTitle">1</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 }}
diff --git a/src/views/board/finalAssembly/index.vue b/src/views/board/finalAssembly/index.vue
index 097570e..4b33698 100644
--- a/src/views/board/finalAssembly/index.vue
+++ b/src/views/board/finalAssembly/index.vue
@@ -5,6 +5,26 @@
          :style="'top:'+(titlePosition[k]&&titlePosition[k].top||0)+'%;left:'+(titlePosition[k]&&titlePosition[k].left||0)+'%'">
       {{ i }}
     </div>
+    <div class="title1">班组</div>
+    <div class="title2">上线数量</div>
+
+    <div class="nowClass">总装</div>
+    <div class="num">1122</div>
+
+    <div class="info1Title">产品条码</div>
+    <div class="info1">B23120783055009802101</div>
+    <div class="info2Title">扫描时间</div>
+    <div class="info2">2023/12/7 12:01:53</div>
+    <div class="info3Title">产品型号</div>
+    <div class="info3">发泡箱体,BCD-530WPG,标准白</div>
+    <div class="info4Title">订单编号</div>
+    <div class="info4">11232394</div>
+    <div class="info5Title">订单数量</div>
+    <div class="info5">300</div>
+    <div class="info6Title">上线数量</div>
+    <div class="info6">63</div>
+    <div class="info7Title">提示信息</div>
+    <div class="info7">扫描成功</div>
 
     <div class="scrollTable">
       <div style="background-color: #094170">
@@ -74,9 +94,6 @@
     <div class="chart2">
       <Chart ref="chart2"></Chart>
     </div>
-    <div class="chart3">
-      <Chart ref="chart3"></Chart>
-    </div>
   </div>
 </template>
 
@@ -95,28 +112,23 @@ export default {
   data() {
     return {
       title: [
-        '工单计划',
-        '泡后库存',
-        '小时产量',
-        '库存统计',
+        '当日小时产量统计',
+        '当日型号产量统计',
+        '表格',
       ],
       titlePosition: [
         {
-          top: 11.5,
+          top: 31.3,
           left: 5.5
         },
         {
-          top: 55.4,
+          top: 31.3,
+          left: 52.8
+        },
+        {
+          top: 62.2,
           left: 5.5
         },
-        {
-          top: 11.5,
-          left: 52.7
-        },
-        {
-          top: 55.4,
-          left: 52.7
-        },
       ],
       scrollTableOption: {
         step: 0.5, // 数值越大速度滚动越快
@@ -281,76 +293,7 @@ export default {
                 ]),
               },
             },
-            data:e.chart4.y.data,
-          },
-        ],
-      })
-      this.$refs.chart3.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: {},
-        },
-        series: [
-          {
-            name: "数量",
-            type: "bar",
-            barWidth: "30%",
-            barMaxWidth: 50,
-            itemStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: "#0f8ad7",
-                  },
-                  {
-                    offset: 1,
-                    color: "#0b30d9",
-                  },
-                ]),
-              },
-            },
-            data: e.chart3.y.data,
+            data: e.chart4.y.data,
           },
         ],
       })
@@ -361,7 +304,7 @@ export default {
 </script>
 <style scoped>
 .app-container {
-  background-image: url("../../../assets/board/pourInto.jpg");
+  background-image: url("../../../assets/board/finalAssembly.jpg");
   background-repeat: no-repeat;
   background-size: 100% 100%;
   width: 100%;
@@ -392,10 +335,10 @@ export default {
 
 .scrollTable {
   position: absolute;
-  top: 15%;
-  left: 4%;
-  width: 45%;
-  height: 36%;
+  top: 66%;
+  left: 3.7%;
+  width: 92.5%;
+  height: 30%;
 }
 
 
@@ -413,25 +356,198 @@ export default {
 
 .chart1 {
   position: absolute;
-  top: 58.5%;
+  top: 34.5%;
   left: 3.6%;
   width: 45.5%;
-  height: 35%;
+  height: 22.5%;
 }
 
 .chart2 {
   position: absolute;
-  top: 15%;
+  top: 34.5%;
   left: 51%;
   width: 45.5%;
-  height: 35%;
+  height: 22.5%;
 }
 
-.chart3 {
+.title1 {
   position: absolute;
-  top: 58.5%;
-  left: 51%;
-  width: 45.5%;
-  height: 35%;
+  top: 12.5%;
+  left: 12.7%;
+  transform: translate(-50%, -50%);
+  font-size: 1.2vw;
+  color: #d6eaed;
+}
+
+.title2 {
+  position: absolute;
+  top: 12.5%;
+  left: 87.2%;
+  transform: translate(-50%, -50%);
+  font-size: 1.2vw;
+  color: #d6eaed;
+}
+
+.nowClass {
+  position: absolute;
+  top: 20%;
+  left: 12.7%;
+  transform: translate(-50%, -50%);
+  font-size: 1.2vw;
+  color: #d6eaed;
+}
+
+.num {
+  position: absolute;
+  top: 20%;
+  left: 87.2%;
+  transform: translate(-50%, -50%);
+  font-size: 1.2vw;
+  color: #d6eaed;
+}
+
+.info1Title {
+  position: absolute;
+  top: 9%;
+  left: 23.5%;;
+  width: 8.5%;
+  font-size: 1.1vw;
+  color: #55c280;
+  text-align: center;
+}
+
+.info1 {
+  position: absolute;
+  top: 9%;
+  left: 32%;
+  width: 18%;
+  font-size: 1.2vw;
+  color: #d6eaed;
+  text-align: center;
+}
+
+.info2Title {
+  position: absolute;
+  top: 9%;
+  left: 50%;
+  width: 8.5%;
+  font-size: 1.1vw;
+  color: #55c280;
+  text-align: center;
+}
+
+.info2 {
+  position: absolute;
+  top: 9%;
+  left: 58.5%;
+  width: 18%;
+  font-size: 1.2vw;
+  color: #d6eaed;
+  text-align: center;
+}
+
+
+
+.info3Title {
+  position: absolute;
+  top: 13.5%;
+  left: 23.5%;;
+  width: 8.5%;
+  font-size: 1.1vw;
+  color: #55c280;
+  text-align: center;
+}
+
+.info3 {
+  position: absolute;
+  top: 13.5%;
+  left: 32%;
+  width: 18%;
+  font-size: 1.2vw;
+  color: #d6eaed;
+  text-align: center;
+}
+
+.info4Title {
+  position: absolute;
+  top: 13.5%;
+  left: 50%;
+  width: 8.5%;
+  font-size: 1.1vw;
+  color: #55c280;
+  text-align: center;
+}
+
+.info4 {
+  position: absolute;
+  top: 13.5%;
+  left: 58.5%;
+  width: 18%;
+  font-size: 1.2vw;
+  color: #d6eaed;
+  text-align: center;
+}
+
+
+
+.info5Title {
+  position: absolute;
+  top: 18%;
+  left: 23.5%;;
+  width: 8.5%;
+  font-size: 1.1vw;
+  color: #55c280;
+  text-align: center;
+}
+
+.info5 {
+  position: absolute;
+  top: 18%;
+  left: 32%;
+  width: 18%;
+  font-size: 1.2vw;
+  color: #d6eaed;
+  text-align: center;
+}
+
+.info6Title {
+  position: absolute;
+  top: 18%;
+  left: 50%;
+  width: 8.5%;
+  font-size: 1.1vw;
+  color: #55c280;
+  text-align: center;
+}
+
+.info6 {
+  position: absolute;
+  top: 18%;
+  left: 58.5%;
+  width: 18%;
+  font-size: 1.2vw;
+  color: #d6eaed;
+  text-align: center;
+}
+
+
+.info7Title {
+  position: absolute;
+  top: 22.5%;
+  left: 23.5%;;
+  width: 8.5%;
+  font-size: 1.1vw;
+  color: #55c280;
+  text-align: center;
+}
+
+.info7 {
+  position: absolute;
+  top: 22.5%;
+  left: 32%;
+  width: 18%;
+  font-size: 1.2vw;
+  color: #d6eaed;
+  text-align: center;
 }
 </style>
diff --git a/src/views/board/foaming/index.vue b/src/views/board/foaming/index.vue
index 15a564f..a928d8c 100644
--- a/src/views/board/foaming/index.vue
+++ b/src/views/board/foaming/index.vue
@@ -14,6 +14,7 @@
     <div style="position: absolute; top: 23%;left: 55%;width:10vw;color: #fff;font-size: 0.8vw;line-height: 1.5vw">
       <div>发泡机 - 运行状态：</div>
     </div>
+    <div class="foamingMachine"></div>
 
     <div class="supplementInfo">注射压力标准范围：10.0-14.0Mpa A、B组份枪头压力差＜1Mpa</div>
     <div class="supplementInfo1">发泡料温度标准范围:18.0-24.0℃</div>
@@ -937,7 +938,7 @@ export default {
         },
         xAxis: {
           type: "category",
-          data: e.chart7.x,
+          data: e.chart3.x,
           axisLine: {
             lineStyle: {
               color: "white",
@@ -967,7 +968,7 @@ export default {
         },
         series: [
           {
-            name: e.chart7.y.name,
+            name: e.chart3.y.name,
             type: "bar",
             barWidth: "33%",
             label: {
@@ -992,7 +993,7 @@ export default {
                 borderRadius: 2,
               },
             },
-            data: e.chart7.y.data,
+            data: e.chart3.y.data,
           },
         ],
       })
@@ -1009,6 +1010,17 @@ export default {
   font-size: 1vw;
   letter-spacing: 2px;
 }
+.foamingMachine{
+  background-image: url("../../../assets/board/foamingMachine.png");
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  position: absolute;
+  transform: translateX(-50%);
+  top: 35%;
+  left: 50%;
+  width: 36vw;
+  height: 12vw;
+}
 .app-container {
   background-image: url("../../../assets/board/foaming1.jpg");
   background-repeat: no-repeat;
diff --git a/src/views/board/foaming/index2.vue b/src/views/board/foaming/index2.vue
index 6907e6d..2825149 100644
--- a/src/views/board/foaming/index2.vue
+++ b/src/views/board/foaming/index2.vue
@@ -18,6 +18,7 @@
       <div>线体1圈 1s</div>
       <div>台车1位 1s</div>
     </div>
+    <div class="foamingMachine"></div>
 
     <div class="supplementInfo">注射压力标准范围：10.0-14.0Mpa A、B组份枪头压力差＜1Mpa</div>
     <div class="supplementInfo1">发泡料温度标准范围:18.0-24.0℃</div>
@@ -1348,6 +1349,17 @@ export default {
 };
 </script>
 <style scoped>
+.foamingMachine{
+  background-image: url("../../../assets/board/foamingMachine.png");
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  position: absolute;
+  transform: translateX(-50%);
+  top: 35%;
+  left: 50%;
+  width: 36vw;
+  height: 12vw;
+}
 .app-container {
   background-image: url("../../../assets/board/foaming1.jpg");
   background-repeat: no-repeat;
diff --git a/src/views/board/pourInto/index2.vue b/src/views/board/pourInto/index2.vue
index e63be71..3c7eb66 100644
--- a/src/views/board/pourInto/index2.vue
+++ b/src/views/board/pourInto/index2.vue
@@ -67,24 +67,44 @@
         </span>
       </p>
       <p>
+      <div style="display: inline-block;width: 50%">
         <span>
-          灌注类型:
+          接地电阻:
         </span>
         <span>
           1
         </span>
-      </p>
-      <p>
+      </div>
+      <div style="display: inline-block;width: 50%">
         <span>
-          灌注量:
+          交耐电流:
         </span>
         <span>
           1
         </span>
+      </div>
+      </p>
+      <p>
+      <div style="display: inline-block;width: 50%">
+        <span>
+          低压启动:
+        </span>
+        <span>
+          1
+        </span>
+      </div>
+      <div style="display: inline-block;width: 50%">
+        <span>
+          动态泄露:
+        </span>
+        <span>
+          1
+        </span>
+      </div>
       </p>
       <p>
         <span>
-          灌注结果:
+          检测结果:
         </span>
         <span>
           1
@@ -110,7 +130,7 @@
       </p>
       <p>
         <span>
-          灌注类型:
+          环境温度:
         </span>
         <span>
           1
@@ -118,15 +138,7 @@
       </p>
       <p>
         <span>
-          灌注量:
-        </span>
-        <span>
-          1
-        </span>
-      </p>
-      <p>
-        <span>
-          灌注结果:
+          检测结果:
         </span>
         <span>
           1
@@ -152,23 +164,7 @@
       </p>
       <p>
         <span>
-          灌注类型:
-        </span>
-        <span>
-          1
-        </span>
-      </p>
-      <p>
-        <span>
-          灌注量:
-        </span>
-        <span>
-          1
-        </span>
-      </p>
-      <p>
-        <span>
-          灌注结果:
+          检测结果:
         </span>
         <span>
           1
@@ -189,26 +185,11 @@
 
       <div class="scrollTable">
         <div style="background-color: #094170">
-          <div class="scrollTableItem" style="font-weight: bold;">
-            产品型号
+          <div class="scrollTableItem" style="width:75%;font-weight: bold;">
+            问题点
           </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            箱体码
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            R1348
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            R1348
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            R6000
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            是否合格
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            记录时间
+          <div class="scrollTableItem" style="width:25%;font-weight: bold;">
+            次数
           </div>
         </div>
         <vue-seamless-scroll
@@ -220,37 +201,17 @@
           <div
             v-for="(item, index) in scrollTableData"
             :key="index"
-
+            style="height:4.8vh;"
           >
-            <div :style='"background-color:" + ((index % 2 === 0)? "#053460":"#032d57") '>
+            <div :style='"height:100%;line-height:4.8vh;background-color:" + ((index % 2 === 0)? "#053460":"#032d57") '>
               <div
-                class="scrollTableItem">
+                class="scrollTableItem" style="width:75%;">
                 {{ item.value1 }}
               </div>
               <div
-                class="scrollTableItem">
+                class="scrollTableItem" style="width: 25%">
                 {{ item.value2 }}
               </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value3 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value4 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value5 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value6 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value7 }}
-              </div>
             </div>
           </div>
         </vue-seamless-scroll>
@@ -269,26 +230,11 @@
 
       <div class="scrollTable">
         <div style="background-color: #094170">
-          <div class="scrollTableItem" style="font-weight: bold;">
-            产品型号
+          <div class="scrollTableItem" style="width:75%;font-weight: bold;">
+            问题点
           </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            箱体码
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            R1348
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            R1348
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            R6000
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            是否合格
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            记录时间
+          <div class="scrollTableItem" style="width:25%;font-weight: bold;">
+            次数
           </div>
         </div>
         <vue-seamless-scroll
@@ -300,37 +246,17 @@
           <div
             v-for="(item, index) in scrollTableData"
             :key="index"
-
+            style="height:4.8vh;"
           >
-            <div :style='"background-color:" + ((index % 2 === 0)? "#053460":"#032d57") '>
+            <div :style='"height:100%;line-height:4.8vh;background-color:" + ((index % 2 === 0)? "#053460":"#032d57") '>
               <div
-                class="scrollTableItem">
+                class="scrollTableItem" style="width:75%;">
                 {{ item.value1 }}
               </div>
               <div
-                class="scrollTableItem">
+                class="scrollTableItem" style="width:25%;">
                 {{ item.value2 }}
               </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value3 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value4 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value5 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value6 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value7 }}
-              </div>
             </div>
           </div>
         </vue-seamless-scroll>
@@ -349,26 +275,11 @@
 
       <div class="scrollTable">
         <div style="background-color: #094170">
-          <div class="scrollTableItem" style="font-weight: bold;">
-            产品型号
+          <div class="scrollTableItem" style="width:75%;font-weight: bold;">
+            问题点
           </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            箱体码
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            R1348
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            R1348
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            R6000
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            是否合格
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            记录时间
+          <div class="scrollTableItem" style="width:25%;font-weight: bold;">
+            次数
           </div>
         </div>
         <vue-seamless-scroll
@@ -380,37 +291,17 @@
           <div
             v-for="(item, index) in scrollTableData"
             :key="index"
-
+            style="height:4.8vh;"
           >
-            <div :style='"background-color:" + ((index % 2 === 0)? "#053460":"#032d57") '>
+            <div :style='"height:100%;line-height:4.8vh;background-color:" + ((index % 2 === 0)? "#053460":"#032d57") '>
               <div
-                class="scrollTableItem">
+                class="scrollTableItem" style="width:75%">
                 {{ item.value1 }}
               </div>
               <div
-                class="scrollTableItem">
+                class="scrollTableItem" style="width:25%">
                 {{ item.value2 }}
               </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value3 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value4 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value5 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value6 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value7 }}
-              </div>
             </div>
           </div>
         </vue-seamless-scroll>
@@ -429,26 +320,11 @@
 
       <div class="scrollTable">
         <div style="background-color: #094170">
-          <div class="scrollTableItem" style="font-weight: bold;">
-            产品型号
+          <div class="scrollTableItem" style="width:75%;font-weight: bold;">
+            问题点
           </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            箱体码
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            R1348
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            R1348
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            R6000
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            是否合格
-          </div>
-          <div class="scrollTableItem" style="font-weight: bold;">
-            记录时间
+          <div class="scrollTableItem" style="width:25%;font-weight: bold;">
+            次数
           </div>
         </div>
         <vue-seamless-scroll
@@ -460,37 +336,17 @@
           <div
             v-for="(item, index) in scrollTableData"
             :key="index"
-
+            style="height:4.8vh;"
           >
-            <div :style='"background-color:" + ((index % 2 === 0)? "#053460":"#032d57") '>
+            <div :style='"height:100%;line-height:4.8vh;background-color:" + ((index % 2 === 0)? "#053460":"#032d57") '>
               <div
-                class="scrollTableItem">
+                class="scrollTableItem" style="width:75%">
                 {{ item.value1 }}
               </div>
               <div
-                class="scrollTableItem">
+                class="scrollTableItem" style="width:25%">
                 {{ item.value2 }}
               </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value3 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value4 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value5 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value6 }}
-              </div>
-              <div
-                class="scrollTableItem">
-                {{ item.value7 }}
-              </div>
             </div>
           </div>
         </vue-seamless-scroll>
@@ -499,26 +355,17 @@
 
     <div class="table1">
       <div style="background-color: #094170">
-        <div class="scrollTableItem" style="font-weight: bold;">
-          产品型号
+        <div class="scrollTableItem1" style="width:25%;font-weight: bold;">
+          序号
         </div>
-        <div class="scrollTableItem" style="font-weight: bold;">
-          箱体码
+        <div class="scrollTableItem1" style="width:25%;font-weight: bold;">
+          条码
         </div>
-        <div class="scrollTableItem" style="font-weight: bold;">
-          R1348
+        <div class="scrollTableItem1" style="width:25%;font-weight: bold;">
+          工位
         </div>
-        <div class="scrollTableItem" style="font-weight: bold;">
-          R1348
-        </div>
-        <div class="scrollTableItem" style="font-weight: bold;">
-          R6000
-        </div>
-        <div class="scrollTableItem" style="font-weight: bold;">
-          是否合格
-        </div>
-        <div class="scrollTableItem" style="font-weight: bold;">
-          记录时间
+        <div class="scrollTableItem1" style="width:25%;font-weight: bold;">
+          问题点
         </div>
       </div>
       <vue-seamless-scroll
@@ -534,33 +381,21 @@
         >
           <div :style='"background-color:" + ((index % 2 === 0)? "#053460":"#032d57") '>
             <div
-              class="scrollTableItem">
+              class="scrollTableItem1" style="width: 25%">
               {{ item.value1 }}
             </div>
             <div
-              class="scrollTableItem">
+              class="scrollTableItem1" style="width: 25%">
               {{ item.value2 }}
             </div>
             <div
-              class="scrollTableItem">
+              class="scrollTableItem1" style="width: 25%">
               {{ item.value3 }}
             </div>
             <div
-              class="scrollTableItem">
+              class="scrollTableItem1" style="width: 25%">
               {{ item.value4 }}
             </div>
-            <div
-              class="scrollTableItem">
-              {{ item.value5 }}
-            </div>
-            <div
-              class="scrollTableItem">
-              {{ item.value6 }}
-            </div>
-            <div
-              class="scrollTableItem">
-              {{ item.value7 }}
-            </div>
           </div>
         </div>
       </vue-seamless-scroll>
@@ -586,32 +421,62 @@ export default {
   data() {
     return {
       title: [
-        // '工单计划',
-        // '小时统计',
-        // '异常TOP',
-        // '合格率统计',
+        '灌注',
+        '电检',
+        '制冷性能',
+        '高低压检漏',
+        '异常统计',
+        '异常分布',
+        '灌注',
+        '电检',
+        '制冷性能',
+        '高低压检漏',
       ],
       titlePosition: [
         {
           top: 11.6,
           left: 5.5
         },
+        {
+          top: 11.6,
+          left: 29
+        },
         {
           top: 11.6,
           left: 52.7
         },
         {
-          top: 55.5,
+          top: 11.6,
+          left: 76.4
+        },
+        {
+          top: 37,
           left: 5.5
         },
         {
-          top: 55.5,
+          top: 37,
+          left: 76.4
+        },
+        {
+          top: 62.5,
+          left: 5.5
+        },
+        {
+          top: 62.5,
+          left: 29
+        },
+        {
+          top: 62.5,
           left: 52.7
         },
+        {
+          top: 62.5,
+          left: 76.4
+        },
       ],
       scrollTableOption: {
         step: 0.5, // 数值越大速度滚动越快
-        limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
+        limitMoveNum: 999, // 开始无缝滚动的数据量 this.dataList.length
         hoverStop: true, // 是否开启鼠标悬停stop
         direction: 1, // 0向下 1向上 2向左 3向右
         openWatch: true, // 开启数据实时监控刷新dom
@@ -625,20 +490,996 @@ export default {
   },
   mounted() {
     getData().then(e => {
+      const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
       this.scrollTableData = e.table6
-      this.$refs.chart1.setData(this.option('灌注量', e.chart10.data[0]))
-      this.$refs.chart11.setData(this.option('灌注量', e.chart10.data[0]))
-      this.$refs.chart12.setData(this.option('标准灌注量', e.chart10.data[1]))
-      this.$refs.chart13.setData(this.option('灌注压力', e.chart10.data[2]))
-      this.$refs.chart21.setData(this.option('灌注量', e.chart10.data[0]))
-      this.$refs.chart22.setData(this.option('标准灌注量', e.chart10.data[1]))
-      this.$refs.chart23.setData(this.option('灌注压力', e.chart10.data[2]))
-      this.$refs.chart31.setData(this.option('灌注量', e.chart10.data[0]))
-      this.$refs.chart32.setData(this.option('标准灌注量', e.chart10.data[1]))
-      this.$refs.chart33.setData(this.option('灌注压力', e.chart10.data[2]))
-      this.$refs.chart41.setData(this.option('灌注量', e.chart10.data[0]))
-      this.$refs.chart42.setData(this.option('标准灌注量', e.chart10.data[1]))
-      this.$refs.chart43.setData(this.option('灌注压力', e.chart10.data[2]))
+      this.$refs.chart1.setData({
+        tooltip: {
+          trigger: "item",
+          formatter: "{a} <br/>{b} : {c} ({d}%)",
+        },
+        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'
+                },
+              },
+              labelLine: { show: true },
+            },
+          },
+        ],
+      })
+
+      this.$refs.chart11.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",
+                      },
+                      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,
+                  },
+                },
+              },
+              {
+                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",
+                      },
+                      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,
+                  },
+                },
+              },
+              {
+                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",
+                      },
+                      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,
+                  },
+                },
+              },
+              {
+                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",
+                      },
+                      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,
+                  },
+                },
+              },
+              {
+                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",
+                      },
+                      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,
+                  },
+                },
+              },
+              {
+                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",
+                      },
+                      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,
+                  },
+                },
+              },
+              {
+                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",
+                      },
+                      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,
+                  },
+                },
+              },
+              {
+                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",
+                      },
+                      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,
+                  },
+                },
+              },
+              {
+                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",
+                      },
+                      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,
+                  },
+                },
+              },
+              {
+                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",
+                      },
+                      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,
+                  },
+                },
+              },
+              {
+                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",
+                      },
+                      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,
+                  },
+                },
+              },
+              {
+                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",
+                      },
+                      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,
+                  },
+                },
+              },
+              {
+                value: 0,
+                name: "invisible",
+                itemStyle: {
+                  normal: {
+                    color: "#412a4e",
+                  },
+                  emphasis: {
+                    color: "#412a4e",
+                  },
+                },
+              },
+            ],
+          },
+        ],
+      })
     })
   },
   methods: {
@@ -797,7 +1638,7 @@ export default {
   letter-spacing: 2px;
 }
 
-.centerImg{
+.centerImg {
   background-image: url("../../../assets/board/finalAssemblyModel.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
@@ -810,7 +1651,7 @@ export default {
 }
 
 
-.scrollTableItem {
+.scrollTableItem1 {
   color: rgb(185, 186, 192);
   margin: auto 0px;
   padding: 4px 0;
@@ -821,6 +1662,17 @@ export default {
   display: inline-block;
   width: 14.2%;
 }
+.scrollTableItem {
+  color: rgb(185, 186, 192);
+  margin: auto 0px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  text-align: center;
+  display: inline-block;
+  width: 14.2%;
+  height: 100%;
+}
 
 .top1 {
   position: absolute;
@@ -881,34 +1733,39 @@ export default {
     margin: 0;
   }
 }
-.bottom1{
+
+.bottom1 {
   position: absolute;
-  top: 66%;
+  top: 66.5%;
   left: 4%;
   width: 21.5%;
   height: 28.5%;
-  .chart11{
+
+  .chart11 {
     position: absolute;
     top: 0%;
     left: 0%;
     width: 33.3%;
-    height: 35%;
+    height: 40%;
   }
-  .chart12{
+
+  .chart12 {
     position: absolute;
     top: 0%;
     left: 33.3%;
     width: 33.3%;
-    height: 35%;
+    height: 40%;
   }
-  .chart13{
+
+  .chart13 {
     position: absolute;
     top: 0%;
     left: 66.6%;
     width: 33.3%;
-    height: 35%;
+    height: 40%;
   }
-  .scrollTable{
+
+  .scrollTable {
     position: absolute;
     top: 40%;
     left: 0%;
@@ -916,34 +1773,39 @@ export default {
     height: 60%;
   }
 }
-.bottom2{
+
+.bottom2 {
   position: absolute;
-  top: 66%;
+  top: 66.5%;
   left: 27.5%;
   width: 21.5%;
   height: 28.5%;
-  .chart21{
+
+  .chart21 {
     position: absolute;
     top: 0%;
     left: 0%;
     width: 33.3%;
-    height: 35%;
+    height: 40%;
   }
-  .chart22{
+
+  .chart22 {
     position: absolute;
     top: 0%;
     left: 33.3%;
     width: 33.3%;
-    height: 35%;
+    height: 40%;
   }
-  .chart23{
+
+  .chart23 {
     position: absolute;
     top: 0%;
     left: 66.6%;
     width: 33.3%;
-    height: 35%;
+    height: 40%;
   }
-  .scrollTable{
+
+  .scrollTable {
     position: absolute;
     top: 40%;
     left: 0%;
@@ -951,34 +1813,39 @@ export default {
     height: 60%;
   }
 }
-.bottom3{
+
+.bottom3 {
   position: absolute;
-  top: 66%;
+  top: 66.5%;
   left: 51%;
   width: 21.5%;
   height: 28.5%;
-  .chart31{
+
+  .chart31 {
     position: absolute;
     top: 0%;
     left: 0%;
     width: 33.3%;
-    height: 35%;
+    height: 40%;
   }
-  .chart32{
+
+  .chart32 {
     position: absolute;
     top: 0%;
     left: 33.3%;
     width: 33.3%;
-    height: 35%;
+    height: 40%;
   }
-  .chart33{
+
+  .chart33 {
     position: absolute;
     top: 0%;
     left: 66.6%;
     width: 33.3%;
-    height: 35%;
+    height: 40%;
   }
-  .scrollTable{
+
+  .scrollTable {
     position: absolute;
     top: 40%;
     left: 0%;
@@ -986,34 +1853,39 @@ export default {
     height: 60%;
   }
 }
-.bottom4{
+
+.bottom4 {
   position: absolute;
-  top: 66%;
+  top: 66.5%;
   left: 74.5%;
   width: 21.5%;
   height: 28.5%;
-  .chart41{
+
+  .chart41 {
     position: absolute;
     top: 0%;
     left: 0%;
     width: 33.3%;
-    height: 35%;
+    height: 40%;
   }
-  .chart42{
+
+  .chart42 {
     position: absolute;
     top: 0%;
     left: 33.3%;
     width: 33.3%;
-    height: 35%;
+    height: 40%;
   }
-  .chart43{
+
+  .chart43 {
     position: absolute;
     top: 0%;
     left: 66.6%;
     width: 33.3%;
-    height: 35%;
+    height: 40%;
   }
-  .scrollTable{
+
+  .scrollTable {
     position: absolute;
     top: 40%;
     left: 0%;
@@ -1021,7 +1893,8 @@ export default {
     height: 60%;
   }
 }
-.table1{
+
+.table1 {
 
   position: absolute;
   top: 41%;
@@ -1029,7 +1902,8 @@ export default {
   width: 21.5%;
   height: 15%;
 }
-.chart1{
+
+.chart1 {
 
   position: absolute;
   top: 41%;
diff --git a/src/views/login.vue b/src/views/login.vue
index f607fcf..785ceb3 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,7 +9,7 @@
           auto-complete="off"
           placeholder="账号"
         >
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon"/>
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
@@ -20,7 +20,7 @@
           placeholder="密码"
           @keyup.enter.native="handleLogin"
         >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon"/>
         </el-input>
       </el-form-item>
       <el-form-item prop="code" v-if="captchaEnabled">
@@ -31,7 +31,7 @@
           style="width: 63%"
           @keyup.enter.native="handleLogin"
         >
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon"/>
         </el-input>
         <div class="login-code">
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
@@ -56,15 +56,16 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-<!--      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>-->
+      <!--      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>-->
     </div>
+    <div class="logo"></div>
   </div>
 </template>
 
 <script>
-import { getCodeImg } from "@/api/login";
+import {getCodeImg} from "@/api/login";
 import Cookies from "js-cookie";
-import { encrypt, decrypt } from '@/utils/jsencrypt'
+import {encrypt, decrypt} from '@/utils/jsencrypt'
 
 export default {
   name: "Login",
@@ -80,12 +81,12 @@ export default {
       },
       loginRules: {
         username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
+          {required: true, trigger: "blur", message: "请输入您的账号"}
         ],
         password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
+          {required: true, trigger: "blur", message: "请输入您的密码"}
         ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+        code: [{required: true, trigger: "change", message: "请输入验证码"}]
       },
       loading: false,
       // 验证码开关
@@ -97,7 +98,7 @@ export default {
   },
   watch: {
     $route: {
-      handler: function(route) {
+      handler: function (route) {
         this.redirect = route.query && route.query.redirect;
       },
       immediate: true
@@ -132,16 +133,17 @@ export default {
         if (valid) {
           this.loading = true;
           if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
+            Cookies.set("username", this.loginForm.username, {expires: 30});
+            Cookies.set("password", encrypt(this.loginForm.password), {expires: 30});
+            Cookies.set('rememberMe', this.loginForm.rememberMe, {expires: 30});
           } else {
             Cookies.remove("username");
             Cookies.remove("password");
             Cookies.remove('rememberMe');
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+            this.$router.push({path: this.redirect || "/"}).catch(() => {
+            });
           }).catch(() => {
             this.loading = false;
             if (this.captchaEnabled) {
@@ -156,14 +158,27 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
+
+.logo {
+  background-image: url("../assets/board/logo.png");
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  width: 8vw;
+  height: 4vw;
+  position: absolute;
+  top: -1%;
+  left: 1%;
+}
+
 .login {
   display: flex;
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  background-image: url("../assets/images/login-background.png");
   background-size: cover;
 }
+
 .title {
   margin: 0px auto 30px auto;
   text-align: center;
@@ -175,32 +190,39 @@ export default {
   background: #ffffff;
   width: 400px;
   padding: 25px 25px 5px 25px;
+
   .el-input {
     height: 38px;
+
     input {
       height: 38px;
     }
   }
+
   .input-icon {
     height: 39px;
     width: 14px;
     margin-left: 2px;
   }
 }
+
 .login-tip {
   font-size: 13px;
   text-align: center;
   color: #bfbfbf;
 }
+
 .login-code {
   width: 33%;
   height: 38px;
   float: right;
+
   img {
     cursor: pointer;
     vertical-align: middle;
   }
 }
+
 .el-login-footer {
   height: 40px;
   line-height: 40px;
@@ -213,6 +235,7 @@ export default {
   font-size: 12px;
   letter-spacing: 1px;
 }
+
 .login-code-img {
   height: 38px;
 }
diff --git a/src/views/register.vue b/src/views/register.vue
index 396d582..ce896f4 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -63,6 +63,8 @@
     <div class="el-register-footer">
       <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
     </div>
+
+    <div class="logo"></div>
   </div>
 </template>
 
@@ -146,12 +148,23 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
+
+.logo{
+  background-image: url("../assets/board/logo.png");
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  width: 8vw;
+  height:4vw;
+  position: absolute;
+  top: -1%;
+  left: 1%;
+}
 .register {
   display: flex;
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  background-image: url("../assets/images/login-background.png");
   background-size: cover;
 }
 .title {