修改

.idea/workspace.xml

@@ -3,150 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="645e93b8-0ad6-4d6f-a066-61732e27367b" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/package-lock.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/alert.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/autocomplete.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/badge.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/base.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/breadcrumb-item.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/breadcrumb.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/button-group.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/button.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/card.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/carousel-item.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/carousel.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/cascader.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/checkbox-group.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/checkbox.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/col.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/collapse-item.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/collapse.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/color-picker.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/date-picker.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/dialog.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/dropdown-item.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/dropdown-menu.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/dropdown.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/fonts/element-icons.ttf" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/fonts/element-icons.woff" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/form-item.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/form.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/icon.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/index.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/input-number.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/input.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/loading.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/menu-item-group.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/menu-item.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/menu.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/message-box.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/message.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/notification.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/option-group.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/option.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/pagination.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/popover.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/progress.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/radio-button.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/radio-group.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/radio.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/rate.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/reset.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/row.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/scrollbar.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/select-dropdown.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/select.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/slider.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/spinner.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/step.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/steps.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/submenu.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/switch.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/tab-pane.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/table-column.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/table.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/tabs.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/tag.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/time-picker.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/time-select.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/tooltip.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/tree.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-darkblue/upload.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/alert.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/autocomplete.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/badge.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/base.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/breadcrumb-item.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/breadcrumb.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/button-group.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/button.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/card.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/carousel-item.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/carousel.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/cascader.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/checkbox-group.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/checkbox.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/col.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/collapse-item.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/collapse.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/color-picker.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/date-picker.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/dialog.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/dropdown-item.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/dropdown-menu.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/dropdown.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/fonts/element-icons.ttf" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/fonts/element-icons.woff" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/form-item.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/form.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/icon.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/index.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/input-number.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/input.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/loading.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/menu-item-group.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/menu-item.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/menu.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/message-box.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/message.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/notification.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/option-group.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/option.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/pagination.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/popover.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/progress.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/radio-button.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/radio-group.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/radio.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/rate.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/reset.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/row.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/scrollbar.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/select-dropdown.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/select.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/slider.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/spinner.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/step.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/steps.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/submenu.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/switch.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/tab-pane.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/table-column.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/table.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/tabs.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/tag.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/time-picker.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/time-select.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/tooltip.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/tree.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/theme/theme-green/upload.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/main.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ys_vue/src/routes.js" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/routes.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ys_vue/src/views/Home.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/views/Home.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/views/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/views/Login.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/views/nav1/Form.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/views/nav1/Form.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ys_vue/src/views/base/staff.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/views/base/staff.vue" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -277,7 +136,7 @@
       <workItem from="1563866734327" duration="18000" />
       <workItem from="1563866849270" duration="1000" />
       <workItem from="1563931907085" duration="616000" />
-      <workItem from="1564024527494" duration="2727000" />
+      <workItem from="1564024527494" duration="3326000" />
     </task>
     <task id="LOCAL-00001" summary="云塑网前端代码">
       <created>1563771143548</created>
@@ -304,7 +163,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="6583000" />
+    <option name="totallyTimeSpent" value="7182000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />

ys_vue/package.json

@@ -15,7 +15,7 @@
     "element-ui": "^2.10.1",
     "font-awesome": "^4.7.0",
     "nprogress": "^0.2.0",
-    "vue": "^2.2.2",
+    "vue": "^2.6.10",
     "vue-router": "^2.3.0",
     "vuex": "^2.0.0-rc.6"
   },

ys_vue/src/App.vue

@@ -9,8 +9,7 @@
 <script>
     export default {
         name: 'app',
-            components: {
-        }
+        components: {}
     }
 </script>
 

ys_vue/src/routes.js

@@ -18,8 +18,6 @@ import moldFile from './views/mold/moldFile.vue'
 import staff from './views/base/staff.vue'
 import competence from './views/base/competence.vue'
 
-console.log(this)
-
 let routes = [
     {
         path: '/login',

ys_vue/src/views/Home.vue

@@ -60,7 +60,7 @@
 					</el-col> -->
 					<el-col :span="24" class="content-wrapper">
 						<transition name="fade" mode="out-in">
-							<router-view></router-view>
+							<router-view></router-view></router-view>
 						</transition>
 					</el-col>
 				</div>
@@ -86,7 +86,7 @@
 					type: [],
 					resource: '',
 					desc: ''
-				}
+                }
 			}
 		},
 		methods: {
@@ -120,15 +120,14 @@
 			showMenu(i,status){
 				this.$refs.menuCollapsed.getElementsByClassName('submenu-hook-'+i)[0].style.display=status?'block':'none';
 			}
-		},
+        },
 		mounted() {
 			var user = sessionStorage.getItem('user');
 			if (user) {
 				user = JSON.parse(user);
 				this.sysUserName = user.name || '';
 				this.sysUserAvatar = user.avatar || '';
-			}
-
+            }
 		}
 	}
 
@@ -241,7 +240,7 @@
 				width: 230px;
 			}
 			.content-container {
-				background: #f8f8f8;
+				// background: #f8f8f8;
                 //f1f2f7
 				flex:1;
 				// position: absolute;
@@ -249,7 +248,7 @@
 				// top: 0px;
 				// bottom: 0px;
 				// left: 230px;
-				overflow-y: scroll;
+				// overflow-y: scroll;
 				padding: 20px;
 				.breadcrumb-container {
 					//margin-bottom: 15px;

ys_vue/src/views/base/staff.vue

@@ -3,34 +3,42 @@
 		<!--工具条-->
 		<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
 			<el-form :inline="true" :model="filters">
+                <el-col :span="2">
+                    <el-form-item>
+                        <el-select v-model="filters.value" clearable placeholder="请选择">
+                            <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-form-item>
+                    <el-input v-model="filters.name" placeholder="请输入账号或姓名进行搜索"></el-input>
+                </el-form-item>
 				<el-form-item>
-					<el-input v-model="filters.name" placeholder="姓名"></el-input>
+					<el-button type="primary" @click="getUsers">查询</el-button>
 				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" v-on:click="getUsers">查询</el-button>
-				</el-form-item>
-				<el-form-item>
+				<el-form-item style="float:right;">
 					<el-button type="primary" @click="handleAdd">新增</el-button>
 				</el-form-item>
+                <el-form-item style="float:right;">
+					<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
+				</el-form-item>
 			</el-form>
 		</el-col>
 
 		<!--列表-->
-		<el-table :data="users" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;">
-			<el-table-column type="selection" width="55">
-			</el-table-column>
-			<el-table-column type="index" width="60">
-			</el-table-column>
-			<el-table-column prop="name" label="姓名" width="120" sortable>
-			</el-table-column>
-			<el-table-column prop="sex" label="性别" width="100" :formatter="formatSex" sortable>
-			</el-table-column>
-			<el-table-column prop="age" label="年龄" width="100" sortable>
-			</el-table-column>
-			<el-table-column prop="birth" label="生日" width="120" sortable>
-			</el-table-column>
-			<el-table-column prop="addr" label="地址" min-width="180" sortable>
-			</el-table-column>
+		<el-table :data="users" highlight-current-row  :height="tableHeight" v-loading="listLoading" @selection-change="selsChange" style="width: 100%;">
+			<el-table-column type="selection" width="55"></el-table-column>
+			<el-table-column type="index" width="60"></el-table-column>
+			<el-table-column prop="name" label="姓名" width="120" sortable></el-table-column>
+			<el-table-column prop="sex" label="性别" width="100" :formatter="formatSex" sortable></el-table-column>
+			<el-table-column prop="age" label="年龄" width="100" sortable></el-table-column>
+			<el-table-column prop="birth" label="生日" width="120" sortable></el-table-column>
+			<el-table-column prop="addr" label="地址" min-width="180" sortable></el-table-column>
 			<el-table-column label="操作" width="150">
 				<template slot-scope="scope">
 					<el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
@@ -41,13 +49,21 @@
 
 		<!--工具条-->
 		<el-col :span="24" class="toolbar">
-			<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
-			<el-pagination layout="prev, pager, next" @current-change="handleCurrentChange" :page-size="20" :total="total" style="float:right;">
-			</el-pagination>
+            <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :page-sizes="[20 , 50 , 80 , 100 , 200]"
+                :page-size="20"
+                layout="total, sizes, prev, pager, next"
+                :total="total"
+                style="float:right;">
+            </el-pagination>
+			<!-- <el-pagination layout="prev, pager, next" @current-change="handleCurrentChange" :page-size="20" :total="total" style="float:right;">
+			</el-pagination> -->
 		</el-col>
 
 		<!--编辑界面-->
-		<el-dialog title="编辑" v-model="editFormVisible" :close-on-click-modal="false">
+		<el-dialog title="编辑人员" :visible.sync="editFormVisible" :close-on-click-modal="false">
 			<el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="姓名" prop="name">
 					<el-input v-model="editForm.name" auto-complete="off"></el-input>
@@ -75,7 +91,7 @@
 		</el-dialog>
 
 		<!--新增界面-->
-		<el-dialog title="新增" v-model="addFormVisible" :close-on-click-modal="false">
+		<el-dialog title="新增人员" :visible.sync="addFormVisible" :close-on-click-modal="false">
 			<el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="姓名" prop="name">
 					<el-input v-model="addForm.name" auto-complete="off"></el-input>
@@ -112,13 +128,32 @@
 	export default {
 		data() {
 			return {
+                 options: [{
+                    value: '选项1',
+                    label: '黄金糕'
+                }, {
+                    value: '选项2',
+                    label: '双皮奶'
+                }, {
+                    value: '选项3',
+                    label: '蚵仔煎'
+                }, {
+                    value: '选项4',
+                    label: '龙须面'
+                }, {
+                    value: '选项5',
+                    label: '北京烤鸭'
+                }],
 				filters: {
-					name: ''
+                    name: '',
+                    value: ''
 				},
 				users: [],
 				total: 0,
-				page: 1,
-				listLoading: false,
+                page: 1,
+                size: 20,
+                listLoading: false,
+                tableHeight: 0,
 				sels: [],//列表选中列
 
 				editFormVisible: false,//编辑界面是否显示
@@ -164,7 +199,11 @@
 			handleCurrentChange(val) {
 				this.page = val;
 				this.getUsers();
-			},
+            },
+            handleSizeChange(val) {
+                this.size = val;
+				this.getUsers();
+            },
 			//获取用户列表
 			getUsers() {
 				let para = {
@@ -182,7 +221,7 @@
 			},
 			//删除
 			handleDel: function (index, row) {
-				this.$confirm('确认删除该记录吗?', '提示', {
+				this.$confirm('确认删除该人员吗?', '提示', {
 					type: 'warning'
 				}).then(() => {
 					this.listLoading = true;
@@ -208,7 +247,7 @@
 			},
 			//显示新增界面
 			handleAdd: function () {
-				this.addFormVisible = true;
+                this.addFormVisible = true;
 				this.addForm = {
 					name: '',
 					sex: -1,
@@ -290,14 +329,17 @@
 
 				});
 			}
-		},
+        },
+        created() {
+            let height = window.innerHeight;
+            this.tableHeight = height - 240;
+        },
 		mounted() {
 			this.getUsers();
-		}
+        }
 	}
-
 </script>
 
 <style scoped>
-
+    
 </style>