merge

src/pages/workbench/workPlace.vue

@@ -969,47 +969,6 @@ export default {
         ]
       ],
       online_tool_arr: [
-<<<<<<< HEAD
-        {
-          text: "智能制图",
-          pic: require("@/assets/imgs/home_tool_ic_znht.png"),
-          bg: "#e5f4fe",
-          color: "#38aef9",
-          url: "/vmap/#/map",
-          target: 1
-        },
-        {
-          text: "流程设计",
-          pic: require("@/assets/imgs/home_tool_ic_lcsj.png"),
-          bg: "#e6ebfe",
-          color: "#515fe7",
-          url: "/progress",
-          // url: "/lcyq/ui/#/process/model", 
-          target: 1
-        },
-        /* {
-          text: "可视化图表",
-          pic: require("@/assets/imgs/home_tool_ic_kshbb.png"),
-          bg: "#fff2e2",
-          color: "#ea7d19",
-          url: "/iam/api/bi/token",
-          target: 1
-        }, */
-        {
-          text: "应用创新",
-          pic: require("@/assets/imgs/home_tool_ic_yycx.png"),
-          bg: "#e7fdfc",
-          color: "#25bdb1",
-          url: "/app_build",
-        },
-        {
-          text: "搜索引擎",
-          pic: require("@/assets/imgs/home_tool_ic_ssyq.png"),
-          bg: "#f1f1f3",
-          color: "#58617a",
-          url:'/search_engine',
-        },
-=======
         // {
         //   text: "智能制图",
         //   pic: require("@/assets/imgs/home_tool_ic_znht.png"),
@@ -1049,7 +1008,6 @@ export default {
         //   color: "#58617a",
         //   url:'/search_engine',
         // },
->>>>>>> dev
       ],
       service_arr: [
         ["服务列表", "申请服务", "云资源"],