d4c4a585e4179cb9e0b4f099c71bcadae63bf010..dbbc8a3cf4ad80a46258993d02cf0b8fc2e0923f
2025-07-11 李喆(开发组)
1
dbbc8a 对比 | 目录
2025-07-11 李喆(开发组)
1
fb1563 对比 | 目录
已修改2个文件
53 ■■■■ 文件已修改
src/views/basesetting/machine.vue 49 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/wel/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basesetting/machine.vue
@@ -32,7 +32,11 @@
    </avue-crud>
    <el-dialog :title="machineTitle" append-to-body v-model="editBox" width="60%">
      <avue-form ref="editFormModal1" :option="editFormModal" v-model="editForm" @submit="formSubmit" @resetForm="resetForm"/>
      <avue-form ref="editFormModal1" :option="editFormModal" v-model="editForm" @submit="formSubmit" @resetForm="resetForm">
        <template #ownerDept="{}">
          <el-tree-select v-model="editForm.ownerDept" :data="organizationTreeList"/>
        </template>
      </avue-form>
    </el-dialog>
  </basic-container>
</template>
@@ -46,8 +50,8 @@
export default {
  data() {
    var that = this;
    var aurl = "/blade-system/dept/lazy-list";
    return {
      organizationTreeList: [],
      machineTitle: "新增",
      isAdd: true,
      editBox: false,
@@ -169,13 +173,7 @@
          {
            label: '所属组织',
            prop: 'ownerDept',
            type: 'tree',
            span: 12,
            props: {
              label: 'deptName',
              value: 'id'
            },
            dicUrl: aurl
            span: 12
          },
          {
            label: '生产商',
@@ -347,9 +345,6 @@
          this.editBox = false;
          this.onLoad();
          done();
        },
        error => {
        }
      );
    },
@@ -396,9 +391,37 @@
            
        }
      );
    },
    traversalLabelValueToTree(tree) {  //遍历数组
      return tree.map(node => {
        // 1. 添加 label 和 value 字段
        const newNode = {
          ...node,
          label: node.fullName,
          value: node.id,
        };
        // 2. 如果有 children,递归处理
        if (node.children && node.children.length > 0) {
          newNode.children = this.traversalLabelValueToTree(node.children);
        }
        return newNode;
      });
    }
  },
  mounted() {
    //判断版本  0:涉密网,1:工控网;//工控网5个,涉密网4个
    axios({url: '/blade-mdm/system/param/getValue?paramKey=networkType',method: 'get'}).then(res => {
        if(res.data.data === "0") {
          var aurl = "/blade-system/dept/lazy-list";
        }else {
          var aurl = "/blade-mdm/system/dept/lazy-list";
        }
        axios({url: aurl,method: 'get'}).then(resp => {
          this.organizationTreeList = this.traversalLabelValueToTree(resp.data.data);
        })
      }
    );
  }
};
</script>
src/views/wel/index.vue
@@ -398,8 +398,8 @@
      this.loading = true;
      axios({
        url: '/blade-mdm/program/ncfile/send-to-machine-by-nodeid',
        method: 'get',
        params: {nodeId:id},
        method: 'post',
        params: {nodeId:row.id},
      }).then(
        res => {
            this.loading = false;