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/feature.vue | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/views/safetyproduction/feature.vue b/src/views/safetyproduction/feature.vue
index 09b4b5b..93a0d3a 100644
--- a/src/views/safetyproduction/feature.vue
+++ b/src/views/safetyproduction/feature.vue
@@ -57,6 +57,8 @@
</el-table-column>
<el-table-column label="得分" prop="point" align="center">
</el-table-column>
+ <el-table-column label="权重" prop="weight" align="center">
+ </el-table-column>
<el-table-column prop="remark" label="备注" align="center">
</el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center">
@@ -126,7 +128,15 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="form.type==0?false:true">
+ <el-row v-if="form.type==0 && form.type!=null">
+ <el-col :span="11" >
+ <el-form-item label="权重" prop="weight">
+ <el-input v-model="form.weight"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row v-if="form.type==1 && form.type!=null">
<el-col :span="11">
<el-form-item label="父要素" prop="parentId">
<el-select
@@ -184,7 +194,6 @@
title: "",
form: {
name: "",
- type: "",
parentId: "",
point:"",
remark: "",
@@ -224,6 +233,9 @@
point: [
{ required: true, message: "得分不能为空", trigger: "change" },
],
+ weight: [
+ { required: true, message: "权重不能为空", trigger: "change" },
+ ],
},
};
},
@@ -259,7 +271,6 @@
this.title = "新增";
this.form = {
name: "",
- type: "",
parentId: "",
remark: "",
};
--
Gitblit v1.9.2