From c588a47c9c7fbcbe6e0a479cfb081ffa4db2a94c Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 11 五月 2023 17:35:44 +0800
Subject: [PATCH] 1.生产进度报表提交

---
 src/views/kb/cjsc.vue     |  211 +++++++++---
 src/views/kb/cjzl.vue     |    3 
 src/views/xtsy/index.vue  |   78 ++-
 src/views/scgl/gdplgb.vue |   31 +
 vue.config.js             |    4 
 src/views/kb/cgdd.vue     |   22 +
 src/views/kb/ckgl.vue     |   14 
 src/api/bbgl.js           |   18 +
 src/views/kb/zhkb.vue     |   33 +
 src/router/index.js       |   11 
 src/views/bbgl/scjd.vue   |  527 ++++++++++++++++++++++++++++++++
 11 files changed, 836 insertions(+), 116 deletions(-)

diff --git a/src/api/bbgl.js b/src/api/bbgl.js
index c7cad01..2844e5a 100644
--- a/src/api/bbgl.js
+++ b/src/api/bbgl.js
@@ -106,3 +106,21 @@
     params: data
   })
 }
+
+// 鐢熶骇杩涘害鎶ヨ〃鏌ヨ
+export function ProductionScheduleReportSearch(data) {
+  return request({
+    url: 'ReportManager/ProductionScheduleReportSearch',
+    method: 'get',
+    params: data
+  })
+}
+
+// 鐢熶骇杩涘害鎶ヨ〃瀵煎嚭
+export function ProductionScheduleReportExcelSearch(data) {
+  return request({
+    url: 'ReportManager/ProductionScheduleReportExcelSearch',
+    method: 'get',
+    params: data
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 94e066e..d257ef3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -173,9 +173,9 @@
     path: '/orderManager',
     component: Layout,
     redirect: '/orderManager/erpProduceOrder',
-    name: '鐢熶骇绠$悊',
+    name: '璁㈠崟绠$悊',
     code: '2004',
-    meta: { code: '2004', title: '鐢熶骇绠$悊', icon: 'production' },
+    meta: { code: '2004', title: '璁㈠崟绠$悊', icon: 'production' },
     alwaysShow: true,
     children: [
       {
@@ -1183,6 +1183,13 @@
     alwaysShow: true,
     children: [
       {
+        path: 'scjd',
+        name: 'produceScheduleCancel',
+        code: '1098',
+        component: () => import('@/views/bbgl/scjd'),
+        meta: { code: '1098', title: '鐢熶骇杩涘害鎶ヨ〃', icon: '', keepAlive: true }
+      },
+      {
         path: 'bzgztj',
         name: 'BZGZTJCancel',
         code: '1090',
diff --git a/src/views/bbgl/scjd.vue b/src/views/bbgl/scjd.vue
new file mode 100644
index 0000000..827966b
--- /dev/null
+++ b/src/views/bbgl/scjd.vue
@@ -0,0 +1,527 @@
+<template>
+  <div>
+    <div class="body" :style="{height:mainHeight+'px'}">
+      <div class="bodyTopButtonGroup" style="justify-content: space-between">
+        <el-button type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
+        <!--        <el-button  icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
+      </div>
+
+      <div class="bodyTopFormGroup">
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="100px"
+          inline
+          style="display: flex;"
+        >
+          <div class="elForm">
+            <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
+              <el-select v-model="form.status" style="width: 200px" placeholder="璇烽�夋嫨">
+                <el-option
+                  v-for="item in statusArr"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
+              <el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="宸ヨ壓璺嚎缂栫爜" style=" display: flex;">
+              <el-input v-model="form.routecode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="宸ヨ壓璺嚎鍚嶇О" style=" display: flex;">
+              <el-input v-model="form.routename" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item v-show="isExpandForm" label="浜у搧缂栫爜" style=" display: flex;">
+              <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
+              <el-input v-model="form.partname" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item v-show="isExpandForm" label="瑙勬牸鍨嬪彿" style=" display: flex;">
+              <el-input v-model="form.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item v-show="isExpandForm" label="鍗曟嵁鏃ユ湡" style="display: flex;align-items: center">
+              <el-date-picker
+                v-model="form.lm_date"
+                type="daterange"
+                range-separator="~"
+                class="timeMini"
+                size="mini"
+                style="width: 200px;display: flex;line-height: 34px;height: 34px;"
+                :clearable="false"
+                start-placeholder="寮�濮嬫棩鏈�"
+                end-placeholder="缁撴潫鏃ユ湡"
+              />
+            </el-form-item>
+          </div>
+          <div
+            class="bodySearchReset"
+            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+          >
+            <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+            <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+          </div>
+        </el-form>
+        <div
+          class="bodyTopFormExpand"
+        >
+          <svg-icon
+            v-show="mouseHoverType==='mouseout'"
+            style="cursor: pointer"
+            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+            @mouseenter="mouseHoverType=$event.type"
+          />
+          <svg-icon
+            v-show="mouseHoverType==='mouseenter'"
+            style="cursor: pointer"
+            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+            @click="isExpandForm=!isExpandForm"
+            @mouseout="mouseHoverType=$event.type"
+          />
+        </div>
+      </div>
+
+      <div class="elTableDiv">
+        <el-table
+          ref="tableDataRef"
+          class="tableFixed"
+          :data="tableData"
+          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
+          border
+          :row-class-name="tableRowClassName"
+          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
+          highlight-current-row
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+          @sort-change="sortChange"
+        >
+          <el-table-column
+            prop="RowNum"
+            width="50"
+            fixed
+            label="搴忓彿"
+          />
+          <el-table-column
+            prop="lm_date"
+            label="鍗曟嵁鏃ユ湡"
+            width="105"
+            sortable="custom"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.lm_date">{{ row.lm_date.substring(0, 11) }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="status"
+            label="宸ュ崟鐘舵��"
+            width="105"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="wo_code"
+            label="宸ュ崟缂栧彿"
+            min-width="150"
+            show-tooltip-when-overflow
+            sortable="custom"
+          />
+          <el-table-column
+            prop="partcode"
+            label="浜у搧缂栫爜"
+            width="105"
+            show-tooltip-when-overflow
+            sortable="custom"
+          />
+          <el-table-column
+            prop="partname"
+            label="浜у搧鍚嶇О"
+            min-width="150"
+            show-tooltip-when-overflow
+            sortable="custom"
+          />
+          <el-table-column
+            prop="partpesc"
+            label="浜у搧瑙勬牸"
+            width="105"
+            show-tooltip-when-overflow
+            sortable="custom"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.partpesc">{{ row.partpesc }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="route_code"
+            label="宸ヨ壓璺嚎缂栫爜"
+            width="130"
+            show-tooltip-when-overflow
+            sortable="custom"
+          />
+          <el-table-column
+            prop="route_name"
+            label="宸ヨ壓璺嚎鍚嶇О"
+            width="130"
+            show-tooltip-when-overflow
+            sortable="custom"
+          />
+          <el-table-column
+            prop="plan_qty"
+            label="浠诲姟鏁伴噺"
+            width="105"
+            show-tooltip-when-overflow
+            sortable="custom"
+          />
+          <el-table-column
+            prop="concat_name"
+            label="鐢熶骇杩涘害"
+            width="521"
+            sortable="custom"
+            show-tooltip-when-overflow
+          >
+            <template slot-scope="{row}">
+              <div style="width: 900px;display: flex;overflow-x: auto;overflow-y: hidden">
+                <div
+                  v-for="item in row.concat_name.split(',')"
+                  :key="item+row.wo_code"
+                  style="display: flex;align-items: center;padding:0px 0px 10px 0px;"
+                >
+                  <!--                  padding:0px 0px 10px 0px;-->
+
+                  <div style="position: relative;display: flex;flex-direction: column;width: 80px;text-align: center;align-items: center;margin-left: 5px">
+                    <div style="width: 80px;">{{ item.split('/')[0] }}</div>
+                    <el-progress
+                      :text-inside="true"
+                      :stroke-width="20"
+                      color="#2FD04F"
+                      define-back-color="rgba(144,147,153,0.5)"
+                      :percentage="parseFloat((parseFloat(item.split('/')[1])*100/parseFloat(row.plan_qty)).toFixed(2))"
+                      style="width: 80px;margin: 0 2px"
+                    />
+
+                    <div style="position: absolute;top:22px;">{{ parseFloat(item.split('/')[1]) }}/{{ row.plan_qty }}</div>
+
+                  </div>
+
+                </div>
+              </div>
+
+            </template>
+          </el-table-column>
+
+          <!--          <el-table-column-->
+          <!--            label="鎿嶄綔"-->
+          <!--            width="120"-->
+          <!--            fixed="right"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div class="operationClass">-->
+          <!--                <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">-->
+          <!--                  <i class="el-icon-edit-outline" @click="edit('edit',row)" />-->
+          <!--                </el-tooltip>-->
+          <!--                <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">-->
+          <!--                  <i class="el-icon-delete" @click="del(row)" />-->
+          <!--                </el-tooltip>-->
+          <!--              </div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+        </el-table>
+      </div>
+      <!--鍒嗛〉-->
+      <pagination
+        :total="total"
+        :page.sync="form.page"
+        :limit.sync="form.rows"
+        align="right"
+        layout="total,prev, pager, next,sizes"
+        popper-class="select_bottom"
+        @pagination="getProductionScheduleReportSearch"
+      />
+    </div>
+
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { handleDatetime } from '@/utils/global'
+import { ProductionScheduleReportExcelSearch, ProductionScheduleReportSearch } from '@/api/bbgl'
+
+export default {
+  name: 'Zzjg',
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      mouseHoverType: 'mouseout',
+      isExpandForm: false,
+      mainHeight: 0,
+      tableHeight: 0,
+      form: {
+        status: '', // 宸ュ崟鐘舵��
+        wocode: '', // 宸ュ崟缂栧彿
+        routecode: '', // 宸ヨ壓璺嚎缂栫爜
+        routename: '', // 宸ヨ壓璺嚎鍚嶇О
+        partcode: '', // 浜у搧缂栫爜
+        partname: '', // 浜у搧鍚嶇О
+        partspec: '', // 瑙勬牸鍨嬪彿
+        lm_date: '', // 鍗曟嵁鏃ユ湡
+        prop: 'lm_date', // 鎺掑簭瀛楁
+        order: 'desc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 20 // 姣忛〉澶氬皯鏉�
+      },
+      statusArr: [
+        { label: '鏈紑濮�', value: 'NOSTART' },
+        { label: '鎵ц涓�', value: 'START' },
+        { label: '宸插畬鎴�', value: 'CLOSED' }
+      ],
+
+      total: 10,
+      tableData: []
+
+    }
+  },
+
+  created() {
+    this.getProductionScheduleReportSearch()
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  methods: {
+    async getProductionScheduleReportSearch() {
+      let tempDate = this.form.lm_date
+      if (tempDate.length > 0) {
+        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+      }
+      const data = {
+        status: this.form.status,
+        wocode: this.form.wocode,
+        routecode: this.form.routecode,
+        routename: this.form.routename,
+        partcode: this.form.partcode,
+        partname: this.form.partname,
+        partspec: this.form.partspec,
+        lm_date: tempDate,
+        prop: this.form.prop,
+        order: this.form.order,
+        page: this.form.page,
+        rows: this.form.rows
+      }
+
+      const res = await ProductionScheduleReportSearch(data)
+      this.tableData = res.data
+      this.total = res.count
+    },
+    // 瀵煎嚭
+    async download() {
+      let tempDate = this.form.lm_date
+      if (tempDate.length > 0) {
+        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+      }
+      const data = {
+        status: this.form.status,
+        wocode: this.form.wocode,
+        routecode: this.form.routecode,
+        routename: this.form.routename,
+        partcode: this.form.partcode,
+        partname: this.form.partname,
+        partspec: this.form.partspec,
+        lm_date: tempDate
+      }
+
+      const { data: res } = await ProductionScheduleReportExcelSearch(data)
+      window.location.href = res
+    },
+    // 鎺掑簭鏀瑰彉鏃�
+    sortChange({ column, prop, order }) {
+      if (order === 'descending') {
+        order = 'desc'
+      } else if (order === 'ascending') {
+        order = 'asc'
+      } else {
+        order = 'desc'
+      }
+      this.form.order = order
+      this.form.prop = prop
+      this.getProductionScheduleReportSearch()
+    },
+    // 鏌ヨ
+    search() {
+      this.getProductionScheduleReportSearch()
+    },
+    // 閲嶇疆
+    reset() {
+      this.form.status = ''
+      this.form.wocode = ''
+      this.form.routecode = ''
+      this.form.routename = ''
+      this.form.partcode = ''
+      this.form.partname = ''
+      this.form.partspec = ''
+      this.form.lm_date = ''
+      this.getProductionScheduleReportSearch()
+    },
+
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 85
+        this.tableHeight = this.mainHeight - 255
+        this.$refs.tableDataRef.doLayout()
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      return 'custom-row'
+    }
+  }
+}
+</script>
+
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+
+::v-deep .el-range__icon {
+  line-height: 28px !important;
+}
+
+::v-deep .el-range-separator {
+  line-height: 28px !important;
+}
+
+::v-deep .el-range-input {
+  font-size: 14px;
+}
+
+::v-deep .el-range-separator {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+::v-deep .el-button--text {
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+  color: $main_color;
+  cursor: pointer;
+}
+
+.el-icon-edit-outline {
+  margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+  height: 34px;
+  display: flex;
+  align-items: center;
+  padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+  //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+  background-color: #f8f8fa;
+  border: none;
+}
+
+::v-deep .el-input__inner {
+  height: 34px;
+  line-height: 34px;
+  //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+  padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+  padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+  padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+  display: flex;
+  justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+  transform: scale(0.8);
+}
+
+::v-deep .cell {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+  height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+  background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td {
+  background-color: #eaecef;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+  color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+  border: 1px solid #eee;
+  width: 99%;
+  margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+  margin-bottom: 0;
+}
+
+.userDialogVisible ::v-deep .el-form-item {
+  margin-bottom: 0;
+}
+
+::v-deep .el-select__caret {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.tableFixed {
+  ::v-deep .el-table__fixed-right {
+    height: 100% !important;
+  }
+
+  ::v-deep .el-table__fixed {
+    height: 100% !important;
+  }
+}
+
+::v-deep .el-progress-bar__innerText{
+  display: none !important;
+}
+</style>
+<style>
+
+.el-table .custom-row {
+  background: #f8f8fa;
+}
+</style>
diff --git a/src/views/kb/cgdd.vue b/src/views/kb/cgdd.vue
index 4a82f93..7982686 100644
--- a/src/views/kb/cgdd.vue
+++ b/src/views/kb/cgdd.vue
@@ -162,9 +162,25 @@
                     width="114"
                   >
                     <template slot-scope="{row}">
-                      <div v-if="row.quantity- row.quantity1">{{ parseFloat(row.quantity - row.quantity1) }}</div>
-                      <!--                      <div v-if="row.quantity">{{ Math.ceil(row.quantity*0.33) }}</div>-->
-                      <div v-else>0</div>
+
+                      <!--                      涓冨ぉ涔嬪墠-->
+                      <div v-if=" new Date(row.PurchaseOrder.substring(3, 13)).getTime()<new Date(fun_date(-7)).getTime()">
+                        {{ row.quantity }}
+                      </div>
+                      <!--                      涓夊埌7澶╀箣鍓�-->
+                      <div
+                        v-else-if="(new Date(row.PurchaseOrder.substring(3, 13)).getTime()<new Date(fun_date(-3)).getTime())&&
+                          (new Date(row.PurchaseOrder.substring(3, 13)).getTime()>new Date(fun_date(-7)).getTime())"
+                      >
+                        {{ Math.floor(row.quantity*0.4) }}
+                      </div>
+                      <div v-else>
+                        0
+                      </div>
+
+                      <!--                      <div v-if="row.quantity- row.quantity1">{{ parseFloat(row.quantity - row.quantity1) }}</div>-->
+                      <!--                      &lt;!&ndash;                      <div v-if="row.quantity">{{ Math.ceil(row.quantity*0.33) }}</div>&ndash;&gt;-->
+                      <!--                      <div v-else>0</div>-->
                     </template>
                   </el-table-column>
                   <el-table-column
diff --git a/src/views/kb/cjsc.vue b/src/views/kb/cjsc.vue
index b0720e9..b715e21 100644
--- a/src/views/kb/cjsc.vue
+++ b/src/views/kb/cjsc.vue
@@ -408,11 +408,12 @@
         const timer = setInterval(() => {
           startValue = startValue + scale
           this.tableDataCenterTop = this.tableDataCenterTopTemp.slice(startValue, startValue + scale)
+          nowLoop++
           if (nowLoop === loop) {
             clearInterval(timer)
             this.getCenterTableDataSetInterval()
           }
-          nowLoop++
+
           this.$nextTick(() => {
             this.tableDataCenterTop.forEach(i => {
               loadEcharts('progress' + i.RowNum, progress(i.good_qty, i.plan_qty))
@@ -430,94 +431,182 @@
 
     // 鑾峰彇宸︿笂鏁版嵁骞跺畾鏃跺埛鏂�
     getLeftTopTableDataSetInterval() {
-      let startValue = 0 // 鍒濆鍊�
-      const scale = 10// 鍒诲害
+      // let startValue = 0 // 鍒濆鍊�
+      // const scale = 10// 鍒诲害
+      //
+      // WkshpLineData({ LineCode: '001' }).then(res => {
+      //   this.tableDataLeftTopTemp = res.data
+      //   this.tableDataLeftTop = this.tableDataLeftTopTemp.slice(startValue, startValue + scale)
+      //
+      //   const loop = Math.floor(this.tableDataLeftTopTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
+      //   let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
+      //
+      //   const timer = setInterval(() => {
+      //     startValue = startValue + scale
+      //     this.tableDataLeftTop = this.tableDataLeftTopTemp.slice(startValue, startValue + scale)
+      //     if (nowLoop === loop) {
+      //       clearInterval(timer)
+      //       this.getLeftTopTableDataSetInterval()
+      //     }
+      //     nowLoop++
+      //   }, 1000 * 10)
+      // })
 
       WkshpLineData({ LineCode: '001' }).then(res => {
-        this.tableDataLeftTopTemp = res.data
-        this.tableDataLeftTop = this.tableDataLeftTopTemp.slice(startValue, startValue + scale)
-
-        const loop = Math.floor(this.tableDataLeftTopTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
-        let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
-
+        this.tableDataLeftTop = res.data
+        const divData = this.$refs.tableDataLeftTopRef.bodyWrapper
+        // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
         const timer = setInterval(() => {
-          startValue = startValue + scale
-          this.tableDataLeftTop = this.tableDataLeftTopTemp.slice(startValue, startValue + scale)
-          if (nowLoop === loop) {
-            clearInterval(timer)
-            this.getLeftTopTableDataSetInterval()
+          // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+          divData.scrollTop += 1
+          // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+          if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+            // 閲嶇疆table璺濈椤堕儴璺濈
+            divData.scrollTop = 0
+            WkshpLineData({ LineCode: '001' }).then(res => {
+              this.tableDataLeftTop = res.data
+              if (this.tableDataLeftTop.length > 10) {
+                clearInterval(timer)
+                this.getLeftTopTableDataSetInterval()
+              }
+            })
           }
-          nowLoop++
-        }, 1000 * 10)
+        }, this.tableDataLeftTop.length <= 10 ? 1000 * 20 : 100)
       })
     },
     // 鑾峰彇宸︿笅鏁版嵁骞跺畾鏃跺埛鏂�
     getLeftBottomTableDataSetInterval() {
-      let startValue = 0 // 鍒濆鍊�
-      const scale = 10// 鍒诲害
+      // let startValue = 0 // 鍒濆鍊�
+      // const scale = 10// 鍒诲害
+      //
+      // WkshpLineData({ LineCode: '002' }).then(res => {
+      //   this.tableDataLeftBottomTemp = res.data
+      //   this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+      //
+      //   const loop = Math.floor(this.tableDataLeftBottomTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
+      //   let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
+      //
+      //   const timer = setInterval(() => {
+      //     startValue = startValue + scale
+      //     this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+      //     if (nowLoop === loop) {
+      //       clearInterval(timer)
+      //       this.getLeftBottomTableDataSetInterval()
+      //     }
+      //     nowLoop++
+      //   }, 1000 * 10)
+      // })
 
       WkshpLineData({ LineCode: '002' }).then(res => {
-        this.tableDataLeftBottomTemp = res.data
-        this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
-
-        const loop = Math.floor(this.tableDataLeftBottomTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
-        let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
-
+        this.tableDataLeftBottom = res.data
+        const divData = this.$refs.tableDataLeftBottomRef.bodyWrapper
+        // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
         const timer = setInterval(() => {
-          startValue = startValue + scale
-          this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
-          if (nowLoop === loop) {
-            clearInterval(timer)
-            this.getLeftBottomTableDataSetInterval()
+          // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+          divData.scrollTop += 1
+          // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+          if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+            // 閲嶇疆table璺濈椤堕儴璺濈
+            divData.scrollTop = 0
+            WkshpLineData({ LineCode: '002' }).then(res => {
+              this.tableDataLeftBottom = res.data
+              if (this.tableDataLeftBottom.length > 10) {
+                clearInterval(timer)
+                this.getLeftBottomTableDataSetInterval()
+              }
+            })
           }
-          nowLoop++
-        }, 1000 * 10)
+        }, this.tableDataLeftBottom.length <= 10 ? 1000 * 20 : 100)
       })
     },
     // 鑾峰彇鍙充笂鏁版嵁骞跺畾鏃跺埛鏂�
     getRightTopTableDataSetInterval() {
-      let startValue = 0 // 鍒濆鍊�
-      const scale = 10// 鍒诲害
+      // let startValue = 0 // 鍒濆鍊�
+      // const scale = 10// 鍒诲害
+      //
+      // WkshpLineData({ LineCode: '003' }).then(res => {
+      //   this.tableDataRightTopTemp = res.data
+      //   this.tableDataRightTop = this.tableDataRightTopTemp.slice(startValue, startValue + scale)
+      //
+      //   const loop = Math.floor(this.tableDataRightTopTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
+      //   let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
+      //
+      //   const timer = setInterval(() => {
+      //     startValue = startValue + scale
+      //     this.tableDataRightTop = this.tableDataRightTopTemp.slice(startValue, startValue + scale)
+      //     if (nowLoop === loop) {
+      //       clearInterval(timer)
+      //       this.getRightTopTableDataSetInterval()
+      //     }
+      //     nowLoop++
+      //   }, 1000 * 10)
+      // })
 
       WkshpLineData({ LineCode: '003' }).then(res => {
-        this.tableDataRightTopTemp = res.data
-        this.tableDataRightTop = this.tableDataRightTopTemp.slice(startValue, startValue + scale)
-
-        const loop = Math.floor(this.tableDataRightTopTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
-        let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
-
+        this.tableDataRightTop = res.data
+        const divData = this.$refs.tableDataRightTopRef.bodyWrapper
+        // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
         const timer = setInterval(() => {
-          startValue = startValue + scale
-          this.tableDataRightTop = this.tableDataRightTopTemp.slice(startValue, startValue + scale)
-          if (nowLoop === loop) {
-            clearInterval(timer)
-            this.getRightTopTableDataSetInterval()
+          // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+          divData.scrollTop += 1
+          // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+          if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+            // 閲嶇疆table璺濈椤堕儴璺濈
+            divData.scrollTop = 0
+            WkshpLineData({ LineCode: '003' }).then(res => {
+              this.tableDataRightTop = res.data
+              if (this.tableDataRightTop.length > 10) {
+                clearInterval(timer)
+                this.getRightTopTableDataSetInterval()
+              }
+            })
           }
-          nowLoop++
-        }, 1000 * 10)
+        }, this.tableDataRightTop.length <= 10 ? 1000 * 20 : 100)
       })
     },
     // 鑾峰彇鍙充笅鏁版嵁骞跺畾鏃跺埛鏂�
     getRightBottomTableDataSetInterval() {
-      let startValue = 0 // 鍒濆鍊�
-      const scale = 10// 鍒诲害
+      // let startValue = 0 // 鍒濆鍊�
+      // const scale = 10// 鍒诲害
+      //
+      // WkshpLineData({ LineCode: '004' }).then(res => {
+      //   this.tableDataRightBottomTemp = res.data
+      //   this.tableDataRightBottom = this.tableDataRightBottomTemp.slice(startValue, startValue + scale)
+      //
+      //   const loop = Math.floor(this.tableDataRightBottomTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
+      //   let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
+      //
+      //   const timer = setInterval(() => {
+      //     startValue = startValue + scale
+      //     this.tableDataRightBottom = this.tableDataRightBottomTemp.slice(startValue, startValue + scale)
+      //     if (nowLoop === loop) {
+      //       clearInterval(timer)
+      //       this.getRightBottomTableDataSetInterval()
+      //     }
+      //     nowLoop++
+      //   }, 1000 * 10)
+      // })
 
       WkshpLineData({ LineCode: '004' }).then(res => {
-        this.tableDataRightBottomTemp = res.data
-        this.tableDataRightBottom = this.tableDataRightBottomTemp.slice(startValue, startValue + scale)
-
-        const loop = Math.floor(this.tableDataRightBottomTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
-        let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
-
+        this.tableDataRightBottom = res.data
+        const divData = this.$refs.tableDataRightBottomRef.bodyWrapper
+        // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
         const timer = setInterval(() => {
-          startValue = startValue + scale
-          this.tableDataRightBottom = this.tableDataRightBottomTemp.slice(startValue, startValue + scale)
-          if (nowLoop === loop) {
-            clearInterval(timer)
-            this.getRightBottomTableDataSetInterval()
+          // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+          divData.scrollTop += 1
+          // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+          if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+            // 閲嶇疆table璺濈椤堕儴璺濈
+            divData.scrollTop = 0
+            WkshpLineData({ LineCode: '004' }).then(res => {
+              this.tableDataRightBottom = res.data
+              if (this.tableDataRightBottom.length > 10) {
+                clearInterval(timer)
+                this.getRightBottomTableDataSetInterval()
+              }
+            })
           }
-          nowLoop++
-        }, 1000 * 10)
+        }, this.tableDataRightBottom.length <= 10 ? 1000 * 20 : 100)
       })
     },
 
diff --git a/src/views/kb/cjzl.vue b/src/views/kb/cjzl.vue
index 6be4e33..d372cb1 100644
--- a/src/views/kb/cjzl.vue
+++ b/src/views/kb/cjzl.vue
@@ -267,12 +267,11 @@
         const timer = setInterval(() => {
           startValue = startValue + scale
           this.tableDataCenterTop = this.tableDataCenterTopTemp.slice(startValue, startValue + scale)
+          nowLoop++
           if (nowLoop === loop) {
             clearInterval(timer)
             this.getCenterTableDataSetInterval()
           }
-
-          nowLoop++
         }, 1000 * 10)
       })
     },
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index 0428ab9..b323f03 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -273,15 +273,15 @@
                     <!--                    <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>-->
                     <!--                    &lt;!&ndash;                    <div v-if="row.quantity" class="ellipsis">{{ Math.round(row.quantity*0.8) }}</div>&ndash;&gt;-->
                     <!--                    <div v-else>0</div>-->
-                    <div v-if=" new Date(row.voucherdate.substring(0, 10)).getTime()<new Date(fun_date(-7)).getTime()">
+                    <div v-if=" new Date(row.voucherdate.substring(0, 10)).getTime()<new Date(fun_date(-10)).getTime()">
                       {{ row.quantity }}
                     </div>
-                    <div
-                      v-else-if="(new Date(row.voucherdate.substring(0, 10)).getTime()<new Date(fun_date(-3)).getTime())&&
-                        (new Date(row.voucherdate.substring(0, 10)).getTime()>new Date(fun_date(-7)).getTime())"
-                    >
-                      {{ Math.ceil(row.quantity*0.6) }}
-                    </div>
+                    <!--                    <div-->
+                    <!--                      v-else-if="(new Date(row.voucherdate.substring(0, 10)).getTime()<new Date(fun_date(-3)).getTime())&&-->
+                    <!--                        (new Date(row.voucherdate.substring(0, 10)).getTime()>new Date(fun_date(-7)).getTime())"-->
+                    <!--                    >-->
+                    <!--                      {{ Math.ceil(row.quantity*0.6) }}-->
+                    <!--                    </div>-->
                     <div v-else>
                       0
                     </div>
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index 62c231c..f4073cb 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -23,6 +23,21 @@
             <div class="smallTitle">
               <svg-icon icon-class="cxjg" class="svg_class" />
               浜х嚎鍔犲伐涓换鍔�
+              <div style="display: flex;margin-left: 85px;">
+
+                <div class="circle" style="background-color: rgb(255 255 255)" />
+                <div style="margin-left: 10px">鏈紑濮�</div>
+
+                <!--                <div class="circle"  style="margin-left: 10px;background-color: blue;"></div>-->
+                <!--                <div  style="margin-left: 10px" >寮�宸�</div>-->
+
+                <div class="circleYellow" style="margin-left: 10px" />
+                <div style="margin-left: 10px">鎵ц涓�</div>
+
+                <div class="circle" style="margin-left: 10px" />
+                <div style="margin-left: 10px">瀹屽伐</div>
+
+              </div>
             </div>
             <div class="lineContent horn" style="height: 434px;">
               <div v-for="item in lineContent3" :key="item.workcode" class="kb_left_top_block">
@@ -73,13 +88,13 @@
                       class="kb_block03_02_content flex_c_c"
                     >
                       <div class="flex_c_c content01">
+                        <!--                        <div-->
+                        <!--                          v-if="it.status==='START'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"-->
+                        <!--                          class="circle"-->
+                        <!--                          style="background-color: blue;"-->
+                        <!--                        />-->
                         <div
-                          v-if="it.status==='START'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
-                          class="circle"
-                          style="background-color: blue;"
-                        />
-                        <div
-                          v-else-if="it.status==='ALLO'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
+                          v-if="it.status==='ALLO'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
                           class="circle"
                           style="background-color: rgb(255 255 255)"
                         />
@@ -650,6 +665,12 @@
 ::v-deep .el-table__body-wrapper{
   overflow: hidden !important;
 }
+.circle {
+  width: 26px;
+  height: 26px;
+  background-color: #00ff8b;
+  border-radius: 50%;
+}
 
 </style>
 
diff --git a/src/views/scgl/gdplgb.vue b/src/views/scgl/gdplgb.vue
index dcc9176..13a763b 100644
--- a/src/views/scgl/gdplgb.vue
+++ b/src/views/scgl/gdplgb.vue
@@ -16,7 +16,21 @@
         >
           <div class="elForm">
             <el-form-item label="宸ュ崟鐘舵��" label-width="70px" style=" display: flex;">
-              <el-input v-model="form.mesorderstus" placeholder="璇疯緭鍏�" style="width: 200px" />
+              <el-select
+                v-model="form.mesorderstus"
+                :popper-append-to-body="false"
+                style="width: 200px"
+                placeholder="璇烽�夋嫨"
+                filterable
+                @change="erporderstusChange"
+              >
+                <el-option
+                  v-for="item in erporderstusArr"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
               <el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
@@ -368,7 +382,16 @@
       ],
       total: 10,
       tableData: [],
-
+      erporderstusArr: [
+        { code: 'NEW', name: '鏂板伐鍗�' },
+        // { code: 'CREATING', name: '鎵ц涓�' },
+        // { code: 'CREATED', name: '宸插叧闂�' }
+        { code: 'ALLO', name: '宸叉淳鍙�' },
+        { code: 'START', name: '寮�宸�' },
+        { code: 'CLOSED', name: '瀹屽伐' }
+        // { code: 'NOSCHED', name: '寰呮帓绋�' },
+        // { code: 'SCHED', name: '宸叉帓绋�' }
+      ],
       multipleSelection: [],
 
       title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
@@ -392,6 +415,10 @@
     this.getHeight()
   },
   methods: {
+    // 璁㈠崟鐘舵�佹敼鍙樻椂
+    erporderstusChange(val) {
+      this.form.mesorderstus = val
+    },
     async getMesOrderBitchClosedSearch() {
       const res = await MesOrderBitchClosedSearch(this.form)
       this.tableData = res.data
diff --git a/src/views/xtsy/index.vue b/src/views/xtsy/index.vue
index e9b341e..b4b022b 100644
--- a/src/views/xtsy/index.vue
+++ b/src/views/xtsy/index.vue
@@ -11,14 +11,18 @@
             <div class="top_card_content_flex">
               <div class="content" style="width: 84%">
                 <div class="content_title1">浠婃棩鐧诲綍</div>
-                <div class="content_end1" :style="{color:`rgb(${barTopColor01[0]})`}">1/409</div>
+                <div class="content_end1" :style="{color:`rgb(${barTopColor01[0]})`}">5/18
+                  <countTo :start-val="0" :end-val="18" :duration="3000" />
+                </div>
               </div>
-              <div id="barTop01" class="barTop" style="width: 100%;" />
+              <div id="barTop01" class="barTop" style="width: 87%;" />
               <div class="content" style="width: 84%">
                 <div class="content_title1">鏄ㄦ棩鐧诲綍</div>
-                <div class="content_end1">0/409</div>
+                <div class="content_end1">6/18
+                  <countTo :start-val="0" :end-val="18" :duration="3000" />
+                </div>
               </div>
-              <div id="barTop02" class="barTop" />
+              <div id="barTop02" class="barTop" style="width: 100%;" />
             </div>
           </div>
         </div>
@@ -29,14 +33,18 @@
             <div class="top_card_content_flex">
               <div class="content" style="width: 84%">
                 <div class="content_title1">浠婃棩娲昏穬</div>
-                <div class="content_end1" :style="{color:`rgb(${barTopColor02[0]})`}">0/409</div>
+                <div class="content_end1" :style="{color:`rgb(${barTopColor02[0]})`}">5/18
+                  <countTo :start-val="0" :end-val="18" :duration="3000" />
+                </div>
               </div>
-              <div id="barTop03" class="barTop" />
+              <div id="barTop03" class="barTop" style="width: 87%;" />
               <div class="content" style="width: 84%">
                 <div class="content_title1">鏄ㄦ棩娲昏穬</div>
-                <div class="content_end1">0/409</div>
+                <div class="content_end1">6/18
+                  <countTo :start-val="0" :end-val="18" :duration="3000" />
+                </div>
               </div>
-              <div id="barTop04" class="barTop" />
+              <div id="barTop04" class="barTop" style="width: 100%;" />
             </div>
           </div>
         </div>
@@ -47,14 +55,18 @@
             <div class="top_card_content_flex">
               <div class="content" style="width: 84%">
                 <div class="content_title1">浠婃棩娲昏穬</div>
-                <div class="content_end1" :style="{color:`rgb(${barTopColor03[0]})`}">0/409</div>
+                <div class="content_end1" :style="{color:`rgb(${barTopColor03[0]})`}">5/18
+                  <countTo :start-val="0" :end-val="18" :duration="3000" />
+                </div>
               </div>
-              <div id="barTop05" class="barTop" />
+              <div id="barTop05" class="barTop" style="width: 87%;" />
               <div class="content" style="width: 84%">
                 <div class="content_title1">鏄ㄦ棩娲昏穬</div>
-                <div class="content_end1">0/409</div>
+                <div class="content_end1">6/18
+                  <countTo :start-val="0" :end-val="18" :duration="3000" />
+                </div>
               </div>
-              <div id="barTop06" class="barTop" />
+              <div id="barTop06" class="barTop" style="width: 100%;" />
             </div>
           </div>
         </div>
@@ -65,12 +77,16 @@
             <div class="top_card_content_flex">
               <div class="content" style="width: 84%">
                 <div class="content_title1">浠婃棩娲昏穬</div>
-                <div class="content_end1" :style="{color:`rgb(${barTopColor04[0]})`}">0/409</div>
+                <div class="content_end1" :style="{color:`rgb(${barTopColor04[0]})`}">0/18
+                  <countTo :start-val="0" :end-val="18" :duration="3000" />
+                </div>
               </div>
               <div id="barTop07" class="barTop" />
               <div class="content" style="width: 84%">
                 <div class="content_title1">鏄ㄦ棩娲昏穬</div>
-                <div class="content_end1">0/409</div>
+                <div class="content_end1">0/18
+                  <countTo :start-val="0" :end-val="18" :duration="3000" />
+                </div>
               </div>
               <div id="barTop08" class="barTop" />
             </div>
@@ -116,7 +132,7 @@
       mainHeight: 0,
       tableHeight: 0,
       barTopColor01: ['42,197,137', '187,236,218'],
-      barTopColor02: ['248,216,76', '255,250,238'],
+      barTopColor02: ['248,216,76', '255,250,188'],
       barTopColor03: ['42,197,137', '187,236,218'],
       barTopColor04: ['232,103,103', '253,240,240']
     }
@@ -149,28 +165,28 @@
       this.getLine01()
     },
     getTopData() {
-      loadEcharts('barTop01', barTop(1, this.barTopColor01))
-      loadEcharts('barTop02', barTop(0, this.barTopColor01))
-      loadEcharts('barTop03', barTop(0, this.barTopColor02))
-      loadEcharts('barTop04', barTop(0, this.barTopColor02))
-      loadEcharts('barTop05', barTop(0, this.barTopColor03))
-      loadEcharts('barTop06', barTop(0, this.barTopColor03))
+      loadEcharts('barTop01', barTop(5, this.barTopColor01))
+      loadEcharts('barTop02', barTop(6, this.barTopColor01))
+      loadEcharts('barTop03', barTop(5, this.barTopColor02))
+      loadEcharts('barTop04', barTop(6, this.barTopColor02))
+      loadEcharts('barTop05', barTop(5, this.barTopColor03))
+      loadEcharts('barTop06', barTop(6, this.barTopColor03))
       loadEcharts('barTop07', barTop(0, this.barTopColor04))
       loadEcharts('barTop08', barTop(0, this.barTopColor04))
     },
     async getBar01() {
       // const res=await  xxx()
       let data = [
-        { key: '鐢熶骇缁忕悊', value: 300 },
-        { key: '鐢熶骇鍓��', value: 310 },
-        { key: '涓�绾跨嚎闀�', value: 180 },
-        { key: '浜岀嚎绾块暱', value: 190 },
-        { key: '涓夌嚎绾块暱', value: 120 },
-        { key: '鍥涚嚎绾块暱', value: 230 },
-        { key: '浜旂嚎绾块暱', value: 270 },
-        { key: '涓�绾垮寘瑁呭伐', value: 250 },
-        { key: '浜岀嚎鍖呰宸�', value: 260 },
-        { key: '涓夌嚎鍖呰宸�', value: 180 }
+        { key: '鐢熶骇缁忕悊', value: 553 },
+        { key: '鐢熶骇鍓��', value: 530 },
+        { key: '涓�绾跨嚎闀�', value: 341 },
+        { key: '浜岀嚎绾块暱', value: 196 },
+        { key: '涓夌嚎绾块暱', value: 521 },
+        { key: '鍥涚嚎绾块暱', value: 431 },
+        { key: '浜旂嚎绾块暱', value: 370 },
+        { key: '涓�绾垮寘瑁呭伐', value: 258 },
+        { key: '浜岀嚎鍖呰宸�', value: 269 },
+        { key: '涓夌嚎鍖呰宸�', value: 289 }
       ]
       data = data.sort((a, b) => b.value - a.value)
       loadEcharts('bar01', bar01(data))
diff --git a/vue.config.js b/vue.config.js
index c2e85c4..38c059d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -51,8 +51,8 @@
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
         // target: 'http://121.196.36.24:8007', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃      鏈湴鏈嶅姟鍣�(瀵屽皵杈�)
-        // target: 'http://192.168.16.246:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃      瀹㈡埛鏈嶅姟鍣�(瀵屽皵杈�)  (鏈笂浜�)
-        target: 'http://rz5qwd.natappfree.cc', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃      瀹㈡埛鏈嶅姟鍣�(瀵屽皵杈�)  (涓婁簯)
+        target: 'http://192.168.16.246:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃      瀹㈡埛鏈嶅姟鍣�(瀵屽皵杈�)  (鏈笂浜�)
+        // target: 'http://pn3963.natappfree.cc', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃      瀹㈡埛鏈嶅姟鍣�(瀵屽皵杈�)  (涓婁簯)
 
         changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
         pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃

--
Gitblit v1.9.3