Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/App.vue

@@ -1,7 +1,6 @@
<template>
  <div id="app">
    <router-view />

  </div>
</template>


 Source/UBCS-WEB/src/api/modeling/cycle.js

 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue

@@ -1204,7 +1204,6 @@
        this.conditionMap = {};
        // 存储查询条件，主要是为了点击页码时带上这个条件
        this.conditionMap["conditionMap[" + this.keyWordFind + "]"] = '*' + this.WupinFindValue + '*';
        console.log(this.conditionMap)
        TableData({
          templateOid: this.templateOid,
          codeClassifyOid: this.codeClassifyOid,

 Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue

@@ -142,7 +142,7 @@
      if (code === "classify_view") {
        row.checkTheStatus = check;
      } else if (!row.checkTheStatus) {
        this.$message.warning('清先勾选查看按钮！');
        this.$message.warning('请先勾选查看按钮！');
        // 在条件不满足时将多选框状态设置为false
        row[id] = false;
      }

 Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue

@@ -142,7 +142,7 @@
      if (code === "data_view") {
        row.checkTheStatus = check;
      } else if (!row.checkTheStatus) {
        this.$message.warning('清先勾选查看按钮！');
        this.$message.warning('请先勾选查看按钮！');
        // 在条件不满足时将多选框状态设置为false
        row[id] = false;
      }

 Source/UBCS-WEB/src/components/file/main.vue

@@ -138,14 +138,6 @@
              }
            }
          },
          /*{
            label: "密级",
            prop: "secretGradeText"
          },
          {
            label: "文档类别",
            prop: "fileDocClassifyName"
          },*/
          {
            label: "创建者",
            prop: "creator"
@@ -396,7 +388,7 @@
    },
    downloadFile(data) {
      download(data).then(res => {
        // console.log(res);
        console.log(res);
        if (res) {
          func.downloadFileByBlobHandler(res);
        }

 Source/UBCS-WEB/src/views/flow/model.vue

@@ -196,7 +196,7 @@
      page: {
        pageSize: 10,
        currentPage: 1,
        total: 0
        total: 0,
      },
      deployBox: false,
      flowBox: false,

 Source/UBCS-WEB/src/views/integration/systemInfo.vue

@@ -296,7 +296,6 @@
        // this.ModifyProperties(this.TreeData, 'text', 'label');
        // 根据this.TreeData的长度计算延迟时间
        const delayTime = this.TreeData.length * 1;
        console.log(delayTime)
        setTimeout(() => {
          this.loading = false;
          this.reload = Math.random();

 Source/UBCS-WEB/src/views/modeling/cycle.vue

@@ -243,6 +243,7 @@
          });
          this.nodesEdgesData = { nodes, edges };
          this.visible = true;
          console.log('nodesEdgesData',this.nodesEdgesData)
        });
      } else {
        this.nodesEdgesData = {};
@@ -304,133 +305,6 @@
      });
    },
    async submit() {
      // const data = {
      //   startStatus: "Auditing",
      //   name: "22",
      //   id: "asas",
      //   nodes: [
      //     {
      //       type: "node",
      //       size: "80*48",
      //       shape: "flow-rect",
      //       color: "#1890FF",
      //       label: "Auditing",
      //       x: 278.60856031183397,
      //       y: 84.12841612613737,
      //       id: "Auditing",
      //       change: true,
      //       index: 0,
      //       name: "Auditing",
      //       indexNum: 0,
      //     },
      //     {
      //       type: "node",
      //       size: "80*48",
      //       shape: "flow-rect",
      //       color: "#1890FF",
      //       label: "Editing",
      //       x: 294.17388658989535,
      //       y: 299.9676071819219,
      //       id: "Editing",
      //       change: true,
      //       index: 1,
      //       name: "Editing",
      //       indexNum: 1,
      //     },
      //     {
      //       type: "node",
      //       size: "80*48",
      //       shape: "flow-rect",
      //       color: "#1890FF",
      //       label: "drg",
      //       x: 278.60856031183397,
      //       y: 463.92237731083515,
      //       id: "drg",
      //       change: true,
      //       index: 3,
      //       name: "drg",
      //       indexNum: 3,
      //     },
      //   ],
      //   edges: [
      //     {
      //       source: "Auditing",
      //       sourceAnchor: 2,
      //       target: "Editing",
      //       targetAnchor: 0,
      //       id: "3083896f",
      //       index: 2,
      //       indexNum: 2,
      //       events: [
      //         {
      //           eventFullName:
      //             "plm.bs.omd.lifecycle.server.pubimpl.TransationEvente",
      //           eventShowName: "TransationEventE",
      //           description: "",
      //           bizDomain: "mdm",
      //           oid: "5",
      //           creator: "",
      //           createTime: "",
      //           lastModifier: "",
      //           lastModifyTime: "",
      //           ts: "",
      //         },
      //       ],
      //     },
      //     {
      //       source: "Editing",
      //       sourceAnchor: 2,
      //       target: "drg",
      //       targetAnchor: 0,
      //       id: "b941a21d",
      //       index: 4,
      //       indexNum: 4,
      //       events: [
      //         {
      //           eventFullName:
      //             "plm.bs.omd.lifecycle.server.pubimpl.TransationEventf",
      //           eventShowName: "TransationEventF",
      //           description: "",
      //           bizDomain: "mdm",
      //           oid: "6",
      //           creator: "",
      //           createTime: "",
      //           lastModifier: "",
      //           lastModifyTime: "",
      //           ts: "",
      //         },
      //         {
      //           eventFullName:
      //             "plm.bs.omd.lifecycle.server.pubimpl.TransationEvente",
      //           eventShowName: "TransationEventE",
      //           description: "",
      //           bizDomain: "mdm",
      //           oid: "5",
      //           creator: "",
      //           createTime: "",
      //           lastModifier: "",
      //           lastModifyTime: "",
      //           ts: "",
      //         },
      //       ],
      //     },
      //   ],
      // };
      // API.add(data)
      //   .then((res) => {
      //     this.submitLoading = false;
      //     if (res.data.code === 200) {
      //       this.$message.success(
      //         this.type === "edit" ? "修改成功！" : "新增成功！"
      //       );
      //       this.visible = false;
      //       this.search();
      //     }
      //   })
      //   .catch(() => {
      //     this.submitLoading = false;
      //   });
      // return;
      const newRowData = await this.$refs.vueFlowchartEditor.getNewRowData();
      if (!newRowData) {
        return;
@@ -457,7 +331,6 @@
        ...flowData,
      };

      console.log('params',params)
      this.submitLoading = true;
      let APIFun = API.add;
      if (this.type === "edit") {

 Source/UBCS-WEB/src/views/modeling/original.vue