From 38e6f27a8082e1173e3c02a33da5da39b6c6872c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 31 七月 2024 13:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b3-personnel-evaluation/evaluation.vue | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/components/do/b3-personnel-evaluation/evaluation.vue b/src/components/do/b3-personnel-evaluation/evaluation.vue
index 5c741d5..0e0de4d 100644
--- a/src/components/do/b3-personnel-evaluation/evaluation.vue
+++ b/src/components/do/b3-personnel-evaluation/evaluation.vue
@@ -1,7 +1,7 @@
<template>
<div class="table-item">
<ValueTable ref="ValueTable"
- :url="$api.deviceScope.selectDeviceParameter" :componentData="componentData" :key="upIndex" />
+ :url="$api.evaluate.page" :componentData="componentData" :key="upIndex" />
</div>
</template>
@@ -12,14 +12,15 @@
ValueTable
},
props:{
- month:String,
- laboratory:Object
+ entity:Object,
},
data(){
return{
componentData: {
entity: {
- deviceName: null,
+ month: this.entity.month,
+ name:this.entity.name,
+ departLims:this.entity.departLims,
orderBy: {
field: 'id',
order: 'desc'
@@ -35,9 +36,23 @@
selectField: {},
requiredAdd: [],
requiredUp: [],
+ needSort: ['name'],
},
- upIndex:0
+ upIndex:0,
}
+ },
+ methods:{
+ refreshTable(){
+ this.componentData.entity = {
+ ...this.componentData.entity,
+ ...this.$parent.entity
+ }
+ this.$refs['ValueTable'].selectList()
+ },
+ refresh(){
+ this.upIndex++
+ this.refreshTable()
+ },
}
}
</script>
--
Gitblit v1.9.3