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

lyfO_o

2022-04-06 1cc4eb09ce38f1f0db114b7d3570f92ceaf1d470

 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">
@@ -109,6 +110,7 @@
                v-model="form.parentId"
                placeholder="请选择"
                style="width: 100%"
                :disabled="title=='编辑'?true:false"
              >
                <el-option
                  v-for="item in parent"
@@ -139,7 +141,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>
@@ -208,7 +210,6 @@
  methods: {
    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
@@ -222,7 +223,6 @@
        this.$refs["form"].clearValidate();
      });
       getParentElement().then(res=>{
          // console.log('父类：',res)
          this.parent=res.data.result
        })
      if (type == "新增") {
@@ -235,7 +235,7 @@
        };
      } else {
        this.title = "编辑";
        this.form = value;
        this.form=JSON.parse(JSON.stringify(value));
      }
    },
    AddelementManagement() {
@@ -292,7 +292,7 @@
                  title: "成功",
                });
              } else {
                his.$message({
                this.$message({
                  type: "warning",
                  message: res.data.message,
                });
@@ -303,18 +303,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();
  },
@@ -334,4 +352,4 @@
  background-color: #034ea2;
  border: 1px solid #034ea2;
}
</style>
</style>