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

songhuangfeng123

2022-03-31 1b3b9e0bb02144949c49702d27884ad0d6b3e7e2

 src/views/safetyproduction/feature.vue

@@ -110,6 +110,7 @@
                v-model="form.parentId"
                placeholder="请选择"
                style="width: 100%"
                :disabled="title=='编辑'?true:false"
              >
                <el-option
                  v-for="item in parent"
@@ -304,7 +305,6 @@
      });
    },
    deleteById(val) {
        console.log(123,val)
        this.$confirm('确认删除吗','提示', {
            confirmButtonText: '确认',
            cancelButtonText: '取消',