From 50df2e6412abc7460226b5e3060479d337629d2f Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期五, 14 六月 2024 17:01:40 +0800 Subject: [PATCH] 修改检验下单,统计图 --- src/components/do/b1-ins-order/add.vue | 13 +++++++++---- src/main.js | 8 ++++---- src/util/echarts.js | 2 +- src/components/view/b4-inspection-item-statistics.vue | 7 ++++--- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue index ffa7fc9..cc04d4d 100644 --- a/src/components/do/b1-ins-order/add.vue +++ b/src/components/do/b1-ins-order/add.vue @@ -153,16 +153,21 @@ <el-col class="search_thing" :span="6"> <div class="search_label"><span class="required-span">* </span>濮旀墭浜猴細</div> <div class="search_input"> - <el-input readonly size="small" v-model="addObj.custom"> + <el-input size="small" clearable disabled v-model="addObj.custom"></el-input> + <!-- <el-input readonly size="small" v-model="addObj.custom"> <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true" :disabled="active>1"></el-button></template> - </el-input> + </el-input> --> </div> </el-col> <el-col class="search_thing" :span="6"> <div class="search_label"><span class="required-span">* </span>濮旀墭鍗曚綅锛�</div> <div class="search_input"> - <el-input size="small" placeholder="鈫愰�夋嫨濮旀墭瀹㈡埛" clearable disabled v-model="addObj.company"></el-input> + <!-- <el-input size="small" placeholder="鈫愰�夋嫨濮旀墭瀹㈡埛" clearable disabled v-model="addObj.company"></el-input> --> + <el-input readonly size="small" v-model="addObj.company" placeholder="閫夋嫨濮旀墭鍗曚綅"> + <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true" + :disabled="active>1"></el-button></template> + </el-input> </div> </el-col> <el-col class="search_thing" :span="6"> @@ -418,7 +423,7 @@ </el-table-column> </el-table> </div> - <el-dialog title="閫夋嫨瀹㈡埛" :visible.sync="selectUserDia" width="70%"> + <el-dialog title="閫夋嫨鍗曚綅" :visible.sync="selectUserDia" width="70%"> <div class="body" style="height: 60vh;" v-if="selectUserDia"> <ValueTable ref="ValueTable2" :url="$api.user.selectCustomPageList" :componentData="componentData2" /> </div> diff --git a/src/components/view/b4-inspection-item-statistics.vue b/src/components/view/b4-inspection-item-statistics.vue index bc0a983..4dd2176 100644 --- a/src/components/view/b4-inspection-item-statistics.vue +++ b/src/components/view/b4-inspection-item-statistics.vue @@ -214,9 +214,9 @@ this.chartData0.yData[0].data = this.pageData.RECETENDAYS this.chartData1.yData[0].data = this.pageData.RECETENDAYS this.chartData1.yData[1].data = this.pageData.FINISHTENDAYS - this.chartData2.percentage = this.pageData.ACCEPT_RATE_TODAY*100+'%' - this.chartData3.percentage = this.pageData.FINISH_RATE_TODAY*100+'%' - this.chartData4.percentage = this.pageData.DELAY_RATE_TODAY*100+'%' + this.chartData2.percentage = (this.pageData.ACCEPT_RATE_TODAY*100).tofixed(0)+'%' + this.chartData3.percentage = (this.pageData.FINISH_RATE_TODAY*100).tofixed(0)+'%' + this.chartData4.percentage = (this.pageData.DELAY_RATE_TODAY*100).tofixed(0)+'%' this.chartData2.data[0].value = this.pageData.ACCEPT this.chartData2.data[1].value = this.pageData.FINISHE - this.pageData.ACCEPT this.loading = false; @@ -229,6 +229,7 @@ this.chartConfig2.isLoading = true this.chartConfig3.isLoading = true this.chartConfig4.isLoading = true + console.log(111111111,this.chartData2) }) }, handleData(val){ diff --git a/src/main.js b/src/main.js index 4293cee..a5fd672 100644 --- a/src/main.js +++ b/src/main.js @@ -15,16 +15,16 @@ Vue.prototype.PROJECT = '妫�娴嬩腑蹇�' // Vue.prototype.PROJECT = '瑁呭鐢电紗' //鏈湴 -Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80"; -const javaApi = 'http://127.0.0.1:8001'; +// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80"; +// const javaApi = 'http://127.0.0.1:8001'; //浜� // Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080"; // const javaApi = 'http://114.132.189.42:1234'; //妫�娴嬩腑蹇冩寮忓簱 -// Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080"; -// const javaApi = 'http://10.1.200.86:8001'; +Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080"; +const javaApi = 'http://10.1.200.86:8001'; //瑁呭鐢电紗娴嬭瘯搴� // Vue.prototype.LOCATIONVUE = "http://10.16.173.59"; diff --git a/src/util/echarts.js b/src/util/echarts.js index e2ce7bd..eec1f8c 100644 --- a/src/util/echarts.js +++ b/src/util/echarts.js @@ -196,7 +196,7 @@ backgroundColor: '#fff', tooltip: { trigger: 'item', - formatter: '{a} <br/>{b} : {c} ({d}%)' + formatter: '{a} <br/>{b} : {c}' }, title: { text: params.percentage, -- Gitblit v1.9.3