瀏覽代碼

wanda-adm:feat > 解决筛选楼层,空间传参undefined问题

shaun-sheep 4 年之前
父節點
當前提交
342a812cd7

+ 6 - 5
src/components/Breadcrumb/index.vue

@@ -2,7 +2,8 @@
     <el-breadcrumb class="app-breadcrumb" separator="/">
         <transition-group name="breadcrumb">
             <el-breadcrumb-item v-for="(item, index) in breadcrumbs" :key="item.path">
-                <span v-if="item.redirect === 'noredirect' || index === breadcrumbs.length - 1" class="no-redirect">{{ item.meta.title }}</span>
+                <span v-if="item.redirect === 'noredirect' || index === breadcrumbs.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>
@@ -42,10 +43,10 @@ export default class extends Vue {
         });
     }
 
-    private isDashboard(route: RouteRecord) {
-        const name = route && route.meta && route.meta.title;
-        return name === "Dashboard";
-    }
+    // private isDashboard(route: RouteRecord) {
+    //     const name = route && route.meta && route.meta.title;
+    //     return name === "Dashboard";
+    // }
 
     private pathCompile(path: string) {
         // To solve this problem https://github.com/PanJiaChen/vue-element-admin/issues/561

+ 1 - 1
src/layout/components/AppMain.vue

@@ -17,6 +17,6 @@ export default class extends Vue {}
 
 <style lang="scss" scoped>
 .app-main {
-    height: calc(100% - 48px);
+    height: calc(100% - 58px);
 }
 </style>

+ 3 - 2
src/layout/components/Navbar/index.vue

@@ -1,8 +1,9 @@
 <template>
     <div class="navbar">
-        <span class="title" v-show="sidebar.opened"><i class="iconfont icon-wandajituan"></i></span>
+        <span class="title" v-show="sidebar.opened">
+            <i class="iconfont icon-wandajituan"></i>
+        </span>
         <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggle-click="toggleSideBar" />
-
         <div class="right-menu">
             <ul class="header-nav">
                 <li class="header-nav-notification">

+ 7 - 0
src/layout/index.vue

@@ -7,6 +7,7 @@
             <breadcrumb id="breadcrumb-container" class="breadcrumb-container"/>
             <hr/>
             <app-main/>
+        <div class="copy-right">当前版本:V 0.0.1</div>
         </div>
     </div>
 </template>
@@ -49,6 +50,12 @@ export default class extends mixins(ResizeMixin) {
     position: relative;
     height: 100%;
     width: 100%;
+    .copy-right{
+        display: flex;
+        justify-content: center;
+        font-size: 12px;
+        line-height: 1.5;
+    }
 }
 
 .drawer-bg {

+ 0 - 8
src/router/index.ts

@@ -198,14 +198,6 @@ export default new Router({
                             ),
                     meta: { title: "平面图" }
                 },
-                {
-                    path: "mapping",
-                    component: () =>
-                        import(
-                            /* webpackChunkName: "mapping" */ "@/views/management/mapping/index.vue"
-                            ),
-                    meta: { title: "xxxxxxx" }
-                }
             ]
         },
         {

+ 6 - 3
src/views/maintain/relationship/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="relationship" v-loading="loading">
         <template v-for="(item,index) in content">
-            <p class="title" >架构从属关系</p>
+            <p class="title">架构从属关系</p>
             <section v-for="(child,childIndex) in item.childGraphicTypeList" :key="childIndex">
                 <p class="ship-title">{{ child.graphTypeName }}
                     <i class="iconfont icon-xiangmuguanli"></i>
@@ -47,7 +47,9 @@
                             <article class="ship-card-time">
                                 <span v-if="relation.computationalState === 3">关系计算中...</span>
                                 <span v-else-if="relation.computationalState === 5">计算失败</span>
-                                <span v-else-if="relation.computationalState !== 3  && relation.computingTime">最后一次计算时间 {{ relation.computingTime }}</span>
+                                <span v-else-if="relation.computationalState !== 3  && relation.computingTime">最后一次计算时间 {{
+                                        relation.computingTime
+                                    }}</span>
                                 <span v-else-if="relation.times">最后一次计算时间 {{ relation.times }}</span>
                                 <span style="float: right">
                                 <el-tooltip
@@ -163,7 +165,7 @@ export default class extends Vue {
 
     manual(relation) {
         console.log(relation.relationTypeName)
-        this.$router.push({ path: 'relation', query:relation})
+        this.$router.push({ path: 'relation', query: relation })
     }
 }
 </script>
@@ -171,6 +173,7 @@ export default class extends Vue {
 <style scoped lang="scss">
 .relationship {
     height: 100%;
+    overflow: auto;
 
     .title {
         text-indent: 10px;

+ 1 - 1
src/views/maintain/space/index.vue

@@ -296,7 +296,7 @@ export default class spaceIndex extends Vue {
                 pageSize: this.paginationList.size,
                 orders: "createTime asc, localName asc, localId desc, id asc",
             };
-            let search = this.inputSearch ? `;localName contain '${ this.inputSearch }' or localId contain '${ this.inputSearch }'` : undefined
+            let search = this.inputSearch ? `;localName contain '${ this.inputSearch }' or localId contain '${ this.inputSearch }'` : ''
             if (this.building.length === 1) {
                 param2.filters = "";
                 switch (this.building[0]) {