Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/assets/css/zkcss.css

+.commonTable{width: 100%;border-collapse:collapse;}
+.commonTable tr th{background: #E6E6E6;height:40px; font-size: 14px;   color: #333;border:1px solid #E6E6E6}
+.commonTable tr{background: #fff;text-align: center; height: 40px;}
+.commonTable tr:nth-child(2n+1){background:#fafafa; }
+.commonTable tr td{font-size: 12px;border: 1px solid #E5E5E5;}
+
+.el-pagination{
+    text-align: center;
+    padding: 15px 0 10px;
+    font-size: 14px;
+    margin-top: 15px;
+}
 .w120{
     width:120px;
 }

src/components/system/menu.vue

+<style>
+    .menuDiv{
+        padding:20px;
+    }
+    .menuDiv .query-box {
+        width: 100%;
+        padding: 0 0 20px;
+        border-bottom: 1px solid #ccc;
+        position: relative;
+        text-align: right;
+    }
+    .menuDiv .normalBtn {
+        color: #fff;
+        padding: 0 15px;
+        height: 30px;
+        background: #e95252;
+        border: 1px solid #e95252;
+        cursor: pointer;
+        border-radius: 15px;
+        margin-left: 10px;
+        outline: none;
+    }
+</style>
+<template>
+    <div class="menuDiv">
+        <div class="query-box">
+            <button type="button" class="normalBtn" @click="menuDialog=true">新增</button>
+        </div>
+        <table class="commonTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+            <tr>
+                <th>菜单编号</th>
+                <th>菜单名称</th>
+                <th>菜单连接</th>
+                <th>菜单等级</th>
+                <th>父级菜单编号</th>
+                <th>状态</th>
+            </tr>
+            <tr>
+                <td>1</td>
+                <td>2</td>
+                <td>3</td>
+                <td>4</td>
+                <td>5</td>
+                <td>正常</td>
+            </tr>
+        </table>
+        <el-pagination background
+            @current-change="handleCurrentChange"
+            :current-page.sync="currentPage"
+            v-if="dataList.length>0"
+            layout="total,prev, pager, next, jumper"
+            :page-size="msg.pageSize"
+            :total="total"
+            >
+        </el-pagination>
+
+        <!-- 修改密码 -->
+        <el-dialog title="新增菜单" :visible.sync="menuDialog" width="500px">
+            <el-form :model="addMsg" :rules="menurules" ref="addMsg" label-width="150px">
+                <el-form-item label="菜单名称" prop="MenuName">
+                    <el-input type="text" style="width:234px" size="small" maxlength="25" v-model="addMsg.MenuName"></el-input>
+                </el-form-item>
+                <el-form-item label="菜单连接" prop="MenuUrl">
+                    <el-input type="text" style="width:234px" size="small" maxlength="25" v-model="addMsg.MenuUrl"></el-input>
+                </el-form-item>
+                <el-form-item label="菜单等级" prop="MenuLevel">
+                    <el-input type="text" style="width:234px" size="small" maxlength="25" v-model="addMsg.MenuLevel"></el-input>
+                </el-form-item>
+                <el-form-item label="父级菜单编号" prop="ParentId">
+                    <el-select style="width:234px;" size="small" v-model="addMsg.ParentId">
+                        <el-option label="编号1" :key="0" :value="0"></el-option>
+                        <el-option label="编号2" :key="1" :value="1"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="图标" prop="IconClass">
+                    <el-input type="text" style="width:234px" size="small" maxlength="25" v-model="addMsg.IconClass"></el-input>
+                </el-form-item>
+
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="menuDialog = false">取 消</el-button>
+                <el-button size="small" type="primary" @click="addMenu()">确 定</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        loading:false,
+        menuDialog:false,
+        currentPage: 1,
+        total: 0,
+        msg: {
+            pageIndex:1,
+            pageSize:20
+        },
+        dataList:[],
+        addMsg:{
+            MenuName:'',
+            MenuUrl:'',
+            MenuLevel:0,
+            ParentId:0,
+            IconClass:'',
+            Status:0,
+        },
+        menurules:{
+
+        }
+      };
+    },
+    created() {
+
+    },
+    methods: {
+        handleCurrentChange(val) {
+            this.msg.pageIndex = val;
+            this.getList();
+        },
+        //获取数据
+        getList(){
+
+        },
+        addMenu(){
+
+        }
+    },
+    mounted() {
+
+    }
+  };
+
+</script>

src/router/index.js

@@ -35,6 +35,11 @@ export default new Router({
       name: 'basicSetUp',
       component: resolve => require(['@/components/setUp/basicSetUp'], resolve),
     },
+    {
+      path: '/menu',
+      name: 'menu',
+      component: resolve => require(['@/components/system/menu'], resolve),
+    },
     {
       path: '/mall',
       name: 'mall',