From f13c44f000a5093456ffd7e08826980166608537 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 29 二月 2024 15:04:25 +0800
Subject: [PATCH] 功能调整
---
src/components/view/a5-capacity-scope.vue | 39 +++++++++++++++++++++++++++++++++++++--
static/js/menu.js | 2 +-
src/assets/api/controller.js | 5 +++--
3 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index a814049..2f6002c 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -85,8 +85,9 @@
const laboratoryScope = {
selectItemParameter: "/laboratoryScope/selectItemParameter", //鏌ヨ瀹為獙瀹ょ鐞嗗垪琛�
addParameter: "/laboratoryScope/addParameter", //娣诲姞瀹為獙瀹ゅ弬鏁�
- delItemParameter: "/laboratoryScope/delParameter", //鍒犻櫎瀹為獙瀹ゅ弬鏁�
- upItemParameter: "/laboratoryScope/upParameter", //淇敼瀹為獙瀹ゅ弬鏁�
+ delParameter: "/laboratoryScope/delParameter", //鍒犻櫎瀹為獙瀹ゅ弬鏁�
+ upParameter: "/laboratoryScope/upParameter", //淇敼瀹為獙瀹ゅ弬鏁�
+ obtainItemParameterList: "/laboratoryScope/obtainItemParameterList", //鑾峰彇瀹為獙瀹ゅ悕绉�
}
const systemLog = {
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 1c4aa14..0720012 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -153,6 +153,12 @@
},
bsm:{
select: []
+ },
+ inspectionValueType:{
+ select:[]
+ },
+ laboratory:{
+ select:[]
}
},
selectField: {
@@ -164,10 +170,16 @@
},
bsm:{
select: []
+ },
+ inspectionValueType:{
+ select:[]
+ },
+ laboratory:{
+ select:[]
}
},
- requiredAdd: ['inspectionItem', 'manHour', 'inspectionItemType','inspectionItemClassify','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','valueType'],
- requiredUp: ['inspectionItem', 'manHour', 'inspectionItemType','inspectionItemClassify','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','valueType']
+ requiredAdd: ['inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','inspectionItemClassify','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','valueType'],
+ requiredUp: ['inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','inspectionItemClassify','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','valueType']
},
testObjectData: {
entity: {
@@ -211,6 +223,8 @@
this.selectEnumByCategory()
this.selectEnumByCategoryForValue()
this.selectEnumByCategoryForSpecial()
+ this.selectEnumByCategoryForInspectionValueType()
+ this.obtainItemParameterList()
this.getPower('0')
},
methods: {
@@ -271,6 +285,27 @@
this.itemParameterData.tagField.bsm.select = res.data
})
},
+ selectEnumByCategoryForInspectionValueType() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "妫�楠屽�肩被鍨�"
+ }).then(res => {
+ this.itemParameterData.selectField.inspectionValueType.select = res.data
+ this.itemParameterData.tagField.inspectionValueType.select = res.data
+ })
+ },
+ obtainItemParameterList() {
+ this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
+ let data = []
+ res.data.forEach(a=>{
+ data.push({
+ label: a.laboratoryName,
+ value: a.laboratoryName
+ })
+ })
+ this.itemParameterData.selectField.laboratory.select = data
+ this.itemParameterData.tagField.laboratory.select = data
+ })
+ },
// 鏉冮檺鍒嗛厤
getPower(radio) {
let power = JSON.parse(sessionStorage.getItem('power'))
diff --git a/static/js/menu.js b/static/js/menu.js
index 4303720..4605633 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -48,7 +48,7 @@
c: [{
v: "鏍囧噯搴�",
i: "font icon-24gl-clipboardList",
- u: "",
+ u: "b2-standard",
p: ""
}, {
v: "鏍囧噯妯℃澘",
--
Gitblit v1.9.3