Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf

shj

2022-04-06 b274738442b2214c018e9b55f96a226a33c18cbe

 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>
@@ -110,6 +133,7 @@
                v-model="form.parentId"
                placeholder="请选择"
                style="width: 100%"
                :disabled="title=='编辑'?true:false"
              >
                <el-option
                  v-for="item in parent"
@@ -207,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
@@ -223,7 +253,6 @@
        this.$refs["form"].clearValidate();
      });
       getParentElement().then(res=>{
          // console.log('父类：',res)
          this.parent=res.data.result
        })
      if (type == "新增") {
@@ -236,7 +265,7 @@
        };
      } else {
        this.title = "编辑";
        this.form = value;
        this.form=JSON.parse(JSON.stringify(value));
      }
    },
    AddelementManagement() {
@@ -304,7 +333,6 @@
      });
    },
    deleteById(val) {
        console.log(123,val)
        this.$confirm('确认删除吗','提示', {
            confirmButtonText: '确认',
            cancelButtonText: '取消',
@@ -323,8 +351,7 @@
                 }else {
                     this.$message({
                         type: "warning",
                         // message: res.data.message,
                         message: "当前A级要素仍然有已绑定的B级要素,无法删除"
                         message: res.data.message,
                     });
                 }
               });