From 6d8273f3405ba9364a792fd7a5a5b8497c488884 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 19 五月 2022 16:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/safetyproduction/gojudging.vue | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/src/views/safetyproduction/gojudging.vue b/src/views/safetyproduction/gojudging.vue
index 67f708e..55b365f 100644
--- a/src/views/safetyproduction/gojudging.vue
+++ b/src/views/safetyproduction/gojudging.vue
@@ -6,8 +6,11 @@
class="btn"
v-if="typeId == 2 ? false : true"
@click="finish()"
- >结单</el-button
- >
+ >结单</el-button>
+ <div class="point">
+ 所有A级要素总分= {{remark}}
+ </div>
+
<div
v-for="(item, index) in lists"
:key="index"
@@ -150,6 +153,7 @@
lists: [],
listType: [],
typeId: "",
+ remark:"",
};
},
created() {
@@ -209,9 +213,40 @@
var arr = this.checkSameDataA(this.list.itemList);
for (var i = 0; i < arr.length; i++) {
arr[i].child = this.checkSameData(arr[i].child);
+ arr[i].elementAWeight = arr[i].child[0].elementAWeight;
arr[i].child.points = arr[i].child.point;
}
this.lists = arr;
+ let showDetail = ''
+ for (let i = 0 ; i < arr.length ; i++){
+ if (i < arr.length - 1 ){
+ showDetail+='('+arr[i].elementAName + ' * '+arr[i].elementAWeight+ ') + '
+ } else{
+ showDetail+='('+arr[i].elementAName + ' * '+arr[i].elementAWeight+ ')'
+ }
+ }
+ this.remark+=showDetail
+ if (this.typeId==2){
+ let pointA = ''
+ let pointDetail = ' = '
+ let finalPoint=0
+ for (let i = 0 ; i < arr.length ; i++){
+ let childData = arr[i].child
+ pointA = 0
+ for (let j = 0 ; j < childData.length ; j++){
+ //改A级要素的总分
+ pointA += childData[j].point
+ }
+ finalPoint += pointA * arr[i].elementAWeight
+ if (i < arr.length - 1 ){
+ pointDetail +='('+pointA + ' * '+arr[i].elementAWeight+ ') + '
+ } else{
+ pointDetail +='('+pointA + ' * '+arr[i].elementAWeight+ ') = '
+ }
+ }
+ pointDetail +=finalPoint
+ this.remark+=pointDetail
+ }
});
},
checkSameDataA(resData) {
@@ -221,6 +256,7 @@
if (!dataInfo[elementAName]) {
dataInfo[elementAName] = {
elementAName,
+ elementAWeight:'',
child: [],
};
}
@@ -237,6 +273,7 @@
dataInfo[elementBName] = {
elementBName,
point: "",
+ elementAWeight:item.elementAWeight,
points: item.point,
child: [],
};
@@ -295,6 +332,12 @@
height: 850px;
overflow-y: overlay;
}
+.point {
+ background-color: rgba(3,78,162,0.1);
+ font-size: 20px;
+ padding: 10px 5px;
+ font-weight: bold;
+}
.title {
font-size: 16px;
padding: 10px 0px;
--
Gitblit v1.9.2