From 2353af8edf94434cd571100bb16ed9fe9f12819d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 16 四月 2024 20:15:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS-WEB/src/views/modeling/cycle.vue b/Source/UBCS-WEB/src/views/modeling/cycle.vue
index 07e770e..6f00942 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,6 +103,7 @@
 <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 },
@@ -111,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",
@@ -156,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", {});
@@ -208,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) => {
@@ -433,12 +456,13 @@
         ...newRowData,
         ...flowData,
       };
-      debugger;
+
+      console.log('params',params)
       this.submitLoading = true;
       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