From 323c2e94f121ee29bee55f1d44a9247232816e1c Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 23 八月 2023 16:09:21 +0800
Subject: [PATCH] 完成检验计划
---
src/views/experiment/passRateStatistics/index.vue | 4 +-
src/views/laboratory/measure/index.vue | 16 ++++----
src/views/experiment/planAssignments/plan.vue | 59 ++++++++++++++++++++---------
3 files changed, 50 insertions(+), 29 deletions(-)
diff --git a/src/views/experiment/passRateStatistics/index.vue b/src/views/experiment/passRateStatistics/index.vue
index fceb330..bf2c28a 100644
--- a/src/views/experiment/passRateStatistics/index.vue
+++ b/src/views/experiment/passRateStatistics/index.vue
@@ -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>
@@ -249,7 +249,7 @@
const myChart2 = echarts.init(chartDom_unqualified_provider, null, {
height: 300
});
-
+
const myChart3 = echarts.init(chartDom_unqualified_project, null, {
height: 268
});
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 0907cbc..5eb0f53 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -44,16 +44,20 @@
<template>
<div class="plan">
<div class="title">
- <span>椤圭洰鍚嶇О锛�</span>
- <el-input v-model="search.name" size="medium" style="width: 200px;margin-right: 20px;"></el-input>
+ <span>鐢宠鍗曠紪鍙凤細</span>
+ <el-input v-model="search.code" size="medium" style="width: 200px;margin-right: 20px;"></el-input>
<span>妫�楠屾椂闂达細</span>
<el-date-picker v-model="search.date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡" size="medium" style="margin-right: 20px;">
+ end-placeholder="缁撴潫鏃ユ湡" size="medium" value-format="yyyy-MM-dd" style="margin-right: 20px;">
</el-date-picker>
- <span>妫�楠屼汉锛�</span>
- <el-input v-model="search.userName" size="medium" style="width: 200px;margin-right: 20px;"></el-input>
- <el-button size="small" type="primary">鏌ヨ</el-button>
- <el-button size="small">閲嶇疆</el-button>
+ <span>妫�楠岀粨鏋滐細</span>
+ <el-select v-model="search.testValue" size="medium" style="width: 200px;margin-right: 20px;">
+ <el-option label="鍏ㄩ儴" :value="null"></el-option>
+ <el-option label="鍚堟牸" :value="1"></el-option>
+ <el-option label="涓嶅悎鏍�" :value="0"></el-option>
+ </el-select>
+ <el-button size="small" type="primary" @click="selectDataList">鏌ヨ</el-button>
+ <el-button size="small" @click="cleanBtn">閲嶇疆</el-button>
</div>
<div class="thing">
<el-table :data="tableData" style="width: 100%;" row-key="code" default-expand-all
@@ -207,9 +211,9 @@
data() {
return {
search: {
- name: null,
+ code: null,
date: [],
- userName: null,
+ testValue: null,
},
tableData: [],
upDia: false,
@@ -228,7 +232,16 @@
},
methods: {
selectDataList() {
- get(this.$url.selectAllPlan).then(res => {
+ var str = {}
+ str.code = this.search.code
+ str.status = this.search.testValue
+ try {
+ if (this.search.date.length != 0) {
+ str.beginTime = this.search.date[0]
+ str.endTime = this.search.date[1]
+ }
+ } catch (e) {}
+ get(this.$url.selectAllPlan, str).then(res => {
this.tableData = JSON.parse(JSON.stringify(res.data).replaceAll('pid', 'code').replaceAll('samplename',
'name').replaceAll('inspectionStatus', 'testState'))
this.tableData.forEach(a => {
@@ -331,7 +344,7 @@
submitUpData2() {
var data = []
this.upData.testValue.forEach(a => {
- if(a.number!=''&&a.number!=null){
+ if (a.number != '' && a.number != null) {
data.push(a.number)
}
})
@@ -341,15 +354,23 @@
}).then(res => {
this.upInsDia = false
this.selectDataList()
- this.$confirm(`<p style="line-height: 80px">鎮ㄧ殑椤圭洰(${this.upData.name})妫�楠岀粨鏋滀负锛�<span class="${res.data==1?'ins_state_success':'ins_state_error'}">${res.data==1?'鍚堟牸':'涓嶅悎鏍�'}</span></p>`, '鎻愪氦鎴愬姛', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍏抽棴',
- dangerouslyUseHTMLString:true,
- type: `${res.data==1?'success':'error'}`
- }).then(() => {
- }).catch(() => {
- })
+ this.$confirm(
+ `<p style="line-height: 80px">鎮ㄧ殑椤圭洰(${this.upData.name})妫�楠岀粨鏋滀负锛�<span class="${res.data==1?'ins_state_success':'ins_state_error'}">${res.data==1?'鍚堟牸':'涓嶅悎鏍�'}</span></p>`,
+ '鎻愪氦鎴愬姛', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍏抽棴',
+ dangerouslyUseHTMLString: true,
+ type: `${res.data==1?'success':'error'}`
+ }).then(() => {}).catch(() => {})
})
+ },
+ cleanBtn(){
+ this.search = {
+ code: null,
+ date: [],
+ testValue: null,
+ }
+ this.selectDataList()
}
}
}
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index c32c063..0e01e41 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -118,11 +118,11 @@
</div>
</div>
<div
- :style="`position: absolute;top:${addTop}px;left: 9px;transition: 1s;width: 99%;height: 82vh;background-color: #fff;z-index: 21;`">
+ :style="`position: absolute;top:${addTop}vh;left: 9px;transition: 1s;width: 99%;height: 82vh;background-color: #fff;z-index: 21;`">
<Add ref="add" />
</div>
<div id="myMOdel"
- :style="`position: absolute;transition: 1s;top:${mymodelTop}px; left: 9px; width: 99%; height: 85vh; background-color: #fff;z-index: 20;`">
+ :style="`position: absolute;transition: 1s;top:${mymodelTop}vh; left: 9px; width: 99%; height: 85vh; background-color: #fff;z-index: 20;`">
<el-col :span="10">
<p style="font-size: 13px;padding-left: 40px;">璁″垝淇℃伅</p>
</el-col>
@@ -329,8 +329,8 @@
createPerson: '鏌愭煇璐熻矗浜�',
createTime: '2021-09-08'
},
- mymodelTop: -700,//14
- addTop: -700,
+ mymodelTop: -85,//14
+ addTop: -85,
planId: 0
}
},
@@ -372,7 +372,7 @@
measureAdd() {
let add = this.$refs.add.add()
if (add) {
- this.addTop = -700
+ this.addTop = -82
this.$message({
message: '鎿嶄綔鎴愬姛锛�',
type: 'success'
@@ -389,7 +389,7 @@
await this.limitGetPlanMeasureInstrument()
},
addPlan() {
- this.addTop = 14
+ this.addTop = 2
this.lookVisible = true
this.$parent.mainShowAdd()
},
@@ -407,7 +407,7 @@
this.planId = id
this.getPlanAndInfoAndIns(id)
this.lookVisible = true
- this.mymodelTop = 10
+ this.mymodelTop = 2
this.$parent.triggerMainBtnPlan()
},
async getPlanAndInfoAndIns(id) {
@@ -428,7 +428,7 @@
},
combackLookPlan() {
this.lookVisible = false
- this.mymodelTop = -700
+ this.mymodelTop = -85
},
blurSearch() {
if (this.radioValue === 1) {
--
Gitblit v1.9.3