From dedbadd96ab7e1533572b25511fd201678c64dad Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 17 十月 2024 09:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/modeling/cycle.vue |   35 ++++++++++++++++++++++++++++-------
 1 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/modeling/cycle.vue b/Source/UBCS-WEB/src/views/modeling/cycle.vue
index 5df55c7..5194d87 100644
--- a/Source/UBCS-WEB/src/views/modeling/cycle.vue
+++ b/Source/UBCS-WEB/src/views/modeling/cycle.vue
@@ -5,6 +5,7 @@
       :option="option"
       :page="page"
       :table-loading="loading"
+      :permission="permissionList"
       selection
       @size-change="search('size', ...arguments)"
       @current-change="search('current', ...arguments)"
@@ -18,6 +19,7 @@
           type="primary"
           icon="el-icon-plus"
           size="small"
+          v-if="permissionList.addBtn"
           @click="openDialog('add', {})"
           >鏂板</el-button
         >
@@ -36,6 +38,7 @@
           type="text"
           icon="el-icon-edit"
           size="mini"
+          v-if="permissionList.editBtn"
           :loading="row.editLoading"
           @click="openDialog('edit', row)"
           >缂栬緫</el-button
@@ -44,6 +47,7 @@
           type="text"
           icon="el-icon-view"
           size="mini"
+          v-if="permissionList.openBtn"
           :loading="row.detailLoading"
           @click="openDialog('detail', row)"
           >棰勮</el-button
@@ -53,6 +57,7 @@
           type="text"
           icon="el-icon-delete"
           size="mini"
+          v-if="permissionList.delBtn"
           :loading="row.delLoading"
           @click="rowDel(row)"
           >鍒犻櫎</el-button
@@ -98,17 +103,13 @@
 <script>
 import API from "@/api/modeling/cycle";
 import CycleFlow from "@/components/flow-cycle/flowchartEditor.vue";
+import {mapGetters} from "vuex";
 export default {
   name: "cycle.vue",
   components: { CycleFlow },
   data() {
     return {
-      form: {
-        // 'contionMap[id]': 'qwe'
-        // contionMap: [
-        //   {id: 'qwe'}
-        // ]
-      },
+      form: {},
       page: {
         pageSize: 10,
         total: 0,
@@ -116,6 +117,10 @@
         layout: "total, sizes, prev, pager, next, jumper",
       },
       option: {
+        height:'auto',
+        calcHeight:20,
+        columnBtn:false,
+        tip:false,
         selection: true,
         searchMenuSpan: 6,
         searchMenuPosition: "right",
@@ -161,6 +166,17 @@
       submitLoading: false,
       selectedData: [],
     };
+  },
+  computed:{
+    ...mapGetters(["permission"]),
+    permissionList(){
+      return{
+        addBtn: this.vaildData(this.permission.modeling_cycle.cycle_add,false),
+        delBtn: this.vaildData(this.permission.modeling_cycle.cycle_delete,false),
+        editBtn: this.vaildData(this.permission.modeling_cycle.cycle_edit,false),
+        openBtn: this.vaildData(this.permission.modeling_cycle.cycle_open,false),
+      }
+    },
   },
   created() {
     this.search("search", {});
@@ -213,6 +229,8 @@
           const nodes = res.data.data.nodes.map((item) => {
             item.label = item.id;
             item.index = item.indexNum;
+            item.x = Number(item.x);
+            item.y = Number(item.y);
             return item;
           });
           const edges = res.data.data.edges.map((item) => {
@@ -225,6 +243,7 @@
           });
           this.nodesEdgesData = { nodes, edges };
           this.visible = true;
+          console.log('nodesEdgesData',this.nodesEdgesData)
         });
       } else {
         this.nodesEdgesData = {};
@@ -290,6 +309,7 @@
       if (!newRowData) {
         return;
       }
+      // const edgeEvents = this.$refs.vueFlowchartEditor.getEdgesEvents();
       const flowData = await this.$refs.vueFlowchartEditor.getFlowData();
       if (Array.isArray(flowData.nodes)) {
         flowData.nodes = flowData.nodes.map((item) => {
@@ -302,6 +322,7 @@
         flowData.edges = flowData.edges.map((item) => {
           item.name = item.label;
           item.indexNum = item.index;
+          // item.events = edgeEvents[item.id] || [];
           return item;
         });
       }
@@ -314,7 +335,7 @@
       let APIFun = API.add;
       if (this.type === "edit") {
         APIFun = API.edit;
-        this.$delete(params, "id");
+        // this.$delete(params, "id");
       }
       APIFun(params)
         .then((res) => {

--
Gitblit v1.9.3