Merge branch 'master' of http://47.110.251.215:3000/web/saber

src/components/WbsTree/ManualSorting.vue

@@ -8,7 +8,7 @@
     >
       <div>
         <span>{{key+1}}</span>
-        <span class="marleft20">{{item.deptName}}</span>
+        <span class="marleft20">{{item.tableName}}</span>
       </div>
       <div class="flexItemsC">
         <i
@@ -54,4 +54,4 @@ export default {
   width: 100%;
   height: 100%;
 }
-</style>
+</style>

src/views/manager/projectinfo/tree.vue

@@ -2187,7 +2187,7 @@ export default {
       this.namelists = [...this.namelist]
     },
     async setParameterName () {//设置参数名称中添加节点参数按钮
-      // wbsId: this.jiedianId 
+      // wbsId: this.jiedianId
       this.namelists.unshift({ name: '', remark: '', k: '', type: 0, })
     },
     async nodeInfoSave () {//节点参数弹框保存按钮