From 09d351ec5fe8b47efc3f9dbbbec9ad31f510a600 Mon Sep 17 00:00:00 2001
From: cqf
Date: 星期三, 22 六月 2022 15:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shf' into shf
---
src/views/safetyproduction/feature.vue | 95 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 77 insertions(+), 18 deletions(-)
diff --git a/src/views/safetyproduction/feature.vue b/src/views/safetyproduction/feature.vue
index 52cc7d6..09b4b5b 100644
--- a/src/views/safetyproduction/feature.vue
+++ b/src/views/safetyproduction/feature.vue
@@ -7,7 +7,24 @@
<el-input v-model="listQuery.filter.name"></el-input>
</el-form-item>
</el-col>
- <el-col :span="4" style="text-align: center">
+ <el-col :span="5">
+ <el-form-item label="要素类型">
+ <el-select
+ v-model="listQuery.filter.type"
+ placeholder="请选择"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6" style="text-align: center">
<el-button type="primary" icon="el-icon-search" @click="find()" class="btns"
>搜索</el-button
>
@@ -18,6 +35,12 @@
@click="handleClick('', '新增')"
>新增</el-button
>
+ <el-button
+ type="primary"
+ class="btns"
+ @click="reset()"
+ >重置</el-button
+ >
</el-col>
</el-row>
</el-form>
@@ -31,6 +54,8 @@
</template>
</el-table-column>
<el-table-column label="父要素" prop="parentName" align="center">
+ </el-table-column>
+ <el-table-column label="得分" prop="point" align="center">
</el-table-column>
<el-table-column prop="remark" label="备注" align="center">
</el-table-column>
@@ -72,6 +97,7 @@
<el-dialog
:title="title"
:visible.sync="dialogVisible"
+ :close-on-click-modal="false"
width="40%"
>
<el-form ref="form" :rules="rules" :model="form" label-width="80px">
@@ -107,6 +133,7 @@
v-model="form.parentId"
placeholder="请选择"
style="width: 100%"
+ :disabled="title=='编辑'?true:false"
>
<el-option
v-for="item in parent"
@@ -117,6 +144,11 @@
</el-option>
</el-select>
</el-form-item>
+ </el-col>
+ <el-col :span="11" :offset="2">
+ <el-form-item label="得分" prop="point">
+ <el-input v-model.number="form.point"></el-input>
+ </el-form-item>
</el-col>
</el-row>
<el-form-item label="备注">
@@ -132,7 +164,7 @@
<el-button type="primary" class="btns" @click="AddelementManagement()"
>确 定</el-button
>
- <el-button @click="dialogVisible = false">取 消</el-button>
+ <el-button @click="cancel()">取 消</el-button>
</span>
</el-dialog>
</div>
@@ -154,6 +186,7 @@
name: "",
type: "",
parentId: "",
+ point:"",
remark: "",
},
pageSize: 10,
@@ -188,6 +221,9 @@
parentId: [
{ required: true, message: "父要素不能为空", trigger: "change" },
],
+ point: [
+ { required: true, message: "得分不能为空", trigger: "change" },
+ ],
},
};
},
@@ -195,9 +231,15 @@
this.elementManagementL();
},
methods: {
+ reset(){
+ this.listQuery.filter={}
+ this.listQuery.pageIndex=1
+ this.listQuery.pageSize=10
+ this.elementManagementL();
+ },
+
async elementManagementL() {
var res = await elementManagementList(this.listQuery);
- console.log(res);
if (res.data.code == 200) {
this.list = res.data.result.records;
this.recordTotal = res.data.result.total
@@ -211,7 +253,6 @@
this.$refs["form"].clearValidate();
});
getParentElement().then(res=>{
- // console.log('父类：',res)
this.parent=res.data.result
})
if (type == "新增") {
@@ -224,7 +265,7 @@
};
} else {
this.title = "编辑";
- this.form = value;
+ this.form=JSON.parse(JSON.stringify(value));
}
},
AddelementManagement() {
@@ -281,7 +322,7 @@
title: "成功",
});
} else {
- his.$message({
+ this.$message({
type: "warning",
message: res.data.message,
});
@@ -292,18 +333,36 @@
});
},
deleteById(val) {
- elementManagementDel({id:val}).then((res) => {
- if (res.data.code == 200) {
- this.elementManagementL();
- this.$notify({
- title: "成功",
- message: "删除成功",
- type: "success",
- duration: 2000,
- });
- }
- });
+ this.$confirm('确认删除吗','提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(()=>{
+ elementManagementDel({id:val}).then((res) => {
+ if (res.data.code == 200) {
+ this.elementManagementL();
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ }else {
+ this.$message({
+ type: "warning",
+ message: res.data.message,
+ });
+ }
+ });
+ })
+ .catch(error =>{
+ });
},
+ cancel(){
+ this.elementManagementL();
+ this.dialogVisible = false;
+ },
find(){
this.elementManagementL();
},
@@ -323,4 +382,4 @@
background-color: #034ea2;
border: 1px solid #034ea2;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2