1

李喆(开发组)

6 天以前 2fb857721d32d3fce01f3487a623f5a9be2a3ac9

1

 src/views/basesetting/machine.vue

@@ -413,11 +413,12 @@
    // 工控网是/blade-mdm/system/dept/lazy-list
    // 涉密网是/blade-mdm/dept/lazy-list
    axios({url: '/blade-mdm/system/param/getValue?paramKey=networkType',method: 'get'}).then(res => {
        if(res.data.data === "0") {
          var aurl = "/blade-mdm/dept/lazy-list";
        }else {
          var aurl = "/blade-mdm/system/dept/lazy-list";
        }
        // if(res.data.data === "0") {
        //   var aurl = "/blade-mdm/dept/lazy-list";
        // }else {
        //   var aurl = "/blade-mdm/system/dept/lazy-list";
        // }
        var aurl = "/blade-mdm/dept/lazy-list";
        axios({url: aurl,method: 'get'}).then(resp => {
          this.organizationTreeList = this.traversalLabelValueToTree(resp.data.data);
        })

 src/views/wel/index.vue

@@ -64,7 +64,7 @@
      upgradeModal: false,
      file: null,
      fileContent: "",
      isSM: false,  //是否是涉密网 ，工控网5个，涉密网4个
      isSM: true,  //是否是涉密网 ，工控网5个，涉密网4个
      isShowTabs: true,
      nodeTypeList: [],
      fileList: [],
@@ -175,8 +175,7 @@
              label: 'dictValue',
              value: 'dictKey',
            },
            disabled: true,
            display: false
            disabled: true
          },
          {
            label: '设备（机床）',
@@ -607,11 +606,6 @@
        this.selectedColumn.id = "";
        this.modalForm = this.selectedColumn;
      }
      if(this.modalForm.nodeType == 20) {
        this.modalOption.column[0].display = true;
      }else {
        this.modalOption.column[0].display = false;
      }
      this.modalBox = true;
    },
    modalSubmit(row,done) {  //新增子节点保存/修改
@@ -683,6 +677,7 @@
        params: obj,
      }).then(
        res => {
          console.log(res.data,111)
          this.loading = false;
          resolve(res.data.data);
        }
@@ -729,12 +724,12 @@
      }
    );
    //判断版本  0:涉密网，1:工控网；//工控网5个，涉密网4个  
    axios({url: '/blade-mdm/system/param/getValue?paramKey=networkType',method: 'get'}).then(res => {
        if(res.data.data === "0") {
          this.isSM = true;
        }
      }
    );
    // axios({url: '/blade-mdm/system/param/getValue?paramKey=networkType',method: 'get'}).then(res => {
    //     if(res.data.data === "0") {
    //       this.isSM = true;
    //     }
    //   }
    // );
  }
};
</script>