1.看板数据修正

2.增加环境变量配置
main
董哲奇 7 months ago
parent 3e93854416
commit d0a8247ffe

@ -0,0 +1,5 @@
# just a flag
ENV = development
# base api
VUE_APP_BASE_API = 'http://127.0.0.1:9080/'

@ -0,0 +1,5 @@
# just a flag
ENV = 'production'
#铁舾生产环境服务器
VUE_APP_BASE_API = 'http://192.127.0.22:8081/'

@ -3,8 +3,9 @@
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "dev": "vue-cli-service serve --mode development",
"build": "vue-cli-service build", "serve": "vue-cli-service serve --mode server",
"build": "vue-cli-service build --mode production",
"lint": "vue-cli-service lint" "lint": "vue-cli-service lint"
}, },
"dependencies": { "dependencies": {

@ -2,7 +2,7 @@
<!-- 垮位分析 --> <!-- 垮位分析 -->
<div class="amphiPosition-container"> <div class="amphiPosition-container">
<!-- 筛选 --> <!-- 筛选 -->
<div class="formData-box"> <!-- <div class="formData-box">
<el-form ref="form" :model="formData" label-width="90px"> <el-form ref="form" :model="formData" label-width="90px">
<el-form-item label="请选择年份" size="mini"> <el-form-item label="请选择年份" size="mini">
<el-select v-model="formData.year" placeholder=""> <el-select v-model="formData.year" placeholder="">
@ -12,7 +12,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="query-btn" @click="queryBtn"></div> <div class="query-btn" @click="queryBtn"></div>
</div> </div>-->
<div class="amphiPosition-box"> <div class="amphiPosition-box">
<div class="left-box"> <div class="left-box">
<div class="border-out"> <div class="border-out">

@ -2,7 +2,7 @@
<!-- 前方需求分析 --> <!-- 前方需求分析 -->
<div class="forwardDemand-container"> <div class="forwardDemand-container">
<!-- 筛选 --> <!-- 筛选 -->
<div class="formData-box"> <!-- <div class="formData-box">
<el-form ref="form" :model="formData" label-width="90px"> <el-form ref="form" :model="formData" label-width="90px">
<el-form-item label="请选择年份" size="mini"> <el-form-item label="请选择年份" size="mini">
<el-select v-model="formData.year"> <el-select v-model="formData.year">
@ -12,7 +12,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="query-btn" @click="queryBtn"></div> <div class="query-btn" @click="queryBtn"></div>
</div> </div>-->
<div class="forwardDemand-box"> <div class="forwardDemand-box">
<div class="left-box"> <div class="left-box">
<div class="border-out"> <div class="border-out">
@ -156,6 +156,8 @@ export default {
nf: this.formData.year, nf: this.formData.year,
}).then((res) => { }).then((res) => {
this.tableList = res.data.detail; this.tableList = res.data.detail;
res.data.xq=res.data.xq?parseInt(res.data.xq).toFixed(0):'0'
this.xqzlSum=res.data.xq
this.rowObj = res.data; this.rowObj = res.data;
this.$nextTick(() => { this.$nextTick(() => {
const elementHeight = this.$refs.refHeight; const elementHeight = this.$refs.refHeight;
@ -174,7 +176,7 @@ export default {
let dataJhzlY = []; let dataJhzlY = [];
let dataWczlY = []; let dataWczlY = [];
let dataXqzlY = []; let dataXqzlY = [];
this.xqzlSum = 0; // this.xqzlSum = 0;
this.jhzlSum = 0; this.jhzlSum = 0;
this.wczlSum = 0; this.wczlSum = 0;
res.data.forEach((item) => { res.data.forEach((item) => {
@ -182,7 +184,7 @@ export default {
dataJhzlY.push(item.jhzl); dataJhzlY.push(item.jhzl);
dataWczlY.push(item.wczl); dataWczlY.push(item.wczl);
dataXqzlY.push(item.xqzl); dataXqzlY.push(item.xqzl);
this.xqzlSum += item.xqzl; // this.xqzlSum += item.xqzl;
this.jhzlSum += item.jhzl; this.jhzlSum += item.jhzl;
this.wczlSum += item.wczl; this.wczlSum += item.wczl;
}); });

@ -2,7 +2,7 @@
<!-- 线表分析 --> <!-- 线表分析 -->
<div class="lineTableAnalysis-container"> <div class="lineTableAnalysis-container">
<!-- 筛选 --> <!-- 筛选 -->
<div class="formData-box"> <!-- <div class="formData-box">
<el-form ref="form" :model="formData" label-width="90px"> <el-form ref="form" :model="formData" label-width="90px">
<el-form-item label="请选择年份" size="mini"> <el-form-item label="请选择年份" size="mini">
<el-select v-model="formData.year" placeholder=""> <el-select v-model="formData.year" placeholder="">
@ -12,7 +12,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="query-btn" @click="queryBtn"></div> <div class="query-btn" @click="queryBtn"></div>
</div> </div>-->
<div class="lineTableAnalysis-box"> <div class="lineTableAnalysis-box">
<div class="left-box"> <div class="left-box">
<div class="border-out"> <div class="border-out">
@ -90,7 +90,7 @@ export default {
}).then((res) => { }).then((res) => {
const ydjhList = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; const ydjhList = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
res.data.ydjh.forEach((item) => { res.data.ydjh.forEach((item) => {
ydjhList[item.mon - 1] = item.zl; ydjhList[item.mon - 1] = item.zl?.toFixed(0);
}); });
this.xbjhList = res.data.xbjh; this.xbjhList = res.data.xbjh;
this.ydjhList = ydjhList; this.ydjhList = ydjhList;

@ -147,18 +147,18 @@ export default {
zrcTable() { zrcTable() {
zrcTable().then((res) => { zrcTable().then((res) => {
this.tableSumObj = res.data; this.tableSumObj = res.data;
var bgData = [res.data.xqzl, res.data.xqzl, res.data.xqzl, res.data.xqzl]; var bgData = [res.data.xqzl||0, res.data.xqzl||0, res.data.xqzl||0, res.data.xqzl||0];
var zlData = [ res.data.xqzl,res.data.dhzl, res.data.jhzl, res.data.wczl]; var zlData = [res.data.xqzl||0,res.data.dhzl||0, res.data.jhzl||0, res.data.wczl||0];
this.DrawingBar(bgData,zlData); this.DrawingBar(bgData,zlData);
// this.ForwardDemandBar(); // this.ForwardDemandBar();
// this.MonthlyPlanBar(); // this.MonthlyPlanBar();
// this.finishBar(); // this.finishBar();
this.drawingPie(res.data.ltsl, res.data.tzsl); this.drawingPie(res.data.ltsl||0, res.data.tzsl||0);
this.planFinishPie(res.data.jhzl, res.data.wczl); this.planFinishPie(res.data.jhzl||0, res.data.wczl||0);
this.forwardDemandPie(res.data.xqzl, res.data.dhzl); this.forwardDemandPie(res.data.xqzl||0, res.data.dhzl||0);
this.monthlyPlanPie(res.data.xqzl, res.data.jhzl); this.monthlyPlanPie(res.data.xqzl||0, res.data.jhzl||0);
this.finishPie(res.data.xqzl, res.data.wczl); this.finishPie(res.data.xqzl||0, res.data.wczl||0);
}); });
}, },
DrawingBar(bgData,zlData) { DrawingBar(bgData,zlData) {

@ -120,7 +120,7 @@ export default {
}, },
pdfChange(item) { pdfChange(item) {
this.pdfUrl = pdf.createLoadingTask( this.pdfUrl = pdf.createLoadingTask(
`http://kban.runpengsoft.com/upload/${this.formData.dcCh}/${this.formData.dcPl}/PDF/${item}.pdf` `${process.env.VUE_APP_BASE_API}/upload/${this.formData.dcCh}/${this.formData.dcPl}/PDF/${item}.pdf`
); );
this.pdfUrl.promise this.pdfUrl.promise
.then((pdf) => { .then((pdf) => {

@ -1,6 +1,6 @@
import axios from "axios"; import axios from "axios";
const service = axios.create({ const service = axios.create({
baseURL: "http://kban.runpengsoft.com", baseURL: process.env.VUE_APP_BASE_API,
timeout: 600000, //600000 timeout: 600000, //600000
withCredentials: false, withCredentials: false,
}); });

Loading…
Cancel
Save