Merge remote-tracking branch 'remotes/origin/shf' into master

lyfO_o

2022-03-31 4a6b6d253451a14063df0659877f3d8c4ca921a5

 src/views/safetyproduction/feature.vue

@@ -74,6 +74,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">
@@ -139,7 +140,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>
@@ -303,6 +304,13 @@
      });
    },
    deleteById(val) {
        console.log(123,val)
        this.$confirm('确认删除吗','提示', {
            confirmButtonText: '确认',
            cancelButtonText: '取消',
            type: 'warning'
        })
            .then(()=>{
      elementManagementDel({id:val}).then((res) => {
        if (res.data.code == 200) {
          this.elementManagementL();
@@ -312,8 +320,21 @@
            type: "success",
            duration: 2000,
          });
                 }else {
                     this.$message({
                         type: "warning",
                         // message: res.data.message,
                         message: "当前A级要素仍然有已绑定的B级要素,无法删除"
                     });
        }
      });
            })
            .catch(error =>{
            });
    },
      cancel(){
          this.elementManagementL();
          this.dialogVisible = false;
    },
  find(){
     this.elementManagementL();