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

src/views/manager/projectinfo/tree.vue

@@ -2281,9 +2281,10 @@ export default {
       return arr ? arr.join() : "";
     },
     TestTreeCheckChange(_, { checkedKeys, halfCheckedKeys }) {
-      // const newarr = [...checkedKeys, ...halfCheckedKeys];
-       const newarr = [...checkedKeys]
+      const newarr = [...checkedKeys, ...halfCheckedKeys];
+      //  const newarr = [...checkedKeys]
       this.nodeDetail.mixRatioTestIds = this.toJoin(newarr);
+      console.log(this.toJoin(newarr),'this.toJoin(newarr)');
     },
     filterChange() {
       if (this.treeData.length > 0) {

src/views/manager/wbsinfo/edit.vue

@@ -1770,12 +1770,12 @@ export default {
       menuleft:20,
       menutop:0,
       menusData:[
-        {icon: 'el-icon-s-promotion', label: '新增节点', key: "add"},
+        {icon: 'el-icon-plus', label: '新增节点', key: "add"},
         {icon: 'el-icon-s-promotion', label: '编辑节点', key: "edit"},
         {icon: 'el-icon-sort', label: '排序节点', key: "sort"},
         {icon: 'el-icon-document-copy', label: '复制节点', key: "copy"},
       
-        {icon: 'el-icon-s-promotion', label: '删除节点', key: "del"},
+        {icon: 'el-icon-delete', label: '删除节点', key: "del"},
       
       ],//树组件操作菜单
       menuKey:''