From 5f1f3d58caf61d6d27a916d5ef244ac7725c3b19 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 28 四月 2023 15:05:51 +0800
Subject: [PATCH] 1.提交

---
 vue.config.js                           |    4 +-
 src/layout/components/Sidebar/index.vue |   29 ++++++++++++++
 src/router/index.js                     |   48 ++++++++++++++++++++++++
 src/icons/svg/zhkb.svg                  |    1 
 4 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/src/icons/svg/zhkb.svg b/src/icons/svg/zhkb.svg
new file mode 100644
index 0000000..39c2f8e
--- /dev/null
+++ b/src/icons/svg/zhkb.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1682562180452" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2688" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><path d="M128 256a42.666667 42.666667 0 0 1 42.666667-42.666667h682.666666a42.666667 42.666667 0 0 1 42.666667 42.666667v469.333333a42.666667 42.666667 0 0 1-42.666667 42.666667H170.666667a42.666667 42.666667 0 0 1-42.666667-42.666667V256z m85.333333 42.666667v384h597.333334V298.666667H213.333333z" fill="#157b7e" p-id="2689"></path><path d="M485.802667 712.981333a42.666667 42.666667 0 0 1 52.394666 0l225.664 175.530667-52.373333 67.370667L512 800.725333l-199.466667 155.157334-52.416-67.370667 225.706667-175.530667zM554.666667 85.333333v170.666667h-85.333334V85.333333h85.333334zM448 256v106.666667a64 64 0 1 0 128 0v-106.666667h85.333333v106.666667a149.333333 149.333333 0 1 1-298.666666 0v-106.666667h85.333333z" fill="#157b7e" p-id="2690"></path></svg>
\ No newline at end of file
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 727bd6d..965599b 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -59,6 +59,7 @@
     routes() {
       return this.$router.options.routes
     },
+
     activeMenu() {
       const route = this.$route
       const { meta, path } = route
@@ -68,8 +69,36 @@
       if (meta.activeMenu) {
         return meta.activeMenu
       }
+
+      if (path.indexOf('kanbanManager') !== -1) { // 褰撶偣鍑绘櫤鎱х湅鏉跨殑鏃跺��
+        const url = this.$router.resolve({
+          path
+          // query: { id: 123 }
+        })
+        const t = url.href.split('/')
+
+        if (t[2] === 'xljgcj') {
+          window.open('#/zhkbc?code=21', '_blank')
+        } else if (t[2] === 'zpcj') {
+          window.open('#/zhkbc?code=25', '_blank')
+        } else {
+          window.open('#/' + t[2], '_blank')
+        }
+      }
+
       return path
     },
+    // activeMenu() {
+    //   const route = this.$route
+    //   const { meta, path } = route
+    //   // if set path, the sidebar will highlight the path you set
+    //   removeCookie('ruleCode')
+    //   setCookie('ruleCode', meta.code)// 灏嗙紪鐮佽鍒檆ode瀛樺埌cookie閲岄潰
+    //   if (meta.activeMenu) {
+    //     return meta.activeMenu
+    //   }
+    //   return path
+    // },
     showLogo() {
       return this.$store.state.settings.sidebarLogo
     },
diff --git a/src/router/index.js b/src/router/index.js
index 29e6cfe..434a914 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -660,6 +660,54 @@
         meta: { code: '1061', title: '瀛樿揣妗f', icon: '', keepAlive: true }
       }
     ]
+  },
+
+  {
+    path: '/kanbanManager',
+    component: Layout,
+    redirect: '/kanbanManager/zhkb',
+    name: '鏅烘収鐪嬫澘',
+    code: '2023',
+    meta: { title: '鏅烘収鐪嬫澘', icon: 'zhkb' },
+    alwaysShow: true,
+    children: [
+      {
+        path: 'zhkb',
+        name: 'ZHKBCancel',
+        component: () => import('@/views/kb/zhkb'),
+        meta: { title: '缁煎悎鐪嬫澘', icon: '', keepAlive: true }
+      }, {
+        path: 'cgdd',
+        name: 'cgddCancel',
+        component: () => import('@/views/kb/cgdd'),
+        meta: { title: '閲囪喘璁㈠崟', icon: '', keepAlive: true }
+      },
+      {
+        path: 'ckgl',
+        name: 'ckglCancel',
+        component: () => import('@/views/kb/ckgl'),
+        meta: { title: '浠撳簱绠$悊', icon: '', keepAlive: true }
+      },
+      {
+        path: 'xljgcj',
+        name: 'ckglCancel',
+        component: () => import('@/views/kb/zhkbc'),
+        meta: { title: '涓嬫枡閲戝伐杞﹂棿', icon: '', keepAlive: true }
+      },
+      // {
+      //   path: 'jgcj',
+      //   name: 'ckglCancel',
+      //   component: () => import('@/views/kb/zhkbc'),
+      //   meta: { title: '閲戝伐杞﹂棿', icon: '', keepAlive: true }
+      // },
+      {
+        path: 'zpcj',
+        name: 'ckglCancel',
+        component: () => import('@/views/kb/zhkbc'),
+        meta: { title: '瑁呴厤杞﹂棿', icon: '', keepAlive: true }
+      }
+
+    ]
   }
 
   // {
diff --git a/vue.config.js b/vue.config.js
index 7d139be..a44c866 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -50,9 +50,9 @@
     },
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
-        // target: 'http://121.196.36.24:8005', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃      鏈湴鏈嶅姟鍣�(鐏电繑)
+        target: 'http://121.196.36.24:8005', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃      鏈湴鏈嶅姟鍣�(鐏电繑)
         // target: 'http://192.168.0.230:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃   瀹㈡埛鏈嶅姟鍣�(鐏电繑)  (鏈笂浜�)
-        target: 'http://3up6ju.natappfree.cc', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃   瀹㈡埛鏈嶅姟鍣�(鐏电繑)  (涓婁簯)
+        // target: 'http://3up6ju.natappfree.cc', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃   瀹㈡埛鏈嶅姟鍣�(鐏电繑)  (涓婁簯)
         changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
         pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
           ['^' + process.env.VUE_APP_BASE_API]: '/api/'

--
Gitblit v1.9.3