Merge remote-tracking branch 'remotes/origin/web-v2' into web-v2-pro

src/views/safetyCheck/equipmentConfig/index.vue

@@ -3,7 +3,7 @@
   <div class="app-container approval_handle">
     <div class="approval_handle-page" v-if="pageType == 1">
       <el-form :model="queryParams" ref="queryForm" style="margin-top:20px;" :inline="true">
-        <el-form-item label="检查内容:" prop="checkLevel">
+        <el-form-item label="类型:" prop="checkLevel">
           <el-select  v-model="queryParams.hazardType" placeholder="请选择检查项">
             <el-option
               v-for="item in dangerArr"
@@ -97,7 +97,7 @@
               node-key="id"
               default-expand-all
               :default-checked-keys="cascaderCheckedData"
-              :render-content="renderContent">
+              >
             </el-tree>
           </el-form-item>
         </div>
@@ -184,35 +184,7 @@ export default {
 
   },
   methods: {
-    //检查类目树删除
-    remove(node, data) {
-      let self = this;
-      this.$confirm('是否确认删除?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-        checkOptionDelete(data.id).then( response => {
-          self.msgSuccess(response.msg)
-          self.checkOptionList();
-        })
-      }).catch(() => {});
 
-    },
-    //检查类目树删除按钮
-    renderContent(h, { node, data, store }) {
-      return (
-        <span
-          style="flex: 1; display: flex; align-items: center; justify-content: space-between; font-size: 14px; padding-right: 8px;"
-        >
-            <span>
-              <span>{node.label}</span>
-            </span>
-            <span>
-              <el-button style="font-size: 12px;" type="text" on-click={() => this.remove(node, data)}>删除</el-button>
-            </span>
-          </span>);
-    },
     handleClick(index,row,doType){
       let _this=this;
       if(doType=='add'){//新增