| .env.development | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| .env.production | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| public/favicon.ico | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/api/kanbanManager.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/styles/global.css | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/utils/myEcharts.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/utils/request.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/kb/procure.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/kb/warehouse.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| vue.config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.env.development
@@ -2,4 +2,4 @@ ENV = 'development' # base api VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = '/api/' .env.production
@@ -2,5 +2,5 @@ ENV = 'production' # base api VUE_APP_BASE_API = '/prod-api' VUE_APP_BASE_API = '/apis/' public/favicon.icosrc/api/kanbanManager.js
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,66 @@ import request from '@/utils/request' // å鸣ä»åºçæ¿å·¦ä¸,çäº§å¾ å ¥åº export function ProductionStockedInLeftTop() { return request({ url: 'KanBanManagerent/ProductionStockedInLeftTop', method: 'get' }) } // å鸣ä»åºçæ¿å·¦ä¸,产åå¾ åè´§ export function ProductConsignmentLeftBottom() { return request({ url: 'KanBanManagerent/ProductConsignmentLeftBottom', method: 'get' }) } // å鸣ä»åºçæ¿å³ä¸,è¿ä¸å¨çäº§å¾ å ¥åºäº§åæè¡TOP5 export function ProductionStockedInRightTop() { return request({ url: 'KanBanManagerent/ProductionStockedInRightTop', method: 'get' }) } // å鸣ä»åºçæ¿å³ä¸,è¿ä¸å¨éå®å¾ å货产åæè¡TOP5 export function ProductionStockedInRightBottom() { return request({ url: 'KanBanManagerent/ProductionStockedInRightBottom', method: 'get' }) } // å鸣éè´å§å¤çæ¿å·¦ä¸,éè´å¾ å ¥åº export function ProcureOutsourcLeftTop() { return request({ url: 'KanBanManagerent/ProcureOutsourcLeftTop', method: 'get' }) } // å鸣éè´å§å¤çæ¿å·¦ä¸,å§å¤å¾ å ¥åº export function ProcureOutsourcLeftBottom() { return request({ url: 'KanBanManagerent/ProcureOutsourcLeftBottom', method: 'get' }) } // å鸣éè´å§å¤çæ¿å³ä¸,è¿ä¸å¨éè´å¾ å ¥åºç©ææè¡TOP5 export function ProcureOutsourcRightTop() { return request({ url: 'KanBanManagerent/ProcureOutsourcRightTop', method: 'get' }) } // å鸣éè´å§å¤çæ¿å³ä¸,è¿ä¸å¨å§å¤å¾ å ¥åºäº§åæè¡TOP5 export function ProcureOutsourcRightBottom() { return request({ url: 'KanBanManagerent/ProcureOutsourcRightBottom', method: 'get' }) } src/styles/global.css
@@ -1,24 +1,120 @@ /*å ¨å±æ ·å¼è¡¨*/ html, body, #app { height: 1080px; height: 100%; margin: 0; padding: 0; width: 1920px; overflow-y: hidden; overflow-x: hidden; /*min-width: 1800px;*/ /*overflow-y: hidden;*/ /*overflow-x: hidden;*/ -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; text-rendering: optimizeLegibility; font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; } /*.body {*/ /* display: flex;*/ /* flex-direction: column;*/ /* height: 800px;*/ /* background-color: #eee;*/ /* margin: 0;*/ /* padding: 30px 10px 0 20px;*/ /*}*/ .body { display: flex; flex-direction: column; height: 100%; background-color: #eaecef; margin: 0; padding: 0 10px; } /*头鍿é®ç»æ ·å¼*/ .bodyTopButtonGroup { /*padding-left: 10px;*/ display: flex; background-color: #f8f8fa; margin-top: 10px; padding: 5px 10px; border-bottom: 3px solid #eee; } /*头é¨è¡¨åç»æ ·å¼*/ .bodyTopFormGroup { background-color: #f8f8fa; padding: 10px 10px 0 10px; display: flex; flex-direction: column; } .bodySearchReset { display: flex; align-items: start; margin-top: 3px; /*margin-left: 5%;*/ /*margin-left: 10%;*/ } .bodyTopFormExpand { display: block; text-align: center; margin-top: 5px; /*justify-content: center;*/ /*align-items: center;*/ /*background-color: #eee;*/ /*cursor: pointer;*/ } .bodyTopFormExpand:hover{ color: #00ff8b !important; } .svg-icon:hover{ color: #00ff8b !important; /*background-color: #00ff8b !important;*/ } .elForm { display: flex; /*justify-content: flex-start;*/ /*justify-content: space-between;*/ /*justify-content: space-around;*/ width: 100%; flex-wrap: wrap; } .elTableDiv { display: flex; border: 1px solid #eee; /*width: 99%;*/ width: 100%; margin: 10px auto; /*margin-top: 20px;*/ box-shadow: 0 0 5px #d7d6d6; position: relative; } .operationClass { height: 23px; display: flex; justify-content: space-between; align-items: center; } /*å¯¹è¯æ¡æé®åºé¨*/ .footerButton { display: flex; justify-content: end; } .ellipsis { text-overflow: ellipsis; overflow: hidden; white-space: nowrap; } .osloading { font-size: 26px !important; } .el-loading-text { font-size: 26px !important; } /* å®ä¹æ»å¨æ¡é«å®½åèæ¯ @@ -27,12 +123,15 @@ ::-webkit-scrollbar { width: 7px; height: 7px; background-color: white; /*background-color: white;*/ background-color: #f8f8fa; } ::-webkit-scrollbar-thumb { box-shadow: inset 0 0 0px white; -webkit-box-shadow: inset 0 0 0px white; /*box-shadow: inset 0 0 0px white;*/ box-shadow: inset 0 0 0px #f8f8fa; /*-webkit-box-shadow: inset 0 0 0px white;*/ -webkit-box-shadow: inset 0 0 0px #f8f8fa; background-color: rgb(193, 193, 193); /*æ»å¨æ¡çèæ¯é¢è²*/ border-radius: 20px; @@ -49,8 +148,17 @@ .el-table__fixed-right::before, .el-table__fixed::before { background-color: unset !important; /*background-color: unset !important;*/ background-color: #f8f8fa !important; } /*scrollbar END*/ /*è§£å³åºå®æ»å¨æ¡é«ä½åç´ å·®*/ .el-table__fixed::before{ height: 0 !important; } .el-table__fixed-right::before{ height: 0 !important; } src/utils/myEcharts.js
ÎļþÌ«´ó src/utils/request.js
@@ -46,26 +46,32 @@ const res = response.data // if the custom code is not 20000, it is judged as an error. if (res.code !== 20000) { // if (res.code !== 20000) { // Message({ // message: res.message || 'Error', // type: 'error', // duration: 5 * 1000 // }) // // // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired; // if (res.code === 50008 || res.code === 50012 || res.code === 50014) { // // to re-login // MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', { // confirmButtonText: 'Re-Login', // cancelButtonText: 'Cancel', // type: 'warning' // }).then(() => { // store.dispatch('user/resetToken').then(() => { // location.reload() // }) // }) // } if (res.code === '300' || res.code === '303') { Message({ message: res.message || 'Error', message: res.Message || 'Error', type: 'error', duration: 5 * 1000 }) // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired; if (res.code === 50008 || res.code === 50012 || res.code === 50014) { // to re-login MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', { confirmButtonText: 'Re-Login', cancelButtonText: 'Cancel', type: 'warning' }).then(() => { store.dispatch('user/resetToken').then(() => { location.reload() }) }) } return Promise.reject(new Error(res.message || 'Error')) } else { return res src/views/kb/procure.vue
@@ -9,7 +9,7 @@ </div> <div class="kb_headTime kb_header_text" style="top: 35px;left: 800px"> <span>ä»åºç®¡çæ°ååçæ¿</span> <span>éè´å§å¤æ°ååçæ¿</span> </div> <div class="kb_headTime" style="top: 35px;right: 25px"> @@ -326,12 +326,12 @@ <script> import './kbCommon.css' import { bar02, kbTop, loadEcharts } from '@/utils/myEcharts' // import { // WareHouseRightBottomData, // WareHouseRightTopData, // WareHouseTopBottomData, // WareHouseTopLeftData // } from '@/api/kanbanManager' import { ProcureOutsourcLeftTop, ProcureOutsourcLeftBottom, ProcureOutsourcRightTop, ProcureOutsourcRightBottom } from '@/api/kanbanManager' export default { name: 'Index2', @@ -371,10 +371,10 @@ window.addEventListener('online', this.updateOnlineStatus) window.addEventListener('offline', this.updateOnlineStatus) this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true }) // // this.getWareHouseTopLeftData() // this.getWareHouseTopBottomData() // this.getEcharts() this.getProcureOutsourcLeftTop() this.getProcureOutsourcLeftBottom() this.getEcharts() }, beforeDestroy() { window.removeEventListener('online', this.updateOnlineStatus) @@ -405,8 +405,8 @@ }, // è·åå·¦ä¸tableæ°æ® getWareHouseTopLeftData() { WareHouseTopLeftData().then(res => { getProcureOutsourcLeftTop() { ProcureOutsourcLeftTop().then(res => { this.tableDataTop = res.data // this.number1 = this.tableDataTop.length const divData = this.$refs.tableDataTopRef.bodyWrapper @@ -419,12 +419,12 @@ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) { // éç½®tableè·ç¦»é¡¶é¨è·ç¦» divData.scrollTop = 0 WareHouseTopLeftData().then(res => { ProcureOutsourcLeftTop().then(res => { this.tableDataTop = res.data // this.number1 = this.tableDataTop.length if (this.tableDataTop.length > 10) { clearInterval(this.tableTopTask) this.getWareHouseTopLeftData() this.getProcureOutsourcLeftTop() } }) } @@ -432,8 +432,8 @@ }) }, // è·åå·¦ä¸tableæ°æ® getWareHouseTopBottomData() { WareHouseTopBottomData().then(res => { getProcureOutsourcLeftBottom() { ProcureOutsourcLeftBottom().then(res => { this.tableDataBottom = res.data this.number2 = this.tableDataBottom.length const divData = this.$refs.tableDataBottomRef.bodyWrapper @@ -447,12 +447,12 @@ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) { // éç½®tableè·ç¦»é¡¶é¨è·ç¦» divData.scrollTop = 0 WareHouseTopBottomData().then(res => { ProcureOutsourcLeftBottom().then(res => { this.tableDataBottom = res.data this.number2 = this.tableDataBottom.length if (this.tableDataBottom.length > 10) { clearInterval(this.tableBottomTask) this.getWareHouseTopBottomData() this.getProcureOutsourcLeftBottom() } }) } @@ -462,23 +462,23 @@ // è·åecharts getEcharts() { WareHouseRightTopData().then(res => { loadEcharts('bar03', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name))) ProcureOutsourcRightTop().then(res => { loadEcharts('bar03', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name))) }) WareHouseRightBottomData().then(res => { loadEcharts('bar04', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name))) ProcureOutsourcRightBottom().then(res => { loadEcharts('bar04', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name))) }) this.echartsRightTop = setInterval(() => { WareHouseRightTopData().then(res => { loadEcharts('bar03', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name))) ProcureOutsourcRightTop().then(res => { loadEcharts('bar03', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name))) }) }, 1000 * 15) this.echartsRightBottom = setInterval(() => { WareHouseRightBottomData().then(res => { loadEcharts('bar04', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name))) ProcureOutsourcRightBottom().then(res => { loadEcharts('bar04', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name))) }) }, 1000 * 15) }, src/views/kb/warehouse.vue
@@ -37,7 +37,7 @@ <el-table-column prop="voucherdate" label="åæ®æ¥æ" width="131" width="151" > <template slot-scope="{row}"> <div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div> @@ -72,19 +72,11 @@ <div v-else>/</div> </template> </el-table-column> <!-- <el-table-column--> <!-- prop="materiel_code"--> <!-- label="产åç¼å·"--> <!-- width="136"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- <div class="ellipsis">{{ row.materiel_code }}</div>--> <!-- </template>--> <!-- </el-table-column>--> <el-table-column prop="materiel_name" label="产ååç§°" width="180" width="260" > <template slot-scope="{row}"> <div class="ellipsis">{{ row.materiel_name }}</div> @@ -93,7 +85,7 @@ <el-table-column prop="specification" label="è§æ ¼åå·" width="136" width="116" > <template slot-scope="{row}"> <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div> @@ -103,7 +95,7 @@ <el-table-column prop="stck_name" label="é¢å ¥ä»åº" width="100" width="110" > <template slot-scope="{row}"> <div v-if="row.stck_name" class="ellipsis">{{ row.stck_name }}</div> @@ -113,43 +105,19 @@ <el-table-column prop="quantity" label="æ°é" width="63" width="73" /> <el-table-column prop="totalStockInQuantity" label="å·²å ¥åºæ°é" width="100" width="120" > <template slot-scope="{row}"> <div v-if="row.totalStockInQuantity">{{ row.totalStockInQuantity }}</div> <div v-else>0</div> </template> </el-table-column> <!-- <el-table-column--> <!-- prop="uomname"--> <!-- label="åä½"--> <!-- width="50"--> <!-- />--> <!-- <el-table-column--> <!-- prop="preStartDate"--> <!-- label="é¢è®¡å¼å·¥"--> <!-- width="100"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- <div v-if="row.preStartDate">{{ row.preStartDate.substring(0, 10) }}</div>--> <!-- <div v-else />--> <!-- </template>--> <!-- </el-table-column>--> <el-table-column prop="preFinishDate" label="é¢è®¡å ¥åº" width="140" > <template slot-scope="{row}"> <div v-if="row.preFinishDate">{{ row.preFinishDate.substring(0, 10) }}</div> <div v-else /> </template> </el-table-column> </el-table> </div> </div> @@ -187,45 +155,11 @@ <div class="ellipsis">{{ row.wo }}</div> </template> </el-table-column> <!-- <el-table-column--> <!-- prop="customename"--> <!-- label="客æ·"--> <!-- width="288"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- <div v-if="row.customename" class="ellipsis">{{ row.customename }}</div>--> <!-- <div v-else>/</div>--> <!-- </template>--> <!-- </el-table-column>--> <!-- <el-table-column--> <!-- prop="username"--> <!-- label="ä¸å¡å"--> <!-- width="65"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- <div v-if="row.username" class="ellipsis">{{ row.username }}</div>--> <!-- <div v-else>/</div>--> <!-- </template>--> <!-- </el-table-column>--> <!-- <el-table-column--> <!-- prop="SourceVoucherCode"--> <!-- label="æ¥æºåå·"--> <!-- width="185"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- <div v-if="row.SourceVoucherCode" class="ellipsis">{{ row.SourceVoucherCode }}</div>--> <!-- <div v-else>/</div>--> <!-- </template>--> <!-- </el-table-column>--> <!-- <el-table-column--> <!-- prop="materiel_code"--> <!-- label="产åç¼å·"--> <!-- width="96"--> <!-- />--> <el-table-column prop="materiel_name" label="产ååç§°" width="288" width="258" > <template slot-scope="{row}"> <div v-if="row.materiel_name" class="ellipsis">{{ row.materiel_name }}</div> @@ -234,7 +168,7 @@ <el-table-column prop="specification" label="è§æ ¼åå·" width="300" width="200" > <template slot-scope="{row}"> <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div> @@ -260,26 +194,7 @@ <div v-else>0</div> </template> </el-table-column> <!-- <el-table-column--> <!-- prop="priuserdefnvc1"--> <!-- label="æ£éªæ¹å¼"--> <!-- width="110"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- <div v-if="row.priuserdefnvc1">{{ row.priuserdefnvc1 }}</div>--> <!-- <div v-else>/</div>--> <!-- </template>--> <!-- </el-table-column>--> <!-- <el-table-column--> <!-- prop="priuserdefnvc2"--> <!-- label="æ£éªäººå"--> <!-- width="110"--> <!-- >--> <!-- <template slot-scope="{row}">--> <!-- <div v-if="row.priuserdefnvc2">{{ row.priuserdefnvc2 }}</div>--> <!-- <div v-else>/</div>--> <!-- </template>--> <!-- </el-table-column>--> <el-table-column prop="deliveryDate" label="é¢è®¡äº¤è´§æ¥æ" @@ -287,6 +202,17 @@ > <template slot-scope="{row}"> <div v-if="row.deliveryDate">{{ row.deliveryDate.substring(0,10) }}</div> <div v-else>/</div> </template> </el-table-column> <el-table-column prop="warning" label="å»¶æå¤©æ°" width="130" > <template slot-scope="{row}"> <div v-if="row.warning">{{ row.warning }}</div> <div v-else>/</div> </template> </el-table-column> @@ -326,12 +252,12 @@ <script> import './kbCommon.css' import { bar02, kbTop, loadEcharts } from '@/utils/myEcharts' // import { // WareHouseRightBottomData, // WareHouseRightTopData, // WareHouseTopBottomData, // WareHouseTopLeftData // } from '@/api/kanbanManager' import { ProductionStockedInLeftTop, ProductConsignmentLeftBottom, ProductionStockedInRightTop, ProductionStockedInRightBottom } from '@/api/kanbanManager' export default { name: 'Index2', @@ -371,10 +297,10 @@ window.addEventListener('online', this.updateOnlineStatus) window.addEventListener('offline', this.updateOnlineStatus) this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true }) // // this.getWareHouseTopLeftData() // this.getWareHouseTopBottomData() // this.getEcharts() this.getProductionStockedInLeftTop() this.getProductConsignmentLeftBottom() this.getEcharts() }, beforeDestroy() { window.removeEventListener('online', this.updateOnlineStatus) @@ -403,10 +329,9 @@ } } }, // è·åå·¦ä¸tableæ°æ® getWareHouseTopLeftData() { WareHouseTopLeftData().then(res => { getProductionStockedInLeftTop() { ProductionStockedInLeftTop().then(res => { this.tableDataTop = res.data // this.number1 = this.tableDataTop.length const divData = this.$refs.tableDataTopRef.bodyWrapper @@ -419,12 +344,12 @@ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) { // éç½®tableè·ç¦»é¡¶é¨è·ç¦» divData.scrollTop = 0 WareHouseTopLeftData().then(res => { ProductionStockedInLeftTop().then(res => { this.tableDataTop = res.data // this.number1 = this.tableDataTop.length if (this.tableDataTop.length > 10) { clearInterval(this.tableTopTask) this.getWareHouseTopLeftData() this.getProductionStockedInLeftTop() } }) } @@ -432,8 +357,8 @@ }) }, // è·åå·¦ä¸tableæ°æ® getWareHouseTopBottomData() { WareHouseTopBottomData().then(res => { getProductConsignmentLeftBottom() { ProductConsignmentLeftBottom().then(res => { this.tableDataBottom = res.data this.number2 = this.tableDataBottom.length const divData = this.$refs.tableDataBottomRef.bodyWrapper @@ -447,12 +372,12 @@ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) { // éç½®tableè·ç¦»é¡¶é¨è·ç¦» divData.scrollTop = 0 WareHouseTopBottomData().then(res => { ProductConsignmentLeftBottom().then(res => { this.tableDataBottom = res.data this.number2 = this.tableDataBottom.length if (this.tableDataBottom.length > 10) { clearInterval(this.tableBottomTask) this.getWareHouseTopBottomData() this.getProductConsignmentLeftBottom() } }) } @@ -462,23 +387,23 @@ // è·åecharts getEcharts() { WareHouseRightTopData().then(res => { loadEcharts('bar03', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name))) ProductionStockedInRightTop().then(res => { loadEcharts('bar03', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name))) }) WareHouseRightBottomData().then(res => { loadEcharts('bar04', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name))) ProductionStockedInRightBottom().then(res => { loadEcharts('bar04', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name))) }) this.echartsRightTop = setInterval(() => { WareHouseRightTopData().then(res => { loadEcharts('bar03', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name))) ProductionStockedInRightTop().then(res => { loadEcharts('bar03', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name))) }) }, 1000 * 15) this.echartsRightBottom = setInterval(() => { WareHouseRightBottomData().then(res => { loadEcharts('bar04', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name))) ProductionStockedInRightBottom().then(res => { loadEcharts('bar04', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name))) }) }, 1000 * 15) }, vue.config.js
@@ -37,7 +37,26 @@ warnings: false, errors: true }, before: require('./mock/mock-server.js') proxy: { [process.env.VUE_APP_BASE_API]: { target: 'http://121.196.36.24:8025', // 请æ±ç第ä¸â½ æ¥â¼å°å æ¬å°å¼åæå¡å¨ // target: 'http://192.168.94.59:8001', // 请æ±ç第ä¸â½ æ¥â¼å°å å®¢æ·æå¡å¨ changeOrigin: true, // 请æ±è·¨åæ¶ï¼é é ç½®æ¤é¡¹ pathRewrite: { // è·¯å¾éå,æ¿æ¢targetä¸ç请æ±å°å ['^' + process.env.VUE_APP_BASE_API]: '/api/' } // ws: true;//å¼å¯ws, 妿æ¯httpä»£çæ¤å¤å¯ä»¥ä¸ç¨è®¾ç½® } // [process.env.VUE_APP_BASE_API_BASE]: { // target: 'http://121.196.36.24:8019', // 请æ±ç第ä¸â½ æ¥â¼å°å æ¬å°å¼åæå¡å¨ // changeOrigin: true, // 请æ±è·¨åæ¶ï¼é é ç½®æ¤é¡¹ // pathRewrite: { // è·¯å¾éå,æ¿æ¢targetä¸ç请æ±å°å // ['^' + process.env.VUE_APP_BASE_API_BASE]: '/base/' // } // // ws: true;//å¼å¯ws, 妿æ¯httpä»£çæ¤å¤å¯ä»¥ä¸ç¨è®¾ç½® // } } // before: require('./mock/mock-server.js') }, configureWebpack: { // provide the app's title in webpack's name field, so that