From 683dec23954007e97a400fda4cd5006d1eb20041 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 16 九月 2022 14:15:54 +0800
Subject: [PATCH] 1.看板根据需求进行了修改

---
 src/views/kb/index.vue |  173 ++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 96 insertions(+), 77 deletions(-)

diff --git a/src/views/kb/index.vue b/src/views/kb/index.vue
index 84a0179..261c053 100644
--- a/src/views/kb/index.vue
+++ b/src/views/kb/index.vue
@@ -21,17 +21,27 @@
           <div class="kb_center_block">
             <div style="display: flex;justify-content: center">
               <div class="kb_center_block_children">
-                <div>{{ value1 }} 浜垮害</div>
-                <!--                <div class="box01" />-->
+                <div>43,256</div>
                 <div class="box02" />
-                <div>褰撴棩鎬昏�楃數閲�</div>
+                <div>鍛ㄨ�楄兘</div>
               </div>
               <div class="kb_center_block_children">
-                <div>{{ value2 }} 浜跨珛鏂�</div>
-                <div class="box01" />
-                <div>褰撴棩鎬昏�楁皵閲�</div>
-                <!--                <div class="box02" />-->
+                <div>72,234</div>
+                <div class="box02" />
+                <div>鏈堣�楄兘</div>
               </div>
+              <div class="kb_center_block_children">
+                <div>122,345</div>
+                <div class="box02" />
+                <div>瀛h�楄兘</div>
+              </div>
+
+              <!--              <div class="kb_center_block_children">-->
+              <!--                <div>{{ value2 }} 浜跨珛鏂�</div>-->
+              <!--                <div class="box01" />-->
+              <!--                <div>褰撴棩鎬昏�楁皵閲�</div>-->
+              <!--                &lt;!&ndash;                <div class="box02" />&ndash;&gt;-->
+              <!--              </div>-->
             </div>
           </div>
         </div>
@@ -40,7 +50,8 @@
             <div id="bar3" style="width: 100%;height: 100%" />
           </div>
           <div class="kb_block">
-            <div id="custom1" style="width: 100%;height: 100%" />
+            <!--            <div id="custom1" style="width: 100%;height: 100%" />-->
+            <div id="barline1" style="width: 100%;height: 100%" />
           </div>
         </div>
       </div>
@@ -64,7 +75,7 @@
 <script>
 import * as echarts from 'echarts'
 import '@/utils/world'
-import { bar1, bar2, bar3, bar4, line1, loadEcharts, pie1, pie2 } from '@/utils/myEcharts'
+import { bar1, bar2, bar3, bar4, barline1, line1, loadEcharts, pie1, pie2 } from '@/utils/myEcharts'
 
 export default {
   name: 'Index',
@@ -81,11 +92,11 @@
     this.loadArea()
     //  鍔犺浇鎵�鏈�
     this.loadAll()
-    // 鍔犺浇鍙充腑
-    this.loadCustom1()
-    setInterval(() => {
-      this.loadCustom1()
-    }, 5000)
+    // // 鍔犺浇鍙充腑
+    // this.loadCustom1()
+    // setInterval(() => {
+    //   this.loadCustom1()
+    // }, 5000)
 
     setInterval(() => {
       this.value1 = Math.floor(Math.random() * 10000 + 5000)
@@ -96,45 +107,45 @@
 
     loadAll() {
       // 鍔犺浇澶撮儴楗煎浘
-      let pie1data = [
+      const pie1data = [
         {
-          name: '瑁呭鍒堕��',
-          value: 54
+          name: '閲囪喘閫炬湡',
+          value: 3
         }, {
-          name: '鐜颁唬鏉愭枡',
-          value: 44
+          name: '杩涙枡妫�楠�',
+          value: 95
         }, {
-          name: '鏂板お鑳芥簮',
-          value: 35
+          name: '褰撴棩褰撴垚鐜�',
+          value: 83
         }, {
-          name: '淇℃伅鎶�鏈�',
-          value: 30
+          name: '璁惧OEE',
+          value: 91
         }, {
-          name: '鍟嗚锤鐗╂祦',
-          value: 20
+          name: '閿�鍞彂璐�',
+          value: 100
         }
       ]
       loadEcharts('pie1', pie1(pie1data))
 
       setInterval(() => {
-        pie1data = [
-          {
-            name: '瑁呭鍒堕��',
-            value: Math.floor(Math.random() * 10) + 60
-          }, {
-            name: '鐜颁唬鏉愭枡',
-            value: Math.floor(Math.random() * 10) + 60
-          }, {
-            name: '鏂板お鑳芥簮',
-            value: Math.floor(Math.random() * 20) + 40
-          }, {
-            name: '淇℃伅鎶�鏈�',
-            value: Math.floor(Math.random() * 20) + 40
-          }, {
-            name: '鍟嗚锤鐗╂祦',
-            value: Math.floor(Math.random() * 20) + 40
-          }
-        ]
+        // pie1data = [
+        //   {
+        //     name: '瑁呭鍒堕��',
+        //     value: Math.floor(Math.random() * 10) + 60
+        //   }, {
+        //     name: '鐜颁唬鏉愭枡',
+        //     value: Math.floor(Math.random() * 10) + 60
+        //   }, {
+        //     name: '鏂板お鑳芥簮',
+        //     value: Math.floor(Math.random() * 20) + 40
+        //   }, {
+        //     name: '淇℃伅鎶�鏈�',
+        //     value: Math.floor(Math.random() * 20) + 40
+        //   }, {
+        //     name: '鍟嗚锤鐗╂祦',
+        //     value: Math.floor(Math.random() * 20) + 40
+        //   }
+        // ]
         loadEcharts('pie1', pie1(pie1data))
       }, 10000)
 
@@ -210,7 +221,7 @@
           'name': '璁惧',
           'value': 30
         }, {
-          'name': '鍏跺畠',
+          'name': '浜哄憳',
           'value': 20
         }
 
@@ -278,7 +289,7 @@
             'name': '璁惧',
             'value': b4
           }, {
-            'name': '鍏跺畠',
+            'name': '浜哄憳',
             'value': b5
           }
         ]
@@ -304,8 +315,13 @@
       setInterval(() => {
         loadEcharts('bar4', bar4())
       }, 6500)
+
+      loadEcharts('barline1', barline1())
+      setInterval(() => {
+        loadEcharts('barline1', barline1())
+      }, 7500)
     },
-    // 鍔犺浇鍙充腑
+    // 鍔犺浇鍙充腑锛堝純鐢級
     loadCustom1() {
       const list = [
         {
@@ -596,7 +612,7 @@
             // color: '#fff',
             color: '#00ffff',
             fontSize: '18',
-            fontWeight: 'lighter'
+            fontWeight: 'bolder'
           }
         },
         grid: {
@@ -632,34 +648,36 @@
             return res
           }
         },
-        xAxis: [{
-          type: 'category',
-          boundaryGap: true,
-          axisLabel: {
-            interval: 0,
-            formatter: '{value}',
-            fontSize: 14,
-            margin: 20,
-            textStyle: {
-              color: this.colorX
-            }
-          },
-          axisLine: {
-            lineStyle: {
-              color: '#032c58'
-            }
-          },
-          splitLine: {
-            show: false,
-            lineStyle: {
-              color: '#032c58'
-            }
-          },
-          axisTick: {
-            show: false
-          },
-          data: xList
-        }],
+        xAxis: [
+          {
+            type: 'category',
+            boundaryGap: true,
+            axisLabel: {
+              interval: 0,
+              formatter: '{value}',
+              fontSize: 14,
+              margin: 20,
+              textStyle: {
+                color: this.colorX
+              }
+            },
+            axisLine: {
+              lineStyle: {
+                color: '#032c58'
+              }
+            },
+            splitLine: {
+              show: false,
+              lineStyle: {
+                color: '#032c58'
+              }
+            },
+            axisTick: {
+              show: false
+            },
+            data: xList
+          }
+        ],
         yAxis: [
           {
             boundaryGap: false,
@@ -671,7 +689,7 @@
                 color: this.colorY
               }
             },
-            name: '浜匡紙鍗曪級',
+            name: '涓囷紙鍗曪級',
             nameTextStyle: {
               color: this.colorY,
               fontSize: 14,
@@ -949,6 +967,7 @@
   margin: auto;
   z-index: 2;
   color: #09d8f2;
+  letter-spacing: 2px;
 }
 
 .kb_headerPic {
@@ -990,7 +1009,7 @@
 .kb_center_block_children {
   height: 120px;
   //border: 1px solid $kbBorderColor;
-  width: 360px;
+  width: 240px;
   display: flex;
   z-index: 2;
   justify-content: space-around;

--
Gitblit v1.9.3