From 0c60341966c08192588e140bbd2db97a9163189d Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 11 五月 2023 17:34:44 +0800
Subject: [PATCH] 1.生产进度报表提交
---
src/views/kb/cjsc.vue | 3
vue.config.js | 4
src/views/kb/cgdd.vue | 12
src/api/bbgl.js | 19 +
src/router/index.js | 36 ++-
src/views/bbgl/scjd.vue | 530 ++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 583 insertions(+), 21 deletions(-)
diff --git a/src/api/bbgl.js b/src/api/bbgl.js
index 361942d..b2c855d 100644
--- a/src/api/bbgl.js
+++ b/src/api/bbgl.js
@@ -141,3 +141,22 @@
})
}
+
+// 鐢熶骇杩涘害鎶ヨ〃鏌ヨ
+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 4ec8e6d..77acd7c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -438,13 +438,13 @@
name: 'SCDDCancel',
code: '1070',
component: () => import('@/views/scgl/scdd'),
- meta: { code: '1070', title: 'ERP鐢熶骇璁㈠崟', icon: '', keepAlive: true }
+ meta: { code: '1070', title: '鐢熶骇璁㈠崟', icon: '', keepAlive: true }
}, {
path: 'gd',
name: 'GDCancel',
code: '1071',
component: () => import('@/views/scgl/gd'),
- meta: { code: '1071', title: 'MES宸ュ崟', icon: '', keepAlive: true }
+ meta: { code: '1071', title: '宸ュ崟', icon: '', keepAlive: true }
}, {
path: 'gdpg',
name: 'GDPDCancel',
@@ -462,7 +462,7 @@
name: 'GDPLGBCancel',
code: '1074',
component: () => import('@/views/scgl/gdplgb'),
- meta: { code: '1074', title: 'MES宸ュ崟鎵归噺鍏抽棴', icon: '', keepAlive: true }
+ meta: { code: '1074', title: '宸ュ崟鎵归噺鍏抽棴', icon: '', keepAlive: true }
}, {
path: 'cngh',
name: 'CNGHCancel',
@@ -555,6 +555,13 @@
meta: { code: '1008', title: '鎶ヨ〃绠＄悊', icon: 'bbgl' },
alwaysShow: true,
children: [
+ {
+ path: 'produceSchedule',
+ name: 'produceScheduleCancel',
+ code: '1098',
+ component: () => import('@/views/bbgl/scjd'),
+ meta: { code: '1098', title: '鐢熶骇杩涘害鎶ヨ〃', icon: '', keepAlive: true }
+ },
{
path: 'bzgztj',
name: 'BZGZTJCancel',
@@ -739,9 +746,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: [
{
@@ -749,7 +756,7 @@
name: 'produceOrderCancel',
code: '1070',
component: () => import('@/views/scgl/scdd'),
- meta: { code: '1070', title: 'ERP鐢熶骇璁㈠崟', icon: '', keepAlive: true }
+ meta: { code: '1070', title: '鐢熶骇璁㈠崟', icon: '', keepAlive: true }
}
]
},
@@ -904,6 +911,13 @@
code: '1095',
component: () => import('@/views/bbgl/wxmx'),
meta: { code: '1095', title: '缁翠慨鏄庣粏鎶ヨ〃', icon: '', keepAlive: true }
+ },
+ {
+ path: 'produceSchedule',
+ name: 'produceScheduleCancel',
+ code: '1098',
+ component: () => import('@/views/bbgl/scjd'),
+ meta: { code: '1098', title: '鐢熶骇杩涘害鎶ヨ〃', icon: '', keepAlive: true }
}
// {
// path: 'installationLampList',
@@ -1042,14 +1056,14 @@
name: 'workOrderCancel',
code: '1071',
component: () => import('@/views/scgl/gd'),
- meta: { code: '1071', title: 'MES宸ュ崟', icon: '', keepAlive: true }
+ meta: { code: '1071', title: '宸ュ崟', icon: '', keepAlive: true }
},
{
path: 'workOrderBatchClose',
name: 'workOrderBatchCloseCancel',
code: '1074',
component: () => import('@/views/scgl/gdplgb'),
- meta: { code: '1074', title: 'MES宸ュ崟鎵归噺鍏抽棴', icon: '', keepAlive: true }
+ meta: { code: '1074', title: '宸ュ崟鎵归噺鍏抽棴', icon: '', keepAlive: true }
}
// {
// path: 'updateWorkOrder',
@@ -1210,14 +1224,14 @@
]
},
- // 18.鍏跺畠ERP闆嗘垚
+ // 18.鍏跺畠闆嗘垚
{
path: '/otherErp',
component: Layout,
redirect: '/otherErp/InventoryList',
- name: '鍏跺畠ERP闆嗘垚',
+ name: '鍏跺畠闆嗘垚',
code: '2018',
- meta: { code: '2018', title: '鍏跺畠ERP闆嗘垚', icon: 'erpjc' },
+ meta: { code: '2018', title: '鍏跺畠闆嗘垚', icon: 'erpjc' },
alwaysShow: true,
children: [
{
diff --git a/src/views/bbgl/scjd.vue b/src/views/bbgl/scjd.vue
new file mode 100644
index 0000000..bafe643
--- /dev/null
+++ b/src/views/bbgl/scjd.vue
@@ -0,0 +1,530 @@
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
+ <el-button v-waves type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
+ <!-- <el-button v-waves 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 v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button v-waves 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;-->
+
+ <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 elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+import { ProductionScheduleReportExcelSearch, ProductionScheduleReportSearch } from '@/api/bbgl'
+
+export default {
+ name: 'Zzjg',
+ components: {
+ Pagination
+ },
+ directives: { elDragDialog, waves },
+ 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 d4edfc6..3c2803b 100644
--- a/src/views/kb/cgdd.vue
+++ b/src/views/kb/cgdd.vue
@@ -147,7 +147,7 @@
width="104"
>
<template slot-scope="{row}">
- <div v-if="new Date(row.voucherdate.substring(0,10)).getTime()<new Date('2023-05-01').getTime()">
+ <div v-if="(new Date(row.voucherdate.substring(0,10)).getTime()<new Date('2023-05-06').getTime())">
{{parseFloat(row.quantity)}}
</div>
<div v-else>0</div>
@@ -158,7 +158,7 @@
width="104"
>
<template slot-scope="{row}">
- <div v-if="new Date(row.voucherdate.substring(0,10)).getTime()<new Date('2023-05-01').getTime()">
+ <div v-if="(new Date(row.voucherdate.substring(0,10)).getTime()<new Date('2023-05-06').getTime())">
0
</div>
<div v-else>{{parseFloat(row.quantity - row.quantity1)}}</div>
@@ -180,11 +180,9 @@
width="139"
>
<template slot-scope="{row}">
- <div v-if="parseFloat(row.warning)<0" style="color: red">{{
- Math.abs(parseFloat(row.warning))
- }}
- </div>
- <div v-else-if="row.warning===null||row.warning===''||row.warning>=0">0</div>
+
+ <div v-if="row.warning===null||row.warning===''||row.warning>=0||(new Date(row.voucherdate.substring(0,10)).getTime()<new Date('2023-05-06').getTime())">0</div>
+ <div v-else-if="parseFloat(row.warning)<0" style="color: red">{{ Math.abs(parseFloat(row.warning)) }}</div>
<!-- <div v-else-if="parseFloat(row.warning)>3">{{ row.warning }}</div>-->
<!-- <div v-else-if="parseFloat(row.warning)>0&&parseFloat(row.warning)<=3" style="color:yellow;">-->
<!-- {{ row.warning }}-->
diff --git a/src/views/kb/cjsc.vue b/src/views/kb/cjsc.vue
index 41c691d..a19aa26 100644
--- a/src/views/kb/cjsc.vue
+++ b/src/views/kb/cjsc.vue
@@ -326,11 +326,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))
diff --git a/vue.config.js b/vue.config.js
index e1c8fee..8a18c07 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,8 +53,8 @@
proxy: {
[process.env.VUE_APP_BASE_API]: {
// target: 'http://121.196.36.24:8011', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
- target: 'http://192.168.1.102:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鑾辩 锛堟湭涓婁簯锛�
- // target: 'http://tr3b6v.natappfree.cc', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鑾辩 (涓婁簯)
+ // target: 'http://192.168.1.102:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鑾辩 锛堟湭涓婁簯锛�
+ target: 'http://tr3b6v.natappfree.cc', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鑾辩 (涓婁簯)
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇穤姹傚湴鍧�
--
Gitblit v1.9.3