From 9b26870265cbbc75bcd32529e46b229a49ec30a0 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期二, 05 九月 2023 11:29:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/experiment/passRateStatistics/index.vue | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/views/experiment/passRateStatistics/index.vue b/src/views/experiment/passRateStatistics/index.vue index a0eadd9..ce5fd7a 100644 --- a/src/views/experiment/passRateStatistics/index.vue +++ b/src/views/experiment/passRateStatistics/index.vue @@ -29,7 +29,7 @@ </el-form-item> <div class="rightBtn"> <el-form-item> - <el-button type="primary" plain size="mini">娓呯┖</el-button> + <el-button type="primary" @click="clear" plain size="mini">娓呯┖</el-button> <el-button type="primary" @click="search" size="mini">鏌ヨ</el-button> </el-form-item> </div> @@ -60,7 +60,7 @@ }}</el-radio-button> </el-radio-group> </div> - <div style="width: 100%;height: 100;"> + <div style="width: 100%;height: 100%;"> <div :hidden="projectData" class="secondBox" ref="unqualified_project"></div> <div :hidden="!projectData" style="height: 100%;text-align: center; color: #999696df; margin-top: 100px;">鏆傛棤鏁版嵁 </div> @@ -70,6 +70,7 @@ </div> <div class="bottom"> <el-button type="primary" size="mini">鏁版嵁瀵煎嚭</el-button> + <!-- <el-button type="primary" size="mini" @click="testWork">娴嬭瘯</el-button> --> </div> </div> </template> @@ -90,6 +91,7 @@ import * as echarts from 'echarts' import { getSupplierList, getTestSampleStatistics, getSupplierNoPassStatistics, getNoPassProjectStatistics, getSampleOptions } from '@/api/experiment/passRateStatistics'; import { dateFormat } from '../../../utils/dateUtil' +import MyWorker from 'comlink-loader!../../../worker/test'; export default { data() { return { @@ -151,6 +153,19 @@ this.tableStart() }, methods: { + testWork(){ + const inst = new MyWorker(); + inst.test() + for (let index = 0; index < 100; index++) { + console.log("涓荤嚎绋�"+index); + } + }, + clear(){ + this.searchData.date=[] + this.searchData.type=null + this.searchData.supplier=null + this.searchData.code=null + }, async search() { this.testSampleStatistics = null this.supplierNoPassStatistics = null @@ -240,9 +255,15 @@ const myChart2 = echarts.init(chartDom_unqualified_provider, null, { height: 300 }); + const myChart3 = echarts.init(chartDom_unqualified_project, null, { height: 268 }); + window.addEventListener("resize",function(){ + myChart1.resize() + myChart2.resize() + myChart3.resize() + }) this.m1 = myChart1 this.m2 = myChart2 this.m3 = myChart3 -- Gitblit v1.9.3