Sendya 6 жил өмнө
parent
commit
00a14ff48e

+ 13 - 9
src/components/layout/LayoutMain.vue

@@ -1,7 +1,13 @@
 <template>
   <a-layout class="layout">
 
-    <sider-menu :menus="menus" :theme="menuTheme" v-if="menuMode === 'inline'" :mode="menuMode" :collapsed="!siderOpen || collapsed" :collapsible="true"></sider-menu>
+    <sider-menu
+      :menus="menus"
+      :theme="menuTheme"
+      v-if="menuMode === 'inline'"
+      :mode="menuMode"
+      :collapsed="!siderOpen || collapsed"
+      :collapsible="true"></sider-menu>
 
     <a-layout>
       <!-- layout header -->
@@ -25,7 +31,7 @@
   import SiderMenu from '@/components/menu/SiderMenu'
   import LayoutHeader from './LayoutHeader'
   import LayoutFooter from './LayoutFooter'
-  import {asyncRouterMap} from '@/router/index'
+  import { asyncRouterMap } from '@/router/index'
   import { mapState } from 'vuex'
 
   export default {
@@ -35,7 +41,7 @@
       LayoutHeader,
       LayoutFooter
     },
-    data() {
+    data () {
       return {
         // light, dark
         menuTheme: 'light',
@@ -45,7 +51,7 @@
         menus: []
       }
     },
-    created() {
+    created () {
       this.menus = asyncRouterMap
     },
     computed: {
@@ -54,7 +60,7 @@
       })
     },
     methods: {
-      toggle() {
+      toggle () {
         this.collapsed = !this.collapsed;
       },
     }
@@ -93,7 +99,6 @@
       position: relative;
       z-index: 10;
 
-
       .logo {
         height: 64px;
         position: relative;
@@ -124,14 +129,14 @@
 
       &.light {
         background-color: #fff;
-        box-shadow: 2px 0px 8px 0px rgba(29,35,41,0.05);
+        box-shadow: 2px 0px 8px 0px rgba(29, 35, 41, 0.05);
 
         .logo {
           background: #fff;
           box-shadow: 1px 1px 0px 0px #e8e8e8;
 
           h1 {
-            color: #1890ff;
+            color: unset;
           }
         }
 
@@ -140,7 +145,6 @@
         }
       }
 
-
     }
 
     .header {

+ 60 - 52
src/components/menu/SiderMenu.vue

@@ -1,59 +1,67 @@
 <template>
-    <a-layout-sider :class="['sider', isMobile ? null : 'shadow', theme ]" width="256px" :collapsible="collapsible" v-model="collapsed" :trigger="null">
-        <div class="logo">
-            <router-link :to="{name:'dashboard'}">
-                <img src="~@/assets/logo.svg" alt="logo">
-                <h1>Ant Design Pro</h1>
-            </router-link>
-        </div>
-        <s-menu :collapsed="collapsed" :menu="menus" :theme="theme" @select="onSelect" :mode="mode" style="padding: 16px 0px;"></s-menu>
-    </a-layout-sider>
+  <a-layout-sider :class="['sider', isMobile ? null : 'shadow', theme ]" width="256px" :collapsible="collapsible"
+                  v-model="collapsed" :trigger="null">
+    <div class="logo">
+      <router-link :to="{name:'dashboard'}">
+        <img src="~@/assets/logo.svg" alt="logo">
+        <h1>Ant Design Pro</h1>
+      </router-link>
+    </div>
+    <s-menu
+      :collapsed="collapsed"
+      :menu="menus"
+      :theme="theme"
+      @select="onSelect"
+      :mode="mode"
+      style="padding: 16px 0px;"></s-menu>
+  </a-layout-sider>
 </template>
 
 <script>
-    import ALayoutSider from "ant-design-vue/es/layout/Sider"
-    import SMenu from './index'
-    export default {
-        name: "SiderMenu",
-        components: { ALayoutSider, SMenu },
-        props: {
-            mode: {
-              type: String,
-              required: false,
-              default: 'inline'
-            },
-            theme: {
-              type: String,
-              required: false,
-              default: 'dark'
-            },
-            collapsible: {
-                type: Boolean,
-                required: false,
-                default: false
-            },
-            collapsed: {
-                type: Boolean,
-                required: false,
-                default: false
-            },
-            menus: {
-                type: Array,
-                required: true
-            }
-        },
-        created() {
+  import ALayoutSider from "ant-design-vue/es/layout/Sider"
+  import SMenu from './index'
 
-        },
-        computed: {
-            isMobile () {
-                return this.$store.state.app.device !== 'desktop'
-            }
-        },
-        methods: {
-            onSelect(obj) {
-                this.$emit('menuSelect', obj)
-            }
-        }
+  export default {
+    name: "SiderMenu",
+    components: { ALayoutSider, SMenu },
+    props: {
+      mode: {
+        type: String,
+        required: false,
+        default: 'inline'
+      },
+      theme: {
+        type: String,
+        required: false,
+        default: 'dark'
+      },
+      collapsible: {
+        type: Boolean,
+        required: false,
+        default: false
+      },
+      collapsed: {
+        type: Boolean,
+        required: false,
+        default: false
+      },
+      menus: {
+        type: Array,
+        required: true
+      }
+    },
+    created () {
+
+    },
+    computed: {
+      isMobile () {
+        return this.$store.state.app.device !== 'desktop'
+      }
+    },
+    methods: {
+      onSelect (obj) {
+        this.$emit('menuSelect', obj)
+      }
     }
+  }
 </script>

+ 13 - 2
src/views/dashboard/Workplace.vue

@@ -21,7 +21,12 @@
     <div>
       <a-row :gutter="24">
         <a-col :xl="16" :lg="24" :md="24" :sm="24" :xs="24">
-          <a-card class="project-list" :loading="loading" style="margin-bottom: 24px;" :bordered="false" title="进行中的项目"
+          <a-card 
+class="project-list" 
+:loading="loading" 
+style="margin-bottom: 24px;" 
+:bordered="false" 
+title="进行中的项目"
                   :body-style="{ padding: 0 }">
             <a slot="extra">全部项目</a>
             <div>
@@ -62,7 +67,13 @@
             </a-list>
           </a-card>
         </a-col>
-        <a-col style="padding: 0 12px" :xl="8" :lg="24" :md="24" :sm="24" :xs="24">
+        <a-col 
+style="padding: 0 12px" 
+:xl="8" 
+:lg="24" 
+:md="24" 
+:sm="24" 
+:xs="24">
           <a-card title="快速开始 / 便捷导航" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
             <div class="item-group">
               <a>操作一</a>

+ 2 - 2
src/views/list/TableInnerEditList.vue

@@ -86,8 +86,8 @@
       :data="loadData"
       :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onChange }"
     >
-      <template v-for="col in columns" v-if="col.scopedSlots" :slot="col.dataIndex" slot-scope="text, record, index">
-        <div>
+      <template v-for="(col, index) in columns" v-if="col.scopedSlots" :slot="col.dataIndex" slot-scope="text, record, index">
+        <div :key="index">
           <a-input
             v-if="record.editable"
             style="margin: -5px 0"

+ 0 - 1
src/views/result/Result.vue

@@ -25,7 +25,6 @@
   .result {
     text-align: center;
     width: 72%;
-    max-width: 560px;
     margin: 0 auto;
     padding: 24px 0 8px;