Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	.idea/workspace.xml

.gitignore

@@ -0,0 +1 @@
+# Created by .ignore support plugin (hsz.mobi)

.idea/workspace.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="645e93b8-0ad6-4d6f-a066-61732e27367b" name="Default" comment="" />
+    <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$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/SysUserServiceImpl.java" afterDir="false" />
+    </list>
     <ignored path="$PROJECT_DIR$/model/cloud-model/target/" />
     <ignored path="$PROJECT_DIR$/model/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -19,8 +22,8 @@
       <file leaf-file-name="SysUserController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="35" column="19" lean-forward="true" selection-start-line="35" selection-start-column="19" selection-end-line="35" selection-end-column="19" />
+            <state relative-caret-position="570">
+              <caret line="29" column="17" selection-start-line="29" selection-start-column="17" selection-end-line="29" selection-end-column="17" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -31,8 +34,8 @@
       <file leaf-file-name="SysUserService.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/SysUserService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="17" column="23" selection-start-line="17" selection-start-column="23" selection-end-line="17" selection-end-column="23" />
+            <state relative-caret-position="420">
+              <caret line="19" column="21" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="21" />
             </state>
           </provider>
         </entry>
@@ -40,8 +43,8 @@
       <file leaf-file-name="SysUserServiceImpl.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/SysUserServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="127">
-              <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+            <state relative-caret-position="219">
+              <caret line="43" column="75" lean-forward="true" selection-start-line="43" selection-start-column="75" selection-end-line="43" selection-end-column="75" />
             </state>
           </provider>
         </entry>
@@ -58,8 +61,8 @@
       <file leaf-file-name="Constant.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/Constant.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="9" column="54" selection-start-line="9" selection-start-column="43" selection-end-line="9" selection-end-column="54" />
+            <state relative-caret-position="390">
+              <caret line="13" column="47" selection-start-line="13" selection-start-column="47" selection-end-line="13" selection-end-column="47" />
             </state>
           </provider>
         </entry>
@@ -135,9 +138,9 @@
         <option value="$PROJECT_DIR$/model/pom.xml" />
         <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java" />
         <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/ConstantUtil.java" />
+        <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/SysUserService.java" />
         <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.java" />
         <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/Constant.java" />
-        <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/SysUserService.java" />
         <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/SysUserServiceImpl.java" />
       </list>
     </option>
@@ -439,7 +442,7 @@
       <workItem from="1564043721591" duration="4169000" />
       <workItem from="1564060637670" duration="152000" />
       <workItem from="1564060843983" duration="5575000" />
-      <workItem from="1564103473387" duration="1094000" />
+      <workItem from="1564103473387" duration="587000" />
     </task>
     <task id="LOCAL-00001" summary="云塑网前端代码">
       <created>1563771143548</created>
@@ -483,18 +486,11 @@
       <option name="project" value="LOCAL" />
       <updated>1564068028514</updated>
     </task>
-    <task id="LOCAL-00007" summary="系统管理员登录">
-      <created>1564104089216</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1564104089216</updated>
-    </task>
-    <option name="localTasksCounter" value="8" />
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="17573000" />
+    <option name="totallyTimeSpent" value="17066000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -502,7 +498,7 @@
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="FindBugs-IDEA" order="7" />
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50053364" side_tool="true" visible="true" weight="0.32899022" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5010672" side_tool="true" weight="0.5863192" />
       <window_info anchor="bottom" id="JRebel Console" order="7" side_tool="true" />
       <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.1072572" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
@@ -515,12 +511,11 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49893278" weight="0.4256243" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info active="true" anchor="bottom" id="Messages" order="7" sideWeight="0.4994664" visible="true" weight="0.32899022" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="bottom" id="Java Enterprise" order="7" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.49893278" weight="0.32899022" />
+      <window_info active="true" anchor="bottom" id="Version Control" order="7" visible="true" weight="0.32899022" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4994664" weight="0.32899022" />
       <window_info anchor="bottom" id="Spring" order="7" />
       <window_info anchor="bottom" id="Terminal" order="7" />
@@ -534,6 +529,7 @@
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="bottom" id="Messages" order="7" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -757,9 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
           <caret line="9" column="31" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -858,41 +851,41 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/ConstantUtil.java" />
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/Constant.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="9" column="54" selection-start-line="9" selection-start-column="43" selection-end-line="9" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/com/baomidou/mybatisplus/core/conditions/query/QueryWrapper.class">
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/SysUserService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="196">
-          <caret line="24" column="11" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="11" />
+        <state relative-caret-position="420">
+          <caret line="19" column="21" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="21" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="35" column="19" lean-forward="true" selection-start-line="35" selection-start-column="19" selection-end-line="35" selection-end-column="19" />
+        <state relative-caret-position="570">
+          <caret line="29" column="17" selection-start-line="29" selection-start-column="17" selection-end-line="29" selection-end-column="17" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/SysUserService.java">
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/Constant.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="17" column="23" selection-start-line="17" selection-start-column="23" selection-end-line="17" selection-end-column="23" />
+        <state relative-caret-position="390">
+          <caret line="13" column="47" selection-start-line="13" selection-start-column="47" selection-end-line="13" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/com/baomidou/mybatisplus/core/conditions/query/QueryWrapper.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="196">
+          <caret line="24" column="11" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="11" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/SysUserServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="127">
-          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        <state relative-caret-position="219">
+          <caret line="43" column="75" lean-forward="true" selection-start-line="43" selection-start-column="75" selection-end-line="43" selection-end-column="75" />
         </state>
       </provider>
     </entry>

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>