From 2d8dfa84916114c1589fd5a1751a5bab6480bbe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Wed, 14 Jun 2023 10:18:03 +0800
Subject: [PATCH] up

---
 package.json                    |  1 +
 public/index.html               |  3 +++
 src/App.vue                     | 38 ++++++++++++++++++--------
 src/layout/noLayout.vue         | 47 +++++++++++++++++++++++++++++++++
 src/main.js                     | 20 ++++++++++++++
 src/store/modules/permission.js | 28 +++++++++++++++-----
 6 files changed, 120 insertions(+), 17 deletions(-)
 create mode 100644 src/layout/noLayout.vue

diff --git a/package.json b/package.json
index f721e4d..3f13cdd 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "path-to-regexp": "2.4.0",
     "view-design": "^4.7.0",
     "vue": "2.6.10",
+    "vue-matomo": "^4.2.0",
     "vue-router": "3.0.6",
     "vuex": "3.1.0",
     "wangeditor": "^4.7.12"
diff --git a/public/index.html b/public/index.html
index fa2be91..12c6783 100644
--- a/public/index.html
+++ b/public/index.html
@@ -13,5 +13,8 @@
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->
+    <!-- Matomo -->
+   
+    <!-- End Matomo Code -->
   </body>
 </html>
diff --git a/src/App.vue b/src/App.vue
index e1f2fe0..82011f4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,28 @@
-<template>
-  <div id="app">
-    <router-view />
-  </div>
-</template>
-
-<script>
-import "./assets/css/common.less";
-export default {
-  name: 'App'
-}
+<template>
+  <div id="app">
+    <router-view />
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import "./assets/css/common.less";
+  export default {
+    name: 'App',
+    computed: {
+      ...mapGetters([
+        'name'
+      ])
+    },
+    watch: {
+      $route(to, from) {
+        let locationHash = window.location.hash;
+
+        this.$matomo.setCustomUrl(locationHash.replace(/#/g, ''));
+        this.$matomo.trackPageView(to.meta.title) //设置页面名称
+      }
+    }
+  }
 </script>
diff --git a/src/layout/noLayout.vue b/src/layout/noLayout.vue
new file mode 100644
index 0000000..fd0677d
--- /dev/null
+++ b/src/layout/noLayout.vue
@@ -0,0 +1,47 @@
+<template>
+  <section class="app-main">
+    <transition name="fade-transform" mode="out-in">
+      <router-view :key="key" />
+    </transition>
+  </section>
+</template>
+
+<script>
+import Breadcrumb from '@/components/Breadcrumb'
+export default {
+  components: {
+    Breadcrumb
+  },
+  name: 'AppMain',
+  computed: {
+    key() {
+      return this.$route.path
+    }
+  }
+}
+</script>
+
+<style scoped>
+.app-main {
+  /*50 = navbar  */
+  min-height: calc(100vh - 30px);
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+}
+.fixed-header+.app-main {
+  padding-top: 50px;
+}
+</style>
+
+<style lang="scss">
+// fix css style bug in open el-dialog
+.el-popup-parent--hidden {
+  .fixed-header {
+    padding-right: 15px;
+  }
+}
+.breadcrumb-container {
+    margin-left: 20px !important;
+  }
+</style>
diff --git a/src/main.js b/src/main.js
index 9232d99..effd60e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -46,3 +46,23 @@ new Vue({
   store,
   render: h => h(App)
 })
+
+import VueMatomo from 'vue-matomo'
+
+Vue.use(VueMatomo, {
+  host: 'http://192.168.60.99:9000/', // 这里配置你自己的piwik服务器地址和网站ID
+  siteId: 1,//siteId值
+  // 根据router自动注册
+  router: router,
+  // // 是否需要在发送追踪信息之前请求许可
+  // // 默认false
+  requireConsent: false,
+  enableLinkTracking: true,
+  // // 是否追踪初始页面
+  // // 默认true
+  trackInitialView: false,
+  // // 最终的追踪js文件名
+  // // 默认 'piwik'
+  trackerFileName: 'matomo',
+  debug: false
+});
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 5a221e7..5e926ba 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -23,10 +23,23 @@ function hasPermission(roles, route) {
  * @param view  格式必须为 xxx/xxx 开头不要加斜杠
  * @returns
  */
-export const loadView = (view) => {
+export const loadView = (view) => { 
+  //console.log('loadView');
   return (resolve) => require([`@/views${view}`], resolve);
 }
-
+
+
+const componentHandler = (item) => {
+  //return path === '#'|| path == ''  ? Layout : loadView(path)
+  if(item.url === '#' || item.url === ''){
+    return Layout
+  }
+  if(item.path&&item.path.includes('#') && item.path !== '#'){
+    console.log('@/layout/noLayout');
+    return ()=>import('@/layout/noLayout')
+  }
+  return loadView(item.url)
+}
 
 /**
  * Filter asynchronous routing tables by recursion
@@ -79,13 +92,16 @@ export function generaMenu(routes, data) {
       })
     } else {
       var path = item.url;
-      if (item.path != "null" && item.path != null && item.path != "") {
+      if (item.path != "null" && item.path != null && item.path != ""&& item.path != "##") {
         path = item.path
-      }
+      }
+      console.log(path)
       const menu = {
-        path: (path === '#' ? item.id + '_key' : path),
+
+        path: (path.includes('#') ? item.id + '_key' : path),
         redirect: (item.children.length > 0 ? "noRedirect" : ""),
-        component: item.url === '#' ? Layout : loadView(item.url),
+        //component: item.url === '#' ? Layout : loadView(item.url),
+        component:componentHandler(item),
         // hidden: true,
         children: [],
         name: 'menu_' + item.id,