loulijun2021
2023-05-11 c588a47c9c7fbcbe6e0a479cfb081ffa4db2a94c
1.生产进度报表提交
已添加1个文件
已修改10个文件
952 ■■■■ 文件已修改
src/api/bbgl.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.js 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bbgl/scjd.vue 527 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/kb/cgdd.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/kb/cjsc.vue 211 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/kb/cjzl.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/kb/ckgl.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/kb/zhkb.vue 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/gdplgb.vue 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/xtsy/index.vue 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
  })
}
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',
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>
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
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)
      })
    },
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)
      })
    },
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>
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>
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
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))
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中的请求地址