From 328adde6e667404fd3aaf388c6191c5b88e8da92 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期五, 20 九月 2024 14:37:21 +0800
Subject: [PATCH] 1.看板修改

---
 src/views/kanbanManager/ckgl.vue | 1222 ++++++++++----------
 vue.config.js                    |    2 
 src/api/kanbanManager.js         |    8 
 src/views/kanbanManager/cj.vue   |  903 ++++++++-------
 src/views/kanbanManager/zhkb.vue | 1052 +++++++++---------
 src/utils/myEcharts.js           |  143 ++
 6 files changed, 1,743 insertions(+), 1,587 deletions(-)

diff --git a/src/api/kanbanManager.js b/src/api/kanbanManager.js
index 79fc2c5..ec3a1e0 100644
--- a/src/api/kanbanManager.js
+++ b/src/api/kanbanManager.js
@@ -36,6 +36,14 @@
   })
 }
 
+// 杞﹂棿缁煎悎鐪嬫澘,宸︿笅閲囪喘璁㈠崟
+export function WorkShopCompreLeftBottom() {
+  return request({
+    url: 'KanBanManagerent/WorkShopCompreLeftBottom',
+    method: 'get'
+  })
+}
+
 // 杞﹂棿缁煎悎鐪嬫澘,鍙充笂閿�鍞鍗�
 export function WorkShopCompreRightTop(data) {
   return request({
diff --git a/src/utils/myEcharts.js b/src/utils/myEcharts.js
index e1f9f65..3fb285e 100644
--- a/src/utils/myEcharts.js
+++ b/src/utils/myEcharts.js
@@ -329,25 +329,25 @@
     },
     series: [
       {
-      name: '鏃堕棿',
-      type: 'line',
-      smooth: false,
-      showAllSymbol: true,
-      symbol: 'emptyCircle',
-      symbolSize: 8,
-      itemStyle: {
-        normal: {
-          color: `rgba(42, 197, 137, 1)`
-        }
-      },
-      lineStyle: {
-        normal: {
-          width: 2,
-          color: `rgba(42, 197, 137, 1)`
-        }
-      },
-      data: dataY
-    }
+        name: '鏃堕棿',
+        type: 'line',
+        smooth: false,
+        showAllSymbol: true,
+        symbol: 'emptyCircle',
+        symbolSize: 8,
+        itemStyle: {
+          normal: {
+            color: `rgba(42, 197, 137, 1)`
+          }
+        },
+        lineStyle: {
+          normal: {
+            width: 2,
+            color: `rgba(42, 197, 137, 1)`
+          }
+        },
+        data: dataY
+      }
     ]
   }
 
@@ -371,7 +371,7 @@
     }
   }
 
-  console.log(titlename,123);
+  console.log(titlename, 123)
 
   // const valdata = [683, 500, 400, 300, 200]
   // const myColor = ['#FF0000', '#FF5511', '#FF8800', '#FFBB00', '#FFFF00']
@@ -423,7 +423,7 @@
           show: false
         },
         axisLabel: {
-          show:false,
+          show: false,
           // color: '#fff',
           color: function(value, index) {
             return value === '0' ? 'transparent' : '#fff'
@@ -3142,3 +3142,104 @@
 
   return option
 }
+
+export function all03(ydata, data) {
+  const option = {
+    backgroundColor: 'transparent',
+    // tooltip: {
+    //   formatter: '{b} ({c})'
+    // },
+    title: {
+      text: '鍚勮溅闂村綋鏈堝畬宸ユ暟閲�',
+      left: '50%',
+      top: '0%',
+      textAlign: 'center',
+      textStyle: {
+        // color: '#fff',
+        color: '#00ffff',
+        fontSize: '20',
+        fontWeight: 'bolder'
+      }
+    },
+    grid: {
+      left: '8%',
+      right: '8%',
+      bottom: '10%',
+      top: '15%',
+      containLabel: true
+    },
+    xAxis: [{
+      // gridIndex: 0,
+      axisTick: {
+        show: false
+      },
+      axisLabel: {
+        show: false
+      },
+      splitLine: {
+        show: false
+      },
+      axisLine: {
+        show: false
+      }
+
+    }],
+    yAxis: [{
+      gridIndex: 0,
+      interval: 0,
+      // data: yAxisData.reverse(),
+      data: ydata.reverse(),
+      axisTick: {
+        show: false
+      },
+      axisLabel: {
+        show: true,
+        textStyle: {
+          fontSize: 18,
+          color: colorX
+        }
+      },
+      splitLine: {
+        show: false
+      },
+      axisLine: {
+        show: false
+      }
+
+    }],
+    series: [
+      {
+        type: 'bar',
+        xAxisIndex: 0,
+        yAxisIndex: 0,
+        barWidth: '45%',
+        itemStyle: {
+          normal: {
+            barBorderRadius: 15,
+            color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
+              offset: 0,
+              color: 'rgba(0,255,205,.6)'
+            }, {
+              offset: 0.8,
+
+              color: 'rgba(41,134,207,1)'
+            }], false)
+          }
+        },
+        label: {
+          normal: {
+            show: true,
+            position: 'right',
+            textStyle: {
+              color: colorX
+            },
+            fontSize: 18
+          }
+        },
+        data: data.map(i => i.quantity).reverse()
+      }
+
+    ]
+  }
+  return option
+}
diff --git a/src/views/kanbanManager/cj.vue b/src/views/kanbanManager/cj.vue
index 0b63d80..afb3678 100644
--- a/src/views/kanbanManager/cj.vue
+++ b/src/views/kanbanManager/cj.vue
@@ -1,445 +1,458 @@
-<template>
-  <div>
-    <div class="kb_dashboard" style="display:flex;flex-direction: column;justify-content: space-between">
-
-      <div class="kb_backgroundCustom" />
-
-      <div class="kb_header">
-        <div class="kb_headTime" style="top: 35px;left:  20px">
-          <span>娴欐睙浼樺厠宸ヨ锤鑲′唤鏈夐檺鍏徃</span>
-        </div>
-
-        <div class="kb_headTime kb_header_text" style="top: 35px;left:  800px">
-          <span>{{ title }}鏁板瓧鍖栫湅鏉�</span>
-        </div>
-
-        <div class="kb_headTime" style="top: 35px;right:  25px">
-          <span>{{ headTime }}</span>
-        </div>
-      </div>
-      <div
-        style=" padding:5px 20px 20px 20px;z-index:2;height: 940px;flex-direction: column;justify-content: space-between;"
-      >
-        <!--        涓婅竟-->
-        <div style="display: flex;justify-content: space-between">
-          <div style="width:100%">
-            <div class="smallTitle">
-              <svg-icon icon-class="cxjg" class="svg_class" />
-              鐢熶骇淇℃伅
-            </div>
-            <div
-              class="lineContent horn"
-              style="height: 450px;display: flex;flex-direction: column;justify-content: space-between"
-            >
-              <el-table
-                ref="tableDataLeftCenterRef"
-                :data="tableDataCenterTop"
-                class="tableData tableDataCell"
-                style="width: 100%;"
-                :header-cell-style="headerCellStyle"
-                :cell-style="cellStyle"
-                height="500"
-              >
-
-                <el-table-column
-                  prop="wo_code"
-                  label="宸ュ崟鍙�"
-                  width="220"
-                />
-                <el-table-column
-                  prop="saleOrderCode"
-                  label="鐢熶骇鍗曞彿"
-                  width="160"
-                />
-                <el-table-column
-                  prop="partcode"
-                  label="浜у搧缂栫爜"
-                  width="160"
-                />
-                <el-table-column
-                  prop="partname"
-                  label="浜у搧鍚嶇О"
-                  width="160"
-                />
-<!--                <el-table-column-->
-<!--                  prop="partspec"-->
-<!--                  label="浜у搧瑙勬牸"-->
-<!--                  width="160"-->
-<!--                >-->
-<!--                  <template slot-scope="{row}">-->
-<!--                    {{ row.partspec ? row.partspec : '/' }}-->
-<!--                  </template>-->
-<!--                </el-table-column>-->
-                <el-table-column
-                  prop="plan_qty"
-                  label="浠诲姟鏁伴噺"
-                  width="120"
-                />
-                <el-table-column
-                  prop="good_qty"
-                  label="鍚堟牸鏁伴噺"
-                  width="120"
-                />
-                <el-table-column
-                  prop="ng_qty"
-                  label="涓嶈壇鏁伴噺"
-                  width="120"
-                />
-                <el-table-column
-                  prop="laborbad_qty"
-                  label="宸ュ簾鏁伴噺"
-                  width="120"
-                />
-                <el-table-column
-                  prop="materielbad_qty"
-                  label="鏂欏簾鏁伴噺"
-                  width="120"
-                />
-                <el-table-column
-                  prop="seq"
-                  label="宸ュ簭椤哄簭"
-                  width="120"
-                />
-                <el-table-column
-                  prop="step_code"
-                  label="宸ュ簭缂栫爜"
-                  width="120"
-                />
-                <el-table-column
-                  prop="step_name"
-                  label="宸ュ簭鍚嶇О"
-                  width="120"
-                />
-                <el-table-column
-                  prop="schedule"
-                  label="瀹屾垚杩涘害(%)"
-                  width="213"
-                />
-              </el-table>
-            </div>
-          </div>
-
-        </div>
-        <!--        涓嬭竟-->
-        <div style="display: flex;justify-content: space-between;margin-top: 15px;">
-          <div style="width: 1000px;">
-            <div class="smallTitle">
-              <svg-icon icon-class="blcs" class="svg_class" />
-              璐ㄩ噺涓嶈壇(杩戜竴鍛�)
-            </div>
-            <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">
-              <div id="cjzl03" class="flex_c_c" style="width: 100%;height:100%" />
-
-            </div>
-          </div>
-          <div style="width: 850px;">
-            <div class="smallTitle">
-              <svg-icon icon-class="ckkc" class="svg_class" />
-              涓嶈壇缁熻(杩戜竴鏈�)
-            </div>
-            <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">
-              <div id="cjzl04" class="flex_c_c" style="width: 100%;height:100%" />
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import './kbCommon.css'
-import { loadEcharts, cjzl04, cjzl03_2 } from '@/utils/myEcharts'
-import {
-  WorkShopProduceBottomLeftData,
-  WorkShopProduceBottomRightData,
-  WorkShopProduceTopData
-} from '@/api/kanbanManager'
-import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
-
-export default {
-  name: 'Cjsc',
-  data() {
-    return {
-      headTime: '',
-      tableDataRightTop: [],
-      wkshopArr: [],
-      legendData: [],
-
-      LeftTopData01: [],
-      LeftTopData02: [],
-
-      RightTopData01: [],
-      RightTopData02: [],
-      cjzl03_xData: [],
-      cjzl03_yData: [],
-      RightBottom: [],
-
-      tableDataCenterTop: [],
-
-      wkshopcode: '',
-      title: ''
-
-    }
-  },
-  activated() {
  window.addEventListener('resize', this.getHeight)
  this.getHeight()
},
created() {
-    setInterval(this.getNowTime, 1000)
-
-    // 涓ゅ皬鏃剁湅鏉垮埛鏂颁竴娆�
-    setInterval(() => {
-      window.location.reload()
-    }, 1000 * 60 * 120)
-  },
-  mounted() {
-    this.getAllApi()
-  },
-  methods: {
-    async getWorkShopProduceTopData() {
-      WorkShopProduceTopData({ wkshopcode: this.wkshopcode.join(',') }).then(res => {
-        this.tableDataCenterTop = res.data
-
-        const divData = this.$refs.tableDataLeftCenterRef.bodyWrapper
-        const timer = setInterval(() => {
-          // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
-          divData.scrollTop += 1
-          if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
-            divData.scrollTop = 0
-            WorkShopProduceTopData({ wkshopcode: this.wkshopcode.join(',') }).then(res => {
-              this.tableDataCenterTop = res.data
-
-              if (this.tableDataCenterTop.length > 11) {
-                clearInterval(timer)
-                this.getWorkShopProduceTopData()
-              }
-            })
-          }
-        }, this.tableDataCenterTop.length <= 11 ? 1000 * 30 : 200)
-      })
-    },
-
-    async getAllApi() {
-      const res = await PrentOrganizationNoCompany()
-      this.wkshopArr = res.data
-
-      if (window.location.hash.indexOf('?') !== -1) {
-        const code = window.location.hash.split('?')[1].split('=')[1]
-        this.title = this.wkshopArr.find(i => i.torg_code === code).torg_name
-        this.wkshopcode = [code]
-      }
-
-      this.wkshopcode.forEach(i => {
-        const aa = this.wkshopArr.find(j => j.torg_code === i).torg_name
-        this.legendData.push(aa)
-      })
-
-      const res4 = await WorkShopProduceBottomLeftData({ wkshopcode: this.wkshopcode.join(',') })
-      this.cjzl03_xData = res4.data[this.wkshopcode[0]].map(i => i.click_date)
-      for (const res4Key in res4.data) {
-        if (this.wkshopcode.includes(res4Key)) {
-          const bb = res4.data[res4Key].map(i => i.count)
-          this.cjzl03_yData.push(bb)
-        }
-      }
-      loadEcharts('cjzl03', cjzl03_2(this.cjzl03_xData, this.legendData, this.cjzl03_yData, true))
-      setInterval(() => {
-        WorkShopProduceBottomLeftData({ wkshopcode: this.wkshopcode.join(',') }).then(res4 => {
-          this.cjzl03_yData = []
-
-          this.cjzl03_xData = res4.data[this.wkshopcode[0]].map(i => i.click_date)
-          for (const res4Key in res4.data) {
-            if (this.wkshopcode.includes(res4Key)) {
-              const bb = res4.data[res4Key].map(i => i.count)
-              this.cjzl03_yData.push(bb)
-            }
-          }
-          loadEcharts('cjzl03', cjzl03_2(this.cjzl03_xData, this.legendData, this.cjzl03_yData, true))
-        })
-      }, 1000 * 50)
-
-      const res5 = await WorkShopProduceBottomRightData({ wkshopcode: this.wkshopcode[0] })
-      this.RightBottom = res5.data
-      if (this.RightBottom.length > 0) {
-        loadEcharts('cjzl04', cjzl04(this.RightBottom.map(i => i.name), this.RightBottom.map(i => i.cont)))
-      }
-
-      setInterval(() => {
-        WorkShopProduceBottomRightData({ wkshopcode: this.wkshopcode[0] }).then(res5 => {
-          this.RightBottom = res5.data
-          if (this.RightBottom.length > 0) {
-            loadEcharts('cjzl04', cjzl04(this.RightBottom.map(i => i.name), this.RightBottom.map(i => i.cont)))
-          }
-        })
-      }, 1000 * 60)
-
-      await this.getWorkShopProduceTopData()
-    },
-
-    // 鑾峰彇褰撳墠鏃堕棿
-    getNowTime() {
-      const dt = new Date()
-      const wk = dt.getDay()
-      const y = dt.getFullYear()
-      const m = (dt.getMonth() + 1 + '').padStart(2, '0')
-      const d = (dt.getDate() + '').padStart(2, '0')
-
-      const hh = (dt.getHours() + '').padStart(2, '0')
-      const mm = (dt.getMinutes() + '').padStart(2, '0')
-      const ss = (dt.getSeconds() + '').padStart(2, '0')
-      const weeks = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�']
-      const week = weeks[wk]
-
-      this.headTime = `${y}-${m}-${d}  ${hh}:${mm}:${ss}   ${week}`
-    },
-    headerCellStyle() {
-      return {
-        backgroundColor: 'transparent',
-        padding: '10px 0',
-        textAlign: 'center',
-        color: '#07acc2',
-        border: 'none',
-        fontSize: '18px'
-      }
-    },
-    cellStyle() {
-      return {
-        padding: '7px 0',
-        textAlign: 'center',
-        backgroundColor: 'transparent',
-        color: '#fff',
-        border: 'none',
-        fontSize: '18px'
-      }
-    }
-
-  }
-
-}
-</script>
-
-<style lang="scss" scoped>
-$main_color: #09d8f2;
-$color01: #00FFFF;
-.tableData {
-  background: transparent;
-}
-
-.el-table::before {
-  height: 0;
-}
-
-.el-table__empty-text {
-  color: $main_color;
-}
-
-.tableDataCell {
-  ::v-deep .cell {
-    padding: 0 2px;
-  }
-}
-
-::v-deep .el-table__body-wrapper::-webkit-scrollbar {
-  /* width: 0;瀹藉害涓�0鏆楄棌 */
-  width: 0;
-  background: transparent;
-}
-
-::v-deep .el-table__body-wrapper {
-  background: transparent;
-}
-
-::v-deep .el-table th,
-::v-deep .el-table tr,
-::v-deep .el-table td {
-  background-color: transparent;
-}
-
-::v-deep .gutter {
-  display: none;
-}
-
-.all_block01 {
-  width: 237px;
-  height: 180px;
-}
-
-.all_block02 {
-  width: 100%;
-  height: 49px;
-  background: rgba(9, 216, 242, 0.1);
-}
-
-.all_block03 {
-  width: 199px;
-  height: 180px;
-}
-
-.all_block04 {
-  width: 100%;
-  height: 49px;
-  background: rgba(9, 216, 242, 0.1);
-}
-
-.kb_center_block_children {
-  height: 180px;
-  //border: 1px solid $kbBorderColor;
-  width: 240px;
-  display: flex;
-  z-index: 2;
-  justify-content: space-around;
-  align-items: center;
-  flex-direction: column;
-  margin: 10px;
-  font-size: 22px;
-
-  .box02 {
-    background: url("../../assets/images/box02.png") no-repeat;
-    transform: scale(1.5);
-    width: 145px;
-    height: 84px;
-
-  }
-}
-
-.all_block05 {
-  position: absolute;
-  animation: upDown 3s ease-in-out infinite;
-  left: 60px;
-}
-
-.all_block06 {
-  position: absolute;
-  animation: upDown2 3s ease-in-out infinite;
-  left: 290px;
-}
-
-.all_block07 {
-  position: absolute;
-  animation: upDown 3s ease-in-out infinite;
-  left: 520px;
-}
-
-@keyframes upDown {
-  0% {
-    top: 50px;
-  }
-  50% {
-    top: 100px;
-  }
-  100% {
-    top: 50px;
-  }
-}
-
-@keyframes upDown2 {
-  0% {
-    top: 100px;
-  }
-  50% {
-    top: 50px;
-  }
-  100% {
-    top: 100px;
-  }
-}
-
-</style>
+<template>
+  <div>
+    <div class="kb_dashboard" style="display:flex;flex-direction: column;justify-content: space-between">
+
+      <div class="kb_backgroundCustom" />
+
+      <div class="kb_header">
+        <div class="kb_headTime" style="top: 35px;left:  20px">
+          <span>姘稿悍甯傛ˉ涓嬪鏂欏巶</span>
+        </div>
+
+        <div class="kb_headTime kb_header_text" style="top: 35px;left:  800px">
+          <!--          <span>{{ title }}鏁板瓧鍖栫湅鏉�</span>-->
+          <span>鍙戞场鎸ゅ嚭鏁板瓧鍖栫湅鏉�</span>
+        </div>
+
+        <div class="kb_headTime" style="top: 35px;right:  25px">
+          <span>{{ headTime }}</span>
+        </div>
+      </div>
+      <div
+        style=" padding:5px 20px 20px 20px;z-index:2;height: 940px;flex-direction: column;justify-content: space-between;"
+      >
+        <!--        涓婅竟-->
+        <div style="display: flex;justify-content: space-between">
+          <div style="width:100%">
+            <div class="smallTitle">
+              <svg-icon icon-class="cxjg" class="svg_class" />
+              鐢熶骇淇℃伅
+            </div>
+            <div
+              class="lineContent horn"
+              style="height: 870px;display: flex;flex-direction: column;justify-content: space-between"
+            >
+              <el-table
+                ref="tableDataLeftCenterRef"
+                :data="tableDataCenterTop"
+                class="tableData tableDataCell"
+                style="width: 100%;"
+                :header-cell-style="headerCellStyle"
+                :cell-style="cellStyle"
+                height="920"
+              >
+
+                <el-table-column
+                  prop="wo_code"
+                  label="宸ュ崟鍙�"
+                  width="270"
+                />
+                <!--                <el-table-column-->
+                <!--                  prop="saleOrderCode"-->
+                <!--                  label="鐢熶骇鍗曞彿"-->
+                <!--                  width="160"-->
+                <!--                />-->
+                <el-table-column
+                  prop="wkshp_name"
+                  label="鐢熶骇杞﹂棿"
+                  width="210"
+                />
+                <!--                600-->
+                <el-table-column
+                  prop="partcode"
+                  label="浜у搧缂栫爜"
+                  width="210"
+                />
+                <el-table-column
+                  prop="partname"
+                  label="浜у搧鍚嶇О"
+                  width="210"
+                />
+                <!--                <el-table-column-->
+                <!--                  prop="partspec"-->
+                <!--                  label="浜у搧瑙勬牸"-->
+                <!--                  width="160"-->
+                <!--                >-->
+                <!--                  <template slot-scope="{row}">-->
+                <!--                    {{ row.partspec ? row.partspec : '/' }}-->
+                <!--                  </template>-->
+                <!--                </el-table-column>-->
+                <el-table-column
+                  prop="plan_qty"
+                  label="浠诲姟鏁伴噺"
+                  width="170"
+                />
+                <el-table-column
+                  prop="good_qty"
+                  label="鍚堟牸鏁伴噺"
+                  width="170"
+                />
+                <!--                <el-table-column-->
+                <!--                  prop="ng_qty"-->
+                <!--                  label="涓嶈壇鏁伴噺"-->
+                <!--                  width="120"-->
+                <!--                />-->
+                <!--                <el-table-column-->
+                <!--                  prop="laborbad_qty"-->
+                <!--                  label="宸ュ簾鏁伴噺"-->
+                <!--                  width="120"-->
+                <!--                />-->
+                <!--                <el-table-column-->
+                <!--                  prop="materielbad_qty"-->
+                <!--                  label="鏂欏簾鏁伴噺"-->
+                <!--                  width="120"-->
+                <!--                />-->
+                <!--                <el-table-column-->
+                <!--                  prop="seq"-->
+                <!--                  label="宸ュ簭椤哄簭"-->
+                <!--                  width="120"-->
+                <!--                />-->
+                <!--                <el-table-column-->
+                <!--                  prop="step_code"-->
+                <!--                  label="宸ュ簭缂栫爜"-->
+                <!--                  width="120"-->
+                <!--                />-->
+                <el-table-column
+                  prop="step_name"
+                  label="宸ュ簭鍚嶇О"
+                  width="320"
+                />
+                <el-table-column
+                  prop="schedule"
+                  label="瀹屾垚杩涘害(%)"
+                  width="313"
+                />
+              </el-table>
+            </div>
+          </div>
+
+        </div>
+        <!--        涓嬭竟-->
+        <!--        <div style="display: flex;justify-content: space-between;margin-top: 15px;">-->
+        <!--          <div style="width: 1000px;">-->
+        <!--            <div class="smallTitle">-->
+        <!--              <svg-icon icon-class="blcs" class="svg_class" />-->
+        <!--              璐ㄩ噺涓嶈壇(杩戜竴鍛�)-->
+        <!--            </div>-->
+        <!--            <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">-->
+        <!--              <div id="cjzl03" class="flex_c_c" style="width: 100%;height:100%" />-->
+
+        <!--            </div>-->
+        <!--          </div>-->
+        <!--          <div style="width: 850px;">-->
+        <!--            <div class="smallTitle">-->
+        <!--              <svg-icon icon-class="ckkc" class="svg_class" />-->
+        <!--              涓嶈壇缁熻(杩戜竴鏈�)-->
+        <!--            </div>-->
+        <!--            <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">-->
+        <!--              <div id="cjzl04" class="flex_c_c" style="width: 100%;height:100%" />-->
+        <!--            </div>-->
+        <!--          </div>-->
+        <!--        </div>-->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import './kbCommon.css'
+import { loadEcharts, cjzl04, cjzl03_2 } from '@/utils/myEcharts'
+import {
+  WorkShopProduceBottomLeftData,
+  WorkShopProduceBottomRightData,
+  WorkShopProduceTopData
+} from '@/api/kanbanManager'
+import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
+
+export default {
+  name: 'Cjsc',
+  data() {
+    return {
+      headTime: '',
+      tableDataRightTop: [],
+      wkshopArr: [],
+      legendData: [],
+
+      LeftTopData01: [],
+      LeftTopData02: [],
+
+      RightTopData01: [],
+      RightTopData02: [],
+      cjzl03_xData: [],
+      cjzl03_yData: [],
+      RightBottom: [],
+
+      tableDataCenterTop: [],
+
+      wkshopcode: '',
+      title: ''
+
+    }
+  },
+  activated() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  created() {
+    setInterval(this.getNowTime, 1000)
+
+    // 涓ゅ皬鏃剁湅鏉垮埛鏂颁竴娆�
+    setInterval(() => {
+      window.location.reload()
+    }, 1000 * 60 * 120)
+  },
+  mounted() {
+    // this.getAllApi()
+    this.getWorkShopProduceTopData()
+  },
+  methods: {
+    async getWorkShopProduceTopData() {
+      // WorkShopProduceTopData({ wkshopcode: this.wkshopcode.join(',') }).then(res => {
+      WorkShopProduceTopData({ wkshopcode: '101,102' }).then(res => {
+        this.tableDataCenterTop = res.data
+
+        const divData = this.$refs.tableDataLeftCenterRef.bodyWrapper
+        const timer = setInterval(() => {
+          // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+          divData.scrollTop += 1
+          if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+            divData.scrollTop = 0
+            WorkShopProduceTopData({ wkshopcode: this.wkshopcode.join(',') }).then(res => {
+              this.tableDataCenterTop = res.data
+
+              if (this.tableDataCenterTop.length > 11) {
+                clearInterval(timer)
+                this.getWorkShopProduceTopData()
+              }
+            })
+          }
+        }, this.tableDataCenterTop.length <= 22 ? 1000 * 30 : 200)
+      })
+    },
+
+    async getAllApi() {
+      const res = await PrentOrganizationNoCompany()
+      this.wkshopArr = res.data
+
+      if (window.location.hash.indexOf('?') !== -1) {
+        const code = window.location.hash.split('?')[1].split('=')[1]
+        this.title = this.wkshopArr.find(i => i.torg_code === code).torg_name
+        this.wkshopcode = [code]
+      }
+
+      this.wkshopcode.forEach(i => {
+        const aa = this.wkshopArr.find(j => j.torg_code === i).torg_name
+        this.legendData.push(aa)
+      })
+
+      const res4 = await WorkShopProduceBottomLeftData({ wkshopcode: this.wkshopcode.join(',') })
+      this.cjzl03_xData = res4.data[this.wkshopcode[0]].map(i => i.click_date)
+      for (const res4Key in res4.data) {
+        if (this.wkshopcode.includes(res4Key)) {
+          const bb = res4.data[res4Key].map(i => i.count)
+          this.cjzl03_yData.push(bb)
+        }
+      }
+      loadEcharts('cjzl03', cjzl03_2(this.cjzl03_xData, this.legendData, this.cjzl03_yData, true))
+      setInterval(() => {
+        WorkShopProduceBottomLeftData({ wkshopcode: this.wkshopcode.join(',') }).then(res4 => {
+          this.cjzl03_yData = []
+
+          this.cjzl03_xData = res4.data[this.wkshopcode[0]].map(i => i.click_date)
+          for (const res4Key in res4.data) {
+            if (this.wkshopcode.includes(res4Key)) {
+              const bb = res4.data[res4Key].map(i => i.count)
+              this.cjzl03_yData.push(bb)
+            }
+          }
+          loadEcharts('cjzl03', cjzl03_2(this.cjzl03_xData, this.legendData, this.cjzl03_yData, true))
+        })
+      }, 1000 * 50)
+
+      const res5 = await WorkShopProduceBottomRightData({ wkshopcode: this.wkshopcode[0] })
+      this.RightBottom = res5.data
+      if (this.RightBottom.length > 0) {
+        loadEcharts('cjzl04', cjzl04(this.RightBottom.map(i => i.name), this.RightBottom.map(i => i.cont)))
+      }
+
+      setInterval(() => {
+        WorkShopProduceBottomRightData({ wkshopcode: this.wkshopcode[0] }).then(res5 => {
+          this.RightBottom = res5.data
+          if (this.RightBottom.length > 0) {
+            loadEcharts('cjzl04', cjzl04(this.RightBottom.map(i => i.name), this.RightBottom.map(i => i.cont)))
+          }
+        })
+      }, 1000 * 60)
+
+      await this.getWorkShopProduceTopData()
+    },
+
+    // 鑾峰彇褰撳墠鏃堕棿
+    getNowTime() {
+      const dt = new Date()
+      const wk = dt.getDay()
+      const y = dt.getFullYear()
+      const m = (dt.getMonth() + 1 + '').padStart(2, '0')
+      const d = (dt.getDate() + '').padStart(2, '0')
+
+      const hh = (dt.getHours() + '').padStart(2, '0')
+      const mm = (dt.getMinutes() + '').padStart(2, '0')
+      const ss = (dt.getSeconds() + '').padStart(2, '0')
+      const weeks = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�']
+      const week = weeks[wk]
+
+      this.headTime = `${y}-${m}-${d}  ${hh}:${mm}:${ss}   ${week}`
+    },
+    headerCellStyle() {
+      return {
+        backgroundColor: 'transparent',
+        padding: '10px 0',
+        textAlign: 'center',
+        color: '#07acc2',
+        border: 'none',
+        fontSize: '18px'
+      }
+    },
+    cellStyle() {
+      return {
+        padding: '7px 0',
+        textAlign: 'center',
+        backgroundColor: 'transparent',
+        color: '#fff',
+        border: 'none',
+        fontSize: '18px'
+      }
+    }
+
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+$main_color: #09d8f2;
+$color01: #00FFFF;
+.tableData {
+  background: transparent;
+}
+
+.el-table::before {
+  height: 0;
+}
+
+.el-table__empty-text {
+  color: $main_color;
+}
+
+.tableDataCell {
+  ::v-deep .cell {
+    padding: 0 2px;
+  }
+}
+
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
+  /* width: 0;瀹藉害涓�0鏆楄棌 */
+  width: 0;
+  background: transparent;
+}
+
+::v-deep .el-table__body-wrapper {
+  background: transparent;
+}
+
+::v-deep .el-table th,
+::v-deep .el-table tr,
+::v-deep .el-table td {
+  background-color: transparent;
+}
+
+::v-deep .gutter {
+  display: none;
+}
+
+.all_block01 {
+  width: 237px;
+  height: 180px;
+}
+
+.all_block02 {
+  width: 100%;
+  height: 49px;
+  background: rgba(9, 216, 242, 0.1);
+}
+
+.all_block03 {
+  width: 199px;
+  height: 180px;
+}
+
+.all_block04 {
+  width: 100%;
+  height: 49px;
+  background: rgba(9, 216, 242, 0.1);
+}
+
+.kb_center_block_children {
+  height: 180px;
+  //border: 1px solid $kbBorderColor;
+  width: 240px;
+  display: flex;
+  z-index: 2;
+  justify-content: space-around;
+  align-items: center;
+  flex-direction: column;
+  margin: 10px;
+  font-size: 22px;
+
+  .box02 {
+    background: url("../../assets/images/box02.png") no-repeat;
+    transform: scale(1.5);
+    width: 145px;
+    height: 84px;
+
+  }
+}
+
+.all_block05 {
+  position: absolute;
+  animation: upDown 3s ease-in-out infinite;
+  left: 60px;
+}
+
+.all_block06 {
+  position: absolute;
+  animation: upDown2 3s ease-in-out infinite;
+  left: 290px;
+}
+
+.all_block07 {
+  position: absolute;
+  animation: upDown 3s ease-in-out infinite;
+  left: 520px;
+}
+
+@keyframes upDown {
+  0% {
+    top: 50px;
+  }
+  50% {
+    top: 100px;
+  }
+  100% {
+    top: 50px;
+  }
+}
+
+@keyframes upDown2 {
+  0% {
+    top: 100px;
+  }
+  50% {
+    top: 50px;
+  }
+  100% {
+    top: 100px;
+  }
+}
+
+</style>
diff --git a/src/views/kanbanManager/ckgl.vue b/src/views/kanbanManager/ckgl.vue
index 4e9c0d4..de0ee98 100644
--- a/src/views/kanbanManager/ckgl.vue
+++ b/src/views/kanbanManager/ckgl.vue
@@ -1,609 +1,613 @@
-<template>
-  <div>
-    <div class="kb_dashboard">
-
-      <div class="kb_backgroundCustom" />
-      <div class="kb_header">
-        <div class="kb_headTime" style="top: 35px;left:  20px">
-          <span>娴欐睙浼樺厠宸ヨ锤鑲′唤鏈夐檺鍏徃</span>
-        </div>
-
-        <div class="kb_headTime kb_header_text" style="top: 35px;left:  800px">
-          <span>浠撳簱绠$悊鏁板瓧鍖栫湅鏉�</span>
-        </div>
-
-        <div class="kb_headTime" style="top: 35px;right:  25px">
-          <span>{{ headTime }}</span>
-        </div>
-      </div>
-
-      <div style="display: flex;justify-content: space-between;padding:0 20px 20px 20px;height: 950px">
-        <div style="width: 1350px;z-index: 2;margin-top: 50px;" class="flex_c_b">
-          <div style="height: 470px;">
-            <div class="smallTitle">
-              <svg-icon icon-class="cpdrk" class="svg_class" />
-              鐢熶骇寰呭叆搴�
-            </div>
-            <div class="lineContent horn" style="height: 410px">
-              <el-table
-                ref="tableDataTopRef"
-                :data="tableDataTop"
-                style="width: 100%;"
-                class="tableData"
-                :header-cell-style="headerCellStyleCenter"
-                :cell-style="cellStyleCenter"
-                height="405"
-              >
-                <el-table-column
-                  prop="voucherdate"
-                  label="鍗曟嵁鏃ユ湡"
-                  width="131"
-                >
-                  <template slot-scope="{row}">
-                    <div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
-                    <div v-else />
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="wo"
-                  label="鍗曟嵁缂栧彿"
-                  width="189"
-                >
-                  <template slot-scope="{row}">
-                    <div class="ellipsis">{{ row.wo }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="wkshp_name"
-                  label="鐢熶骇杞﹂棿"
-                  width="105"
-                >
-                  <template slot-scope="{row}">
-                    <div class="ellipsis">{{ row.wkshp_name }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="saleOrderCode"
-                  label="閿�鍞鍗曞彿"
-                  width="200"
-                >
-                  <template slot-scope="{row}">
-                    <div v-if="row.saleOrderCode" class="ellipsis">{{ row.saleOrderCode }}</div>
-                    <div v-else>/</div>
-                  </template>
-                </el-table-column>
-                <!--                <el-table-column-->
-                <!--                  prop="materiel_code"-->
-                <!--                  label="浜у搧缂栧彿"-->
-                <!--                  width="136"-->
-                <!--                >-->
-                <!--                  <template slot-scope="{row}">-->
-                <!--                    <div class="ellipsis">{{ row.materiel_code }}</div>-->
-                <!--                  </template>-->
-                <!--                </el-table-column>-->
-                <el-table-column
-                  prop="materiel_name"
-                  label="浜у搧鍚嶇О"
-                  width="170"
-                >
-                  <template slot-scope="{row}">
-                    <div class="ellipsis">{{ row.materiel_name }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="specification"
-                  label="瑙勬牸鍨嬪彿"
-                  width="136"
-                >
-                  <template slot-scope="{row}">
-                    <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>
-                    <div v-else>/</div>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="stck_name"
-                  label="棰勫叆浠撳簱"
-                  width="100"
-                >
-                  <template slot-scope="{row}">
-                    <div v-if="row.stck_name" class="ellipsis">{{ row.stck_name }}</div>
-                    <div v-else>/</div>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="quantity"
-                  label="鏁伴噺"
-                  width="63"
-                />
-                <el-table-column
-                  prop="totalStockInQuantity"
-                  label="宸插叆搴撴暟閲�"
-                  width="110"
-                >
-                  <template slot-scope="{row}">
-                    <div v-if="row.totalStockInQuantity">{{ row.totalStockInQuantity }}</div>
-                    <div v-else>0</div>
-                  </template>
-                </el-table-column>
-                <!--                  <el-table-column-->
-                <!--                    prop="uomname"-->
-                <!--                    label="鍗曚綅"-->
-                <!--                    width="50"-->
-                <!--                  />-->
-                <!--                  <el-table-column-->
-                <!--                    prop="preStartDate"-->
-                <!--                    label="棰勮寮�宸�"-->
-                <!--                    width="100"-->
-                <!--                  >-->
-                <!--                    <template slot-scope="{row}">-->
-                <!--                      <div v-if="row.preStartDate">{{ row.preStartDate.substring(0, 10) }}</div>-->
-                <!--                      <div v-else />-->
-                <!--                    </template>-->
-                <!--                  </el-table-column>-->
-                <el-table-column
-                  prop="preFinishDate"
-                  label="棰勮鍏ュ簱"
-                  width="140"
-                >
-                  <template slot-scope="{row}">
-                    <div v-if="row.preFinishDate">{{ row.preFinishDate.substring(0, 10) }}</div>
-                    <div v-else />
-                  </template>
-                </el-table-column>
-
-              </el-table>
-            </div>
-          </div>
-          <div style="height: 470px;margin-top: 30px;">
-            <div class="smallTitle">
-              <svg-icon icon-class="drk" class="svg_class" />
-              濮斿寰呭叆搴�
-            </div>
-            <div class="lineContent horn" style="height: 410px">
-              <el-table
-                ref="tableDataBottomRef"
-                :data="tableDataBottom"
-                style="width: 100%;"
-                class="tableData"
-                :header-cell-style="headerCellStyleCenter"
-                :cell-style="cellStyleCenter"
-                height="405"
-              >
-                <el-table-column
-                  prop="voucherdate"
-                  label="鍗曟嵁鏃ユ湡"
-                  width="151"
-                >
-                  <template slot-scope="{row}">
-                    <div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
-                    <div v-else>/</div>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="wo"
-                  label="鍗曟嵁缂栧彿"
-                  width="225"
-                >
-                  <template slot-scope="{row}">
-                    <div class="ellipsis">{{ row.wo }}</div>
-                  </template>
-                </el-table-column>
-
-                <el-table-column
-                  prop="materiel_name"
-                  label="浜у搧鍚嶇О"
-                  width="278"
-                >
-                  <template slot-scope="{row}">
-                    <div v-if="row.materiel_name" class="ellipsis">{{ row.materiel_name }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="specification"
-                  label="瑙勬牸鍨嬪彿"
-                  width="220"
-                >
-                  <template slot-scope="{row}">
-                    <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>
-                    <div v-else>/</div>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="quantity"
-                  label="鏁伴噺"
-                  width="120"
-                >
-                  <template slot-scope="{row}">
-                    <div class="ellipsis">{{ row.quantity }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="saleOutQuantity"
-                  label="宸插彂璐ф暟閲�"
-                  width="140"
-                >
-                  <template slot-scope="{row}">
-                    <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>
-                    <div v-else>0</div>
-                  </template>
-                </el-table-column>
-
-                <el-table-column
-                  prop="deliveryDate"
-                  label="棰勮浜や粯鏃ユ湡"
-                  width="200"
-                >
-                  <template slot-scope="{row}">
-                    <div v-if="row.deliveryDate">{{ row.deliveryDate.substring(0, 10) }}</div>
-                    <div v-else>/</div>
-                  </template>
-                </el-table-column>
-
-                <!--                <el-table-column-->
-                <!--                  prop="warning"-->
-                <!--                  label="寤舵湡澶╂暟"-->
-                <!--                  width="130"-->
-                <!--                >-->
-                <!--                  <template slot-scope="{row}">-->
-                <!--                    <div v-if="row.warning">{{ row.warning }}</div>-->
-                <!--                    <div v-else>/</div>-->
-                <!--                  </template>-->
-                <!--                </el-table-column>-->
-              </el-table>
-            </div>
-          </div>
-
-        </div>
-        <div style="width: 500px;z-index: 2;margin-top: 50px;" class="flex_c_b">
-          <div style="height: 470px;">
-            <div class="smallTitle">
-              <svg-icon icon-class="ph" class="svg_class" />
-              鍗婃垚鍝併�佷骇鍝佸簱瀛橀噺鎺掕Top5
-            </div>
-            <div class="lineContent horn" style="height: 410px">
-              <div id="bar03" style="width: 100%;height:100%; " />
-              <!--/*              <div id="bar03" style="width: 100%;height:100%;margin-left: -25px;margin-top: -10px" />*/-->
-            </div>
-          </div>
-          <div style="height: 470px;margin-top: 30px;">
-            <div class="smallTitle">
-              <svg-icon icon-class="ph" class="svg_class" />
-              鍘熸潗鏂欏簱瀛橀噺鎺掕Top5
-            </div>
-            <div class="lineContent horn" style="height: 410px">
-              <div id="bar04" style="width: 100%;height:100%;" />
-              <!--              <div id="bar04" style="width: 100%;height:100%;margin-left: -25px;margin-top: -10px" />-->
-            </div>
-          </div>
-        </div>
-      </div>
-
-    </div>
-  </div>
-</template>
-
-<script>
-import './kbCommon.css'
-import { bar02, kbTop, loadEcharts } from '@/utils/myEcharts'
-import {
-  WareHouseTopLeftData,
-  WareHouseTopBottomData,
-  WareHouseRightTopData,
-  WareHouseRightBottomData
-} from '@/api/kanbanManager'
-
-export default {
-  name: 'Index2',
-
-  data() {
-    return {
-      onLine: navigator.onLine, // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
-
-      headTime: '',
-      tableDataTop: [],
-      tableDataBottom: [],
-
-      MarqueeTipsContent: '', // 鍏憡
-      speed: 100, // 鍏憡鎾斁鐨勯�熷害
-
-      tableTopTask: null,
-      tableBottomTask: null,
-      echartsRightTop: null,
-      echartsRightBottom: null,
-
-      starsCount: 800, // 鏄熸槦鏁伴噺
-      distance: 900 // 闂磋窛
-
-    }
-  },
-
-  activated() {
  window.addEventListener('resize', this.getHeight)
  this.getHeight()
},
created() {
-    setInterval(this.getNowTime, 1000)
-
-    // 涓ゅ皬鏃剁湅鏉垮埛鏂颁竴娆�
-    setInterval(() => {
-      window.location.reload()
-    }, 1000 * 60 * 120)
-  },
-  mounted() {
-    // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
-    window.addEventListener('online', this.updateOnlineStatus)
-    window.addEventListener('offline', this.updateOnlineStatus)
-    this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true })
-
-    this.getWareHouseTopLeftData()
-    this.getWareHouseTopBottomData()
-    this.getEcharts()
-  },
-  beforeDestroy() {
-    window.removeEventListener('online', this.updateOnlineStatus)
-    window.removeEventListener('offline', this.updateOnlineStatus)
-  },
-  methods: {
-    // 鏇存柊缃戠粶鐘舵��
-    updateOnlineStatus(e) {
-      if (e.isFirst) {
-        // console.log('x')
-      } else {
-        const loading = this.$loading({
-          lock: true,
-          text: '鏂綉浜嗭紝姝e湪鎷煎懡鑱旂綉涓紝璇锋鏌ョ綉缁滄槸鍚︽甯�...',
-          spinner: 'el-icon-loading',
-          customClass: 'osloading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
-        const { type } = e
-        this.onLine = type === 'online'
-        if (this.onLine) {
-          loading.close()
-          this.$message.success('缃戠粶杩炴帴鎴愬姛锛�')
-        } else {
-          this.$message.error('缃戠粶鎺夌嚎锛岃鍏虫敞缃戠粶鐘舵�侊紒')
-        }
-      }
-    },
-    // 鑾峰彇宸︿笂table鏁版嵁
-    getWareHouseTopLeftData() {
-      WareHouseTopLeftData().then(res => {
-        this.tableDataTop = res.data
-        // this.number1 = this.tableDataTop.length
-        const divData = this.$refs.tableDataTopRef.bodyWrapper
-        // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
-        this.tableTopTask = setInterval(() => {
-          // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
-          divData.scrollTop += 1
-          // divData.scrollTop += divData.scrollHeight / this.tableData.length
-          // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
-          if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
-            // 閲嶇疆table璺濈椤堕儴璺濈
-            divData.scrollTop = 0
-            WareHouseTopLeftData().then(res => {
-              this.tableDataTop = res.data
-              // this.number1 = this.tableDataTop.length
-              if (this.tableDataTop.length > 10) {
-                clearInterval(this.tableTopTask)
-                this.getWareHouseTopLeftData()
-              }
-            })
-          }
-        }, this.tableDataTop.length <= 10 ? 1000 * 30 : 200)
-      })
-    },
-    // 鑾峰彇宸︿笅table鏁版嵁
-    getWareHouseTopBottomData() {
-      WareHouseTopBottomData().then(res => {
-        this.tableDataBottom = res.data
-        this.number2 = this.tableDataBottom.length
-        const divData = this.$refs.tableDataBottomRef.bodyWrapper
-        // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
-        // const task = setInterval(() => {
-        this.tableBottomTask = setInterval(() => {
-          // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
-          divData.scrollTop += 1
-          // divData.scrollTop += divData.scrollHeight / this.tableData.length
-          // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
-          if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
-            // 閲嶇疆table璺濈椤堕儴璺濈
-            divData.scrollTop = 0
-            WareHouseTopBottomData().then(res => {
-              this.tableDataBottom = res.data
-              this.number2 = this.tableDataBottom.length
-              if (this.tableDataBottom.length > 10) {
-                clearInterval(this.tableBottomTask)
-                this.getWareHouseTopBottomData()
-              }
-            })
-          }
-        }, this.tableDataBottom.length <= 10 ? 1000 * 20 : 100)
-      })
-    },
-
-    // 鑾峰彇echarts
-    getEcharts() {
-      WareHouseRightTopData().then(res => {
-        loadEcharts('bar03', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
-      })
-
-      WareHouseRightBottomData().then(res => {
-        loadEcharts('bar04', bar02(res.dat.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
-      })
-
-      this.echartsRightTop = setInterval(() => {
-        WareHouseRightTopData().then(res => {
-          loadEcharts('bar03', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
-        })
-      }, 1000 * 15)
-
-      this.echartsRightBottom = setInterval(() => {
-        WareHouseRightBottomData().then(res => {
-          loadEcharts('bar04', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
-        })
-      }, 1000 * 15)
-    },
-    // 鑾峰彇褰撳墠鏃堕棿
-    getNowTime() {
-      const dt = new Date()
-      const wk = dt.getDay()
-      const y = dt.getFullYear()
-      const m = (dt.getMonth() + 1 + '').padStart(2, '0')
-      const d = (dt.getDate() + '').padStart(2, '0')
-
-      const hh = (dt.getHours() + '').padStart(2, '0')
-      const mm = (dt.getMinutes() + '').padStart(2, '0')
-      const ss = (dt.getSeconds() + '').padStart(2, '0')
-      const weeks = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�']
-      const week = weeks[wk]
-
-      this.headTime = `${y}-${m}-${d}  ${hh}:${mm}:${ss}   ${week}`
-    },
-    headerCellStyleCenter() {
-      return {
-        backgroundColor: 'transparent ',
-        padding: '10px 0',
-        textAlign: 'center',
-        color: '#07acc2',
-        border: 'none',
-        fontSize: '18px'
-      }
-    },
-    cellStyleCenter() {
-      return {
-        padding: '7.5px 0',
-        textAlign: 'center',
-        backgroundColor: 'transparent ',
-        color: '#c7e7ff',
-        border: 'none',
-        fontSize: '18px'
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-$main_color: #09d8f2;
-$color01: #00FFFF;
-.tableData {
-  background: transparent;
-}
-
-.el-table::before {
-  height: 0;
-}
-
-.el-table__empty-text {
-  color: $main_color;
-}
-
-.tableDataCell {
-  ::v-deep .cell {
-    padding: 0 2px;
-  }
-}
-
-::v-deep .el-table__body-wrapper::-webkit-scrollbar {
-  /* width: 0;瀹藉害涓�0鏆楄棌 */
-  width: 0;
-  background: transparent;
-}
-
-::v-deep .el-table__body-wrapper {
-  background: transparent;
-}
-
-::v-deep .el-table th,
-::v-deep .el-table tr,
-::v-deep .el-table td {
-  background-color: transparent;
-}
-
-::v-deep .gutter {
-  display: none;
-}
-
-.all_block01 {
-  width: 237px;
-  height: 180px;
-}
-
-.all_block02 {
-  width: 100%;
-  height: 49px;
-  background: rgba(9, 216, 242, 0.1);
-}
-
-.all_block03 {
-  width: 199px;
-  height: 180px;
-}
-
-.all_block04 {
-  width: 100%;
-  height: 49px;
-  background: rgba(9, 216, 242, 0.1);
-}
-
-.kb_center_block_children {
-  height: 180px;
-  //border: 1px solid $kbBorderColor;
-  width: 240px;
-  display: flex;
-  z-index: 2;
-  justify-content: space-around;
-  align-items: center;
-  flex-direction: column;
-  margin: 10px;
-  font-size: 22px;
-
-  .box02 {
-    background: url("../../assets/images/box02.png") no-repeat;
-    transform: scale(1.5);
-    width: 145px;
-    height: 84px;
-
-  }
-}
-
-.all_block05 {
-  position: absolute;
-  animation: upDown 3s ease-in-out infinite;
-  left: 60px;
-}
-
-.all_block06 {
-  position: absolute;
-  animation: upDown2 3s ease-in-out infinite;
-  left: 290px;
-}
-
-.all_block07 {
-  position: absolute;
-  animation: upDown 3s ease-in-out infinite;
-  left: 520px;
-}
-
-@keyframes upDown {
-  0% {
-    top: 50px;
-  }
-  50% {
-    top: 100px;
-  }
-  100% {
-    top: 50px;
-  }
-}
-
-@keyframes upDown2 {
-  0% {
-    top: 100px;
-  }
-  50% {
-    top: 50px;
-  }
-  100% {
-    top: 100px;
-  }
-}
-
-</style>
+<template>
+  <div>
+    <div class="kb_dashboard">
+
+      <div class="kb_backgroundCustom" />
+      <div class="kb_header">
+        <div class="kb_headTime" style="top: 35px;left:  20px">
+          <span>姘稿悍甯傛ˉ涓嬪鏂欏巶</span>
+        </div>
+
+        <div class="kb_headTime kb_header_text" style="top: 35px;left:  800px">
+          <span>浠撳簱绠$悊鏁板瓧鍖栫湅鏉�</span>
+        </div>
+
+        <div class="kb_headTime" style="top: 35px;right:  25px">
+          <span>{{ headTime }}</span>
+        </div>
+      </div>
+
+      <div style="display: flex;justify-content: space-between;padding:0 20px 20px 20px;height: 950px">
+        <div style="width: 1350px;z-index: 2;margin-top: 50px;" class="flex_c_b">
+          <div style="height: 470px;">
+            <div class="smallTitle">
+              <svg-icon icon-class="cpdrk" class="svg_class" />
+              鐢熶骇寰呭叆搴�
+            </div>
+            <div class="lineContent horn" style="height: 410px">
+              <el-table
+                ref="tableDataTopRef"
+                :data="tableDataTop"
+                style="width: 100%;"
+                class="tableData"
+                :header-cell-style="headerCellStyleCenter"
+                :cell-style="cellStyleCenter"
+                height="405"
+              >
+                <el-table-column
+                  prop="voucherdate"
+                  label="鍗曟嵁鏃ユ湡"
+                  width="131"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
+                    <div v-else />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="wo"
+                  label="鍗曟嵁缂栧彿"
+                  width="189"
+                >
+                  <template slot-scope="{row}">
+                    <div class="ellipsis">{{ row.wo }}</div>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="wkshp_name"
+                  label="鐢熶骇杞﹂棿"
+                  width="105"
+                >
+                  <template slot-scope="{row}">
+                    <div class="ellipsis">{{ row.wkshp_name }}</div>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="saleOrderCode"
+                  label="閿�鍞鍗曞彿"
+                  width="200"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.saleOrderCode" class="ellipsis">{{ row.saleOrderCode }}</div>
+                    <div v-else>/</div>
+                  </template>
+                </el-table-column>
+                <!--                <el-table-column-->
+                <!--                  prop="materiel_code"-->
+                <!--                  label="浜у搧缂栧彿"-->
+                <!--                  width="136"-->
+                <!--                >-->
+                <!--                  <template slot-scope="{row}">-->
+                <!--                    <div class="ellipsis">{{ row.materiel_code }}</div>-->
+                <!--                  </template>-->
+                <!--                </el-table-column>-->
+                <el-table-column
+                  prop="materiel_name"
+                  label="浜у搧鍚嶇О"
+                  width="170"
+                >
+                  <template slot-scope="{row}">
+                    <div class="ellipsis">{{ row.materiel_name }}</div>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="specification"
+                  label="瑙勬牸鍨嬪彿"
+                  width="136"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>
+                    <div v-else>/</div>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="stck_name"
+                  label="棰勫叆浠撳簱"
+                  width="100"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.stck_name" class="ellipsis">{{ row.stck_name }}</div>
+                    <div v-else>/</div>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="quantity"
+                  label="鏁伴噺"
+                  width="63"
+                />
+                <el-table-column
+                  prop="totalStockInQuantity"
+                  label="宸插叆搴撴暟閲�"
+                  width="110"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.totalStockInQuantity">{{ row.totalStockInQuantity }}</div>
+                    <div v-else>0</div>
+                  </template>
+                </el-table-column>
+                <!--                  <el-table-column-->
+                <!--                    prop="uomname"-->
+                <!--                    label="鍗曚綅"-->
+                <!--                    width="50"-->
+                <!--                  />-->
+                <!--                  <el-table-column-->
+                <!--                    prop="preStartDate"-->
+                <!--                    label="棰勮寮�宸�"-->
+                <!--                    width="100"-->
+                <!--                  >-->
+                <!--                    <template slot-scope="{row}">-->
+                <!--                      <div v-if="row.preStartDate">{{ row.preStartDate.substring(0, 10) }}</div>-->
+                <!--                      <div v-else />-->
+                <!--                    </template>-->
+                <!--                  </el-table-column>-->
+                <el-table-column
+                  prop="preFinishDate"
+                  label="棰勮鍏ュ簱"
+                  width="140"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.preFinishDate">{{ row.preFinishDate.substring(0, 10) }}</div>
+                    <div v-else />
+                  </template>
+                </el-table-column>
+
+              </el-table>
+            </div>
+          </div>
+          <div style="height: 470px;margin-top: 30px;">
+            <div class="smallTitle">
+              <svg-icon icon-class="drk" class="svg_class" />
+              濮斿寰呭叆搴�
+            </div>
+            <div class="lineContent horn" style="height: 410px">
+              <el-table
+                ref="tableDataBottomRef"
+                :data="tableDataBottom"
+                style="width: 100%;"
+                class="tableData"
+                :header-cell-style="headerCellStyleCenter"
+                :cell-style="cellStyleCenter"
+                height="405"
+              >
+                <el-table-column
+                  prop="voucherdate"
+                  label="鍗曟嵁鏃ユ湡"
+                  width="151"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
+                    <div v-else>/</div>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="wo"
+                  label="鍗曟嵁缂栧彿"
+                  width="225"
+                >
+                  <template slot-scope="{row}">
+                    <div class="ellipsis">{{ row.wo }}</div>
+                  </template>
+                </el-table-column>
+
+                <el-table-column
+                  prop="materiel_name"
+                  label="浜у搧鍚嶇О"
+                  width="278"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.materiel_name" class="ellipsis">{{ row.materiel_name }}</div>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="specification"
+                  label="瑙勬牸鍨嬪彿"
+                  width="220"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>
+                    <div v-else>/</div>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="quantity"
+                  label="鏁伴噺"
+                  width="120"
+                >
+                  <template slot-scope="{row}">
+                    <div class="ellipsis">{{ row.quantity }}</div>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="saleOutQuantity"
+                  label="宸插彂璐ф暟閲�"
+                  width="140"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>
+                    <div v-else>0</div>
+                  </template>
+                </el-table-column>
+
+                <el-table-column
+                  prop="deliveryDate"
+                  label="棰勮浜や粯鏃ユ湡"
+                  width="200"
+                >
+                  <template slot-scope="{row}">
+                    <div v-if="row.deliveryDate">{{ row.deliveryDate.substring(0, 10) }}</div>
+                    <div v-else>/</div>
+                  </template>
+                </el-table-column>
+
+                <!--                <el-table-column-->
+                <!--                  prop="warning"-->
+                <!--                  label="寤舵湡澶╂暟"-->
+                <!--                  width="130"-->
+                <!--                >-->
+                <!--                  <template slot-scope="{row}">-->
+                <!--                    <div v-if="row.warning">{{ row.warning }}</div>-->
+                <!--                    <div v-else>/</div>-->
+                <!--                  </template>-->
+                <!--                </el-table-column>-->
+              </el-table>
+            </div>
+          </div>
+
+        </div>
+        <div style="width: 500px;z-index: 2;margin-top: 50px;" class="flex_c_b">
+          <div style="height: 470px;">
+            <div class="smallTitle">
+              <svg-icon icon-class="ph" class="svg_class" />
+              鍗婃垚鍝併�佷骇鍝佸簱瀛橀噺鎺掕Top5
+            </div>
+            <div class="lineContent horn" style="height: 410px">
+              <div id="bar03" style="width: 100%;height:100%; " />
+              <!--/*              <div id="bar03" style="width: 100%;height:100%;margin-left: -25px;margin-top: -10px" />*/-->
+            </div>
+          </div>
+          <div style="height: 470px;margin-top: 30px;">
+            <div class="smallTitle">
+              <svg-icon icon-class="ph" class="svg_class" />
+              鍘熸潗鏂欏簱瀛橀噺鎺掕Top5
+            </div>
+            <div class="lineContent horn" style="height: 410px">
+              <div id="bar04" style="width: 100%;height:100%;" />
+              <!--              <div id="bar04" style="width: 100%;height:100%;margin-left: -25px;margin-top: -10px" />-->
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </div>
+  </div>
+</template>
+
+<script>
+import './kbCommon.css'
+import { bar02, kbTop, loadEcharts } from '@/utils/myEcharts'
+import {
+  WareHouseTopLeftData,
+  WareHouseTopBottomData,
+  WareHouseRightTopData,
+  WareHouseRightBottomData
+} from '@/api/kanbanManager'
+
+export default {
+  name: 'Index2',
+
+  data() {
+    return {
+      onLine: navigator.onLine, // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
+
+      headTime: '',
+      tableDataTop: [],
+      tableDataBottom: [],
+
+      MarqueeTipsContent: '', // 鍏憡
+      speed: 100, // 鍏憡鎾斁鐨勯�熷害
+
+      tableTopTask: null,
+      tableBottomTask: null,
+      echartsRightTop: null,
+      echartsRightBottom: null,
+
+      starsCount: 800, // 鏄熸槦鏁伴噺
+      distance: 900 // 闂磋窛
+
+    }
+  },
+
+  activated() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  created() {
+    setInterval(this.getNowTime, 1000)
+
+    // 涓ゅ皬鏃剁湅鏉垮埛鏂颁竴娆�
+    setInterval(() => {
+      window.location.reload()
+    }, 1000 * 60 * 120)
+  },
+  mounted() {
+    // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
+    window.addEventListener('online', this.updateOnlineStatus)
+    window.addEventListener('offline', this.updateOnlineStatus)
+    this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true })
+
+    this.getWareHouseTopLeftData()
+    this.getWareHouseTopBottomData()
+    this.getEcharts()
+  },
+  beforeDestroy() {
+    window.removeEventListener('online', this.updateOnlineStatus)
+    window.removeEventListener('offline', this.updateOnlineStatus)
+  },
+  methods: {
+    // 鏇存柊缃戠粶鐘舵��
+    updateOnlineStatus(e) {
+      if (e.isFirst) {
+        // console.log('x')
+      } else {
+        const loading = this.$loading({
+          lock: true,
+          text: '鏂綉浜嗭紝姝e湪鎷煎懡鑱旂綉涓紝璇锋鏌ョ綉缁滄槸鍚︽甯�...',
+          spinner: 'el-icon-loading',
+          customClass: 'osloading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        const { type } = e
+        this.onLine = type === 'online'
+        if (this.onLine) {
+          loading.close()
+          this.$message.success('缃戠粶杩炴帴鎴愬姛锛�')
+        } else {
+          this.$message.error('缃戠粶鎺夌嚎锛岃鍏虫敞缃戠粶鐘舵�侊紒')
+        }
+      }
+    },
+    // 鑾峰彇宸︿笂table鏁版嵁
+    getWareHouseTopLeftData() {
+      WareHouseTopLeftData().then(res => {
+        this.tableDataTop = res.data
+        // this.number1 = this.tableDataTop.length
+        const divData = this.$refs.tableDataTopRef.bodyWrapper
+        // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+        this.tableTopTask = setInterval(() => {
+          // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+          divData.scrollTop += 1
+          // divData.scrollTop += divData.scrollHeight / this.tableData.length
+          // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+          if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+            // 閲嶇疆table璺濈椤堕儴璺濈
+            divData.scrollTop = 0
+            WareHouseTopLeftData().then(res => {
+              this.tableDataTop = res.data
+              // this.number1 = this.tableDataTop.length
+              if (this.tableDataTop.length > 10) {
+                clearInterval(this.tableTopTask)
+                this.getWareHouseTopLeftData()
+              }
+            })
+          }
+        }, this.tableDataTop.length <= 10 ? 1000 * 30 : 200)
+      })
+    },
+    // 鑾峰彇宸︿笅table鏁版嵁
+    getWareHouseTopBottomData() {
+      WareHouseTopBottomData().then(res => {
+        this.tableDataBottom = res.data
+        this.number2 = this.tableDataBottom.length
+        const divData = this.$refs.tableDataBottomRef.bodyWrapper
+        // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+        // const task = setInterval(() => {
+        this.tableBottomTask = setInterval(() => {
+          // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+          divData.scrollTop += 1
+          // divData.scrollTop += divData.scrollHeight / this.tableData.length
+          // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+          if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+            // 閲嶇疆table璺濈椤堕儴璺濈
+            divData.scrollTop = 0
+            WareHouseTopBottomData().then(res => {
+              this.tableDataBottom = res.data
+              this.number2 = this.tableDataBottom.length
+              if (this.tableDataBottom.length > 10) {
+                clearInterval(this.tableBottomTask)
+                this.getWareHouseTopBottomData()
+              }
+            })
+          }
+        }, this.tableDataBottom.length <= 10 ? 1000 * 20 : 100)
+      })
+    },
+
+    // 鑾峰彇echarts
+    getEcharts() {
+      WareHouseRightTopData().then(res => {
+        loadEcharts('bar03', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
+      })
+
+      WareHouseRightBottomData().then(res => {
+        loadEcharts('bar04', bar02(res.dat.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
+      })
+
+      this.echartsRightTop = setInterval(() => {
+        WareHouseRightTopData().then(res => {
+          loadEcharts('bar03', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
+        })
+      }, 1000 * 15)
+
+      this.echartsRightBottom = setInterval(() => {
+        WareHouseRightBottomData().then(res => {
+          loadEcharts('bar04', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
+        })
+      }, 1000 * 15)
+    },
+    // 鑾峰彇褰撳墠鏃堕棿
+    getNowTime() {
+      const dt = new Date()
+      const wk = dt.getDay()
+      const y = dt.getFullYear()
+      const m = (dt.getMonth() + 1 + '').padStart(2, '0')
+      const d = (dt.getDate() + '').padStart(2, '0')
+
+      const hh = (dt.getHours() + '').padStart(2, '0')
+      const mm = (dt.getMinutes() + '').padStart(2, '0')
+      const ss = (dt.getSeconds() + '').padStart(2, '0')
+      const weeks = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�']
+      const week = weeks[wk]
+
+      this.headTime = `${y}-${m}-${d}  ${hh}:${mm}:${ss}   ${week}`
+    },
+    headerCellStyleCenter() {
+      return {
+        backgroundColor: 'transparent ',
+        padding: '10px 0',
+        textAlign: 'center',
+        color: '#07acc2',
+        border: 'none',
+        fontSize: '18px'
+      }
+    },
+    cellStyleCenter() {
+      return {
+        padding: '7.5px 0',
+        textAlign: 'center',
+        backgroundColor: 'transparent ',
+        color: '#c7e7ff',
+        border: 'none',
+        fontSize: '18px'
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+$main_color: #09d8f2;
+$color01: #00FFFF;
+.tableData {
+  background: transparent;
+}
+
+.el-table::before {
+  height: 0;
+}
+
+.el-table__empty-text {
+  color: $main_color;
+}
+
+.tableDataCell {
+  ::v-deep .cell {
+    padding: 0 2px;
+  }
+}
+
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
+  /* width: 0;瀹藉害涓�0鏆楄棌 */
+  width: 0;
+  background: transparent;
+}
+
+::v-deep .el-table__body-wrapper {
+  background: transparent;
+}
+
+::v-deep .el-table th,
+::v-deep .el-table tr,
+::v-deep .el-table td {
+  background-color: transparent;
+}
+
+::v-deep .gutter {
+  display: none;
+}
+
+.all_block01 {
+  width: 237px;
+  height: 180px;
+}
+
+.all_block02 {
+  width: 100%;
+  height: 49px;
+  background: rgba(9, 216, 242, 0.1);
+}
+
+.all_block03 {
+  width: 199px;
+  height: 180px;
+}
+
+.all_block04 {
+  width: 100%;
+  height: 49px;
+  background: rgba(9, 216, 242, 0.1);
+}
+
+.kb_center_block_children {
+  height: 180px;
+  //border: 1px solid $kbBorderColor;
+  width: 240px;
+  display: flex;
+  z-index: 2;
+  justify-content: space-around;
+  align-items: center;
+  flex-direction: column;
+  margin: 10px;
+  font-size: 22px;
+
+  .box02 {
+    background: url("../../assets/images/box02.png") no-repeat;
+    transform: scale(1.5);
+    width: 145px;
+    height: 84px;
+
+  }
+}
+
+.all_block05 {
+  position: absolute;
+  animation: upDown 3s ease-in-out infinite;
+  left: 60px;
+}
+
+.all_block06 {
+  position: absolute;
+  animation: upDown2 3s ease-in-out infinite;
+  left: 290px;
+}
+
+.all_block07 {
+  position: absolute;
+  animation: upDown 3s ease-in-out infinite;
+  left: 520px;
+}
+
+@keyframes upDown {
+  0% {
+    top: 50px;
+  }
+  50% {
+    top: 100px;
+  }
+  100% {
+    top: 50px;
+  }
+}
+
+@keyframes upDown2 {
+  0% {
+    top: 100px;
+  }
+  50% {
+    top: 50px;
+  }
+  100% {
+    top: 100px;
+  }
+}
+
+</style>
diff --git a/src/views/kanbanManager/zhkb.vue b/src/views/kanbanManager/zhkb.vue
index 2fbadb7..c1e6ff4 100644
--- a/src/views/kanbanManager/zhkb.vue
+++ b/src/views/kanbanManager/zhkb.vue
@@ -1,511 +1,541 @@
-<template>
-  <div>
-    <div class="kb_dashboard" style="display:flex;flex-direction: column;justify-content: space-between">
-
-      <div class="kb_backgroundCustom" />
-
-      <div class="kb_header">
-        <div class="kb_headTime" style="top: 35px;left:  20px">
-          <span>娴欐睙浼樺厠宸ヨ锤鑲′唤鏈夐檺鍏徃</span>
-        </div>
-
-        <div class="kb_headTime kb_header_text" style="top: 35px;left:  800px">
-          <span>杞﹂棿缁煎悎鏁板瓧鍖栫湅鏉�</span>
-        </div>
-
-        <div class="kb_headTime" style="top: 35px;right:  25px">
-          <span>{{ headTime }}</span>
-        </div>
-      </div>
-      <div
-        style=" padding:5px 20px 20px 20px;z-index:2;height: 940px;flex-direction: column;justify-content: space-between;"
-      >
-        <!--        涓婅竟-->
-        <div style="display: flex;justify-content: space-between">
-          <div style="width: 1150px;">
-            <div class="smallTitle">
-              <svg-icon icon-class="cxjg" class="svg_class" />
-              鐢熶骇璁㈠崟(褰撴湀)
-            </div>
-            <div
-              class="lineContent horn"
-              style="height: 450px;display: flex;flex-direction: column;justify-content: space-between"
-            >
-              <div style="height: 180px;padding: 10px;display: flex;justify-content: space-around">
-                <div v-for="i in LeftTopData01" :key="i.wkshp_code" class="flex_c_s">
-                  <div class="all_block01 flex_c_s" style="width: 135px;">
-                    <div class="flex_c_c all_block02">{{ i.wkshp_name }}</div>
-                    <div class="" style="display: flex;justify-content:space-between">
-                      <div class="all_block02 flex_c_c" style="width: 49% ">浠诲姟鏁�</div>
-                      <div class="all_block02 flex_c_c" style="width: 49% ">{{ i.plan_qty }}</div>
-                    </div>
-                    <div class="" style="display: flex;justify-content:space-between">
-                      <div class="all_block02 flex_c_c" style="width: 49% ">瀹屽伐鏁�</div>
-                      <div class="all_block02 flex_c_c" style="width: 49% ">{{ i.good_qty }}</div>
-                    </div>
-                  </div>
-                </div>
-
-              </div>
-              <div style="height: 280px;">
-                <div id="all01" class="flex_c_c" style="width: 100%;height:100%;" />
-              </div>
-            </div>
-          </div>
-          <div style="width: 700px;">
-            <div class="smallTitle">
-              <svg-icon icon-class="cggz" class="svg_class" />
-              閿�鍞鍗�(鏈�/瀛�)
-            </div>
-            <div
-              class="lineContent horn"
-              style="height: 450px;display: flex;flex-direction: column;justify-content: space-between"
-            >
-              <div style="height: 180px;padding: 10px;display: flex;justify-content: space-between">
-
-                <div v-for="i in RightTopData01" :key="i.Quarter" class="flex_c_s">
-                  <div class="all_block03 flex_c_s" style="width: 165px;">
-                    <div class="flex_c_c all_block04">{{ i.Quarter }}</div>
-                    <div class="" style="display: flex;justify-content:space-between">
-                      <div class="all_block04 flex_c_c" style="width: 49% ">浠诲姟鏁�</div>
-                      <div class="all_block04 flex_c_c" style="width: 49% ">{{ i.quantity }}</div>
-                    </div>
-                    <div class="" style="display: flex;justify-content:space-between">
-                      <div class="all_block04 flex_c_c" style="width: 49% ">鍑哄簱鏁�</div>
-                      <div class="all_block04 flex_c_c" style="width: 49% ">{{ i.ouquantity }}</div>
-                    </div>
-                  </div>
-                </div>
-
-              </div>
-              <div style="height: 260px;">
-                <div id="all02" class="flex_c_c" style="width: 100%;height:100%;" />
-              </div>
-            </div>
-          </div>
-        </div>
-        <!--        涓嬭竟-->
-        <div style="display: flex;justify-content: space-between;margin-top: 15px;">
-          <div style="width: 1150px;">
-            <div class="smallTitle">
-              <svg-icon icon-class="blcs" class="svg_class" />
-              璐ㄩ噺涓嶈壇(杩戜竴鍛�)
-            </div>
-            <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">
-              <div id="cjzl03" class="flex_c_c" style="width: 100%;height:100%" />
-
-            </div>
-          </div>
-          <div style="width: 700px;">
-            <div class="smallTitle">
-              <svg-icon icon-class="ckkc" class="svg_class" />
-              浠撳簱搴撳瓨
-            </div>
-            <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">
-              <div style="display: flex;justify-content: center;position: relative">
-                <div class="kb_center_block_children all_block05">
-                  <div style="font-size: 24px;">{{ parseFloat(RightBottom.Y) }}</div>
-                  <div class="box02" />
-                  <div>鍘熸潗鏂�</div>
-                </div>
-                <div class="kb_center_block_children all_block06">
-                  <div style="font-size: 24px;">{{ parseFloat(RightBottom.B) }}</div>
-                  <div class="box02" />
-                  <div>鍗婃垚鍝�</div>
-                </div>
-                <div class="kb_center_block_children all_block07">
-                  <div style="font-size: 24px;">{{ parseFloat(RightBottom.C) }}</div>
-                  <div class="box02" />
-                  <div>浜ф垚鍝�</div>
-                </div>
-
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import './kbCommon.css'
-import { loadEcharts, all01, all02, cjzl03 } from '@/utils/myEcharts'
-import {
-  WorkShopCompreLeftTop,
-  WorkShopCompreRightBottom,
-  WorkShopCompreRightTop,
-  WorkShopProduceBottomLeftData
-} from '@/api/kanbanManager'
-import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
-
-export default {
-  name: 'Cjsc',
-  data() {
-    return {
-      headTime: '',
-      tableDataRightTop: [],
-      wkshopArr: [],
-      legendData: [],
-
-      LeftTopData01: [],
-      LeftTopData02: [],
-
-      RightTopData01: [],
-      RightTopData02: [],
-      cjzl03_xData: [],
-      cjzl03_yData: [],
-      RightBottom: {}
-
-    }
-  },
-  activated() {
  window.addEventListener('resize', this.getHeight)
  this.getHeight()
},
created() {
-    setInterval(this.getNowTime, 1000)
-
-    // // 涓ゅ皬鏃剁湅鏉垮埛鏂颁竴娆�
-    setInterval(() => {
-      window.location.reload()
-    }, 1000 * 60 * 120)
-  },
-  mounted() {
-    this.getAllApi()
-  },
-  methods: {
-    async getAllApi() {
-      const res = await PrentOrganizationNoCompany()
-      this.wkshopArr = res.data
-
-      const temp = ['501', '502', '503', '508', '504', '505', '506', '507']
-      // const temp = ['0103', '006', '01', 'qw', '0104', 'CJ001', 'LD001', 'ZP001']
-      temp.forEach(i => {
-        const aa = this.wkshopArr.find(j => j.torg_code === i).torg_name
-        this.legendData.push(aa)
-      })
-
-      const res2 = await WorkShopCompreLeftTop({ wkshopcode: temp.join(',') })
-      for (const res2Key in res2.data.LeftTop) {
-        const data = {
-          good_qty: 0,
-          plan_qty: 0,
-          wkshp_code: '',
-          wkshp_name: ''
-        }
-        if (temp.includes(res2Key)) {
-          data.good_qty = res2.data.LeftTop[res2Key][0].good_qty
-          data.plan_qty = res2.data.LeftTop[res2Key][0].plan_qty
-          data.wkshp_code = res2.data.LeftTop[res2Key][0].wkshp_code
-          data.wkshp_name = this.wkshopArr.find(i => i.torg_code === data.wkshp_code).torg_name
-          this.LeftTopData01.push(data)
-        }
-      }
-      const t = this.LeftTopData01[ this.LeftTopData01.length - 1]
-      this.LeftTopData01.splice(7, 1)
-      this.LeftTopData01.splice(3, 0, t)
-      for (const res2Key in res2.data.LeftBottom) {
-        const data = {
-          quantity: 0,
-          wkshp_code: '',
-          wkshp_name: ''
-        }
-        if (temp.includes(res2Key)) {
-          data.quantity = res2.data.LeftBottom[res2Key][0].quantity
-          data.plan_qty = res2.data.LeftBottom[res2Key][0].plan_qty
-          data.wkshp_code = res2.data.LeftBottom[res2Key][0].wkshp_code
-          data.wkshp_name = this.wkshopArr.find(i => i.torg_code === data.wkshp_code).torg_name
-          this.LeftTopData02.push(data)
-        }
-      }
-      const t1 = this.LeftTopData02[ this.LeftTopData02.length - 1]
-      this.LeftTopData02.splice(7, 1)
-      this.LeftTopData02.splice(3, 0, t1)
-      loadEcharts('all01', all01(this.legendData, this.LeftTopData02))
-
-      setInterval(() => {
-        WorkShopCompreLeftTop({ wkshopcode: temp.join(',') }).then(res2 => {
-          this.LeftTopData01 = []
-          this.LeftTopData02 = []
-          for (const res2Key in res2.data.LeftTop) {
-            const data = {
-              good_qty: 0,
-              plan_qty: 0,
-              wkshp_code: '',
-              wkshp_name: ''
-            }
-            if (temp.includes(res2Key)) {
-              data.good_qty = res2.data.LeftTop[res2Key][0].good_qty
-              data.plan_qty = res2.data.LeftTop[res2Key][0].plan_qty
-              data.wkshp_code = res2.data.LeftTop[res2Key][0].wkshp_code
-              data.wkshp_name = this.wkshopArr.find(i => i.torg_code === data.wkshp_code).torg_name
-              this.LeftTopData01.push(data)
-            }
-          }
-          const t = this.LeftTopData01[ this.LeftTopData01.length - 1]
-          this.LeftTopData01.splice(7, 1)
-          this.LeftTopData01.splice(3, 0, t)
-          for (const res2Key in res2.data.LeftBottom) {
-            const data = {
-              quantity: 0,
-              wkshp_code: '',
-              wkshp_name: ''
-            }
-            if (temp.includes(res2Key)) {
-              data.quantity = res2.data.LeftBottom[res2Key][0].quantity
-              data.plan_qty = res2.data.LeftBottom[res2Key][0].plan_qty
-              data.wkshp_code = res2.data.LeftBottom[res2Key][0].wkshp_code
-              data.wkshp_name = this.wkshopArr.find(i => i.torg_code === data.wkshp_code).torg_name
-              this.LeftTopData02.push(data)
-            }
-          }
-          const t1 = this.LeftTopData02[ this.LeftTopData02.length - 1]
-          this.LeftTopData02.splice(7, 1)
-          this.LeftTopData02.splice(3, 0, t1)
-          loadEcharts('all01', all01(this.legendData, this.LeftTopData02))
-        })
-      }, 1000 * 30)
-
-      const res3 = await WorkShopCompreRightTop()
-      res3.data.RightTop.forEach(i => {
-        this.RightTopData01.push({
-          Quarter: i.Quarter,
-          quantity: i.quantity,
-          ouquantity: i.ouquantity
-        })
-      })
-      res3.data.RightBottom.forEach(i => {
-        this.RightTopData02.push({
-          Month: i.Month + '鏈�',
-          quantity: i.quantity,
-          ouquantity: i.ouquantity
-        })
-      })
-      loadEcharts('all02', all02(this.RightTopData02))
-      setInterval(() => {
-        WorkShopCompreRightTop().then(res3 => {
-          this.RightTopData01 = []
-          this.RightTopData02 = []
-          res3.data.RightTop.forEach(i => {
-            this.RightTopData01.push({
-              Quarter: i.Quarter,
-              quantity: i.quantity,
-              ouquantity: i.ouquantity
-            })
-          })
-          res3.data.RightBottom.forEach(i => {
-            this.RightTopData02.push({
-              Month: i.Month + '鏈�',
-              quantity: i.quantity,
-              ouquantity: i.ouquantity
-            })
-          })
-          loadEcharts('all02', all02(this.RightTopData02))
-        })
-      }, 1000 * 40)
-
-      const res4 = await WorkShopProduceBottomLeftData({ wkshopcode: temp.join(',') })
-      this.cjzl03_xData = res4.data[temp[0]].map(i => i.click_date)
-      for (const res4Key in res4.data) {
-        if (temp.includes(res4Key)) {
-          const bb = res4.data[res4Key].map(i => i.count)
-          this.cjzl03_yData.push(bb)
-        }
-      }
-      loadEcharts('cjzl03', cjzl03(this.cjzl03_xData, this.legendData, this.cjzl03_yData, true))
-      setInterval(() => {
-        WorkShopProduceBottomLeftData({ wkshopcode: temp.join(',') }).then(res4 => {
-          this.cjzl03_yData = []
-
-          this.cjzl03_xData = res4.data[temp[0]].map(i => i.click_date)
-          for (const res4Key in res4.data) {
-            if (temp.includes(res4Key)) {
-              const bb = res4.data[res4Key].map(i => i.count)
-              this.cjzl03_yData.push(bb)
-            }
-          }
-          loadEcharts('cjzl03', cjzl03(this.cjzl03_xData, this.legendData, this.cjzl03_yData, true))
-        })
-      }, 1000 * 50)
-
-      const res5 = await WorkShopCompreRightBottom()
-      this.RightBottom = res5.data
-
-      setInterval(() => {
-        WorkShopCompreRightBottom().then(res5 => {
-          this.RightBottom = res5.data
-        })
-      }, 1000 * 60)
-    },
-
-    // 鑾峰彇Echarts
-    getEcharts() {
-      // loadEcharts('cjzl01', cjzl01(this.cjzl01Data))
-
-      // loadEcharts('cjzl02_1', cjzl02(this.cjzl02_1Title, this.cjzl02_1Data))
-      // loadEcharts('cjzl02_2', cjzl02(this.cjzl02_2Title, this.cjzl02_2Data))
-      // loadEcharts('cjzl02_3', cjzl02(this.cjzl02_3Title, this.cjzl02_3Data))
-      // loadEcharts('cjzl02_4', cjzl02(this.cjzl02_4Title, this.cjzl02_4Data))
-      // loadEcharts('cjzl02_5', cjzl02(this.cjzl02_5Title, this.cjzl02_5Data))
-
-      // loadEcharts('cjzl04', cjzl04(this.legendData, this.cjzl04Data[0], this.cjzl04Data[1], this.cjzl04Data[2]))// 鍙充晶
-      // loadEcharts('cjzl03', cjzl03(this.cjzl03_xData, this.legendData, this.cjzl03_yData))// 宸︿晶
-    },
-
-    // 鑾峰彇褰撳墠鏃堕棿
-    getNowTime() {
-      const dt = new Date()
-      const wk = dt.getDay()
-      const y = dt.getFullYear()
-      const m = (dt.getMonth() + 1 + '').padStart(2, '0')
-      const d = (dt.getDate() + '').padStart(2, '0')
-
-      const hh = (dt.getHours() + '').padStart(2, '0')
-      const mm = (dt.getMinutes() + '').padStart(2, '0')
-      const ss = (dt.getSeconds() + '').padStart(2, '0')
-      const weeks = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�']
-      const week = weeks[wk]
-
-      this.headTime = `${y}-${m}-${d}  ${hh}:${mm}:${ss}   ${week}`
-    },
-    headerCellStyle() {
-      return {
-        backgroundColor: 'transparent ',
-        padding: '10px 0',
-        textAlign: 'center',
-        color: '#07acc2',
-        border: 'none',
-        fontSize: '20px'
-      }
-    },
-    cellStyle() {
-      return {
-        padding: '7px 0',
-        textAlign: 'center',
-        backgroundColor: 'transparent ',
-        color: '#c7e7ff',
-        border: 'none',
-        fontSize: '20px'
-      }
-    }
-
-  }
-
-}
-</script>
-
-<style lang="scss" scoped>
-$main_color: #09d8f2;
-$color01: #00FFFF;
-.tableData {
-  background: transparent;
-}
-
-.el-table::before {
-  height: 0;
-}
-
-.el-table__empty-text {
-  color: $main_color;
-}
-
-.tableDataCell {
-  ::v-deep .cell {
-    padding: 0 2px;
-  }
-}
-
-::v-deep .el-table__body-wrapper::-webkit-scrollbar {
-  /* width: 0;瀹藉害涓�0鏆楄棌 */
-  width: 0;
-  background: transparent;
-}
-
-::v-deep .el-table th,
-::v-deep .el-table tr,
-::v-deep .el-table td {
-  background-color: transparent;
-}
-
-.all_block01 {
-  width: 237px;
-  height: 180px;
-}
-
-.all_block02 {
-  width: 100%;
-  height: 49px;
-  background: rgba(9, 216, 242, 0.1);
-}
-
-.all_block03 {
-  width: 199px;
-  height: 180px;
-}
-
-.all_block04 {
-  width: 100%;
-  height: 49px;
-  background: rgba(9, 216, 242, 0.1);
-}
-
-.kb_center_block_children {
-  height: 180px;
-  //border: 1px solid $kbBorderColor;
-  width: 240px;
-  display: flex;
-  z-index: 2;
-  justify-content: space-around;
-  align-items: center;
-  flex-direction: column;
-  margin: 10px;
-  font-size: 22px;
-
-  .box02 {
-    background: url("../../assets/images/box02.png") no-repeat;
-    transform: scale(1.5);
-    width: 145px;
-    height: 84px;
-
-  }
-}
-
-.all_block05 {
-  position: absolute;
-  animation: upDown 3s ease-in-out infinite;
-  left: -20px;
-}
-
-.all_block06 {
-  position: absolute;
-  animation: upDown2 3s ease-in-out infinite;
-  left: 220px;
-}
-
-.all_block07 {
-  position: absolute;
-  animation: upDown 3s ease-in-out infinite;
-  left: 460px;
-}
-
-@keyframes upDown {
-  0% {
-    top: 50px;
-  }
-  50% {
-    top: 100px;
-  }
-  100% {
-    top: 50px;
-  }
-}
-
-@keyframes upDown2 {
-  0% {
-    top: 100px;
-  }
-  50% {
-    top: 50px;
-  }
-  100% {
-    top: 100px;
-  }
-}
-</style>
+<template>
+  <div>
+    <div class="kb_dashboard" style="display:flex;flex-direction: column;justify-content: space-between">
+
+      <div class="kb_backgroundCustom" />
+
+      <div class="kb_header">
+        <div class="kb_headTime" style="top: 35px;left:  20px">
+          <span>姘稿悍甯傛ˉ涓嬪鏂欏巶</span>
+        </div>
+
+        <div class="kb_headTime kb_header_text" style="top: 35px;left:  800px">
+          <span>瀛i摥缁煎悎鏁板瓧鍖栫湅鏉�</span>
+        </div>
+
+        <div class="kb_headTime" style="top: 35px;right:  25px">
+          <span>{{ headTime }}</span>
+        </div>
+      </div>
+      <div
+        style=" padding:5px 20px 20px 20px;z-index:2;height: 940px;flex-direction: column;justify-content: space-between;"
+      >
+        <!--        涓婅竟-->
+        <div style="display: flex;justify-content: space-between">
+          <div style="width: 925px;">
+            <div class="smallTitle">
+              <svg-icon icon-class="blcs" class="svg_class" />
+              閲囪喘璁㈠崟(鏈�/瀛�)
+            </div>
+            <div
+              class="lineContent horn"
+              style="height: 450px;display: flex;flex-direction: column;justify-content: space-between"
+            >
+              <div style="height: 180px;padding: 10px;display: flex;justify-content: space-between">
+
+                <div v-for="i in LeftTopData01" :key="i.Quarter" class="flex_c_s">
+                  <div class="all_block03 flex_c_s">
+                    <div class="flex_c_c all_block04">{{ i.Quarter }}</div>
+                    <div class="" style="display: flex;justify-content:space-between">
+                      <div class="all_block04 flex_c_c" style="width: 49% ">浠诲姟鏁�</div>
+                      <div class="all_block04 flex_c_c" style="width: 49% ">{{ i.quantity }}</div>
+                    </div>
+                    <div class="" style="display: flex;justify-content:space-between">
+                      <div class="all_block04 flex_c_c" style="width: 49% ">鍏ュ簱鏁�</div>
+                      <div class="all_block04 flex_c_c" style="width: 49% ">{{ i.ouquantity }}</div>
+                    </div>
+                  </div>
+                </div>
+
+              </div>
+              <div style="height: 260px;">
+                <div id="all02_1" class="flex_c_c" style="width: 100%;height:100%;" />
+              </div>
+            </div>
+          </div>
+          <div style="width: 925px;">
+            <div class="smallTitle">
+              <svg-icon icon-class="cggz" class="svg_class" />
+              閿�鍞鍗�(鏈�/瀛�)
+            </div>
+            <div
+              class="lineContent horn"
+              style="height: 450px;display: flex;flex-direction: column;justify-content: space-between"
+            >
+              <div style="height: 180px;padding: 10px;display: flex;justify-content: space-between">
+
+                <div v-for="i in RightTopData01" :key="i.Quarter" class="flex_c_s">
+                  <div class="all_block03 flex_c_s">
+                    <div class="flex_c_c all_block04">{{ i.Quarter }}</div>
+                    <div class="" style="display: flex;justify-content:space-between">
+                      <div class="all_block04 flex_c_c" style="width: 49% ">浠诲姟鏁�</div>
+                      <div class="all_block04 flex_c_c" style="width: 49% ">{{ i.quantity }}</div>
+                    </div>
+                    <div class="" style="display: flex;justify-content:space-between">
+                      <div class="all_block04 flex_c_c" style="width: 49% ">鍑哄簱鏁�</div>
+                      <div class="all_block04 flex_c_c" style="width: 49% ">{{ i.ouquantity }}</div>
+                    </div>
+                  </div>
+                </div>
+
+              </div>
+              <div style="height: 260px;">
+                <div id="all02" class="flex_c_c" style="width: 100%;height:100%;" />
+              </div>
+            </div>
+          </div>
+        </div>
+        <!--        涓嬭竟-->
+        <div style="display: flex;justify-content: space-between;margin-top: 15px;">
+          <div style="width: 925px;">
+            <div class="smallTitle">
+              <svg-icon icon-class="cxjg" class="svg_class" />
+              鐢熶骇璁㈠崟(褰撴湀)
+            </div>
+            <div
+              class="lineContent horn"
+              style="height: 380px;display: flex;flex-direction: column;justify-content: space-between"
+            >
+              <div style="height: 180px;padding: 10px;display: flex;justify-content: space-evenly">
+                <div v-for="i in LeftBottomData01" :key="i.wkshp_code" class="flex_c_s">
+                  <div class="all_block01 flex_c_s" style="width: 275px;">
+                    <div class="flex_c_c all_block02" style="">{{ i.wkshp_name }}</div>
+                    <div class="" style="display: flex;justify-content:space-between">
+                      <div class="all_block02 flex_c_c" style="width: 49% ">浠诲姟鏁�</div>
+                      <div class="all_block02 flex_c_c" style="width: 49% ">{{ i.plan_qty }}</div>
+                    </div>
+                    <div class="" style="display: flex;justify-content:space-between">
+                      <div class="all_block02 flex_c_c" style="width: 49% ">瀹屽伐鏁�</div>
+                      <div class="all_block02 flex_c_c" style="width: 49% ">{{ i.good_qty }}</div>
+                    </div>
+                  </div>
+                </div>
+
+              </div>
+              <div style="height: 260px;">
+                <div id="all01" class="flex_c_c" style="width: 100%;height:100%;" />
+              </div>
+            </div>
+          </div>
+          <div style="width: 925px;">
+            <div class="smallTitle">
+              <svg-icon icon-class="ckkc" class="svg_class" />
+              浠撳簱搴撳瓨
+            </div>
+            <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">
+              <div style="display: flex;justify-content: center;position: relative">
+                <div class="kb_center_block_children all_block05">
+                  <div style="font-size: 24px;">{{ parseFloat(RightBottom.Y) }}</div>
+                  <div class="box02" />
+                  <div>鍘熸潗鏂�</div>
+                </div>
+                <div class="kb_center_block_children all_block06">
+                  <div style="font-size: 24px;">{{ parseFloat(RightBottom.B) }}</div>
+                  <div class="box02" />
+                  <div>鍗婃垚鍝�</div>
+                </div>
+                <div class="kb_center_block_children all_block07">
+                  <div style="font-size: 24px;">{{ parseFloat(RightBottom.C) }}</div>
+                  <div class="box02" />
+                  <div>浜ф垚鍝�</div>
+                </div>
+
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import './kbCommon.css'
+import { loadEcharts, all02, all03 } from '@/utils/myEcharts'
+import {
+  WorkShopCompreLeftBottom, WorkShopCompreLeftTop, WorkShopCompreRightBottom, WorkShopCompreRightTop
+} from '@/api/kanbanManager'
+
+export default {
+  name: 'Cjsc',
+  data() {
+    return {
+      headTime: '',
+      tableDataRightTop: [],
+      wkshopArr: [],
+      legendData: [],
+
+      LeftTopData01: [],
+      LeftTopData02: [],
+
+      RightTopData01: [],
+      RightTopData02: [],
+
+      LeftBottomData01: [],
+      LeftBottomData02: [],
+
+      RightBottom: {}
+
+    }
+  },
+  created() {
+    setInterval(this.getNowTime, 1000)
+
+    // // 涓ゅ皬鏃剁湅鏉垮埛鏂颁竴娆�
+    setInterval(() => {
+      window.location.reload()
+    }, 1000 * 60 * 120)
+  },
+  mounted() {
+    this.getAllApi()
+  },
+  methods: {
+    async getAllApi() {
+      // const { data: res } = await ShopSearch()
+      const res = [
+        { org_code: '101', org_name: '鍙戞场杞﹂棿' },
+        { org_code: '102', org_name: '鎸ゅ嚭杞﹂棿' }
+
+      ]
+      this.wkshopArr = res
+      const temp = this.wkshopArr.map(i => i.org_code)
+      // const temp = this.wkshopArr.map(i => i.org_code)
+
+      temp.forEach(i => {
+        const aa = this.wkshopArr.find(j => j.org_code === i).org_name
+        this.legendData.push(aa)
+      })
+
+      // 宸︿笂 閲囪喘璁㈠崟
+      const res2 = await WorkShopCompreLeftBottom()
+      res2.data.BottomLeftTop.forEach(i => {
+        this.LeftTopData01.push({
+          Quarter: i.Quarter,
+          quantity: i.quantity,
+          ouquantity: i.ouquantity
+        })
+      })
+      res2.data.BottomLeftBottom.forEach(i => {
+        this.LeftTopData02.push({
+          Month: i.Month + '鏈�',
+          quantity: i.quantity,
+          ouquantity: i.ouquantity
+        })
+      })
+      loadEcharts('all02_1', all02(this.LeftTopData02, '姣忔湀閲囪喘鏁伴噺/鍏ュ簱鏁伴噺'))
+      setInterval(() => {
+        this.LeftTopData01 = []
+        this.LeftTopData02 = []
+        WorkShopCompreLeftBottom().then(res2 => {
+          res2.data.BottomLeftTop.forEach(i => {
+            this.LeftTopData01.push({
+              Quarter: i.Quarter,
+              quantity: i.quantity,
+              ouquantity: i.ouquantity
+            })
+          })
+          res2.data.BottomLeftBottom.forEach(i => {
+            this.LeftTopData02.push({
+              Month: i.Month + '鏈�',
+              quantity: i.quantity,
+              ouquantity: i.ouquantity
+            })
+          })
+          loadEcharts('all02_1', all02(this.LeftTopData02, '姣忔湀閲囪喘鏁伴噺/鍏ュ簱鏁伴噺'))
+        })
+      }, 1000 * 35)
+
+      // 鍙充笂 閿�鍞鍗�
+      const res3 = await WorkShopCompreRightTop()
+      res3.data.RightTop.forEach(i => {
+        this.RightTopData01.push({
+          Quarter: i.Quarter,
+          quantity: i.quantity,
+          ouquantity: i.ouquantity
+        })
+      })
+      res3.data.RightBottom.forEach(i => {
+        this.RightTopData02.push({
+          Month: i.Month + '鏈�',
+          quantity: i.quantity,
+          ouquantity: i.ouquantity
+        })
+      })
+      loadEcharts('all02', all02(this.RightTopData02, '姣忔湀璁㈠崟鏁伴噺/鍑哄簱鏁伴噺'))
+      setInterval(() => {
+        WorkShopCompreRightTop().then(res3 => {
+          this.RightTopData01 = []
+          this.RightTopData02 = []
+          res3.data.RightTop.forEach(i => {
+            this.RightTopData01.push({
+              Quarter: i.Quarter,
+              quantity: i.quantity,
+              ouquantity: i.ouquantity
+            })
+          })
+          res3.data.RightBottom.forEach(i => {
+            this.RightTopData02.push({
+              Month: i.Month + '鏈�',
+              quantity: i.quantity,
+              ouquantity: i.ouquantity
+            })
+          })
+          loadEcharts('all02', all02(this.RightTopData02, '姣忔湀璁㈠崟鏁伴噺/鍑哄簱鏁伴噺'))
+        })
+      }, 1000 * 40)
+
+      // 宸︿笅 鐢熶骇璁㈠崟
+      const res4 = await WorkShopCompreLeftTop({ wkshopcode: temp.join(',') })
+      for (const res4Key in res4.data.LeftTop) {
+        const data = {
+          good_qty: 0,
+          plan_qty: 0,
+          wkshp_code: '',
+          wkshp_name: ''
+        }
+        if (temp.includes(res4Key)) {
+          data.good_qty = res4.data.LeftTop[res4Key][0].good_qty
+          data.plan_qty = res4.data.LeftTop[res4Key][0].plan_qty
+          data.wkshp_code = res4.data.LeftTop[res4Key][0].wkshp_code
+          data.wkshp_name = this.wkshopArr.find(i => i.org_code === data.wkshp_code).org_name
+          this.LeftBottomData01.push(data)
+        }
+      }
+      for (const res4Key in res4.data.LeftBottom) {
+        const data = {
+          quantity: 0,
+          wkshp_code: '',
+          wkshp_name: ''
+        }
+        if (temp.includes(res4Key)) {
+          data.quantity = res4.data.LeftBottom[res4Key][0].quantity
+          data.plan_qty = res4.data.LeftBottom[res4Key][0].plan_qty
+          data.wkshp_code = res4.data.LeftBottom[res4Key][0].wkshp_code
+          data.wkshp_name = this.wkshopArr.find(i => i.org_code === data.wkshp_code).org_name
+          this.LeftBottomData02.push(data)
+        }
+      }
+      loadEcharts('all01', all03(this.legendData, this.LeftBottomData02))
+
+      setInterval(() => {
+        WorkShopCompreLeftTop({ wkshopcode: temp.join(',') }).then(res2 => {
+          this.LeftBottomData01 = []
+          this.LeftBottomData02 = []
+          for (const res4Key in res4.data.LeftTop) {
+            const data = {
+              good_qty: 0,
+              plan_qty: 0,
+              wkshp_code: '',
+              wkshp_name: ''
+            }
+            if (temp.includes(res4Key)) {
+              data.good_qty = res2.data.LeftTop[res4Key][0].good_qty
+              data.plan_qty = res2.data.LeftTop[res4Key][0].plan_qty
+              data.wkshp_code = res2.data.LeftTop[res4Key][0].wkshp_code
+              data.wkshp_name = this.wkshopArr.find(i => i.org_code === data.wkshp_code).org_name
+              this.LeftBottomData01.push(data)
+            }
+          }
+          for (const res4Key in res2.data.LeftBottom) {
+            const data = {
+              quantity: 0,
+              wkshp_code: '',
+              wkshp_name: ''
+            }
+            if (temp.includes(res4Key)) {
+              data.quantity = res2.data.LeftBottom[res4Key][0].quantity
+              data.plan_qty = res2.data.LeftBottom[res4Key][0].plan_qty
+              data.wkshp_code = res2.data.LeftBottom[res4Key][0].wkshp_code
+              data.wkshp_name = this.wkshopArr.find(i => i.org_code === data.wkshp_code).org_name
+              this.LeftBottomData02.push(data)
+            }
+          }
+          loadEcharts('all01', all03(this.legendData, this.LeftBottomData02))
+        })
+      }, 1000 * 30)
+
+      // 鍙充笅 浠撳簱搴撳瓨
+      const res5 = await WorkShopCompreRightBottom()
+      this.RightBottom = res5.data
+
+      setInterval(() => {
+        WorkShopCompreRightBottom().then(res5 => {
+          this.RightBottom = res5.data
+        })
+      }, 1000 * 60)
+    },
+
+    // 鑾峰彇Echarts
+    getEcharts() {
+      // loadEcharts('cjzl01', cjzl01(this.cjzl01Data))
+
+      // loadEcharts('cjzl02_1', cjzl02(this.cjzl02_1Title, this.cjzl02_1Data))
+      // loadEcharts('cjzl02_2', cjzl02(this.cjzl02_2Title, this.cjzl02_2Data))
+      // loadEcharts('cjzl02_3', cjzl02(this.cjzl02_3Title, this.cjzl02_3Data))
+      // loadEcharts('cjzl02_4', cjzl02(this.cjzl02_4Title, this.cjzl02_4Data))
+      // loadEcharts('cjzl02_5', cjzl02(this.cjzl02_5Title, this.cjzl02_5Data))
+
+      // loadEcharts('cjzl04', cjzl04(this.legendData, this.cjzl04Data[0], this.cjzl04Data[1], this.cjzl04Data[2]))// 鍙充晶
+      // loadEcharts('cjzl03', cjzl03(this.cjzl03_xData, this.legendData, this.cjzl03_yData))// 宸︿晶
+    },
+
+    // 鑾峰彇褰撳墠鏃堕棿
+    getNowTime() {
+      const dt = new Date()
+      const wk = dt.getDay()
+      const y = dt.getFullYear()
+      const m = (dt.getMonth() + 1 + '').padStart(2, '0')
+      const d = (dt.getDate() + '').padStart(2, '0')
+
+      const hh = (dt.getHours() + '').padStart(2, '0')
+      const mm = (dt.getMinutes() + '').padStart(2, '0')
+      const ss = (dt.getSeconds() + '').padStart(2, '0')
+      const weeks = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�']
+      const week = weeks[wk]
+
+      this.headTime = `${y}-${m}-${d}  ${hh}:${mm}:${ss}   ${week}`
+    },
+    headerCellStyle() {
+      return {
+        backgroundColor: 'transparent ',
+        padding: '10px 0',
+        textAlign: 'center',
+        color: '#07acc2',
+        border: 'none',
+        fontSize: '20px'
+      }
+    },
+    cellStyle() {
+      return {
+        padding: '7px 0',
+        textAlign: 'center',
+        backgroundColor: 'transparent ',
+        color: '#c7e7ff',
+        border: 'none',
+        fontSize: '20px'
+      }
+    }
+
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+$main_color: #09d8f2;
+$color01: #00FFFF;
+.tableData {
+  background: transparent;
+}
+
+.el-table::before {
+  height: 0;
+}
+
+.el-table__empty-text {
+  color: $main_color;
+}
+
+.tableDataCell {
+  ::v-deep .cell {
+    padding: 0 2px;
+  }
+}
+
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
+  /* width: 0;瀹藉害涓�0鏆楄棌 */
+  width: 0;
+  background: transparent;
+}
+
+::v-deep .el-table th,
+::v-deep .el-table tr,
+::v-deep .el-table td {
+  background-color: transparent;
+}
+
+.all_block01 {
+  width: 187px;
+  height: 180px;
+}
+
+.all_block02 {
+  width: 100%;
+  height: 49px;
+  background: rgba(9, 216, 242, 0.1);
+}
+
+.all_block03 {
+  width: 199px;
+  height: 180px;
+}
+
+.all_block04 {
+  width: 100%;
+  height: 49px;
+  background: rgba(9, 216, 242, 0.1);
+}
+
+.kb_center_block_children {
+  height: 180px;
+  //border: 1px solid $kbBorderColor;
+  width: 240px;
+  display: flex;
+  z-index: 2;
+  justify-content: space-around;
+  align-items: center;
+  flex-direction: column;
+  margin: 10px;
+  font-size: 22px;
+
+  .box02 {
+    background: url("../../assets/images/box02.png") no-repeat;
+    transform: scale(1.5);
+    width: 145px;
+    height: 84px;
+
+  }
+}
+
+.all_block05 {
+  position: absolute;
+  animation: upDown 3s ease-in-out infinite;
+  left: 70px;
+}
+
+.all_block06 {
+  position: absolute;
+  animation: upDown2 3s ease-in-out infinite;
+  left: 320px;
+}
+
+.all_block07 {
+  position: absolute;
+  animation: upDown 3s ease-in-out infinite;
+  left: 570px;
+}
+
+@keyframes upDown {
+  0% {
+    top: 50px;
+  }
+  50% {
+    top: 100px;
+  }
+  100% {
+    top: 50px;
+  }
+}
+
+@keyframes upDown2 {
+  0% {
+    top: 100px;
+  }
+  50% {
+    top: 50px;
+  }
+  100% {
+    top: 100px;
+  }
+}
+</style>
diff --git a/vue.config.js b/vue.config.js
index 5e2cb2a..3cd6e83 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,7 +53,7 @@
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
         target: 'http://121.196.36.24:8034', // 鏈湴
-        // target: 'http://192.168.0.147:8000', // 浼樺厠
+        // target: 'http://192.168.0.99:8000', // 妗ヤ笅
         changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
         pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
           ['^' + process.env.VUE_APP_BASE_API]: '/api/'

--
Gitblit v1.9.3