From 7d05c69630d066c0992368423f90e440e3638f91 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 29 九月 2024 11:01:51 +0800
Subject: [PATCH] 整合代码

---
 Source/UBCS-WEB/src/api/modeling/cycle.js                   |  120 ++++++++++++------------
 Source/UBCS-WEB/src/views/modeling/original.vue             |    2 
 Source/UBCS-WEB/src/views/modeling/cycle.vue                |  129 -------------------------
 Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue |    2 
 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue |    1 
 Source/UBCS-WEB/src/components/file/main.vue                |   10 -
 Source/UBCS-WEB/src/views/integration/systemInfo.vue        |    1 
 Source/UBCS-WEB/src/App.vue                                 |    1 
 Source/UBCS-WEB/src/views/flow/model.vue                    |    2 
 Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue     |    2 
 10 files changed, 66 insertions(+), 204 deletions(-)

diff --git a/Source/UBCS-WEB/src/App.vue b/Source/UBCS-WEB/src/App.vue
index 916c298..7bfe443 100644
--- a/Source/UBCS-WEB/src/App.vue
+++ b/Source/UBCS-WEB/src/App.vue
@@ -1,7 +1,6 @@
 <template>
   <div id="app">
     <router-view />
-
   </div>
 </template>
 
diff --git a/Source/UBCS-WEB/src/api/modeling/cycle.js b/Source/UBCS-WEB/src/api/modeling/cycle.js
index 90fe8ca..8fbd122 100644
--- a/Source/UBCS-WEB/src/api/modeling/cycle.js
+++ b/Source/UBCS-WEB/src/api/modeling/cycle.js
@@ -1,60 +1,60 @@
-import request from '@/router/axios';
-
-export const getList = (params) => {
-    return request({
-        url: '/api/ubcs-omd/lifeCycle/page',
-        method: 'get',
-        params
-    })
-}
-// 鏂板
-export const add = (data) => {
-  return request({
-      url: '/api/ubcs-omd/lifeCycle/submit',
-      method: 'post',
-      data
-  })
-}
-// 淇敼
-export const edit = (data) => {
-  return request({
-      url: '/api/ubcs-omd/lifeCycle/edit-save',
-      method: 'put',
-      data
-  })
-}
-export const detail = (params) => {
-  return request({
-      url: '/api/ubcs-omd/lifeCycle/detail',
-      method: 'get',
-      params
-  })
-}
-// 鍒犻櫎
-export const del = (data, isBatch) => {
-  let url = '/api/ubcs-omd/lifeCycle/remove'
-  if (isBatch) {
-    url = '/api/ubcs-omd/lifeCycle/batch-remove'
-  }
-  return request({
-      url,
-      method: 'post',
-      data
-  })
-}
-// 鑾峰彇鐢熷懡鍛ㄦ湡浜嬩欢
-export const getEventList = (params) => {
-  return request({
-      url: '/api/ubcs-omd/lifeCycle/page-event',
-      method: 'get',
-      params
-  })
-}
-export default {
-  getList,
-  add,
-  detail,
-  del,
-  edit,
-  getEventList
-}
+import request from '@/router/axios';
+
+export const getList = (params) => {
+    return request({
+        url: '/api/ubcs-omd/lifeCycle/page',
+        method: 'get',
+        params
+    })
+}
+// 鏂板
+export const add = (data) => {
+  return request({
+      url: '/api/ubcs-omd/lifeCycle/submit',
+      method: 'post',
+      data
+  })
+}
+// 淇敼
+export const edit = (data) => {
+  return request({
+      url: '/api/ubcs-omd/lifeCycle/edit-save',
+      method: 'put',
+      data
+  })
+}
+export const detail = (params) => {
+  return request({
+      url: '/api/ubcs-omd/lifeCycle/detail',
+      method: 'get',
+      params
+  })
+}
+// 鍒犻櫎
+export const del = (data, isBatch) => {
+  let url = '/api/ubcs-omd/lifeCycle/remove'
+  if (isBatch) {
+    url = '/api/ubcs-omd/lifeCycle/batch-remove'
+  }
+  return request({
+      url,
+      method: 'post',
+      data
+  })
+}
+// 鑾峰彇鐢熷懡鍛ㄦ湡浜嬩欢
+export const getEventList = (params) => {
+  return request({
+      url: '/api/ubcs-omd/lifeCycle/page-event',
+      method: 'get',
+      params
+  })
+}
+export default {
+  getList,
+  add,
+  detail,
+  del,
+  edit,
+  getEventList
+}
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 333132e..04d6918 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/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,
diff --git a/Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue b/Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue
index 7a4430d..eab7324 100644
--- a/Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue
+++ b/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;
       }
diff --git a/Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue b/Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue
index ad57d3a..6961dfb 100644
--- a/Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue
+++ b/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;
       }
diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue
index 1ce4b26..fbfd11e 100644
--- a/Source/UBCS-WEB/src/components/file/main.vue
+++ b/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);
         }
diff --git a/Source/UBCS-WEB/src/views/flow/model.vue b/Source/UBCS-WEB/src/views/flow/model.vue
index 466eeed..279e904 100644
--- a/Source/UBCS-WEB/src/views/flow/model.vue
+++ b/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,
diff --git a/Source/UBCS-WEB/src/views/integration/systemInfo.vue b/Source/UBCS-WEB/src/views/integration/systemInfo.vue
index 0b13756..90d9aac 100644
--- a/Source/UBCS-WEB/src/views/integration/systemInfo.vue
+++ b/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();
diff --git a/Source/UBCS-WEB/src/views/modeling/cycle.vue b/Source/UBCS-WEB/src/views/modeling/cycle.vue
index 6f00942..5194d87 100644
--- a/Source/UBCS-WEB/src/views/modeling/cycle.vue
+++ b/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") {
diff --git a/Source/UBCS-WEB/src/views/modeling/original.vue b/Source/UBCS-WEB/src/views/modeling/original.vue
index d555c5f..b45a6ac 100644
--- a/Source/UBCS-WEB/src/views/modeling/original.vue
+++ b/Source/UBCS-WEB/src/views/modeling/original.vue
@@ -105,7 +105,7 @@
             </el-descriptions-item>
           </el-descriptions>
         </div>
-        <div style="height: 40vh">
+        <div style="  height: 40vh">
           <el-descriptions :column="1" border class="margin-top" size="medium" title="灞炴�ч厤缃�"></el-descriptions>
           <el-tabs v-model="itemForm.activeName" stretch="true" style="height:235px" @tab-click="handleClick">
             <el-tab-pane label="鍙傜収" name="referTab">

--
Gitblit v1.9.3