From 863311fcdc647eb30ac43a21b64560f51b77d1e7 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 4 Jan 2022 11:08:32 +0800
Subject: [PATCH] commit

---
 .../workingGroup/components/workingGroup1/index.vue  | 11 ++++++++---
 .../workingGroup/components/workingGroup2/index.vue  | 12 ++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
index c2fdb3a50..f5b3b5368 100644
--- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
+++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
@@ -222,7 +222,7 @@
                                             label="我司在工作组排名顺序"
                                             prop="deptOrder"
                                             align="center"
-                                            width="150">
+                                            width="170">
                                         <template slot-scope="scope">
                                             <el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.deptOrder"></el-input>
                                         </template>
@@ -1555,6 +1555,7 @@
                             this.addForm.wgMeetingInfos.forEach(item => {
                                 item.joinfile = JSON.stringify(item.joinfile)
                             })
+                            this.addForm.status = '3'
                             this.$http.postData('wg_work_group/add', this.addForm, {
                                 _this: this
                             }, res => {
@@ -1670,6 +1671,7 @@
                         drawShape: function drawShape(cfg, group) {
                             const level = cfg.level
                             const nodeType = cfg.nature
+                            const processType = cfg.status
                             if (nodeType === '0') {
                                 const circle = group.addShape('circle', {
                                     attrs: {
@@ -1760,7 +1762,11 @@
                                     radius: (bbox.height + 12) / 2
                                 });
                                 // 自定义层级颜色
-                                if (nodeType === '1') {
+                                if (processType !== '1') {
+                                    rect.attr({
+                                        fill: '#666'
+                                    });
+                                } else if (nodeType === '1') {
                                     rect.attr({
                                         fill: '#1C98B8'
                                     });
@@ -1880,7 +1886,6 @@
                         graph.setItemState(ce, 'click', false);
                     });
                     const edgeItem = e.item; // 获取被点击的边元素对象
-                    console.log('EdgeClick', edgeItem)
                     graph.setItemState(edgeItem, 'click', true); // 设置当前边的 click 状态为 true
                     this.handleEdgeClick (edgeItem)
                 });
diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
index 966207c0f..7d6e0f37a 100644
--- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
+++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
@@ -222,7 +222,7 @@
                                                 label="我司在工作组排名顺序"
                                                 prop="deptOrder"
                                                 align="center"
-                                                width="150">
+                                                width="170">
                                             <template slot-scope="scope">
                                                 <el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.deptOrder"></el-input>
                                             </template>
@@ -1411,6 +1411,7 @@
                             this.addForm.wgMeetingInfos.forEach(item => {
                                 item.joinfile = JSON.stringify(item.joinfile)
                             })
+                            this.addForm.status = '3'
                             this.$http.postData('wg_work_group/add', this.addForm, {
                                 _this: this
                             }, res => {
@@ -1474,7 +1475,6 @@
                 this.headerNo = true
                 let row = node._cfg.model
                 this.addForm.pName = row.name
-                console.log(row);
                 if (row.level === '2') {
                     this.standId = row.wgStandorpolicyInfos[0].standId
                 }
@@ -1512,6 +1512,7 @@
                         drawShape: function drawShape(cfg, group) {
                             const level = cfg.level
                             const nodeType = cfg.nature
+                            const processType = cfg.status
                             if (nodeType === '0') {
                                 const circle = group.addShape('circle', {
                                     attrs: {
@@ -1602,7 +1603,11 @@
                                     radius: (bbox.height + 12) / 2
                                 });
                                 // 自定义层级颜色
-                                if (nodeType === '1') {
+                                if (processType !== '1') {
+                                    rect.attr({
+                                        fill: '#666'
+                                    });
+                                } else if (nodeType === '1') {
                                     rect.attr({
                                         fill: '#1C98B8'
                                     });
@@ -1722,7 +1727,6 @@
                         graph.setItemState(ce, 'click', false);
                     });
                     const edgeItem = e.item; // 获取被点击的边元素对象
-                    console.log('EdgeClick', edgeItem)
                     graph.setItemState(edgeItem, 'click', true); // 设置当前边的 click 状态为 true
                     this.handleEdgeClick (edgeItem)
                 });