From 614e84cde0b55475a3120a55f92db9a2de09c31f Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 23 八月 2023 15:00:54 +0800
Subject: [PATCH] 合格率统计完善，检验报告修改
---
src/views/experiment/passRateStatistics/index.vue | 15 +++++++++++++++
src/worker/test.js | 5 +++++
package.json | 1 +
src/layout/components/Sidebar/index.vue | 1 +
src/views/experiment/checkTheReport/index.vue | 2 +-
5 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/package.json b/package.json
index c0ee919..00e6b41 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
"babel-jest": "23.6.0",
"babel-plugin-dynamic-import-node": "2.3.3",
"chalk": "2.4.2",
+ "comlink-loader": "^2.0.0",
"connect": "3.6.6",
"eslint": "6.7.2",
"eslint-plugin-vue": "6.2.2",
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 1187cbb..e093b2b 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -31,6 +31,7 @@
'sidebar'
]),
routes() {
+ console.log(this.$router.options.routes);
return this.$router.options.routes
},
activeMenu() {
diff --git a/src/views/experiment/checkTheReport/index.vue b/src/views/experiment/checkTheReport/index.vue
index a5057c4..2a92de3 100644
--- a/src/views/experiment/checkTheReport/index.vue
+++ b/src/views/experiment/checkTheReport/index.vue
@@ -100,7 +100,7 @@
<el-table-column prop="approver" label="瀹℃壒浜�" min-width="8%">
<template slot-scope="scope">
<span>
- <el-tag type="info" icon="el-icon-user">
+ <el-tag v-if="scope.row.approver!=null && scope.row.approver!=''" type="info" icon="el-icon-user">
<i class="el-icon-user">{{ scope.row.approver }}</i>
</el-tag>
</span>
diff --git a/src/views/experiment/passRateStatistics/index.vue b/src/views/experiment/passRateStatistics/index.vue
index a0eadd9..fceb330 100644
--- a/src/views/experiment/passRateStatistics/index.vue
+++ b/src/views/experiment/passRateStatistics/index.vue
@@ -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,13 @@
this.tableStart()
},
methods: {
+ testWork(){
+ const inst = new MyWorker();
+ inst.test()
+ for (let index = 0; index < 100; index++) {
+ console.log("涓荤嚎绋�"+index);
+ }
+ },
async search() {
this.testSampleStatistics = null
this.supplierNoPassStatistics = null
@@ -240,9 +249,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
diff --git a/src/worker/test.js b/src/worker/test.js
new file mode 100644
index 0000000..9fda9e4
--- /dev/null
+++ b/src/worker/test.js
@@ -0,0 +1,5 @@
+export function test(){
+ for (let index = 0; index < 100; index++) {
+ console.log("瀛愮嚎绋�"+index);
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3