From b2e5d99674febc3a86ec673acbb87b9377e43f2a Mon Sep 17 00:00:00 2001
From: PLUTO <>
Date: Fri, 27 Oct 2023 17:38:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/GridTree/addNode.vue           | 237 ------------------
 src/components/GridTree/nodeWrap.vue          |   2 +-
 src/components/JwTree/addNode.vue             | 237 ------------------
 src/components/JwTree/nodeWrap.vue            |  15 +-
 src/components/Tree/addNode.vue               | 237 ------------------
 .../organizational/gridTree/index.vue         |   2 +-
 6 files changed, 3 insertions(+), 727 deletions(-)
 delete mode 100644 src/components/GridTree/addNode.vue
 delete mode 100644 src/components/JwTree/addNode.vue
 delete mode 100644 src/components/Tree/addNode.vue

diff --git a/src/components/GridTree/addNode.vue b/src/components/GridTree/addNode.vue
deleted file mode 100644
index 5f8582e38..000000000
--- a/src/components/GridTree/addNode.vue
+++ /dev/null
@@ -1,237 +0,0 @@
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover placement="right-start" v-model="visible">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <!-- <button class="btn" type="button" slot="reference">
-          <span class="iconfont"></span>
-        </button> -->
-      </el-popover>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  props: ["childNodeP"],
-  data() {
-    return {
-      visible: false,
-    };
-  },
-  methods: {
-    addType(type) {
-      this.visible = false;
-      if (type != 4) {
-        var data;
-        if (type == 1) {
-          data = {
-            nodeName: "审核人",
-            error: true,
-            type: 1,
-            settype: 1,
-            selectMode: 0,
-            selectRange: 0,
-            directorLevel: 1,
-            examineMode: 1,
-            noHanderAction: 1,
-            examineEndDirectorLevel: 0,
-            childNode: this.childNodeP,
-            nodeUserList: [],
-          };
-        } else if (type == 2) {
-          data = {
-            nodeName: "抄送人",
-            type: 2,
-            ccSelfSelectFlag: 1,
-            childNode: this.childNodeP,
-            nodeUserList: [],
-          };
-        }
-        this.$emit("update:childNodeP", data);
-      } else {
-        this.$emit("update:childNodeP", {
-          nodeName: "路由",
-          type: 4,
-          childNode: null,
-          conditionNodes: [
-            {
-              nodeName: "条件1",
-              error: true,
-              type: 3,
-              priorityLevel: 1,
-              conditionList: [],
-              nodeUserList: [],
-              childNode: this.childNodeP,
-            },
-            {
-              nodeName: "条件2",
-              type: 3,
-              priorityLevel: 2,
-              conditionList: [],
-              nodeUserList: [],
-              childNode: null,
-            },
-          ],
-        });
-      }
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: -webkit-inline-box;
-  display: -ms-inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &:before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    margin: auto;
-    width: 1px;
-    height: 100%;
-    background-color: #2f87ff;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      -webkit-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgba(0, 0, 0, 0.1);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
-      }
-    }
-  }
-}
-</style>
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgba(50, 150, 250, 0.4);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/GridTree/nodeWrap.vue b/src/components/GridTree/nodeWrap.vue
index 0a9f4f2a4..80e8a7ec3 100644
--- a/src/components/GridTree/nodeWrap.vue
+++ b/src/components/GridTree/nodeWrap.vue
@@ -58,7 +58,7 @@
         </div>
       </div>
     </div>
-    <nodeWrapGrid v-if="nodeConfig.childNode" :nodeConfig.sync="nodeConfig.childNode"></nodeWrapGrid>
+    <!-- <nodeWrapGrid v-if="nodeConfig.childNode" :nodeConfig.sync="nodeConfig.childNode"></nodeWrapGrid> -->
   </div>
 </template>
 <script>
diff --git a/src/components/JwTree/addNode.vue b/src/components/JwTree/addNode.vue
deleted file mode 100644
index 5f8582e38..000000000
--- a/src/components/JwTree/addNode.vue
+++ /dev/null
@@ -1,237 +0,0 @@
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover placement="right-start" v-model="visible">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <!-- <button class="btn" type="button" slot="reference">
-          <span class="iconfont"></span>
-        </button> -->
-      </el-popover>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  props: ["childNodeP"],
-  data() {
-    return {
-      visible: false,
-    };
-  },
-  methods: {
-    addType(type) {
-      this.visible = false;
-      if (type != 4) {
-        var data;
-        if (type == 1) {
-          data = {
-            nodeName: "审核人",
-            error: true,
-            type: 1,
-            settype: 1,
-            selectMode: 0,
-            selectRange: 0,
-            directorLevel: 1,
-            examineMode: 1,
-            noHanderAction: 1,
-            examineEndDirectorLevel: 0,
-            childNode: this.childNodeP,
-            nodeUserList: [],
-          };
-        } else if (type == 2) {
-          data = {
-            nodeName: "抄送人",
-            type: 2,
-            ccSelfSelectFlag: 1,
-            childNode: this.childNodeP,
-            nodeUserList: [],
-          };
-        }
-        this.$emit("update:childNodeP", data);
-      } else {
-        this.$emit("update:childNodeP", {
-          nodeName: "路由",
-          type: 4,
-          childNode: null,
-          conditionNodes: [
-            {
-              nodeName: "条件1",
-              error: true,
-              type: 3,
-              priorityLevel: 1,
-              conditionList: [],
-              nodeUserList: [],
-              childNode: this.childNodeP,
-            },
-            {
-              nodeName: "条件2",
-              type: 3,
-              priorityLevel: 2,
-              conditionList: [],
-              nodeUserList: [],
-              childNode: null,
-            },
-          ],
-        });
-      }
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: -webkit-inline-box;
-  display: -ms-inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &:before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    margin: auto;
-    width: 1px;
-    height: 100%;
-    background-color: #2f87ff;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      -webkit-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgba(0, 0, 0, 0.1);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
-      }
-    }
-  }
-}
-</style>
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgba(50, 150, 250, 0.4);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/JwTree/nodeWrap.vue b/src/components/JwTree/nodeWrap.vue
index d7ab6d270..225bd88e9 100644
--- a/src/components/JwTree/nodeWrap.vue
+++ b/src/components/JwTree/nodeWrap.vue
@@ -57,7 +57,7 @@
         </div>
       </div>
     </div>
-    <nodeWrapJw v-if="nodeConfig.childNode" :nodeConfig.sync="nodeConfig.childNode"></nodeWrapJw>
+    <!-- <nodeWrapJw v-if="nodeConfig.childNode" :nodeConfig.sync="nodeConfig.childNode"></nodeWrapJw> -->
   </div>
 </template>
 <script>
@@ -73,10 +73,6 @@ export default {
   computed: {},
   watch: {},
   methods: {
-    getAllName(item) {
-      return item;
-    },
-
     spliceNameFun(row, num) {
       if (row && row.length > num) {
         return row.substring(0, num) + "...";
@@ -84,10 +80,6 @@ export default {
       return row;
     },
 
-    getItemNameArr(str) {
-      return str.split(",").slice(0, 2);
-    },
-
     getOnerSixLevelFlag(item) {
       return this.sixLevelArr.includes(item.level);
     },
@@ -143,19 +135,14 @@ export default {
 .node-box-after {
   .nodeBoxTop {
     font-size: 14px;
-    cursor: pointer;
     position: relative;
     color: #fff;
     display: inline-block;
     width: 168px;
     height: 164px;
-    padding-top: 10px;
     text-align: center;
     background-image: url(~@/assets/images/home/firstLevel.png);
     background-size: 100%;
-    div:nth-child(2) {
-      cursor: pointer;
-    }
   }
 }
 .auto-judge {
diff --git a/src/components/Tree/addNode.vue b/src/components/Tree/addNode.vue
deleted file mode 100644
index 5f8582e38..000000000
--- a/src/components/Tree/addNode.vue
+++ /dev/null
@@ -1,237 +0,0 @@
-<template>
-  <div class="add-node-btn-box">
-    <div class="add-node-btn">
-      <el-popover placement="right-start" v-model="visible">
-        <div class="add-node-popover-body">
-          <a class="add-node-popover-item approver" @click="addType(1)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>审批人</p>
-          </a>
-          <a class="add-node-popover-item notifier" @click="addType(2)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>抄送人</p>
-          </a>
-          <a class="add-node-popover-item condition" @click="addType(4)">
-            <div class="item-wrapper">
-              <span class="iconfont"></span>
-            </div>
-            <p>条件分支</p>
-          </a>
-        </div>
-        <!-- <button class="btn" type="button" slot="reference">
-          <span class="iconfont"></span>
-        </button> -->
-      </el-popover>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  props: ["childNodeP"],
-  data() {
-    return {
-      visible: false,
-    };
-  },
-  methods: {
-    addType(type) {
-      this.visible = false;
-      if (type != 4) {
-        var data;
-        if (type == 1) {
-          data = {
-            nodeName: "审核人",
-            error: true,
-            type: 1,
-            settype: 1,
-            selectMode: 0,
-            selectRange: 0,
-            directorLevel: 1,
-            examineMode: 1,
-            noHanderAction: 1,
-            examineEndDirectorLevel: 0,
-            childNode: this.childNodeP,
-            nodeUserList: [],
-          };
-        } else if (type == 2) {
-          data = {
-            nodeName: "抄送人",
-            type: 2,
-            ccSelfSelectFlag: 1,
-            childNode: this.childNodeP,
-            nodeUserList: [],
-          };
-        }
-        this.$emit("update:childNodeP", data);
-      } else {
-        this.$emit("update:childNodeP", {
-          nodeName: "路由",
-          type: 4,
-          childNode: null,
-          conditionNodes: [
-            {
-              nodeName: "条件1",
-              error: true,
-              type: 3,
-              priorityLevel: 1,
-              conditionList: [],
-              nodeUserList: [],
-              childNode: this.childNodeP,
-            },
-            {
-              nodeName: "条件2",
-              type: 3,
-              priorityLevel: 2,
-              conditionList: [],
-              nodeUserList: [],
-              childNode: null,
-            },
-          ],
-        });
-      }
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-.add-node-btn-box {
-  width: 240px;
-  display: -webkit-inline-box;
-  display: -ms-inline-flexbox;
-  display: inline-flex;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  -webkit-box-flex: 1;
-  -ms-flex-positive: 1;
-  position: relative;
-
-  &:before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    margin: auto;
-    width: 1px;
-    height: 100%;
-    background-color: #2f87ff;
-  }
-
-  .add-node-btn {
-    user-select: none;
-    width: 240px;
-    padding: 20px 0 32px;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    flex-shrink: 0;
-    -webkit-box-flex: 1;
-    flex-grow: 1;
-
-    .btn {
-      outline: none;
-      box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
-      width: 30px;
-      height: 30px;
-      background: #3296fa;
-      border-radius: 50%;
-      position: relative;
-      border: none;
-      line-height: 30px;
-      -webkit-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        color: #fff;
-        font-size: 16px;
-      }
-
-      &:hover {
-        transform: scale(1.3);
-        box-shadow: 0 13px 27px 0 rgba(0, 0, 0, 0.1);
-      }
-
-      &:active {
-        transform: none;
-        background: #1e83e9;
-        box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
-      }
-    }
-  }
-}
-</style>
-<style lang="scss">
-.add-node-popover-body {
-  display: flex;
-
-  .add-node-popover-item {
-    margin-right: 10px;
-    cursor: pointer;
-    text-align: center;
-    flex: 1;
-    color: #191f25 !important;
-
-    .item-wrapper {
-      user-select: none;
-      display: inline-block;
-      width: 80px;
-      height: 80px;
-      margin-bottom: 5px;
-      background: #fff;
-      border: 1px solid #e2e2e2;
-      border-radius: 50%;
-      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-      .iconfont {
-        font-size: 35px;
-        line-height: 80px;
-      }
-    }
-
-    &.approver {
-      .item-wrapper {
-        color: #ff943e;
-      }
-    }
-
-    &.notifier {
-      .item-wrapper {
-        color: #3296fa;
-      }
-    }
-
-    &.condition {
-      .item-wrapper {
-        color: #15bc83;
-      }
-    }
-
-    &:hover {
-      .item-wrapper {
-        background: #3296fa;
-        box-shadow: 0 10px 20px 0 rgba(50, 150, 250, 0.4);
-      }
-
-      .iconfont {
-        color: #fff;
-      }
-    }
-
-    &:active {
-      .item-wrapper {
-        box-shadow: none;
-        background: #eaeaea;
-      }
-
-      .iconfont {
-        color: inherit;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/views/dataBoard/organizational/gridTree/index.vue b/src/views/dataBoard/organizational/gridTree/index.vue
index f38d68b80..182594839 100644
--- a/src/views/dataBoard/organizational/gridTree/index.vue
+++ b/src/views/dataBoard/organizational/gridTree/index.vue
@@ -182,7 +182,7 @@ export default {
     }
 
     .lastLevel {
-      height: 145px !important;
+      height: 180px !important;
       // margin-top: -45px !important;
     }