From 34a7e21b3508ac0f5f011d958210fdb7176d726b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 09 九月 2023 11:54:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/lims-before

---
 src/views/experiment/passRateStatistics/index.vue |   41 ++++++++++++++++++++++++++++++-----------
 1 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/views/experiment/passRateStatistics/index.vue b/src/views/experiment/passRateStatistics/index.vue
index a0eadd9..75437a0 100644
--- a/src/views/experiment/passRateStatistics/index.vue
+++ b/src/views/experiment/passRateStatistics/index.vue
@@ -1,38 +1,36 @@
 <template>
   <div class="content-main">
     <div class="top-bar">
-      <el-form ref="form" :inline="true" :rules="rules" :model="searchData" label-position="top">
+      <el-form ref="form" :inline="true" :rules="rules" :model="searchData" label-position="left">
         <el-form-item label="妫�娴嬫棩鏈�:" class="sermargin" prop="date">
-          <el-date-picker v-model="searchData.date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
+          <el-date-picker size="small" v-model="searchData.date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
             end-placeholder="缁撴潫鏃ユ湡">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="妫�楠岀被鍨�:" class="sermargin" prop="type">
-          <el-select v-model="searchData.type" placeholder="鍏ㄩ儴">
+          <el-select size="small" v-model="searchData.type" placeholder="鍏ㄩ儴">
             <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="渚涘簲鍟�:">
-          <el-select v-model="searchData.supplier" placeholder="鍏ㄩ儴">
+          <el-select size="small" v-model="searchData.supplier" placeholder="鍏ㄩ儴">
             <el-option v-for="item in supplier" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item style="margin-left: 40px;" label="鏍峰搧:">
-          <el-select v-model="searchData.code" filterable placeholder="璇烽�夋嫨">
+          <el-select size="small" v-model="searchData.code" filterable placeholder="璇烽�夋嫨">
             <el-option v-for="item in sampleOptions" :key="item.value" :label="item.label" :value="item.value">
               <span style="float: left">{{ item.label }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
             </el-option>
           </el-select>
         </el-form-item>
-        <div class="rightBtn">
           <el-form-item>
-            <el-button type="primary" plain size="mini">娓呯┖</el-button>
-            <el-button type="primary" @click="search" size="mini">鏌ヨ</el-button>
+            <el-button type="primary" @click="clear" plain size="small">娓呯┖</el-button>
+            <el-button type="primary" @click="search" size="small">鏌ヨ</el-button>
           </el-form-item>
-        </div>
       </el-form>
     </div>
     <div class="top-bar-copy"></div>
@@ -60,7 +58,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 +68,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 +89,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 +151,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 +253,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
@@ -401,7 +420,7 @@
 
   .top-bar-copy {
     width: 100%;
-    height: 12vh;
+    height: 7vh;
   }
 
   .chart-content {

--
Gitblit v1.9.3