Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

+<template>
+  <div class="breadcrumb">
+    <el-breadcrumb class="app-breadcrumb" separator-class="el-icon-arrow-right">
+      <transition-group name="breadcrumb">
+        <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path">
+          <span
+            v-if="
+              item.redirect === 'noRedirect' || index == levelList.length - 1
+            "
+            class="no-redirect"
+            >{{ item.meta.title }}</span
+          >
+          <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
+        </el-breadcrumb-item>
+      </transition-group>
+    </el-breadcrumb>
+  </div>
+</template>
+
+<script>
+import pathToRegexp from "path-to-regexp";
+
+export default {
+  data() {
+    return {
+      levelList: null,
+    };
+  },
+  watch: {
+    $route() {
+      this.getBreadcrumb();
+    },
+  },
+  created() {
+    this.getBreadcrumb();
+  },
+  methods: {
+    getBreadcrumb() {
+      // only show routes with meta.title
+      let matched = this.$route.matched.filter(
+        (item) => item.meta && item.meta.title
+      );
+      this.levelList = matched.filter(
+        (item) => item.meta && item.meta.title
+      );
+    },
+    isDashboard(route) {
+      const name = route && route.name;
+      if (!name) {
+        return false;
+      }
+      return (
+        name.trim().toLocaleLowerCase() === "Dashboard".toLocaleLowerCase()
+      );
+    },
+    pathCompile(path) {
+      const { params } = this.$route;
+      var toPath = pathToRegexp.compile(path);
+      return toPath(params);
+    },
+    handleLink(item) {
+      // const { redirect, path } = item;
+      // if (redirect) {
+      //   this.$router.push(redirect);
+      //   return;
+      // }
+      // this.$router.push(path);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.breadcrumb {
+  margin: 15px auto 0;
+  box-sizing: border-box;
+  text-indent: 16px;
+}
+.breadcrumb1366 {
+  padding: 10px 0 !important;
+}
+.isFullScreen{
+  width: calc(100% - 20px);
+  margin: 0 auto;
+  padding: 10px!important;
+}
+.cur-location {
+  font-size: 16px;
+  color: white;
+  line-height: 40px;
+  float: left;
+  img {
+    position: relative;
+    top: 3px;
+    margin-right: 4px;
+  }
+}
+.app-breadcrumb.el-breadcrumb {
+  display: inline-block;
+  font-size: 14px;
+  // line-height: 40px;
+  .no-redirect {
+    color: white;
+    cursor: text;
+  }
+}
+.el-breadcrumb__inner a,
+.el-breadcrumb__inner.is-link {
+  color: white;
+  cursor: text;
+  font-weight: normal;
+}
+// .el-breadcrumb__inner a:hover,
+// .el-breadcrumb__inner.is-link:hover {
+//   text-decoration: underline;
+// }
+</style>

 <template>
   <section class="app-main">
+    <!-- <Breadcrumb v-if="judgeRoute()" /> -->
     <transition name="fade-transform" mode="out-in">
       <router-view />
     </transition>
   </section>
 </template>
 <script>
+import Breadcrumb from "@/components/Breadcrumb/index";
 export default {
   name: 'AppMain',
+  components: {
+    Breadcrumb
+  },
+  methods: {
+    judgeRoute(){
+      if (this.$route.path == '/home' || this.$route.path.indexOf('jsbwcx') > -1) {
+        return false
+      }else{
+        return true
+      }
+    }
+  },
   computed: {
     key () {
       return this.$route.path

@@ -92,6 +92,7 @@ export const asyncRoutes = [
   {
     path: '/jktj',
     component: Layout,
+    meta: { title: '统计监控', icon: 'sqcx'},
     children: [
       {
         path: 'ywltj',
@@ -176,7 +177,7 @@ export const asyncRoutes = [
   {
     path: '/busineInfo',
     component: Layout,
-    meta: { title: '接入业务信息', icon: 'sqcx', breadcrumb: false },
+    meta: { title: '不动产数据', icon: 'sqcx'},
     redirect: '/busineInfo/landOwnership',
     alwaysShow: true,
     name: 'busineInfo',
@@ -277,7 +278,7 @@ export const asyncRoutes = [
   {
     path: '/system',
     component: Layout,
-    meta: { title: '系统管理', icon: 'sqcx', breadcrumb: false },
+    meta: { title: '运维中心', icon: 'sqcx', breadcrumb: false },
     redirect: '/system/dictionaries',
     alwaysShow: true,
     name: 'system',