xg

.idea/workspace.xml

@@ -2,8 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="645e93b8-0ad6-4d6f-a066-61732e27367b" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ys_vue/src/common/js/util.js" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/common/js/util.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ys_vue/src/port.js" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/port.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/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/views/Login.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ys_vue/src/views/base/role.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/views/base/role.vue" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/model/cloud-model/target/" />
@@ -23,7 +26,7 @@
       <file leaf-file-name="CloudModelApplication.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/CloudModelApplication.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="221">
+            <state relative-caret-position="115">
               <caret line="16" selection-start-line="16" selection-end-line="16" />
             </state>
           </provider>
@@ -41,48 +44,20 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="RoleController.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="RoleController.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/RoleController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="17">
-              <caret line="40" column="18" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="18" />
+            <state relative-caret-position="289">
+              <caret line="56" column="12" selection-start-line="56" selection-start-column="10" selection-end-line="56" selection-end-column="12" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
+      <file leaf-file-name="RoleServiceImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/RoleServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="238">
-              <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="misc.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.idea/misc.xml">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file leaf-file-name="modules.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.idea/modules.xml">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/model/.gitignore">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="221">
-              <caret line="13" column="11" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="SysUser.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/SysUser.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="510">
-              <caret line="35" column="27" selection-start-line="35" selection-start-column="19" selection-end-line="35" selection-end-column="27" />
+            <state relative-caret-position="218">
+              <caret line="31" column="40" selection-start-line="31" selection-start-column="40" selection-end-line="31" selection-end-column="40" />
             </state>
           </provider>
         </entry>
@@ -1318,8 +1293,8 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.CodeGenerator" />
         <item itemvalue="Spring Boot.CloudModelApplication" />
+        <item itemvalue="Application.CodeGenerator" />
         <item itemvalue="Application.MD5Util" />
       </list>
     </recent_temporary>
@@ -1345,7 +1320,7 @@
       <workItem from="1564060843983" duration="5575000" />
       <workItem from="1564103473387" duration="587000" />
       <workItem from="1564105171770" duration="8299000" />
-      <workItem from="1564124460751" duration="154000" />
+      <workItem from="1564124460751" duration="4718000" />
     </task>
     <task id="LOCAL-00001" summary="云塑网前端代码">
       <created>1563771143548</created>
@@ -1424,18 +1399,25 @@
       <option name="project" value="LOCAL" />
       <updated>1564124354822</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml">
+      <created>1564124645822</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1564124645822</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="25788000" />
+    <option name="totallyTimeSpent" value="30352000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5010672" side_tool="true" weight="0.5863192" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50159913" side_tool="true" weight="0.29112554" />
       <window_info anchor="bottom" id="JRebel Console" order="7" side_tool="true" />
       <window_info anchor="right" id="Maven Projects" order="3" weight="0.1072572" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
@@ -1446,18 +1428,19 @@
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49893278" weight="0.29207385" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.49840087" visible="true" weight="0.41017315" />
       <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Messages" order="7" />
       <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" weight="0.32899022" />
+      <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.4989339" weight="0.32792208" />
       <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" />
       <window_info anchor="bottom" id="Problems" order="8" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16684435" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16684435" />
       <window_info anchor="right" id="Bean Validation" order="4" />
       <window_info id="Web" order="2" side_tool="true" />
       <window_info id="JRebel" order="2" side_tool="true" />
@@ -1466,7 +1449,6 @@
       <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="bottom" id="FindBugs-IDEA" order="7" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -1565,13 +1547,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/SysUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="510">
-          <caret line="35" column="27" selection-start-line="35" selection-start-column="19" selection-end-line="35" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/resources/mapper/DictionaryDataMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="450">
@@ -1668,13 +1643,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/CloudModelApplication.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="16" selection-start-line="16" selection-end-line="16" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1696,13 +1664,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/RoleServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="263">
-          <caret line="37" column="31" lean-forward="true" selection-start-line="37" selection-start-column="31" selection-end-line="37" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/Company.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="187">
@@ -1776,13 +1737,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/RoleController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="40" column="18" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.idea/misc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1810,5 +1764,33 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/SysUser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="510">
+          <caret line="35" column="27" selection-start-line="35" selection-start-column="19" selection-end-line="35" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/CloudModelApplication.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="16" selection-start-line="16" selection-end-line="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/RoleServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="218">
+          <caret line="31" column="40" selection-start-line="31" selection-start-column="40" selection-end-line="31" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/RoleController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="289">
+          <caret line="56" column="12" selection-start-line="56" selection-start-column="10" selection-end-line="56" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

ys_vue/src/common/js/util.js

@@ -18,8 +18,6 @@ export default {
         return context == null || context == "" || context == "undefined" ? "" : context;
     },
     formatDate: {
-
-
         format: function (date, pattern) {
             pattern = pattern || DEFAULT_PATTERN;
             return pattern.replace(SIGN_REGEXP, function ($0) {

ys_vue/src/port.js

@@ -9,6 +9,8 @@ export default {
         resetPwd: '/manage/user/passwordReset'
     },
     base: {
-        addRole: '/role/add',  // 新建角色
+        addRole: '/role/add',  // 新建或修改角色
+        roleList: '/role/list', // 角色列表
+        delRole: '/role/delete' // 删除角色
     }
 }

ys_vue/src/routes.js

@@ -94,11 +94,12 @@ let routes = [
     {
         path: '/',
         component: Home,
-        name: '',
+        name: '项目管理',
         iconCls: 'iconfont icon-ic_dashboard',
-        leaf: true,//只有一个节点
         children: [
-            { path: '/project', component: project, name: '项目管理' }
+            { path: '/project', component: project, name: '项目列表' },
+            { path: '/staff', component: staff, name: '人员管理' },
+            { path: '/competence', component: competence, name: '权限管理' }
         ]
     },
     // 模具管理
@@ -119,9 +120,8 @@ let routes = [
         name: '基础管理',
         iconCls: 'iconfont icon-setting-fill',
         children: [
-            { path: '/staff', component: staff, name: '人员管理' },
             { path: '/role', component: role, name: '角色管理' },
-            { path: '/competence', component: competence, name: '权限管理' }
+            //{ path: '/role', component: role, name: '公司管理' },
         ]
     },
     {

ys_vue/src/views/Login.vue

@@ -6,10 +6,10 @@
             </div>
             <h3 class="title">云塑网后台管理系统</h3>
             <el-form-item class="login-input" prop="username">
-                <el-input type="text" v-model="ruleForm.username" auto-complete="off" placeholder="账号"></el-input>
+                <el-input type="text" v-model="ruleForm.username" auto-complete="off" placeholder="账号" clearable prefix-icon="el-icon-user-solid"></el-input>
             </el-form-item>
             <el-form-item class="login-input" prop="password">
-                <el-input type="password" v-model="ruleForm.password" auto-complete="off" placeholder="密码"></el-input>
+                <el-input type="password" v-model="ruleForm.password" auto-complete="off" placeholder="密码" show-password prefix-icon="el-icon-lock"></el-input>
             </el-form-item>
             <!-- <el-checkbox v-model="checked" checked class="remember">记住密码</el-checkbox> -->
             <el-form-item class="login-button" style="width:100%;">

ys_vue/src/views/base/role.vue

@@ -4,33 +4,40 @@
 		<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
 			<el-form :inline="true" :model="filters">
                 <el-form-item>
-                    <el-input v-model="filters.name" placeholder="请输入角色名称进行搜索"></el-input>
+                    <el-input v-model="filters.keyName" placeholder="请输入角色名称进行搜索" clearable></el-input>
                 </el-form-item>
 				<el-form-item>
-					<el-button type="primary" @click="getUsers">查询</el-button>
+					<el-button type="primary" @click.native="getRoles">查询</el-button>
 				</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-button type="primary" @click.native="handleAdd">新增</el-button>
 				</el-form-item>
 			</el-form>
 		</el-col>
 
 		<!--列表-->
-		<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 :data="list" highlight-current-row :height="tableHeight" v-loading="listLoading" style="width: 100%;">
+			<el-table-column prop="roleName" label="角色名称" width="120" sortable></el-table-column>
+			<el-table-column prop="sex" label="权限">
+                <template slot-scope="scope">
+                    <el-col :span="2" v-if="scope.row.uploadPower == 1">
+                        <el-tag size="medium">上传</el-tag>
+                    </el-col>
+                    <el-col :span="2" v-if="scope.row.dowloadPower == 1">
+                        <el-tag size="medium">下载</el-tag>
+                    </el-col>
+                    <el-col :span="2" v-if="scope.row.viewPower == 1">
+                        <el-tag size="medium">浏览</el-tag>
+                    </el-col>
+                    <el-col :span="2" v-if="scope.row.approvalPower == 1">
+                        <el-tag size="medium">审批</el-tag>
+                    </el-col>
+                </template>
+            </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>
-					<el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
+					<el-button size="small" @click.native="handleEdit(scope.$index, scope.row)">编辑</el-button>
+					<el-button type="danger" size="small" @click.native.native="handleDel(scope.$index, scope.row)">删除</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -48,44 +55,44 @@
             </el-pagination>
 		</el-col>
 
-		<!--编辑界面-->
-		<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>
-				</el-form-item>
-				<el-form-item label="性别">
-					<el-radio-group v-model="editForm.sex">
-						<el-radio class="radio" :label="1">男</el-radio>
-						<el-radio class="radio" :label="0">女</el-radio>
-					</el-radio-group>
-				</el-form-item>
-				<el-form-item label="年龄">
-					<el-input-number v-model="editForm.age" :min="0" :max="200"></el-input-number>
-				</el-form-item>
-				<el-form-item label="生日">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.birth"></el-date-picker>
+        <!--新增界面-->
+		<el-dialog title="新增角色" :visible.sync="addFormVisible" :close-on-click-modal="false">
+			<el-form :model="addForm" label-width="80px" :rules="formRules" ref="addForm">
+				<el-form-item label="角色名称" prop="roleName">
+					<el-input v-model="addForm.roleName" auto-complete="off"></el-input>
 				</el-form-item>
-				<el-form-item label="地址">
-					<el-input type="textarea" v-model="editForm.addr"></el-input>
+				<el-form-item label="权限配置">
+                    <el-row>
+                        <el-col :span="6" v-for="(item,index) in roleList" :key="item.val" style="text-align:center;">
+                            <el-checkbox v-model="addForm[item.label]">{{item.name}}</el-checkbox>
+                        </el-col>
+                    </el-row>
+					 <!-- <el-table :data="roleList" border :show-header="false" style="width: 100%">
+                        <el-table-column prop="name" label="名称" width="80"></el-table-column>
+                        <el-table-column prop="role" label="权限">
+                            <template slot-scope="scope">
+                                <div v-for="(item,index) in scope.row.role"></div>
+                            </template>
+                        </el-table-column>
+                    </el-table> -->
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
-				<el-button @click.native="editFormVisible = false">取消</el-button>
-				<el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>
+				<el-button @click.native="addFormVisible = false">取消</el-button>
+				<el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
 			</div>
 		</el-dialog>
 
-		<!--新增界面-->
-		<el-dialog title="新增角色" :visible.sync="addFormVisible" :close-on-click-modal="false">
-			<el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
+		<!--编辑界面-->
+		<el-dialog title="编辑人员" :visible.sync="editFormVisible" :close-on-click-modal="false">
+			<el-form :model="editForm" label-width="80px" :rules="formRules" ref="editForm">
 				<el-form-item label="角色名称" prop="roleName">
-					<el-input v-model="addForm.roleName" auto-complete="off"></el-input>
+					<el-input v-model="editForm.roleName" auto-complete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="权限配置">
                     <el-row>
                         <el-col :span="6" v-for="(item,index) in roleList" :key="item.val" style="text-align:center;">
-                            <el-checkbox v-model="addForm[item.label]">{{item.name}}</el-checkbox>
+                            <el-checkbox v-model="editForm[item.label]" :checked="editForm[item.label]">{{item.name}}</el-checkbox>
                         </el-col>
                     </el-row>
 					 <!-- <el-table :data="roleList" border :show-header="false" style="width: 100%">
@@ -99,8 +106,8 @@
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
-				<el-button @click.native="addFormVisible = false">取消</el-button>
-				<el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
+				<el-button @click.native="editFormVisible = false">取消</el-button>
+				<el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>
 			</div>
 		</el-dialog>
 	</section>
@@ -108,14 +115,12 @@
 
 <script>
 	import util from '../../common/js/util'
-	//import NProgress from 'nprogress'
-	import { getUserListPage, removeUser, batchRemoveUser, editUser, addUser } from '../../api/api';
 
 	export default {
 		data() {
 			return {
 				filters: {
-                    name: ''
+                    keyName: ''
                 },
                 // roleList: [{
                 //     name: '项目文档',
@@ -142,24 +147,22 @@
                     {name:'浏览',val:2,label:'viewPower',viewPower:false},
                     {name:'审批',val:3,label:'approvalPower',approvalPower:false}
                 ],
-				users: [],
+				list: [],
 				total: 0,
                 page: 1,
                 size: 20,
                 listLoading: false,
                 tableHeight: 0,
-                sels: [],//列表选中列
                 
-                // 新增界面
-                // 新增界面是否显示
-				addFormVisible: false,
-				addLoading: false,
-				addFormRules: {
+                formRules: {
 					roleName: [
 						{ required: true, message: '请输入姓名', trigger: 'blur' }
 					]
-				},
-				// 新增界面数据
+                },
+
+                // 新增界面
+				addFormVisible: false,
+				addLoading: false,
 				addForm: {
                     roleName: '',
                     uploadPower: false,
@@ -169,55 +172,71 @@
 				},
                 
                 // 编辑界面
-                // 编辑界面是否显示
 				editFormVisible: false,
 				editLoading: false,
-				editFormRules: {
-					name: [
-						{ required: true, message: '请输入姓名', trigger: 'blur' }
-					]
-				},
-				//编辑界面数据
 				editForm: {
 					id: 0,
-					name: '',
-					role: []
+					roleName: '',
+                    uploadPower: false,
+                    dowloadPower:false,
+                    viewPower:false,
+                    approvalPower:false
 				}
 			}
 		},
 		methods: {
-			//性别显示转换
-			formatSex: function (row, column) {
-				return row.sex == 1 ? '男' : row.sex == 0 ? '女' : '未知';
-			},
+            //  分页
 			handleCurrentChange(val) {
 				this.page = val;
-				this.getUsers();
+				this.getRoles();
             },
+
             handleSizeChange(val) {
                 this.size = val;
-				this.getUsers();
+				this.getRoles();
             },
+
 			//获取用户列表
-			getUsers() {
-				let para = {
-					page: this.page,
-					name: this.filters.name
-				};
+			getRoles() {
 				this.listLoading = true;
-				//NProgress.start();
-				getUserListPage(para).then((res) => {
-					this.total = res.data.total;
-					this.users = res.data.users;
-					this.listLoading = false;
-					//NProgress.done();
-				});
+                this.http.post(this.port.base.roleList, {
+                    keyName: this.filters.keyName
+                }, res => {
+                    this.listLoading = false;
+                    if (res.code == "ok") {
+                        this.list = res.data;
+                        //this.total = res.data.total;
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: 'error'
+                        });
+                    }
+                }, error => {
+                    this.listLoading = false;
+                    this.$message({
+                        message: error,
+                        type: 'error'
+                    });
+                })
+            },
+
+            //显示新增界面
+			handleAdd: function () {
+                this.addFormVisible = true;
+				this.addForm = {
+					roleName: '',
+					uploadPower: false,
+                    dowloadPower:false,
+                    viewPower:false,
+                    approvalPower:false
+				};
             },
+            
             //新增
 			addSubmit: function () {
 				this.$refs.addForm.validate((valid) => {
 					if (valid) {
-                        var _this = this;
                         this.addLoading = true;
                         this.http.post(this.port.base.addRole, {
                             roleName: this.addForm.roleName,
@@ -228,12 +247,13 @@
                             flag: 0
                         }, res => {
                             this.addLoading = false;
+                            this.addFormVisible = false;
                             if (res.code == "ok") {
                                 this.$message({
                                     message: '创建成功',
                                     type: 'success'
                                 });
-                                this.getUsers();
+                                this.getRoles();
                             } else {
                                 this.$message({
                                     message: res.msg,
@@ -242,6 +262,7 @@
                             }
                         }, error => {
                             this.addLoading = false;
+                            this.addFormVisible = false;
                             this.$message({
                                 message: error,
                                 type: 'error'
@@ -249,100 +270,100 @@
                         })
 					}
 				});
-			},
+            },
+            
 			//删除
 			handleDel: function (index, row) {
-				this.$confirm('确认删除该人员吗?', '提示', {
+				this.$confirm('确认删除该角色吗?', '提示', {
 					type: 'warning'
 				}).then(() => {
-					this.listLoading = true;
-					//NProgress.start();
-					let para = { id: row.id };
-					removeUser(para).then((res) => {
-						this.listLoading = false;
-						//NProgress.done();
-						this.$message({
-							message: '删除成功',
-							type: 'success'
-						});
-						this.getUsers();
-					});
-				}).catch(() => {
-
+					var _this = this;
+                    this.addLoading = true;
+                    this.http.post(this.port.base.delRole, {
+                        id: row.id
+                    }, res => {
+                        if (res.code == "ok") {
+                            this.$message({
+                                message: '删除成功',
+                                type: 'success'
+                            });
+                            this.getRoles();
+                        } else {
+                            this.$message({
+                                message: res.msg,
+                                type: 'error'
+                            });
+                        }
+                    }, error => {
+                        this.$message({
+                            message: error,
+                            type: 'error'
+                        });
+                    })
 				});
-			},
+            },
+            
 			//显示编辑界面
 			handleEdit: function (index, row) {
-				this.editFormVisible = true;
-				this.editForm = Object.assign({}, row);
-			},
-			//显示新增界面
-			handleAdd: function () {
-                this.addFormVisible = true;
-				this.addForm = {
-					roleName: '',
-					uploadPower: false,
-                    dowloadPower:false,
-                    viewPower:false,
-                    approvalPower:false
+                this.editFormVisible = true;
+                this.editForm = {
+                    id: row.id,
+					roleName: row.roleName,
+					uploadPower: row.uploadPower==0?false:true,
+                    dowloadPower: row.dowloadPower==0?false:true,
+                    viewPower: row.viewPower==0?false:true,
+                    approvalPower: row.approvalPower==0?false:true
 				};
-			},
+            },
+            
 			//编辑
 			editSubmit: function () {
 				this.$refs.editForm.validate((valid) => {
 					if (valid) {
-						this.$confirm('确认提交吗？', '提示', {}).then(() => {
-							this.editLoading = true;
-							//NProgress.start();
-							let para = Object.assign({}, this.editForm);
-							para.birth = (!para.birth || para.birth == '') ? '' : util.formatDate.format(new Date(para.birth), 'yyyy-MM-dd');
-							editUser(para).then((res) => {
-								this.editLoading = false;
-								//NProgress.done();
-								this.$message({
-									message: '提交成功',
-									type: 'success'
-								});
-								this.$refs['editForm'].resetFields();
-								this.editFormVisible = false;
-								this.getUsers();
-							});
-						});
+						this.editLoading = true;
+                        this.http.post(this.port.base.addRole, {
+                            id: this.editForm.id,
+                            roleName: this.editForm.roleName,
+                            uploadPower: this.editForm.uploadPower?1:0,
+                            dowloadPower: this.editForm.dowloadPower?1:0,
+                            viewPower: this.editForm.viewPower?1:0,
+                            approvalPower: this.editForm.approvalPower?1:0,
+                            flag: 1
+                        }, res => {
+                            this.editLoading = false;
+                            this.editFormVisible = false;
+                            if (res.code == "ok") {
+                                this.$message({
+                                    message: '修改成功',
+                                    type: 'success'
+                                });
+                                this.getRoles();
+                            } else {
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'error'
+                                });
+                            }
+                        }, error => {
+                            this.editLoading = false;
+                            this.editFormVisible = false;
+                            this.$message({
+                                message: error,
+                                type: 'error'
+                            });
+                        })
 					}
 				});
-			},
-			selsChange: function (sels) {
-				this.sels = sels;
-			},
-			//批量删除
-			batchRemove: function () {
-				var ids = this.sels.map(item => item.id).toString();
-				this.$confirm('确认删除选中记录吗？', '提示', {
-					type: 'warning'
-				}).then(() => {
-					this.listLoading = true;
-					//NProgress.start();
-					let para = { ids: ids };
-					batchRemoveUser(para).then((res) => {
-						this.listLoading = false;
-						//NProgress.done();
-						this.$message({
-							message: '删除成功',
-							type: 'success'
-						});
-						this.getUsers();
-					});
-				}).catch(() => {
-
-				});
-			}
+            }
         },
+
         created() {
             let height = window.innerHeight;
             this.tableHeight = height - 240;
         },
+
 		mounted() {
-			this.getUsers();
+			this.getRoles();
         }
 	}
 </script>

ys_vue/src/views/base/staff.vue

@@ -62,59 +62,59 @@
 			</el-pagination> -->
 		</el-col>
 
-		<!--编辑界面-->
-		<el-dialog title="编辑人员" :visible.sync="editFormVisible" :close-on-click-modal="false">
-			<el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
+        <!--新增界面-->
+		<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="editForm.name" auto-complete="off"></el-input>
+					<el-input v-model="addForm.name" auto-complete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="性别">
-					<el-radio-group v-model="editForm.sex">
+					<el-radio-group v-model="addForm.sex">
 						<el-radio class="radio" :label="1">男</el-radio>
 						<el-radio class="radio" :label="0">女</el-radio>
 					</el-radio-group>
 				</el-form-item>
 				<el-form-item label="年龄">
-					<el-input-number v-model="editForm.age" :min="0" :max="200"></el-input-number>
+					<el-input-number v-model="addForm.age" :min="0" :max="200"></el-input-number>
 				</el-form-item>
 				<el-form-item label="生日">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.birth"></el-date-picker>
+					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.birth"></el-date-picker>
 				</el-form-item>
 				<el-form-item label="地址">
-					<el-input type="textarea" v-model="editForm.addr"></el-input>
+					<el-input type="textarea" v-model="addForm.addr"></el-input>
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
-				<el-button @click.native="editFormVisible = false">取消</el-button>
-				<el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>
+				<el-button @click.native="addFormVisible = false">取消</el-button>
+				<el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
 			</div>
 		</el-dialog>
 
-		<!--新增界面-->
-		<el-dialog title="新增人员" :visible.sync="addFormVisible" :close-on-click-modal="false">
-			<el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
+		<!--编辑界面-->
+		<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="addForm.name" auto-complete="off"></el-input>
+					<el-input v-model="editForm.name" auto-complete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="性别">
-					<el-radio-group v-model="addForm.sex">
+					<el-radio-group v-model="editForm.sex">
 						<el-radio class="radio" :label="1">男</el-radio>
 						<el-radio class="radio" :label="0">女</el-radio>
 					</el-radio-group>
 				</el-form-item>
 				<el-form-item label="年龄">
-					<el-input-number v-model="addForm.age" :min="0" :max="200"></el-input-number>
+					<el-input-number v-model="editForm.age" :min="0" :max="200"></el-input-number>
 				</el-form-item>
 				<el-form-item label="生日">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.birth"></el-date-picker>
+					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.birth"></el-date-picker>
 				</el-form-item>
 				<el-form-item label="地址">
-					<el-input type="textarea" v-model="addForm.addr"></el-input>
+					<el-input type="textarea" v-model="editForm.addr"></el-input>
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
-				<el-button @click.native="addFormVisible = false">取消</el-button>
-				<el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
+				<el-button @click.native="editFormVisible = false">取消</el-button>
+				<el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>
 			</div>
 		</el-dialog>
 	</section>