From 35957bef5daf8b80ef2eb4a51b90d50a74d285f1 Mon Sep 17 00:00:00 2001
From: liudianxin <liudianxin@bd-apaas.com>
Date: Wed, 19 Aug 2020 14:47:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE=E4=B8=AD=E7=82=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90is=5Fadmin?=
 =?UTF-8?q?=EF=BC=8C=E7=BC=96=E8=BE=91=EF=BC=8Cblockradius=E9=98=B4?=
 =?UTF-8?q?=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/general/block-radius.vue       |  1 +
 src/components/work-flow/super-flow.vue       | 20 +++++++++++++++++--
 src/pages/data-analysis/data-analysis.vue     | 18 +++++++++--------
 .../process-design/edit.vue                   | 16 ++++++++++++---
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/src/components/general/block-radius.vue b/src/components/general/block-radius.vue
index ebb5cfe..1cd4585 100644
--- a/src/components/general/block-radius.vue
+++ b/src/components/general/block-radius.vue
@@ -55,6 +55,7 @@ export default {
 <style scoped>
 .block_radius {
   background-color: #fff;
+  box-shadow: 0px 3px 6px 0px rgba(15, 19, 65, 0.05);
   border-radius: 10px;
   padding: 20px;
   margin-bottom: 20px;
diff --git a/src/components/work-flow/super-flow.vue b/src/components/work-flow/super-flow.vue
index 5a93e3c..c0162f0 100644
--- a/src/components/work-flow/super-flow.vue
+++ b/src/components/work-flow/super-flow.vue
@@ -619,6 +619,8 @@ export default {
     };
   },
   mounted() {
+    this.setOrigin();
+    this.setVal();
     this.getProcessServiceList();
     document.addEventListener("mousemove", this.docMousemove);
     document.addEventListener("mouseup", this.docMouseup);
@@ -628,6 +630,10 @@ export default {
     });
   },
   methods: {
+    setOrigin() {
+      let width = this.$refs.flowContainer.clientWidth;
+      this.origin = [width / 2, 0];
+    },
     linkStyle(link) {
       return {};
     },
@@ -1147,16 +1153,18 @@ export default {
       let index = this.nodeParamsList.findIndex((item) => {
         return item.id == this.nodeItem.id;
       });
-      this.nodeParamsList[index].plugins.split(plugin_index, 1);
+      this.nodeParamsList[index].plugins.splice(plugin_index, 1);
     },
     delNode(item) {
       console.log(item);
       let obj = this.$refs.superFlow.toJSON();
       let nodes = obj.nodeList;
       let links = obj.linkList;
+      let node_meta_id = "";
       for (let i = 0; i < nodes.length; i++) {
         console.log(nodes[i]);
         if (nodes[i].id == item) {
+          node_meta_id = nodes[i].meta.id;
           nodes.splice(i, 1);
         }
       }
@@ -1167,9 +1175,17 @@ export default {
           i--;
         }
       }
+      let index = this.nodeParamsList.findIndex((item) => {
+        return item.id == node_meta_id;
+      });
+      this.nodeParamsList.splice(index, 1);
       this.nodeList = nodes;
       this.linkList = links;
-      console.log(this.nodeList, this.linkList);
+      this.nodeItem = {
+        id: "",
+        name: "",
+      };
+      console.log(this.nodeList, this.linkList, this.nodeParamsList);
     },
   },
 };
diff --git a/src/pages/data-analysis/data-analysis.vue b/src/pages/data-analysis/data-analysis.vue
index 20e57e8..7fa182e 100644
--- a/src/pages/data-analysis/data-analysis.vue
+++ b/src/pages/data-analysis/data-analysis.vue
@@ -89,14 +89,16 @@ export default {
   },
   methods: {
     initNavList() {
-      this.is_admin = this.$store.state.userInfo.is_admin;
-      if (this.is_admin == 3 || this.is_admin == 4) {
-        this.navList = this.userNav;
-      } else if (this.is_admin == 2) {
-        this.navList = this.userNav1;
-      } else if (this.is_admin == 1) {
-        this.navList = this.userNav2;
-      }
+      this.$api.user.getNowUser().then((response) => {
+        this.is_admin = response.data.data.is_admin;
+        if (this.is_admin == 3 || this.is_admin == 4) {
+          this.navList = this.userNav;
+        } else if (this.is_admin == 2) {
+          this.navList = this.userNav1;
+        } else if (this.is_admin == 1) {
+          this.navList = this.userNav2;
+        }
+      });
     },
   },
   mounted() {
diff --git a/src/pages/workbench/component-center/process-management/process-design/edit.vue b/src/pages/workbench/component-center/process-management/process-design/edit.vue
index 1b6be6f..4d953ad 100644
--- a/src/pages/workbench/component-center/process-management/process-design/edit.vue
+++ b/src/pages/workbench/component-center/process-management/process-design/edit.vue
@@ -57,8 +57,14 @@
           :active-icon="require('@/assets/imgs/progress_ic_liucheng.png')"
           class="apaas_step"
         >
-          <div class="step_in">
-            <WorkFlow ref="workFlow" :node_list="node_list" :link_list="link_list" :node_params_list="node_params_list" class="work_flow" />
+          <div class="step_in" v-if="step == 1">
+            <WorkFlow
+              ref="workFlow"
+              :node_list="node_list"
+              :link_list="link_list"
+              :node_params_list="node_params_list"
+              class="work_flow"
+            />
             <div class="btn_footer">
               <el-button class="cancel" @click="cancel">取消</el-button>
               <div>
@@ -249,8 +255,11 @@ export default {
           describe: self.basic_form.desc,
           ...res,
         };
-        this.$api.workbench.addProcess(query).then((response) => {
+        this.$api.workbench.editProcess(query).then((response) => {
           if (response.data.success == 1) {
+            this.step = 2;
+          } else {
+            this.$message.error(response.data.errMsg);
           }
         });
       }
@@ -274,6 +283,7 @@ export default {
             this.node_list = data.nodeList;
             this.link_list = data.linkList;
             this.node_params_list = [];
+            this.workflows_id = data.workflows_id;
             this.node_list.forEach((item) => {
               item.meta.id =
                 parseInt(Math.random() * 1000 * 1000) +
-- 
2.26.0