Merge remote-tracking branch 'origin/main'

ruoyi-ui/src/components/RecursiveTree/index.vue

@@ -1,22 +1,24 @@
 <template>
   <div class="tree-node">
     <div class="node-content">
-      <el-input v-model="nodeData.hz_name" placeholder="请输入标题名称" style="width: 250px;" v-if="isRoot"/>
+      <el-input v-model="nodeData.title" placeholder="请输入标题名称" style="width: 250px;" v-if="isRoot"/>
       <el-input v-model="nodeData.title" placeholder="请输入标题名称" style="width: 250px;" v-if="nodeData.type===0"/>
 
-      <el-input placeholder="请选择引用考核任务" readonly v-if="nodeData.type===1" style="width: 250px;"
+      <el-input placeholder="请选择引用考核任务" readonly v-if="nodeData.type===1||nodeData.type===2" style="width: 250px;"
                 v-model="nodeData.pcTitle" @focus.stop="changeKaohe">
         <i slot="suffix" class="el-input__icon el-icon-search" style="color: #1890ff; font-weight: bolder"></i>
       </el-input>
 
       <!--评分占比-->
       <el-input-number style="margin-left: 5px;" v-model="nodeData.zb" :precision="2" :step="0.01" :min="0.01"
-                       :max="1" v-if="nodeData.type||nodeData.type===0"></el-input-number>
+                       :max="1" v-if="nodeData.type===1||nodeData.type===0"></el-input-number>
 
       <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild(0)"
-                 v-if="isRoot||nodeData.type===0">子级标题</el-button>
+                 v-if="isRoot||nodeData.type===0">标题</el-button>
       <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild(1)"
-                 v-if="isRoot||nodeData.type===0">子级引用</el-button>
+                 v-if="isRoot||nodeData.type===0">占比引用</el-button>
+      <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addChild(2)"
+                 v-if="isRoot||nodeData.type===0">不占比引用</el-button>
       <el-button type="danger" icon="el-icon-delete" size="mini" @click.stop="removeNode" v-if="!isRoot"></el-button>
     </div>
     <div class="children" v-if="nodeData.data && nodeData.data.length">

ruoyi-ui/src/views/kaohe/gather/index.vue

@@ -233,7 +233,7 @@ export default {
     // 表单重置
     reset() {
       this.treeData = {
-        hz_name: '',
+        title: '',
         data: []
       }
     },