Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/components/mindmap/custom.vue

@@ -51,7 +51,7 @@ const fittingString = (str, maxWidth, fontSize) => {
 };
 const ERROR_COLOR = 'red';
 const getNodeConfig = (node) => {
-  if (node.nodeUrl) {
+  if (node.color) {
     return {
       basicColor: node.color,
       fontColor: '#333',
@@ -134,7 +134,7 @@ const nodeBasicMethod = {
         y: 0,
         width: w - 19,
         height: h,
-        fill: config.bgColor,
+        fill: config.basicColor,
         stroke: config.borderColor,
         radius: 2,
         cursor: 'pointer',

src/components/mindmap/project.vue

@@ -48,12 +48,12 @@ const fittingString = (str, maxWidth, fontSize) => {
 };
 const ERROR_COLOR = 'red';
 const getNodeConfig = (node) => {
-  if (node.nodeUrl) {
+  if (node.color) {
     return {
       basicColor: node.color,
       fontColor: '#333',
       borderColor: node.color,
-      bgColor: '#fff',
+      bgColor: node.color,
     };
   }
   let config = {
@@ -106,8 +106,8 @@ const nodeBasicMethod = {
       attrs: {
         x: 0,
         y: 0,
-        fill: config.bgColor,
-        stroke: config.borderColor,
+        // fill: config.bgColor,
+        // stroke: config.borderColor,
         width: w,
         height: h,
       },
@@ -121,7 +121,7 @@ const nodeBasicMethod = {
           x: 3,
           y: h / 2,
           r: 0,
-          fill: config.basicColor,
+          // fill: config.basicColor,
         },
         // must be assigned in G6 3.3 and later versions. it can be any string you want, but should be unique in a custom item type
         name: 'left-dot-shape',
@@ -134,8 +134,8 @@ const nodeBasicMethod = {
         y: 0,
         width: w - 19,
         height: h,
-        fill: config.basicColor,
-        stroke: config.borderColor,
+        // fill: config.basicColor,
+        // stroke: config.borderColor,
         radius: 2,
         cursor: 'pointer',
       },
@@ -148,9 +148,9 @@ const nodeBasicMethod = {
       attrs: {
         x: 3,
         y: 0,
-        width: 3,
+        width:0,
         height: h,
-        fill: config.basicColor,
+        // fill: config.basicColor,
         radius: 1.5,
       },
       // must be assigned in G6 3.3 and later versions. it can be any string you want, but should be unique in a custom item type

src/components/mindmap/saler.vue

@@ -53,19 +53,19 @@ const fittingString = (str, maxWidth, fontSize) => {
 };
 const ERROR_COLOR = 'red';
 const getNodeConfig = (node) => {
-  if (node.nodeUrl) {
+  if (node.color) {
     return {
       basicColor: node.color,
       fontColor: '#333',
       borderColor: node.color,
-      bgColor: '#fff',
+      bgColor: node.color,
     };
   }
   let config = {
-    basicColor: node.color,
+    basicColor: ERROR_COLOR,
     fontColor: '#333',
-    borderColor:  node.color,
-    bgColor: '#fff',
+    borderColor:  ERROR_COLOR,
+    bgColor: ERROR_COLOR,
   };
   switch (node.type) {
     case 'root': {

src/router/index.js

@@ -102,31 +102,7 @@ let routes = [
           ast_nav:true
         },
         component: () => import(/* webpackChunkName: "about" */ '@/views/printmodel/design/index.vue')
-      },/*{
-        path: '/customerportrait',
-        name: 'customerportrait',
-        meta: {
-          title: '客户画像',
-          ast_nav:true
-        },
-        component: () => import(/!* webpackChunkName: "about" *!/ '@/components/mindmap/custom.vue')
-      },*//*{
-        path: '/projectportrait',
-        name: 'projectportrait',
-        meta: {
-          title: '项目画像',
-          ast_nav:true
-        },
-        component: () => import(/!* webpackChunkName: "about" *!/ '@/components/mindmap/project.vue')
-      }*//*{
-        path: '/salerportrait',
-        name: 'salerportrait',
-        meta: {
-          title: '业务员画像',
-          ast_nav:true
-        },
-        component: () => import(/* webpackChunkName: "about" */ /*)
-      },*/{
+      },{
         path: '/salesfunnel',
         name: 'salesfunnel',
         meta: {