Merge branch 'master' of http://gitea.yxtsoft.com/yxt_group/demo into master

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/dict_type/DictTypeFeign.java

@@ -29,5 +29,5 @@ public interface DictTypeFeign {
 
     @DeleteMapping("/delete/{sid}")
     @ApiOperation(value = "数据字典类型删除")
-    ResultBean delete(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid);
+    ResultBean delete(@PathVariable String sid);
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_forum_comment/SysForumCommentFeign.java

@@ -31,4 +31,8 @@ public interface SysForumCommentFeign {
     @ApiOperation(value = "查询论坛评论")
     @RequestMapping("/selectSysForumComment")
     ResultBean selectSysForumComment();
+
+    @ApiOperation(value = "查询论坛评论")
+    @RequestMapping("/selectSysForumCommentOne/{sid}")
+    ResultBean selectSysForumCommentOne(@PathVariable String sid);
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info_ship/SysInfoShipFeign.java

@@ -27,7 +27,7 @@ public interface SysInfoShipFeign {
     ResultBean deleteSysInfoShip(@PathVariable String sid);
 
     @ApiOperation(value = "修改教师学生关联")
-    @RequestMapping("alterSysInfoShip")
+    @RequestMapping("/alterSysInfoShip")
     ResultBean alterSysInfoShip(@RequestBody SysInfoShip sysInfoShip);
 
     @ApiOperation(value = "查询教师学生关联")

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlan.java

@@ -22,4 +22,18 @@ public class SysPlan extends BaseEntity {
     private String planContent;
     @ApiModelProperty("反馈意见")
     private String planOpinion;
+
+    @ApiModelProperty("姓名")
+    private String name;
+    @ApiModelProperty("系别")
+    private String department;
+    @ApiModelProperty("专业")
+    private String speciality;
+    @ApiModelProperty("班级")
+    private String calss;
+
+    @ApiModelProperty("进度内容")
+    private String planContentJd;
+    @ApiModelProperty("反馈意见")
+    private String planOpinionYj;
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlanFeign.java

@@ -31,4 +31,12 @@ public interface SysPlanFeign {
     @ApiOperation(value = "查询自主学习计划")
     @RequestMapping("/selectSysPlan")
     ResultBean selectSysPlan();
+
+    @ApiOperation(value = "查询指定的一个自主学习计划")
+    @RequestMapping("/selectSysPlanOne/{sid}")
+    ResultBean selectSysPlanOne(@PathVariable String sid);
+
+    @ApiOperation(value = "查询自主学习计划的进度")
+    @RequestMapping("/selectSysPlanComment/{sid}")
+    ResultBean selectSysPlanCommentBySid(@PathVariable String sid);
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan_schedule/SysPlanScheduleFeign.java

@@ -18,9 +18,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @Api(tags = "自主学习计划进度表")
 public interface SysPlanScheduleFeign {
 
-    @ApiOperation(value = "修改自主学习计划进度")
-    @RequestMapping("/alterSysPlanSchedule")
-    ResultBean alterSysPlanSchedule(@RequestBody SysPlanSchedule sysPlanSchedule);
+//    @ApiOperation(value = "修改自主学习计划进度")
+//    @RequestMapping("/alterSysPlanSchedule")
+//    ResultBean alterSysPlanSchedule(@RequestBody SysPlanSchedule sysPlanSchedule);
 
     @ApiOperation(value = "添加/修改 自主学习计划进度")
     @RequestMapping("/saveSysPlanSchedule")

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_role/SysRoleFeign.java

@@ -22,7 +22,7 @@ public interface SysRoleFeign {
 
     @ApiOperation(value = "删除角色")
     @PostMapping("/deleteRole/{sid}")
-    ResultBean deleteRole(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid);
+    ResultBean deleteRole(@PathVariable String sid);
 
     @ApiOperation(value = "查询角色")
     @PostMapping("/RoleOne/{sid}")

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user/SysUser.java

@@ -29,4 +29,15 @@ public class SysUser extends BaseEntity {
     private int hasActivated;
     @ApiModelProperty("token")
     private String token;
+
+    @ApiModelProperty("性别")
+    private String sex;
+    @ApiModelProperty("入学年份")
+    private String studyYear;
+    @ApiModelProperty("系别")
+    private String department;
+    @ApiModelProperty("专业")
+    private String speciality;
+    @ApiModelProperty("班级")
+    private String calss;
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user_role/SysUserRole.java

@@ -16,4 +16,14 @@ public class SysUserRole extends BaseEntity {
     private String userSid;
     @ApiModelProperty("角色sid")
     private String roleSid;
+
+    @ApiModelProperty("姓名")
+    private String name;
+    @ApiModelProperty("昵称")
+    private String nickName;
+    @ApiModelProperty("工号/学号")
+    private String userName;
+    @ApiModelProperty("角色名称")
+    private String roleName;
+
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user_role/SysUserRoleFeign.java

@@ -24,10 +24,11 @@ public interface SysUserRoleFeign {
     ResultBean alterUserRole(@RequestBody SysUserRole sysUserRole);
 
     @ApiOperation(value = "删除该用户角色")
-    @RequestMapping("/deleteUserRoleById")
-    ResultBean deleteUserRoleById(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid);
+    @RequestMapping("/deleteUserRoleById/{sid}")
+    ResultBean deleteUserRoleById(@PathVariable String sid);
 
     @ApiOperation(value = "查询用户权限")
-    @RequestMapping("/selectUserRole")
-    ResultBean selectUserRole();
+    @RequestMapping("/selectUserRole/{sid}")
+    ResultBean selectUserRole(@PathVariable String sid);
+
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentMapper.java

@@ -3,6 +3,7 @@ package com.yxt.demo.system.biz.sys_forum_comment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.demo.system.api.sys_forum_comment.SysForumComment;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +15,6 @@ import java.util.List;
 @Mapper
 public interface SysForumCommentMapper extends BaseMapper<SysForumComment> {
     List<SysForumComment> selectSysForumCommentList();
+
+    SysForumComment selectSysForumCommentOne(@Param("sid") String sid);
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentMapper.xml

@@ -4,4 +4,8 @@
     <select id="selectSysForumCommentList" resultType="com.yxt.demo.system.api.sys_forum_comment.SysForumComment">
         select * from sys_forum_comment
     </select>
+
+    <select id="selectSysForumCommentOne" resultType="com.yxt.demo.system.api.sys_forum_comment.SysForumComment">
+        select * from sys_forum_comment where sid = #{sid}
+    </select>
 </mapper>

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentRest.java

@@ -47,4 +47,9 @@ public class SysForumCommentRest implements SysForumCommentFeign {
     public ResultBean selectSysForumComment() {
         return sysForumCommentService.selectSysForumComment();
     }
+
+    @Override
+    public ResultBean selectSysForumCommentOne(String sid) {
+        return sysForumCommentService.selectSysForumCommentOne(sid);
+    }
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentService.java

@@ -46,4 +46,10 @@ public class SysForumCommentService extends MybatisBaseService<SysForumCommentMa
         }
         return rb.success().setData(sysForumComments);
     }
+
+    public ResultBean selectSysForumCommentOne(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        SysForumComment sysForumComment = sysForumCommentMapper.selectSysForumCommentOne(sid);
+        return rb.success().setData(sysForumComment);
+    }
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.java

@@ -3,6 +3,7 @@ package com.yxt.demo.system.biz.sys_plan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.demo.system.api.sys_plan.SysPlan;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +15,12 @@ import java.util.List;
 @Mapper
 public interface SysPlanMapper extends BaseMapper<SysPlan> {
     List<SysPlan> selectSysPlanList();
+
+    SysPlan selectSysPlanOneStudent(@Param("sid") String sid);
+
+    SysPlan selectSysPlanOneTeacher(@Param("sid") String sid);
+
+    SysPlan selectSysPlanBySid(@Param("sid") String sid);
+
+    SysPlan selectSysPlanCommentBySid(@Param("sid") String sid);
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.xml

@@ -2,6 +2,33 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yxt.demo.system.biz.sys_plan.SysPlanMapper">
     <select id="selectSysPlanList" resultType="com.yxt.demo.system.api.sys_plan.SysPlan">
-        select * from sys_plan
+        select p.id,p.sid,p.studentNo,p.teacherNo,p.planContent,p.planOpinion,i.name,i.department,i.speciality,i.calss from sys_plan p
+        left join sys_info i
+        on p.studentNo = i.infoId or p.teacherNo = i.infoId
+    </select>
+
+    <select id="selectSysPlanOneStudent" resultType="com.yxt.demo.system.api.sys_plan.SysPlan">
+        select p.id,p.sid,p.studentNo,p.teacherNo,p.planContent,p.planOpinion,i.name,i.department,i.speciality,i.calss from sys_plan p
+        left join sys_info i
+        on p.studentNo = i.infoId
+        where p.sid = #{sid}
+    </select>
+
+    <select id="selectSysPlanOneTeacher" resultType="com.yxt.demo.system.api.sys_plan.SysPlan">
+        select p.id,p.sid,p.studentNo,p.teacherNo,p.planContent,p.planOpinion,i.name,i.department,i.speciality,i.calss from sys_plan p
+        left join sys_info i
+        on p.studentNo = i.infoId
+        where p.sid = #{sid}
+    </select>
+
+    <select id="selectSysPlanBySid" resultType="com.yxt.demo.system.api.sys_plan.SysPlan">
+        select * from sys_plan where sid = #{sid}
+    </select>
+
+    <select id="selectSysPlanCommentBySid" resultType="com.yxt.demo.system.api.sys_plan.SysPlan">
+        select p.id,p.sid,p.teacherNo,p.studentNo,p.planContent,p.planOpinion,ps.planContent planContentJd,ps.planOpinion planOpinionYj from sys_plan p
+        left join sys_plan_schedule ps
+        on p.sid = ps.planSid
+        where p.sid = #{sid}
     </select>
 </mapper>

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanRest.java

@@ -49,4 +49,14 @@ public class SysPlanRest implements SysPlanFeign {
     public ResultBean selectSysPlan() {
         return sysPlanService.selectSysPlan();
     }
+
+    @Override
+    public ResultBean selectSysPlanOne(String sid) {
+        return sysPlanService.selectSysPlanOne(sid);
+    }
+
+    @Override
+    public ResultBean selectSysPlanCommentBySid(String sid) {
+        return sysPlanService.selectSysPlanCommentBySid(sid);
+    }
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanService.java

@@ -49,4 +49,23 @@ public class SysPlanService extends MybatisBaseService<SysPlanMapper, SysPlan> {
         List<SysPlan> sysPlans = sysPlanMapper.selectSysPlanList();
         return rb.success().setData(sysPlans);
     }
+
+    public ResultBean selectSysPlanOne(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        SysPlan sysPlan1 = sysPlanMapper.selectSysPlanBySid(sid);
+        if (sysPlan1.getStudentNo() != null){
+            SysPlan sysPlan = sysPlanMapper.selectSysPlanOneStudent(sid);
+            return rb.success().setData(sysPlan);
+        }else if (sysPlan1.getTeacherNo() != null){
+            SysPlan sysPlan = sysPlanMapper.selectSysPlanOneTeacher(sid);
+            return rb.success().setData(sysPlan);
+        }
+        return rb.setMsg("没有该任务");
+    }
+
+    public ResultBean selectSysPlanCommentBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        SysPlan sysPlan = sysPlanMapper.selectSysPlanBySid(sid);
+        return rb.success().setData(sysPlan);
+    }
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleRest.java

@@ -21,10 +21,10 @@ public class SysPlanScheduleRest implements SysPlanScheduleFeign{
     @Autowired
     private SysPlanScheduleService sysPlanScheduleService;
 
-    @Override
-    public ResultBean alterSysPlanSchedule(SysPlanSchedule sysPlanSchedule) {
-        return sysPlanScheduleService.alterSysPlanSchedule(sysPlanSchedule);
-    }
+//    @Override
+//    public ResultBean alterSysPlanSchedule(SysPlanSchedule sysPlanSchedule) {
+//        return sysPlanScheduleService.alterSysPlanSchedule(sysPlanSchedule);
+//    }
 
     @Override
     public ResultBean saveSysPlanSchedule(SysPlanSchedule sysPlanSchedule) {

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleService.java

@@ -19,15 +19,15 @@ public class SysPlanScheduleService extends MybatisBaseService<SysPlanScheduleMa
     @Autowired
     private SysPlanScheduleMapper sysPlanScheduleMapper;
 
-    public ResultBean alterSysPlanSchedule(SysPlanSchedule sysPlanSchedule){
-        ResultBean rb = ResultBean.fireFail();
-        sysPlanSchedule.setModifyTime(new Date());
-        int i = baseMapper.updateById(sysPlanSchedule);
-        if (i == 0){
-            return rb.setMsg("修改失败");
-        }
-        return rb.success();
-    }
+//    public ResultBean alterSysPlanSchedule(SysPlanSchedule sysPlanSchedule){
+//        ResultBean rb = ResultBean.fireFail();
+//        sysPlanSchedule.setModifyTime(new Date());
+//        int i = baseMapper.updateById(sysPlanSchedule);
+//        if (i == 0){
+//            return rb.setMsg("修改失败");
+//        }
+//        return rb.success();
+//    }
 
     public void saveSysPlanSchedule(SysPlanSchedule sysPlanSchedule){
         baseMapper.insert(sysPlanSchedule);
@@ -35,6 +35,10 @@ public class SysPlanScheduleService extends MybatisBaseService<SysPlanScheduleMa
 
     public ResultBean updateSysPlanSchedule(SysPlanSchedule sysPlanSchedule) {
         ResultBean rb = ResultBean.fireFail();
+        if (sysPlanSchedule.getSid() == null){
+            baseMapper.insert(sysPlanSchedule);
+            return rb.success().setMsg("添加成功");
+        }
         sysPlanScheduleMapper.updateSysPlanScheduleBySid(sysPlanSchedule);
         return rb.success();
     }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.java

@@ -3,6 +3,7 @@ package com.yxt.demo.system.biz.sys_user_role;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.demo.system.api.sys_user_role.SysUserRole;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,4 +18,6 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
     List<SysUserRole> selectSysUserRole(String sid);
 
     List<SysUserRole> selectUserRoleList();
+
+    SysUserRole selectUserRole(@Param("sid") String sid);
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.xml

@@ -8,4 +8,11 @@
     <select id="selectUserRoleList" resultType="com.yxt.demo.system.api.sys_user_role.SysUserRole">
         select * from sys_user_role
     </select>
+
+    <select id="selectUserRole" resultType="com.yxt.demo.system.api.sys_user_role.SysUserRole">
+        select ur.id,u.name,u.nickName,u.userName,ur.userSid,ur.roleSid,r.name roleName from sys_user u
+        left join sys_user_role ur on u.sid = ur.userSid
+        left join sys_role r on ur.roleSid = r.sid
+        where ur.userSid = #{sid}
+    </select>
 </mapper>

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleRest.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @Api(tags = "用户角色关联表")
 @RestController
-@RequestMapping("v1/sysuser")
+@RequestMapping("v1/sysuserrole")
 public class SysUserRoleRest implements SysUserRoleFeign {
 
     @Autowired
@@ -43,7 +43,7 @@ public class SysUserRoleRest implements SysUserRoleFeign {
     }
 
     @Override
-    public ResultBean selectUserRole() {
-        return sysUserRoleSerrvice.selectUserRole();
+    public ResultBean selectUserRole(String sid) {
+        return sysUserRoleSerrvice.selectUserRole(sid);
     }
 }

demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleSerrvice.java

@@ -44,9 +44,10 @@ public class SysUserRoleSerrvice extends MybatisBaseService<SysUserRoleMapper, S
         }
     }
 
-    public ResultBean selectUserRole(){
+    public ResultBean selectUserRole(String sid){
         ResultBean rb = ResultBean.fireFail();
-        List<SysUserRole> userRolesList = sysUserRoleMapper.selectUserRoleList();
-        return rb.setData(userRolesList);
+        SysUserRole sysUserRole = sysUserRoleMapper.selectUserRole(sid);
+//        List<SysUserRole> userRolesList = sysUserRoleMapper.selectUserRoleList();
+        return rb.success().setData(sysUserRole);
     }
 }

demo-web-ui/.env.development

@@ -6,5 +6,6 @@ VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
 ##VUE_APP_URL = "http://26077a35f5.wicp.vip"
-VUE_APP_URL = "http://anrui.yyundong.com"
+# VUE_APP_URL = "http://anrui.yyundong.com"
 ##VUE_APP_URL = "http://1mn7264414.qicp.vip"
+VUE_APP_URL = "http://39.104.100.138:9112"

demo-web-ui/.env.production

@@ -5,5 +5,5 @@ ENV = 'production'
 VUE_APP_BASE_API = '/api'
 
 ## 配置 正式接口地址
-VUE_APP_URL = "http://120.46.131.15:8111"
+VUE_APP_URL = "http://192.168.3.183:9112"
 

demo-web-ui/src/api/User/login.js

@@ -9,7 +9,6 @@ class user {
       data
     })
   }
-
   logout(data) { // 退出
     return request({
       url: '/portal/v1/sysuser/signOut',
@@ -26,7 +25,7 @@ class user {
     })
   }
 
-  reGetPwd(data) {
+  reGetPwd(data) { //修改密码
     return request({
       url: '/portal/v1/sysuser/reGetPwd',
       method: 'post',

demo-web-ui/src/api/system/Role/role.js

@@ -13,7 +13,7 @@ export function rolemenus(data) {
 // 获取左侧菜单
 export function getrolemenus(data) {
   return request({
-    url: '/portal/v1/sysmenu/sourcemenutree',
+    url: 'v1/SysMenu/list',
     method: 'POST',
     async: false,
     data: data,

demo-web-ui/src/api/system/functional/functional.js

@@ -31,7 +31,7 @@ export function savePost(data) {
 // 模块名称
 export function sourceList(data) {
   return request({
-    url: '/portal/v1/syssource/listAll',
+    url: 'v1/SysMenu/list',
     method: 'POST',
     data: data,
     headers: {

demo-web-ui/src/api/system/menu/index.js

@@ -7,7 +7,7 @@ let tokens = window.sessionStorage.getItem('token');
 //获取菜单 分页列表
 export function pageList(data) {
   return request({
-    url: '/portal/v1/sysmenu/listAllVoForSource',
+    url: 'v1/SysMenu/list',
     method: 'POST',
     data: data,
     headers: {
@@ -20,7 +20,7 @@ export function pageList(data) {
 // 新增保存 菜单信息
 export function saveMenusInfo(data) {
   return request({
-    url: '/portal/v1/sysmenu/save',
+    url: 'v1/SysMenu/save',
     method: 'POST',
     data: data,
     headers: { 'Content-Type': 'application/json' }
@@ -30,7 +30,7 @@ export function saveMenusInfo(data) {
 // 修改保存 菜单信息
 export function putMenusInfo(data) {
   return request({
-    url: '/portal/v1/sysmenu/update/' + data.sid,
+    url: 'v1/SysMenu/alterSysMenu',
     method: 'POST',
     data: data,
     headers: { 'Content-Type': 'application/json' }
@@ -40,7 +40,7 @@ export function putMenusInfo(data) {
 //根据sid 删除单个 资源信息
 export function delMenus(data) {
   return request({
-    url: '/portal/v1/sysmenu/delBySids/' + data.sid,
+    url: 'v1/SysMenu/deleteSysMenu/' + data.sid,
     method: 'get',
     data: qs.stringify(data),
     headers: {

demo-web-ui/src/api/system/sources/index.js

@@ -5,7 +5,7 @@ let tokens = window.sessionStorage.getItem('token');
 //获取菜单 分页列表
 export function pageList(data) {
   return request({
-    url: '/portal/v1/syssource/listPage',
+    url: 'v1/sysinfo/selectInfoList',
     method: 'POST',
     data: data,
     headers: {'Content-Type': 'application/json',
@@ -16,7 +16,7 @@ export function pageList(data) {
 //保存 资源信息
 export function saveSourcesInfo(data) {
   return request({
-    url: '/portal/v1/syssource/save',
+    url: 'v1/sysinfo/saveInfo',
     method: 'POST',
     data: data,
     headers: {'Content-Type': 'application/json',
@@ -27,7 +27,7 @@ export function saveSourcesInfo(data) {
 // 修改 保存 资源信息
 export function putSourcesInfo(data) {
   return request({
-    url: '/portal/v1/syssource/update/' + data.sid,
+    url: 'v1/sysinfo/alterInfo',
     method: 'POST',
     data: data,
     headers: {'Content-Type': 'application/json',
@@ -35,10 +35,40 @@ export function putSourcesInfo(data) {
     }
   })
 }
+export function addStudentScore(data) {
+  return request({
+    url: 'v1/sysstudentscore/addStudentScore',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+export function saveSysInfoShip(data) {
+  return request({
+    url: 'v1/sysinfoship/saveSysInfoShip',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+export function selectTeacherDownStudent(data) {
+  return request({
+    url: 'v1/sysinfoship/selectTeacherDownStudent/' + data.infoId,
+    method: 'get',
+    data: qs.stringify(data),
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
 //根据sid 删除单个 资源信息
 export function delSources(data) {
   return request({
-    url: '/portal/v1/syssource/delBySids/' + data.sid,
+    url: 'v1/sysinfo/deleteInfo/' + data.sid,
     method: 'get',
     data: qs.stringify(data),
     headers: {'Content-Type': 'application/json',

demo-web-ui/src/api/user.js

@@ -3,19 +3,17 @@ import qs from 'qs'
 //登录
 export function login(data) {
   return request({
-    url: '/portal/v1/sysuser/login',
+    url: '/v1/sysuser/login',
     method: 'post',
     data: data,
-    headers: {'Content-Type': 'application/json'}
   })
 }
 // 用户注册
 export function registUser(data) {
   return request({
-    url: '/system/user/save',
+    url: 'v1/sysuser/register',
     method: 'post',
     data,
-    headers:{'Content-Type':'application/x-www-form-urlencoded;'}
   })
 }
 // 获取手机验证码
@@ -46,7 +44,7 @@ export function getInfo(token) {
 // 根据token值获取登录后的用户信息
 export function loginDetails(data) {
   return request({
-    url: '/portal/v1/sysuser/loginDetails',
+    url: '/v1/sysuser/loginDetails',
     method: 'post',
     data: data,
     headers: {

demo-web-ui/src/layout/components/Navbar.vue

@@ -23,6 +23,7 @@ export default {
 			name:'',
       year:'',
       pNameAndDepartmentNameAndPostName:'',
+      userSid:'',
 		}
 	},
 	mounted(){
@@ -30,15 +31,17 @@ export default {
 		this.departmentName = window.sessionStorage.getItem('departmentName')
 		this.name = window.sessionStorage.getItem('name')
     this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName')
-    this.name = window.sessionStorage.getItem('name')
+    this.userSid = window.sessionStorage.getItem('userSid')
     var nowDate = new Date()
     this.year = nowDate.getFullYear()
+    console.log(this.userSid);
 	},
   methods: {
     logout() {
-      // this.$router.push({path: '/home'})
-      window.opener = null
-      window.open('about:blank', '_top').close()
+      window.localStorage.removeItem("token");
+      this.$router.push("/login");
+      // window.opener = null
+      // window.open('about:blank', '_top').close()
     }
   }
 }

demo-web-ui/src/layout/components/Sidebar/index.vue

@@ -12,12 +12,19 @@
         mode="vertical"
         router
       >
+      <el-submenu index="/workflow">
+          <template slot="title">
+            <span>用户管理</span>
+          </template>
+          <el-menu-item index="/workflow/definition">学生信息</el-menu-item>
+          <el-menu-item index="/workflow/form">教师信息</el-menu-item>
+        </el-submenu>
         <template v-for="(item,index) in routes">
           <!--<template v-if="item.children && item.children.length != 0">
 
           </template>
           <template v-else>-->
-          <el-menu-item :index="item.path" :key="index">
+          <el-menu-item :index="item.pageUrl" :key="index">
             <!-- <i :class="item.icon"></i> -->
             <span slot="title">{{ item.name }}</span>
           </el-menu-item>
@@ -28,13 +35,6 @@
         	:item="route"
         	:base-path="route.path"
         	 />-->
-        <el-submenu index="/workflow">
-          <template slot="title">
-            <span>工作流</span>
-          </template>
-          <el-menu-item index="/workflow/definition">流程定义</el-menu-item>
-          <el-menu-item index="/workflow/form">表单配置</el-menu-item>
-        </el-submenu>
 
       </el-menu>
     </el-scrollbar>
@@ -97,44 +97,34 @@
         getrolemenus(params).then(res => {
           console.log('aaa')
           console.log(res)
-          let userRoles = this.resRouter(res.data)
-          // userRoles.push(
-          //   {
-          //     path: '/workflow', component: Layout, redirect: '/workflow/index', name: '工作流',
-          //     children: [{
-          //       name: "WorkflowIndex",
-          //       path: "/workflow/index",
-          //       component: "",
-          //       alwaysShow: true,
-          //       meta: {icon: "", title: "工作流"}
-          //     }]
-          //   })
-          // userRoles.push({path: '*', redirect: '/404', hidden: true})
-          return userRoles
+          this.routes = res.data
+          // let userRoles = this.resRouter(res.data)
+
+          // return userRoles
         })
       },
-      resRouter(menus) { //递归，将后台传来数组
-        for (var i = 0; i < menus.length; i++) {
-          if (menus[i].children && menus[i].children.length != 0) {
-            this.resRouter(menus[i].children)
-          }
-          if (menus[i].children.length == 0) {
-            delete menus[i].children
-            delete menus[i].redirect
-          }
-          if (menus[i].component == '') {
-            menus[i] = {
-              path: menus[i].path,
-              component: Layout,
-              redirect: menus[i].path,
-              children: [menus[i]],
-              name: menus[i].meta.title,
-            }
-          }
-        }
-        this.routes = menus
-        return menus
-      }
+      // resRouter(menus) { //递归，将后台传来数组
+      //   for (var i = 0; i < menus.length; i++) {
+      //     if (menus[i].children && menus[i].children.length != 0) {
+      //       this.resRouter(menus[i].children)
+      //     }
+      //     if (menus[i].children.length == 0) {
+      //       delete menus[i].children
+      //       delete menus[i].redirect
+      //     }
+      //     if (menus[i].component == '') {
+      //       menus[i] = {
+      //         path: menus[i].path,
+      //         component: Layout,
+      //         redirect: menus[i].path,
+      //         children: [menus[i]],
+      //         name: menus[i].meta.title,
+      //       }
+      //     }
+      //   }
+      //   this.routes = menus
+      //   return menus
+      // }
     }
   }
 </script>

demo-web-ui/src/layout/index.vue

@@ -6,7 +6,6 @@
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
     <div class="main-container">
       <div class="home-box">
-        <a href="javascript:window.opener=null;window.open('','_self');window.close();" class="text-center">平台首页</a>
         <a href="javascript:void(0);" class="text-center">系统管理</a>
       </div>
       <sidebar class="sidebar-container"/>    <!--菜单-->

demo-web-ui/src/router/index.js

@@ -22,30 +22,155 @@ export const constantRoutes = [
     redirect: 'login'
   },
   {
-    path: '/login',
-    component: () => import('@/views/login/login.vue')
+    path: '/reg',
+    component: () => import("@/views/regist/User.vue")
   },
   {
-    path: '/home',
-    component: () => import('@/views/Home/Home.vue'),
-    name: 'home'
-
+    path: '/login',
+    component: () => import('@/views/login/login.vue')
   },
   {
     path: '/index',
     component: Layout,
     redirect: '/index',
-    children: [{
+    children: [
+      {
         path: '/index',
         component: () =>
           import('@/views/index.vue'),
-      name: 'index',
         meta: {
           title: '主页',
           noCache: true,
           affix: true
         }
-    }]
+      },
+      {
+        path: '/userManage',
+        component: () =>
+          import('@/views/userManage/userManage.vue'),
+        meta: {
+          title: '用户管理'
+        }
+      },
+      {
+        path: '/region',
+        component: () =>
+          import('@/views/region/region.vue'),
+        meta: {
+          title: '自主学习计划管理'
+        }
+      },
+      {
+        path: '/RoleAdminister',
+        component: () => import('@/views/RoleAdminister/RoleAdminister.vue'),
+        meta: {
+          title: '角色管理'
+        }
+      },
+      {
+        path: '/postManage',
+        component: () =>
+          import('@/views/postManage/postManage.vue'),
+        meta: {
+          title: '自主学习计划进度管理'
+        }
+      },
+      {
+        path: '/guideManage',
+        component: () =>
+          import('@/views/guideManage/guideManage.vue'),
+        meta: {
+          title: '指导任务管理'
+        }
+      },
+      {
+        path: '/functional',
+        component: () =>
+          import('@/views/functional/functional.vue'),
+        meta: {
+          title: '成绩设置'
+        }
+      },
+      {
+        path: '/sourceManage',
+        component: () =>
+          import('@/views/sourceManage/sourceManage.vue'),
+        meta: {
+          title: '自学资源管理'
+        }
+      },
+      {
+        path: '/menuManage',
+        component: () => import('@/views/menuManage/menuManage.vue'),
+        meta: {
+          title: '菜单管理'
+        }
+      },
+      {
+        path: '/mobileterminal',
+        component: () => import('@/views/mobileterminal/mobileterminal.vue'),
+        meta: {
+          title: '移动端管理'
+        }
+      },
+      {
+        path: '/personalization',
+        component: () => import('@/views/personalization/personalization.vue'),
+        meta: {
+          title: '公告管理'
+        }
+      },
+      {
+        path: '/copyofprocess',
+        component: () => import('@/views/copyofprocess/liuchengchasongguanli'),
+        meta: {
+          title: '论坛管理'
+        }
+      },
+      {
+        path: '/dictManage',
+        component: () => import('@/views/dictManage/dictManage.vue'),
+        meta: {
+          title: '数据字典管理'
+        }
+      },
+      {
+        path: '/logManage',
+        component: () =>
+          import('@/views/logManage/logManage.vue'),
+        meta: {
+          title: '统计信息管理'
+        }
+      },
+      {
+        path: '/PwdModify',
+        component: () => import('@/views/PwdModify/PwdModify.vue'),
+        meta: {
+          title: '账户信息管理'
+        }
+      },
+      {
+        path: '/organizationManage',
+        component: () =>
+          import('@/views/organizationManage/organizationManage.vue'),
+        meta: {
+          title: '论坛交流'
+        }
+      },
+      {
+        path: '/datamapping',
+        component: () => import('@/views/datamapping/shujuyingshe.vue'),
+        meta: { title: '自主学习计划制定指导', noCache: true }
+      },
+      {
+        path: '/organizationManage',
+        component: () =>
+          import('@/views/organizationManage/organizationManage.vue'),
+        meta: {
+          title: '自主学习计划实施指导'
+        }
+      }
+    ]
   }, {
     path: '/region',
     component: Layout,
@@ -78,9 +203,7 @@ export const constantRoutes = [
     redirect: '/RoleAdminister',
     children: [{
       path: '/RoleAdminister',
-      component: () =>
-        import('@/views/RoleAdminister/RoleAdminister.vue'),
-      name: 'RoleAdminister',
+      component: () => import('@/views/RoleAdminister/RoleAdminister.vue'), name: 'RoleAdminister',
       meta: {
         title: '角色管理'
       }
@@ -121,7 +244,7 @@ export const constantRoutes = [
         import('@/views/sourceManage/sourceManage.vue'),
       name: 'sourceManage',
       meta: {
-        title: '资源管理'
+        title: '自学资源管理'
       }
     }]
   }, {
@@ -234,7 +357,7 @@ export const constantRoutes = [
     component: Layout,
     redirect: '/workflow',
     meta: {
-      title: '工作流'
+      title: '用户管理'
     },
     children: [
       {
@@ -243,7 +366,7 @@ export const constantRoutes = [
           import('@/views/workflow/definition/definition.vue'),
         name: 'definition',
         meta: {
-          title: '流程定义'
+          title: '学生信息'
         }
       },
       {
@@ -252,7 +375,7 @@ export const constantRoutes = [
           import('@/views/workflow/form/form.vue'),
         name: 'form',
         meta: {
-          title: '表单配置'
+          title: '教师信息'
         }
       }
     ]

demo-web-ui/src/styles/sidebar.scss

@@ -12,6 +12,7 @@
   .TagsView{
     height: 40px;
   }
+  
   .home-box{
   	position: fixed;
   	top: 60px;
@@ -25,9 +26,9 @@
   		display: inline-block;
   		line-height: 40px;
   		box-sizing: border-box;
-  		width: 50%;
+  		width: 100%;
       text-align: center;
-  		font-size: 16px;
+  		font-size: 18px;
   		font-weight: 500;
       color: #FFFFFF;
   	}
@@ -122,7 +123,7 @@
       }
     }
 	& .el-menu-item.is-active {
-	   background-color: $subMenuHover !important;
+	  //  background-color: $subMenuHover !important;
 	}
   }
 

demo-web-ui/src/utils/request.js

@@ -4,11 +4,11 @@ import store from '@/store'
 import { getToken, getStorage } from '@/utils/auth'
 
 // create an axios instance
-console.log(process.env.VUE_APP_URL)
+console.log('dadadadad', process.env.VUE_APP_URL)
 const service = axios.create({
-  baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
-  // timeout: 5000 // request timeout
-  headers:{'Content-Type':'application/x-www-form-urlencoded;'}
+  baseURL: process.env.VUE_APP_URL, // url = base url + request url
+  timeout: 5000, // request timeout
+  // headers: { 'Content-Type': 'application/json' }
 })
 
 // request interceptor

demo-web-ui/src/views/Home/Home.vue

@@ -1,655 +0,0 @@
-<template>
-  <div style="height: 100%;">
-    <div class="header">
-      <p class="title"><img src="../../assets/loginImg/logo.png"/>安瑞集团信息化平台</p>
-      <div class="head_info" style="display: flex;flex-direction: row;justify-content:space-between;align-items: center">
-        <div>欢迎您</div>
-        <div>
-          <el-select v-model="defaultOrgPathName" class="selectStyle" size="small" placeholder="" @change="changeOrg" filterable>
-            <el-option v-for="item in orgDept_list" :key="item.orgPath" :label="item.orgName" :value="item.orgName"/>
-          </el-select>
-        </div>
-        <div style="padding-right: 5px">
-          <el-tooltip placement="top">
-            <div slot="content">{{ roleName }}</div>
-            <el-button style="color: #FFFFFF;font-size: 17px" type="text">{{ postName }}</el-button>
-          </el-tooltip>
-        </div>
-        <div>{{ name }}</div>
-        <div @click="logout()" style="display: flex;flex-direction: row;justify-content:center;align-items: center;padding-left: 20px;padding-right: 10px"><img src="@/assets/images/dy.png"/></div>
-      </div>
-    </div>
-    <div class="container1">
-      <el-row :gutter="20">
-        <el-col :span="14">
-          <ul class="grid-content bg-ltop">
-            <li @click="todowork">
-              <div style="position: relative">
-                <el-badge v-if="shuliang.workCount !== 0" :value="shuliang.workCount" size="mini" class="mark"/>
-                <img src="@/assets/home/ltIcon1.png">
-              </div>
-              <p>待办工作</p>
-            </li>
-            <li @click="donework">
-              <img src="@/assets/home/ltIcon2.png">
-              <p>已办工作</p>
-            </li>
-            <li @click="tobereadwork">
-              <div style="position: relative">
-                <el-badge v-if="shuliang.toBeReadCount !== 0" :value="shuliang.toBeReadCount" size="mini" class="mark"/>
-                <img src="@/assets/home/ltIcon4.png">
-              </div>
-              <p>待阅工作</p>
-            </li>
-            <li @click="havereadwork">
-              <img src="@/assets/home/ltIcon3.png">
-              <p>已阅工作</p>
-            </li>
-          </ul>
-        </el-col>
-        <el-col :span="10">
-          <div class="grid-content bg-rtop">
-            <img class="anrui" src="@/assets/home/anrui.png"/>
-            <p class="rt_title">通知公告</p>
-            <ul>
-              <li>
-                <img class="rtImg" src="../../assets/home/notice.png"/>
-                <span class="notice">关于召开2021年公司全体员工大会的通知工大会的通知工大会的通知...</span>
-                <span class="anrui_time">2021-09-01</span>
-              </li>
-              <li>
-                <img src="../../assets/home/notice.png"/>
-                <span class="notice">关于召开2021年公司全体员工大会的通知工大会的通知工大会的通知</span>
-                <span class="anrui_time">2021-09-01</span>
-              </li>
-              <li>
-                <img src="../../assets/home/notice.png"/>
-                <span class="notice">关于召开2021年公司全体员工大会的通知</span>
-                <span class="anrui_time">2021-09-01</span>
-              </li>
-              <li>
-                <img src="../../assets/home/notice.png"/>
-                <span class="notice">关于召开2021年公司全体员工大会的通知</span>
-                <span class="anrui_time">2021-09-01</span>
-              </li>
-              <li>
-                <img src="../../assets/home/notice.png"/>
-                <span class="notice">关于召开2021年公司全体员工大会的通知</span>
-                <span class="anrui_time">2021-09-01</span>
-              </li>
-            </ul>
-          </div>
-        </el-col>
-      </el-row>
-      <ul class="bg-bottom">
-        <li @click="toNav(index)" v-for="(item,index) in menus" :key='index'>
-          <img :src="item.imgUrl">
-          <p>{{ item.title }}</p>
-        </li>
-      </ul>
-      <p class="copy">Copyright © {{ year }} 安瑞集团 All Rights Reserved</p>
-    </div>
-    <!--<ul class="nav-box">-->
-    <!--<li style="background-color: #e87861;" @click="toNavbar('http://39.104.100.138:8081/')">
-      <img src="@/assets/images/jcxx.png">
-      <p>基础信息</p>
-    </li>-->
-
-    <!--<template v-for="(item, i) in menus">
-      <li v-if="item.sourceName == '系统管理'" :key="i" @click="toNav('index','系统管理')" :style="{backgroundColor: item.iconBgColor}">
-        <img :src="item.iconUrl">
-        <p>{{ item.sourceName }}</p>
-      </li>
-      <li v-else :key="i" @click="toNavbar(item.pageUrl)" :style="{backgroundColor: item.iconBgColor}">
-        <img :src="item.iconUrl">
-        <p>{{ item.sourceName }}</p>
-      </li>
-    </template>-->
-    <!-- <li style="background-color: #e87861;" @click="toNavbar('http://39.104.100.138:8081/')">
-      <img src="@/assets/images/jcxx.png">
-      <p>基础信息</p>
-    </li>
-    <li style="background-color: #e87861;" @click="toNavbar('http://localhost:9529/')">
-      <img src="@/assets/images/jcxx.png">
-      <p>基础信息</p>
-    </li> -->
-    <!-- <li @click="xxzx">
-       <img src="@/assets/images/xxzx.png">
-       <p>消息中心</p>
-     </li>
-     <li @click="xxzx">
-       <img src="@/assets/images/xxzx.png">
-       <p>消息中心</p>
-     </li>
-     <li @click="xxzx">
-       <img src="@/assets/images/xxzx.png">
-       <p>消息中心</p>
-     </li>
-     <li @click="xxzx">
-       <img src="@/assets/images/xxzx.png">
-       <p>消息中心</p>
-     </li>
-     <li style="background-color: #ffb751;" @click="xxzx">
-       <img src="@/assets/images/cxjl.png">
-       <p>诚信计量</p>
-     </li>
-     <li style="background-color: #6fb3e0;" @click="xxzx">
-       <img src="@/assets/images/zwsm.png">
-       <p>C标志自我声明</p>
-     </li>
-     <li style="background-color: #87b880;" @click="xxzx">
-       <img src="@/assets/images/sjcc.png">
-       <p>双随机抽查</p>
-     </li>
-     <li style="background-color: #448fb9;" @click="xxzx">
-       <img src="@/assets/images/jlsc.png">
-       <p>能量计量审查</p>
-     </li>
-     <li style="background-color: #24ca95;" @click="xxzx">
-       <img src="@/assets/images/qjsh.png">
-       <p>强检计量器具审核</p>
-     </li>
-     <li style="background-color: #b4429d;" @click="xxzx">
-       <img src="@/assets/images/jsxd.png">
-       <p>技术规范制修订</p>
-     </li>
-     <li style="background-color: #b3b442;" @click="toNavbar('http://39.104.100.138:8083/')">
-       <img src="@/assets/images/xtbg.png">
-       <p>协同办公</p>
-     </li>
-     <li style="background-color: #eab054;" @click="xxzx">
-       <img src="@/assets/images/tjfx.png">
-       <p>统计分析</p>
-     </li>
-     <li style="background-color: #e87861;" @click="toNavbar('http://39.104.100.138:8081/')">
-       <img src="@/assets/images/jcxx.png">
-       <p>基础信息</p>
-     </li>
-     <li style="background-color: #e87861;" @click="toNavbar('http://localhost:9529/')">
-       <img src="@/assets/images/jcxx.png">
-       <p>基础信息</p>
-     </li>
-     <li style="background-color: #617be8;" @click="toNav('index','系统管理')">
-       <img src="@/assets/images/xtgl.png">
-       <p>系统管理</p>
-     </li> -->
-    <!--</ul>-->
-    <el-dialog center :visible.sync="dialogVisible" width="40%" :show-close="false" :close-on-click-modal="false">
-      <el-form :model="form" class="formadd">
-        <el-row style="border-top: 1px solid #e0e3eb">
-          <el-col :span="4" class="tleftb">
-            <span>原密码</span>
-          </el-col>
-          <el-col :span="20">
-            <el-form-item><el-input v-model="form.original" type="password" show-password/></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>新密码</span>
-          </el-col>
-          <el-col :span="20">
-            <el-form-item><el-input v-model="form.password" type="password" show-password/></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>确认密码</span>
-          </el-col>
-          <el-col :span="20">
-            <el-form-item><el-input v-model="form.confirmPassword" type="password" show-password/></el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" size="small" @click="handleConirm">确 定</el-button>
-        <el-button size="small" @click="handleQuXiao">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getToken, removeToken, getStorage, removeStorage } from '@/utils/auth'
-import {sourcesofrole} from '@/api/system/Role/role.js'
-import User from '@/api/User/login.js'
-import { getTodoNum } from '@/api/system/home/home'
-import { getToBeReadNum } from '@/api/flow/read'
-
-export default {
-  data() {
-    return {
-      menus: [{
-        imgUrl: require('@/assets/home/bIcon1.png'),
-        title: '业务管理'
-      }, {
-        imgUrl: require('@/assets/home/scm.png'),
-        title: '供应链管理'
-      }, {
-        imgUrl: require('@/assets/home/bIcon2.png'),
-        title: '风控管理'
-      }, {
-        imgUrl: require('@/assets/home/bIcon3.png'),
-        title: '审计管理'
-      }, {
-        imgUrl: require('@/assets/home/bIcon4.png'),
-        title: '财务管理'
-      }, {
-        imgUrl: require('@/assets/home/bIcon5.png'),
-        title: '行政管理'
-      }, {
-        imgUrl: require('@/assets/home/bIcon6.png'),
-        title: '报表中心'
-      }, {
-        imgUrl: require('@/assets/home/bIcon7.png'),
-        title: '基础信息'
-      }, {
-        imgUrl: require('@/assets/home/notice.png'),
-        title: '消息中心'
-      }, {
-        imgUrl: require('@/assets/home/bIcon8.png'),
-        title: '系统管理'
-      }],
-      userInfo: {},
-      orgDept_list: [],
-      shuliang: {
-        workCount: '',
-        toBeReadCount: ''
-      },
-      dialogVisible: false,
-      form: {
-        original: '',
-        password: '',
-        confirmPassword: '',
-        userSid: ''
-      },
-      timer: '',
-      Orgname: '',
-      departmentName: '',
-      name: '',
-      pNameAndDepartmentNameAndPostName: '',
-      defaultOrgPathName: '',
-      defaultOrgPath: '',
-      roleName: '',
-      postName: '',
-      year: ''
-    }
-  },
-  beforeCreate() {
-
-  },
-  created() {
-    this.getsPasswordByUserSid()
-  },
-  mounted() {
-    this.Orgname = window.sessionStorage.getItem('Orgname')
-    this.departmentName = window.sessionStorage.getItem('departmentName')
-    this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName')
-    this.defaultOrgPathName = window.sessionStorage.getItem('defaultOrgPathName')
-    this.defaultOrgPath = window.sessionStorage.getItem('defaultOrgPath')
-    this.roleName = window.sessionStorage.getItem('roleName')
-    this.postName = window.sessionStorage.getItem('postName')
-    this.name = window.sessionStorage.getItem('name')
-    var nowDate = new Date()
-    this.year = nowDate.getFullYear()
-//    sourcesofrole({ psid: '0', roleSid: this.$store.getters.userInfo.roleSid }).then(res => {
-//      this.menus = res.data
-//    })
-  },
-  methods: {
-    getsPasswordByUserSid() {
-      User.selectPasswordByUserSid(window.sessionStorage.getItem('userSid')).then((resp) => {
-        if (resp.success && resp.data) {
-          this.dialogVisible = true
-        } else {
-          this.getNum()
-          this.timer = setInterval(this.getNum, 20000)
-        }
-      })
-      User.getOrgListByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
-        if (res.success) {
-          this.orgDept_list = res.data
-        }
-      })
-    },
-    getNum() {
-      getTodoNum(window.sessionStorage.getItem('userSid')).then((resp) => {
-        if (resp.success) {
-          this.shuliang.workCount = resp.data
-        }
-      })
-      getToBeReadNum(window.sessionStorage.getItem('userSid')).then((resp) => {
-        if (resp.success) {
-          this.shuliang.toBeReadCount = resp.data
-        }
-      })
-    },
-    handleConirm() {
-      if (this.form.original === '') {
-        this.$message({ showClose: true, type: 'error', message: '原密码不能为空' })
-        return
-      }
-      if (this.form.password !== this.form.confirmPassword) {
-        this.$message({ showClose: true, type: 'error', message: '两次输入密码不一致' })
-        return
-      }
-      this.form.userSid = window.sessionStorage.getItem('userSid')
-      User.updatePassword(this.form).then((resp) => {
-        if (resp.success) {
-          this.$alert('密码修改成功！请重新登录点击确定后退出。', '修改成功', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.handleQuXiao()
-            }
-          })
-        }
-      })
-    },
-    handleQuXiao() {
-      this.dialogVisible = false
-      this.form = {
-        original: '',
-        password: '',
-        confirmPassword: ''
-      }
-      User.logout({ token: getStorage() }).then((res) => {
-        if (res.success) {
-          removeStorage()
-          this.$store.commit('user/SET_UESRINFO', '')
-          this.$router.push({ path: '/login' })
-        }
-      })
-    },
-    todowork() {
-      window.open('/#/todo' + '?token=' + getStorage(), '_blank')
-      // this.$router.push({ path: '/todo' + '?token=' + getStorage() })
-      //  window.open('http://127.0.0.1/message'+'?token='+getStorage(),'_blank')
-    },
-    donework() {
-      window.open('/#/done' + '?token=' + getStorage(), '_blank')
-      // this.$router.push({ path: '/done' + '?token=' + getStorage() })
-      //  window.open('http://127.0.0.1/message'+'?token='+getStorage(),'_blank')
-    },
-    tobereadwork() {
-      window.open('/#/toberead' + '?token=' + getStorage(), '_blank')
-    },
-    havereadwork() {
-      window.open('/#/haveread' + '?token=' + getStorage(), '_blank')
-    },
-    logout() {
-      this.$confirm('确定要退出吗, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        User.logout({token: getStorage()}).then(res => {
-          removeStorage()
-          this.$store.commit('user/SET_UESRINFO', '')
-          this.$router.push({ path: '/login' })
-        })
-      })
-    },
-    xxzx() {
-      this.$alert('项目正在开发中', '提示', {
-        dangerouslyUseHTMLString: true
-      })
-    },
-    toNavbar(name) {
-      let myPopup = window.open(name + '?token=' + getStorage(), '_blank')
-    },
-    changeOrg(value) {
-      const choose = this.orgDept_list.filter((item) => item.orgName === value)
-      this.defaultOrgPathName = choose[0].orgName
-      this.defaultOrgPath = choose[0].orgPath
-    },
-    toNav(index, name, titleName) {
-      const organizationData = {
-        defaultOrgPathName: this.defaultOrgPathName,
-        defaultOrgPath: this.defaultOrgPath
-      }
-      if (index == '9') {
-        // this.$router.push({path: '/index'})
-        let myPopup = window.open('/#/index', '_blank')
-      } else if (index == '7') {
-        // let myPopup = window.open('http://127.0.0.1:9531/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-      } else if (index == '8') {
-        // let myPopup = window.open('http://127.0.0.1:9531/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-      } else if (index == '1') {
-        // let myPopup = window.open('http://127.0.0.1:9531/scm/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/scm/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/scm/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-      } else if (index == '4') {
-        // let myPopup = window.open('http://127.0.0.1:9531/fin/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/fin/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/fin/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-      } else if (index == '5') {
-        // let myPopup = window.open('http://127.0.0.1:9531/manage/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/manage/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/manage/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-      } else if (index == '0') {
-        // let myPopup = window.open('http://127.0.0.1:9531/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-      }
-//				const page = this.$router.resolve({name: name})
-//				window.open(page.href,'_blank')
-    }
-  },
-  beforeDestroy() {
-    clearInterval(this.timer)
-  }
-}
-</script>
-<style scoped="scoped">
-li:hover,
-p:hover {
-  cursor: pointer
-}
-</style>
-<style lang="scss" scoped>
-p {
-  margin: 0;
-  padding: 0;
-}
-
-.header {
-  background-color: #0294d7;
-  color: #fff;
-  overflow: hidden;
-  height: 60px;
-  line-height: 60px;
-
-  .title {
-    img {
-      width: 70px;
-      vertical-align: middle;
-      font-family: Adobe Heiti Std;
-    }
-
-    float: left;
-    font-size: 34px;
-    margin-left: 35px;
-    height: 60px;
-    line-height: 60px;
-  }
-
-  .head_info {
-    float: right;
-    margin-top: 0;
-    font-size: 17px;
-  }
-
-  p {
-    float: left;
-  }
-}
-
-//.head_info img {
-//  width: 25px;
-//  margin-top: 20px;
-//  margin-left: 30px;
-//  margin-right: 10px;
-//  float: left;
-//}
-//
-//.head_info .dy {
-//  margin-left: 10px;
-//  margin-right: 20px;
-//}
-
-.container1 {
-  background: #E9F1F7;
-  padding: 20px;
-  width: 100%;
-  height: calc(100% - 60px);
-  margin: 0;
-
-  .bg-ltop {
-    margin: 0;
-    padding: 0 20px;
-    background-image: url(../../assets/home/ltBg.png);
-    border-radius: 10px;
-    overflow: hidden;
-    height: 190px;
-
-    li {
-      float: left;
-      list-style: none;
-      width: 25%;
-      text-align: center;
-
-      img {
-        width: 70px;
-        margin: 45px auto 10px auto;
-      }
-    }
-  }
-
-  .bg-rtop {
-    background-image: url(../../assets/home/rtBg.png);
-    border-radius: 10px;
-    height: 190px;
-    overflow: hidden;
-    position: relative;
-
-    .anrui {
-      width: 100%;
-      height: 40px;
-    }
-
-    .rt_title {
-      position: absolute;
-      top: 10px;
-      left: 15px;
-      font-size: 18px;
-      font-family: SourceHanSerifCN;
-      font-weight: 600;
-      color: #191919;
-    }
-
-    ul {
-      margin: 0px auto;
-      padding: 0;
-      height: 148px;
-      width: 100%;
-
-      li {
-        font-size: 14px;
-        height: 33px;
-        line-height: 28px;
-        list-style: none;
-        text-decoration: underline;
-        border-bottom: 1px solid #666;
-        width: calc(100% - 70px);
-        margin-left: 40px;
-        position: relative;
-        padding-top: 10px;
-        font-family: SimSun;
-
-        img {
-          width: 16px;
-          margin: 5px 10px;
-          position: absolute;
-          left: -30px;
-        }
-
-        .notice {
-          display: inline-block;
-          width: 65%;
-          text-overflow: ellipsis;
-          overflow: hidden;
-          white-space: nowrap;
-        }
-
-        .anrui_time {
-          float: right;
-          display: inline-block;
-          margin-right: 5px;
-          line-height: 30px;
-        }
-      }
-    }
-  }
-
-  .bg-bottom {
-    background-image: url(../../assets/home/bottomBg.png);
-    border-radius: 10px;
-    overflow: hidden;
-    margin: 20px 0 0 0;
-    padding: 10px 20px;
-
-    li {
-      float: left;
-      list-style: none;
-      width: 11.6%;
-      margin: 10px 2.5%;
-      background: #fff;
-      border-radius: 40px;
-      text-align: center;
-      padding: 10px 25px 15px;
-
-      img {
-        width: 80%;
-        margin: 10px auto;
-      }
-    }
-  }
-}
-
-.copy {
-  position: fixed;
-  bottom: 0;
-  width: calc(100% - 40px);
-  margin: auto;
-  text-align: center;
-  line-height: 40px;
-  border-top: 2px solid #4E74A6;
-  background: #E9F1F7;
-  font-size: 14px;
-  color: #666;
-}
-
-.mark {
-  position: absolute;
-  top: 38%;
-  margin-left: 58px;
-}
-
-.mark {
-  ::v-deep .el-badge__content {
-    font-size: 14px !important;
-  }
-}
-.selectStyle {
-  ::v-deep .el-input__inner {
-    border: 0px !important;
-    background-color: #0294d7 !important;
-    font-size: 17px;
-    color: #FFFFFF;
-  }
-}
-</style>

demo-web-ui/src/views/Regist/User.vue

@@ -3,48 +3,53 @@
     <el-header>
       <h3 class="title">河北省计量业务应用平台</h3>
     </el-header>
+    <div class="stude">学生注册</div>
     <div class="user-from">
-			<el-form :model="userForm" :rules="rules"  ref="userForm" label-width="120px" class="demo-userForm">
-				<el-form-item label="身份证号" prop="idNo">
-					<el-input v-model="userForm.idNo" @blur="onInputBlur" placeholder="请输入身份证号" :maxlength="18"></el-input>
+      <el-form
+        :model="userForm"
+        :rules="rules"
+        ref="userForm"
+        label-width="120px"
+        class="demo-userForm"
+      >
+        <el-form-item label="学生学号" prop="userName">
+          <el-input
+            v-model="userForm.userName"
+            placeholder="请输入学号"
+          ></el-input>
         </el-form-item>
-				<el-form-item label="真实姓名" prop="name">
-					<el-input v-model="userForm.name" placeholder="请输入真实姓名"></el-input>
-				</el-form-item>
-				<el-form-item label="个人手机号" prop="mobile">
-					<el-input v-model="userForm.mobile" placeholder="请输入手机号" ></el-input>
-					<el-button class="Tips" type="text" :disabled='isDisabled' @click.stop.prevent="getcode()">点击获取验证码 {{downTime ? downTime+'s':''}}</el-button>
-				</el-form-item>
-				<el-form-item label="手机验证码" prop="verificationCode">
-					<el-input v-model="userForm.verificationCode" placeholder="请输入验证码"></el-input>
-				</el-form-item>
-				<el-form-item label="用户名" prop="userName">
-					<el-input v-model="userForm.userName" :disabled="true"></el-input>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="userForm.name" placeholder="请输入姓名"></el-input>
         </el-form-item>
         <el-form-item label="密码" prop="password">
-					<paddwordinput v-model="userForm.password" placeholder="请输入密码" :pastips='true' :maxlength="10"></paddwordinput>
-					<el-button class="Tips" type="text">密码必须为8至10位大小写字母和数字组合</el-button>
+          <paddwordinput
+            v-model="userForm.password"
+            placeholder="请输入密码"
+            :pastips="true"
+            :maxlength="10"
+          ></paddwordinput>
+          <el-button class="Tips" type="text"
+            >密码必须为8至10位大小写字母和数字组合</el-button
+          >
         </el-form-item>
-				<el-form-item label="确认密码" prop="rePassword">
-					<paddwordinput v-model="userForm.rePassword" placeholder="请再次输入密码" :maxlength="10"></paddwordinput>
+        <el-form-item label="确认密码" prop="confirmPassword">
+          <paddwordinput
+            v-model="userForm.confirmPassword"
+            placeholder="请再次输入密码"
+            :maxlength="10"
+          ></paddwordinput>
         </el-form-item>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="身份证正面照" prop="idFrontPhoto">
-            	<UploadImg @imgUrl="FrontPhotoUrl"></UploadImg>
-            	<el-input v-model="userForm.idFrontPhoto" v-show="false"></el-input>
+        <el-form-item label="昵称" prop="nickName">
+          <el-input v-model="userForm.nickName" placeholder="请输入昵称"></el-input>
         </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="身份证背面照" prop="idBackPhoto">
-            	<UploadImg @imgUrl="BackPhotoUrl"></UploadImg>
-            	<el-input v-model="userForm.idBackPhoto" v-show="false"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-				<el-form-item style="text-align: center;">
-					<el-button type="primary" @click="submitForm('userForm')" :disabled="btnDisabled">注册</el-button>
-					<el-button @click="resetForm('userForm')">关闭</el-button>
+        <el-form-item style="text-align: center">
+          <el-button
+            type="primary"
+            @click="submitForm('userForm')"
+            :disabled="btnDisabled"
+            >注册</el-button
+          >
+          <el-button @click="resetForm()">关闭</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -52,155 +57,108 @@
 </template>
 
 <script>
-	import {
-		registUser,
-		getVerificationCode
-	} from '@/api/user1.js'
-	import qs from 'qs'
-	import UploadImg from '@/components/uploadFile/index.vue'
-	import paddwordinput from '@/components/passwordSafe/index.vue'
+import {registUser} from '@/api/user.js'
+import qs from "qs";
+import paddwordinput from "@/components/passwordSafe/index.vue";
 export default {
-		components:{ UploadImg, paddwordinput },
+  components: {  paddwordinput },
   data() {
     var validatorPhone = function (rule, value, callback) {
-        if (value === '') {
-          callback(new Error('手机号不能为空'))
-        } else if (!/^1\d{10}$/.test(value)) {
-          callback(new Error('手机号格式错误'))
+      if (value === "") {
+        callback(new Error("学号不能为空"));
       } else {
-          callback()
-        }
+        callback();
       }
+    };
     var validatePass2 = (rule, value, callback) => {
-      	  if (value === '') {
-               callback(new Error('请再次输入密码'))
+      if (value === "") {
+        callback(new Error("请再次输入密码"));
         // password 是表单上绑定的字段
       } else if (value !== this.userForm.password) {
-               callback(new Error('两次输入密码不一致!'))
+        callback(new Error("两次输入密码不一致!"));
       } else {
-             	 callback()
-            }
+        callback();
       }
+    };
     return {
-				downTime: '',
+      downTime: "",
       isDisabled: false,
       userForm: {
-					name: '',
-					userName: '', //用户名
-					password: '',
-					rePassword: '',
-					mobile: '', // 手机号
-					verificationCode: '',
-					idNo: '',
-					idBackPhoto: '', // 反面
-					idFrontPhoto: ''
+        name: "",//姓名
+        userName: "", //学号
+        password: "",
+        confirmPassword: "",
+        nickName: "", //昵称
       },
       btnDisabled: false,
-				rule: [{required: true, message: '不能为空', trigger: 'blur'}],
+      rule: [{ required: true, message: "不能为空", trigger: "blur" }],
       rules: {
-          idNo: [
-            { required: true, message: '请输入身份证号', trigger: 'blur' },
-            { pattern: /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/,
-              message: '身份证号格式错误', trigger: 'blur' ,
-            }
-          ],
-          name: [
-            { required: true, message: '请输入真实姓名', trigger: 'blur' }
-          ],
-          mobile: [
-            { required: true, validator: validatorPhone, trigger: 'blur' }
-          ],
-          verificationCode: [
-            { required: true, message: '请输入手机验证码', trigger: 'blur' }
-          ],
         userName: [
-            { required: true, message: '请输入身份证号', trigger: 'blur' }
+          { required: true, validator: validatorPhone, trigger: "blur" },
         ],
         password: [
-            { required: true, message: '请输入密码', trigger: 'blur' },
-            { min: 8, max: 10, message: '长度在 8 到 10 个字符大小写字母和数字组合', trigger: 'blur' }
+          { required: true, message: "请输入密码", trigger: "blur" },
+          {
+            min: 8,
+            max: 10,
+            message: "长度在 8 到 10 个字符大小写字母和数字组合",
+            trigger: "blur",
+          },
         ],
-          rePassword: [
+        confirmPassword: [
             { required: true, validator: validatePass2, trigger: 'blur' }
           ],
-          idFrontPhoto: [
-            { required: true, message: '请输入上传身份证', trigger: 'blur' }
-          ],
-          idBackPhoto: [
-            { required: true, message: '请输入上传身份证', trigger: 'blur' }
-          ],
-        }
+      },
     };
   },
   methods: {
-			// 手机验证码
-			getcode() {
-        let _this = this
-        if (!/^1\d{10}$/.test(_this.userForm.mobile)) {
-          this.$message({
-            type: 'error',
-            message: '手机号格式错误!'
-          });
-        }else {
-          _this.downTime = 60
-          let timeInterval = null
-          _this.isDisabled = true
-          timeInterval = setInterval(()=>{
-          	--_this.downTime
-          	if(_this.downTime == 0){
-          		clearInterval(timeInterval)
-          		_this.downTime = '';
-             _this.isDisabled = false
-          	}
-          },1000)
-          getVerificationCode({
-          	mobile: _this.userForm.mobile
-          }).then(res =>{
-            // this.isDisabled = false
-          })
-        }
-			},
     FrontPhotoUrl(url) {
-				this.userForm.idFrontPhoto = url.filePath
+      this.userForm.idFrontPhoto = url.filePath;
     },
     BackPhotoUrl(url) {
-				this.userForm.idBackPhoto = url.filePath
+      this.userForm.idBackPhoto = url.filePath;
     },
     submitForm(formName) {
-				this.btnDisabled = true
+      this.btnDisabled = true;
       this.$refs[formName].validate((valid) => {
         if (valid) {
-						registUser(qs.stringify(this.userForm)).then((res) => {
-							this.btnDisabled = false
-							this.$confirm('注册成功, 是否关闭页面?', '提示', {
-									confirmButtonText: '确定',
-									cancelButtonText: '取消',
-									type: 'success'
+          registUser(this.userForm)
+            .then((res) => {
+              console.log(res);
+              this.btnDisabled = false;
+              this.$confirm("注册成功, 是否关闭页面?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "success",
               }).then(() => {
-									window.close();
-								})
-						}).catch(() => {
-							this.btnDisabled = false
+                this.$router.push('/login');
+              });
             })
+            .catch(() => {
+              this.btnDisabled = false;
+            });
         } else {
           return false;
         }
       });
     },
-			resetForm(formName) {
-        window.close();
-				this.$refs[formName].resetFields();
+    resetForm() {
+      this.$router.push('/login');
     },
-			onInputBlur() { // 用户名密码
-				this.userForm.userName = this.userForm.idNo
+    onInputBlur() {
+      // 用户名密码
+      this.userForm.userName = this.userForm.idNo;
     },
-		}
-	}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 @import "~@/styles/variables.scss";
-  h3{margin: 0;padding: 0;}
+h3 {
+  margin: 0;
+  padding: 0;
+}
 .el-header {
   width: 100%;
   background-color: #0294d7;
@@ -227,6 +185,11 @@
 .opcity {
   opacity: 1 !important;
 }
+.stude{
+  margin-left: 735px;
+  margin-top: 20px;
+  font-size: 26px;
+}
 .user-from {
   width: 860px;
   padding-top: 20px;
@@ -272,7 +235,7 @@
   }
 
   .avatar-uploader .el-upload:hover {
-			border-color: #409EFF;
+    border-color: #409eff;
   }
 
   .avatar-uploader-icon {

demo-web-ui/src/views/copyofprocess/liuchengchasongguanli.vue

@@ -1,35 +1,98 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-      <button-bar view-title="流程抄送设置" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <button-bar
+        view-title="流程抄送设置"
+        ref="btnbar"
+        :btndisabled="btndisabled"
+        @btnhandle="btnHandle"
+      />
       <div class="main-content">
         <div class="searchcon">
-          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{
+            searchxianshitit
+          }}</el-button>
           <div v-show="isSearchShow" class="search">
-            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+            <el-form
+              ref="listQueryform"
+              :inline="true"
+              :model="listQuery"
+              label-width="100px"
+              class="tab-header"
+            >
               <el-form-item label="流程名称">
-                <el-select v-model="listQuery.params.flowName" placeholder="请选择" filterable>
-                  <el-option v-for="item in flow_list" :key="item.key" :label="item.name" :value="item.name"></el-option>
+                <el-select
+                  v-model="listQuery.params.flowName"
+                  placeholder="请选择"
+                  filterable
+                >
+                  <el-option
+                    v-for="item in flow_list"
+                    :key="item.key"
+                    :label="item.name"
+                    :value="item.name"
+                  ></el-option>
                 </el-select>
               </el-form-item>
             </el-form>
-            <div class="btn" style="text-align: center;">
-              <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">查询</el-button>
-              <el-button type="primary" size="small" icon="el-icon-refresh" @click="handleReset">重置</el-button>
+            <div class="btn" style="text-align: center">
+              <el-button
+                type="primary"
+                size="small"
+                icon="el-icon-search"
+                @click="handleFilter"
+                >查询</el-button
+              >
+              <el-button
+                type="primary"
+                size="small"
+                icon="el-icon-refresh"
+                @click="handleReset"
+                >重置</el-button
+              >
             </div>
           </div>
         </div>
         <div class="listtop">
           <div class="tit">业务流程列表</div>
-          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+          <pageye
+            v-show="list.length > 0"
+            :total="listQuery.total"
+            :page.sync="listQuery.current"
+            :limit.sync="listQuery.size"
+            class="pagination"
+            @pagination="getList"
+          />
         </div>
         <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
-            <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center"/>
+          <el-table
+            :key="tableKey"
+            v-loading="listLoading"
+            :data="list"
+            border
+            style="width: 100%"
+          >
+            <el-table-column
+              width="60"
+              label="序号"
+              type="index"
+              :index="indexMethod"
+              align="center"
+            />
             <el-table-column width="180" label="操作" align="center">
               <template slot-scope="scope">
-                <el-button size="small" type="primary" @click="handleUpdate(scope.row)">设置</el-button>
-                <el-button size="small" type="danger" @click="handleDelete(scope.row)">删除</el-button>
+                <el-button
+                  size="small"
+                  type="primary"
+                  @click="handleUpdate(scope.row)"
+                  >设置</el-button
+                >
+                <el-button
+                  size="small"
+                  type="danger"
+                  @click="handleDelete(scope.row)"
+                  >删除</el-button
+                >
               </template>
             </el-table-column>
             <el-table-column label="流程名称" align="center" width="400">
@@ -37,7 +100,11 @@
                 <span>{{ scope.row.flowName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="抄送角色" align="left" header-align="center">
+            <el-table-column
+              label="抄送角色"
+              align="left"
+              header-align="center"
+            >
               <template slot-scope="scope">
                 <span>{{ scope.row.roleName }}</span>
               </template>
@@ -47,51 +114,66 @@
         <div class="pages">
           <div class="tit" />
           <!-- 翻页 -->
-          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+          <pagination
+            v-show="list.length > 0"
+            :total="listQuery.total"
+            :page.sync="listQuery.current"
+            :limit.sync="listQuery.size"
+            class="pagination"
+            @pagination="getList"
+          />
         </div>
       </div>
     </div>
-    <liuchengchaosongAdd v-show="viewState == 2 ||viewState == 3" ref="divadd" @doback="resetState" @reloadlist="getList" />
+    <liuchengchaosongAdd
+      v-show="viewState == 2 || viewState == 3"
+      ref="divadd"
+      @doback="resetState"
+      @reloadlist="getList"
+    />
   </div>
 </template>
 
 <script>
-import { pageList, delBySids } from '@/api/system/liuchengchaosong/liuchengchaosong'
-import { selectFlowList } from '@/api/system/postManage/index'
-import Pagination from '@/components/pagination'
-import pageye from '@/components/pagination/pageye'
-import ButtonBar from '@/components/ButtonBar'
-import liuchengchaosongAdd from './liuchengchaosongAdd'
+import {
+  pageList,
+  delBySids,
+} from "@/api/system/liuchengchaosong/liuchengchaosong";
+import { selectFlowList } from "@/api/system/postManage/index";
+import Pagination from "@/components/pagination";
+import pageye from "@/components/pagination/pageye";
+import ButtonBar from "@/components/ButtonBar";
+import liuchengchaosongAdd from "./liuchengchaosongAdd";
 
 export default {
-  name: 'liuchengchaosong',
+  name: "liuchengchaosong",
   components: {
     Pagination,
     pageye,
     ButtonBar,
-    liuchengchaosongAdd
+    liuchengchaosongAdd,
   },
   data() {
     return {
       btndisabled: false,
       btnList: [
         {
-          type: 'primary',
-          size: 'small',
-          icon: 'plus',
-          btnKey: 'toAdd',
-          btnLabel: '新增'
+          type: "primary",
+          size: "small",
+          icon: "plus",
+          btnKey: "toAdd",
+          btnLabel: "新增",
         },
         {
-          type: 'info',
-          size: 'small',
-          icon: 'cross',
-          btnKey: 'doClose',
-          btnLabel: '关闭'
-        }
+          type: "info",
+          size: "small",
+          icon: "cross",
+          btnKey: "doClose",
+          btnLabel: "关闭",
+        },
       ],
       isSearchShow: false,
-      searchxianshitit: '显示查询条件',
+      searchxianshitit: "显示查询条件",
       viewState: 1, // 1、列表 2、添加-车辆预订 3、编辑  4、查看 5、订金-订金收取
       // 查询 -----------
       flow_list: [], // 分公司
@@ -105,75 +187,76 @@ export default {
         size: 5,
         total: 0,
         params: {
-          flowName: ''
-        }
-      }
-    }
+          flowName: "",
+        },
+      },
+    };
   },
   mounted() {
-    this.$refs['btnbar'].setButtonList(this.btnList)
+    this.$refs["btnbar"].setButtonList(this.btnList);
   },
   created() {
     // 初始化变量
-    this.init()
+    this.init();
     // 加载列表
-    this.getList()
+    this.getList();
   },
   methods: {
     init() {
       selectFlowList().then((res) => {
         if (res.success) {
-          this.flow_list = res.data
+          this.flow_list = res.data;
         }
-      })
+      });
     },
     btnHandle(btnKey) {
-      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      console.log("XXXXXXXXXXXXXXX    " + btnKey);
       switch (btnKey) {
-        case 'toAdd':
-          this.toAdd()
-          break
-        case 'doClose':
-          this.doClose()
-          break
+        case "toAdd":
+          this.toAdd();
+          break;
+        case "doClose":
+          this.doClose();
+          break;
         default:
-          break
+          break;
       }
     },
     // 搜索条件效果
     clicksearchShow() {
-      this.isSearchShow = !this.isSearchShow
+      this.isSearchShow = !this.isSearchShow;
       if (this.isSearchShow) {
-        this.searchxianshitit = '隐藏查询条件'
+        this.searchxianshitit = "隐藏查询条件";
       } else {
-        this.searchxianshitit = '显示查询条件'
+        this.searchxianshitit = "显示查询条件";
       }
     },
     // 序号
     indexMethod(index) {
-      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
-      var pageindex = index + 1 + pagestart
-      return pageindex
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size;
+      var pageindex = index + 1 + pagestart;
+      return pageindex;
     },
     // 查询列表信息
     getList() {
-      this.listLoading = true
-      this.listQuery.params.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+      this.listLoading = true;
+      this.listQuery.params.orgSidPath =
+        window.sessionStorage.getItem("orgSidPath");
       pageList(this.listQuery).then((response) => {
-        this.listLoading = false
+        this.listLoading = false;
         if (response.success) {
-          this.list = response.data.records
-          this.listQuery.total = response.data.total
+          this.list = response.data.records;
+          this.listQuery.total = response.data.total;
         } else {
-          this.list = []
-          this.listQuery.total = 0
+          this.list = [];
+          this.listQuery.total = 0;
         }
-      })
+      });
     },
     // 查询按钮
     handleFilter() {
-      this.listQuery.current = 1
-      this.getList()
+      this.listQuery.current = 1;
+      this.getList();
     },
     // 重置
     handleReset() {
@@ -182,46 +265,50 @@ export default {
         size: 5,
         total: 0,
         params: {
-          flowName: ''
-        }
-      }
-      this.getList()
+          flowName: "",
+        },
+      };
+      this.getList();
     },
     toAdd() {
-      this.viewState = 2
-      this.$refs['divadd'].showAdd()
+      this.viewState = 2;
+      this.$refs["divadd"].showAdd();
     },
     // 编辑
     handleUpdate(row) {
-      this.viewState = 3
-      this.$refs['divadd'].showEdit(row)
+      this.viewState = 3;
+      this.$refs["divadd"].showEdit(row);
     },
     handleDelete(row) {
-      const tip = '请确认是否删除'
-      this.$confirm(tip, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      const tip = "请确认是否删除";
+      this.$confirm(tip, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       }).then(() => {
-        const aa = []
-        aa.push(row.sid)
+        const aa = [];
+        aa.push(row.sid);
         delBySids(aa).then((res) => {
           if (res.success) {
-            this.$message({ showClose: true, type: 'success', message: '删除成功' })
-            this.getList()
+            this.$message({
+              showClose: true,
+              type: "success",
+              message: "删除成功",
+            });
+            this.getList();
           }
-        })
-      })
+        });
+      });
     },
     resetState() {
-      this.viewState = 1
+      this.viewState = 1;
     },
     doClose() {
-      this.$store.dispatch('tagsView/delView', this.$route)
-      this.$router.go(-1)
-    }
-  }
-}
+      this.$store.dispatch("tagsView/delView", this.$route);
+      this.$router.go(-1);
+    },
+  },
+};
 </script>
 
 <style scoped>

demo-web-ui/src/views/guideManage/guideManage.vue

@@ -0,0 +1,249 @@
+<template>
+  <el-tabs
+    class="my-tabs"
+    v-model="activeName"
+    type="card"
+    @tab-click="handleClick"
+  >
+    <el-tab-pane label="教师信息" name="roleList">
+      <div class="container">
+        <el-table :data="tableData" border style="width: 100%">
+          <el-table-column prop="name" label="教师姓名" align="center">
+          </el-table-column>
+          <el-table-column prop="infoId" label="教师工号" align="center">
+          </el-table-column>
+          <el-table-column label="查看" align="center" width="100px">
+            <template slot-scope="scope">
+              <el-button type="text" @click="lookstuder(scope.row)"
+                >查看学生</el-button
+              >
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="editRow(scope.row)">
+                添加
+              </el-button>
+              <el-button
+                type="danger"
+                size="mini"
+                @click.native.prevent="deleteRow(scope.row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          :total="page.total"
+          :page.sync="page.current"
+          :limit.sync="page.size"
+          @pagination="pagination"
+        />
+        <el-dialog title="收货地址" :visible.sync="lookstuders">
+          <el-table :data="gridData">
+            <el-table-column
+              property="infoId"
+              label="日期"
+              width="150"
+            ></el-table-column>
+            <el-table-column
+              property="name"
+              label="姓名"
+              width="200"
+            ></el-table-column>
+            <el-table-column property="address" label="地址"></el-table-column>
+          </el-table>
+        </el-dialog>
+        <!-- 编辑角色信息 -->
+        <el-dialog
+          :title="dialogTitle + '学生'"
+          :visible.sync="editDialog"
+          width="40%"
+        >
+          <table class="e-table" cellspacing="0">
+            <tr>
+              <td>教师姓名</td>
+              <td>
+                <el-input
+                  v-model="teacher.teacherName"
+                  style="width: 300px"
+                ></el-input>
+              </td>
+            </tr>
+            <tr>
+              <td>教师工号</td>
+              <td>
+                <el-input
+                  v-model="teacher.teacherNo"
+                  style="width: 300px"
+                ></el-input>
+              </td>
+            </tr>
+            <tr>
+              <td>学生姓名</td>
+              <td>
+                <el-select v-model="teacher.studentName" placeholder="请选择">
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </td>
+            </tr>
+            <tr>
+              <td>学生学号</td>
+              <td>
+                <el-select v-model="teacher.studentNo" placeholder="请选择">
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.infoId"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </td>
+            </tr>
+          </table>
+          <div style="margin-top: 20px; text-align: center">
+            <el-button type="primary" @click="save()">保存</el-button>
+            <!--<el-button @click="editDialog = false">关闭</el-button>-->
+          </div>
+        </el-dialog>
+      </div>
+    </el-tab-pane>
+  </el-tabs>
+</template>
+  
+  <script>
+import {
+  pageList,
+  saveSysInfoShip,
+  selectTeacherDownStudent,
+} from "@/api/system/sources/index.js";
+
+export default {
+  data() {
+    return {
+      activeName: "roleList",
+      dialogTitle: "",
+      editDialog: false,
+      lookstuders: false,
+      form: {},
+      gridData: {},
+      teacher: {},
+      type: "js",
+      formBackup: Object.assign({}, this.form),
+      page: {
+        total: 0, // 默认数据总数
+        current: 1, // 默认开始页面
+        size: 10, // 每页的数据条数
+        params: {
+          psid: "",
+          sourceId: "",
+          sourceName: "",
+        },
+      },
+      tableData: [],
+      zylb: [],
+      sourceList: [],
+      options: {},
+      value: "",
+    };
+  },
+  mounted() {
+    this.getPageList(this.page);
+    pageList("xs").then((res) => {
+      this.options = res.data;
+      console.log(res);
+    });
+  },
+  methods: {
+    lookstuder(row) {
+      this.lookstuders = true;
+      console.log(row.infoId);
+        selectTeacherDownStudent({ infoId: row.infoId }).then((res) => {
+          this.gridData=res.data
+        });
+    },
+    pagination(val) {
+      // 分页
+      this.page.current = val.pageNum;
+      this.page.size = val.pageSize;
+      this.getPageList(this.page);
+    },
+    resetSearch() {
+      // 重置
+      this.page = {
+        total: 0, // 默认数据总数
+        current: 1, // 默认开始页面
+        size: 10, // 每页的数据条数
+        params: {
+          name: "",
+          psid: "",
+          sourceId: "",
+          sourceName: "",
+        },
+      };
+      this.getPageList();
+    },
+    getPageList() {
+      // 获取列表
+      pageList(this.type).then((res) => {
+        this.tableData = res.data;
+        this.page.total = res.data.total;
+      });
+    },
+    handleClick(tab, event) {
+      if (tab.name == "addrole") {
+        this.dialogTitle = "新增";
+        this.roleForm = Object.assign({}, this.formBackup);
+      } else {
+        this.getPageList();
+      }
+    },
+    reset() {
+      this.form = {};
+    },
+    editRow(row) {
+      this.dialogTitle = "添加";
+      this.editDialog = true;
+      this.form = Object.assign({}, row);
+    },
+    save() {
+      console.log(this.teacher);
+      saveSysInfoShip(this.teacher).then((res) => {
+        console.log(res);
+      });
+      this.editDialog = false;
+    },
+    deleteRow(row) {
+      this.$confirm("确定要删除该资源吗, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        delSources({ sid: row.sid }).then((res) => {
+          this.getPageList();
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+        });
+      });
+    },
+  },
+};
+</script>
+  
+  <style scoped="scoped" lang="scss">
+.my-tabs {
+  margin-top: 10px;
+}
+</style>
+  

demo-web-ui/src/views/login/login.vue

@@ -9,38 +9,54 @@
         <el-form ref="loginForm" :model="loginForm" class="login-form">
           <h3 class="title1">用户登录</h3>
           <el-form-item>
-            <el-input v-model="loginForm.userName" autocomplete="off" placeholder="请输入账号" prefix-icon="el-icon-user">
+            <el-input
+              v-model="loginForm.userName"
+              autocomplete="off"
+              placeholder="请输入账号"
+              prefix-icon="el-icon-user"
+            >
             </el-input>
           </el-form-item>
           <el-form-item>
-            <el-input v-model="loginForm.password" autocomplete="off" placeholder="请输入密码" prefix-icon="el-icon-lock" show-password>
+            <el-input
+              v-model="loginForm.password"
+              autocomplete="off"
+              placeholder="请输入密码"
+              prefix-icon="el-icon-lock"
+              show-password
+            >
             </el-input>
-            <span class="nopsw register" @click="handleforgetPwd">忘记密码 ？</span>
           </el-form-item>
-          <el-form-item v-show="showMsg" style="margin-bottom:0;">
+          <el-form-item v-show="showMsg" style="margin-bottom: 0">
             <span class="text-danger">提示：用户名或密码错误，请重试！</span>
           </el-form-item>
           <el-form-item>
-            <el-popover
-              placement="top"
-              width="400"
-              trigger="click"
-              v-model="loginCode"
-              @show="codeShow">
-              <imgCodeRole @login="login" ref="imgCodeRole"></imgCodeRole>
-              <el-button slot="reference" type="primary" class="login-btn" v-loading="loading">登 录</el-button>
+            <el-popover placement="top" width="400" trigger="click">
+              <el-button
+                slot="reference"
+                v-loading="loading"
+                type="primary"
+                class="login-btn"
+                @click="login"
+                >登 录</el-button
+              >
             </el-popover>
-            <!--<router-link :to="{name: 'registUser'}"  target="_blank"  tag="a" class="register fl">个人注册</router-link>
-						<router-link :to="{name: 'registOrg'}"  target="_blank"  tag="a" class="register fr">单位注册</router-link>-->
           </el-form-item>
         </el-form>
       </div>
     </div>
-
-    <el-dialog title="忘记密码" :visible.sync="forgetPwd" :close-on-click-modal="false">
+    <el-link :underline="false" class="register" @click="regist">注册</el-link>
+    <!-- <el-dialog
+      title="忘记密码"
+      :visible.sync="forgetPwd"
+      :close-on-click-modal="false"
+    >
       <el-form :model="nopassword">
         <el-form-item label="手机号">
-          <el-input v-model="nopassword.userPhone" autocomplete="off"></el-input>
+          <el-input
+            v-model="nopassword.userPhone"
+            autocomplete="off"
+          ></el-input>
         </el-form-item>
         <el-form-item label="姓名">
           <el-input v-model="nopassword.userName" autocomplete="off"></el-input>
@@ -50,96 +66,105 @@
         <el-button @click="forgetPwd = false">取 消</el-button>
         <el-button type="primary" @click="reGetPwd()">确 定</el-button>
       </div>
-    </el-dialog>
-
+    </el-dialog> -->
   </div>
 </template>
 
 <script>
-import {
-  login,
-  imgCode
-} from '@/api/user.js'
-import user from '@/api/User/login.js'
-import {setToken, getToken, setSession} from '@/utils/auth'
-import imgCodeRole from '@/components/imgCodeRole/index.vue'
+import { login, imgCode } from "@/api/user.js";
+import user from "@/api/User/login.js";
+import { setToken, getToken, setSession } from "@/utils/auth";
+// import imgCodeRole from "@/components/imgCodeRole/index.vue";
 
 export default {
-  components: {imgCodeRole},
+  components: {},
   data() {
     return {
       loginForm: {
-        userName: '',
-        password: '',
-        verifyCode: '',
-        uuid: ''
+        userName: "",
+        password: "",
+        verifyCode: "",
+        uuid: "",
       },
-      imgCode: '',
+      imgCode: "",
       loading: false,
       loginCode: false,
       showMsg: false,
       forgetPwd: false,
       nopassword: {
-        userPhone: '',
-        userName: ''
-      }
-    }
+        userPhone: "",
+        userName: "",
       },
-  mounted() {
-    // window.loginIt = this.loginIt;
+    };
   },
+  mounted() {},
   methods: {
-    // loginIt(data) {
-    //   alert(data);
-    // },
     login(data) {
-      this.loading = true
-      this.loginForm.verifyCode = data.verifyCode
-      this.loginForm.uuid = data.uuid
-      this.$store.dispatch('user/login', this.loginForm).then((res) => {
+      this.loading = true;
+      this.loginForm.verifyCode = data.verifyCode;
+      this.loginForm.uuid = data.uuid;
+      this.$store
+        .dispatch("user/login", this.loginForm)
+        .then((res) => {
           // this.$store.dispatch('user/getInfo')
-        this.$router.push({path: '/home'})
-        this.loading = false
-      }).catch(() => {
-        this.loading = false
-        this.$refs.imgCodeRole.getCodeImage()
+          this.$router.push({ path: "/index" });
+          this.loading = false;
         })
+        .catch(() => {
+          this.loading = false;
+          // this.$refs.imgCodeRole.getCodeImage();
+        });
     },
     codeShow() {
-      if (this.loginForm.password == '' || this.loginForm.userName == '') {
-        this.loginCode = false
-        this.showMsg = true
+      if (this.loginForm.password == "" || this.loginForm.userName == "") {
+        this.loginCode = false;
+        this.showMsg = true;
         return;
       }
-      this.$refs.imgCodeRole.getCodeImage()
+      this.$refs.imgCodeRole.getCodeImage();
     },
     handleforgetPwd() {
-      this.forgetPwd = true
+      this.forgetPwd = true;
       this.nopassword = {
-        userPhone: '',
-        userName: ''
-      }
+        userPhone: "",
+        userName: "",
+      };
     },
     reGetPwd() {
-      if (this.nopassword.userPhone === '') {
-        this.$message({ showClose: true, type: 'error', message: '手机号不能为空' })
-        return
+      if (this.nopassword.userPhone === "") {
+        this.$message({
+          showClose: true,
+          type: "error",
+          message: "手机号不能为空",
+        });
+        return;
       }
-      if (this.nopassword.userName === '') {
-        this.$message({ showClose: true, type: 'error', message: '姓名不能为空' })
-        return
+      if (this.nopassword.userName === "") {
+        this.$message({
+          showClose: true,
+          type: "error",
+          message: "姓名不能为空",
+        });
+        return;
       }
       user.reGetPwd(this.nopassword).then((res) => {
         if (res.success) {
-          this.$message({ showClose: true, type: 'success', message: '新密码已发送至手机，请查看短信' })
-          this.forgetPwd = false
+          this.$message({
+            showClose: true,
+            type: "success",
+            message: "新密码已发送至手机，请查看短信",
+          });
+          this.forgetPwd = false;
         } else {
-          this.$message({ showClose: true, type: 'error', message: res.msg })
-        }
-      })
-    }
+          this.$message({ showClose: true, type: "error", message: res.msg });
         }
+      });
+    },
+    regist(){
+      this.$router.push('/reg')
     }
+  },
+};
 </script>
 
 <style lang="scss">
@@ -151,7 +176,11 @@ export default {
   background-image: url(../../assets/loginImg/bgImg.png);
   background-position: center;
   overflow: hidden;
-
+  .register{
+    position: absolute;
+    left: 1300px;
+    top:370px;
+  }
   .logoTitle {
     margin: 30px;
 
@@ -176,7 +205,7 @@ export default {
   .main {
     width: 30%;
     /*height: 640px;*/
-    background: #FFFFFF;
+    background: #ffffff;
     box-shadow: 0px 13px 12px 0px rgba(0, 0, 0, 0.15);
     opacity: 0.9;
     border-radius: 20px;
@@ -249,7 +278,7 @@ export default {
   }
 
   .text-danger {
-    color: #F56C6C;
+    color: #f56c6c;
   }
 
   .login-btn {
@@ -275,7 +304,7 @@ export default {
   }
 
   .el-loading-mask {
-    background-color: rgba(255, 255, 255, .6);
+    background-color: rgba(255, 255, 255, 0.6);
   }
 }
 </style>

demo-web-ui/src/views/menuManage/menuManage.vue

@@ -2,36 +2,6 @@
   <el-tabs v-model="activeName" class="my-tabs" type="card" @tab-click="handleClick">
     <el-tab-pane label="菜单列表" name="roleList">
       <div class="content">
-        <!--<div class="tab-header">-->
-         <!-- <el-form :inline="true" :model="form" class="demo-form-inline">
-            <el-row :gutter="20">
-              <el-col :span="18">
-                <el-form-item label="菜单名称">
-                  <el-input v-model="page.params.name" placeholder="菜单名称" clearable/>
-                </el-form-item>
-                <el-form-item label="资源名称">
-                  &lt;!&ndash;<el-select v-model="page.sourceSid" @change="$forceUpdate()" :disabled="isadd">
-                    <el-option
-                      v-for="(item, i) in sourceNameData"
-                      :key="i"
-                      :label="item.sourceName"
-                      :value="item.sid">
-                    </el-option>
-                  </el-select>&ndash;&gt;
-                  <el-input v-model="page.params.sourceName" placeholder="资源名称" clearable/>
-                </el-form-item>
-                <el-button type="primary" @click="getPageList">查询</el-button>
-              </el-col>-->
-             <!-- <el-col :span="6">
-                <el-form-item style="float: right;">
-                  <el-button type="primary" @click="getSorting">保存排序</el-button>
-                </el-form-item>
-              </el-col>-->
-            <!--</el-row>
-          </el-form>-->
-       <!-- </div>-->
-
-        <!-- table -->
         <div class="table-describe clearfix">
           <h4 style="color:#000;">菜单列表</h4>
         </div>
@@ -46,14 +16,10 @@
           <el-table-column prop="name" label="菜单名称" width="220"/>
           <el-table-column label="操作" width="260" align="center">
             <template slot-scope="scope">
-              <el-button type="primary" size="mini" @click="add(scope.row)">
-                添加子菜单
-              </el-button>
-              <el-button v-if="scope.row.isSource == '0'" type="primary" size="mini" @click="editRow(scope.row)">
+              <el-button  type="primary" size="mini" @click="editRow(scope.row)">
                 修改
               </el-button>
               <el-button
-                v-if="scope.row.isSource == '0'"
                 type="danger"
                 size="mini"
                 @click.native.prevent="deleteRow(scope.row)"
@@ -62,12 +28,6 @@
               </el-button>
             </template>
           </el-table-column>
-          <!--<el-table-column prop="sourceName" label="资源名称" align="center"></el-table-column>-->
-         <!-- <el-table-column prop="sortNo" sortable label="排序" align="center" width="100">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.sortNo" size="mini"/>
-            </template>
-          </el-table-column>-->
           <el-table-column prop="pageUrl" label="链接地址" align="center"/>
           <el-table-column prop="isEnable" label="可见性" align="center">
             <template slot-scope="scope">
@@ -83,29 +43,8 @@
           </el-table-column>
         </el-table>
       </div>
-      <!-- <pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" @pagination="pagination"/> -->
-      <!-- 编辑功能信息 -->
       <el-dialog :title="dialogTitle + '功能信息'" :visible.sync="editDialog" width="40%">
         <table class="e-table" cellspacing="0">
-          <tr>
-            <td>上级菜单</td>
-            <td>
-              <el-input v-model="form.pname" :disabled="true" style="width:300px"/>
-            </td>
-          </tr>
-          <tr>
-            <td>资源名称</td>
-            <td>
-              <el-select v-model="form.sourceSid" :disabled="isadd" @change="$forceUpdate()">
-                <el-option
-                  v-for="(item, i) in sourceNameData"
-                  :key="i"
-                  :label="item.sourceName"
-                  :value="item.sid"
-                />
-              </el-select>
-            </td>
-          </tr>
           <tr>
             <td>菜单名称</td>
             <td>
@@ -169,25 +108,6 @@
       <!-- 添加 -->
       <!--<el-dialog :title="dialogTitle + '菜单管理'" :visible.sync="editDialog" width="40%">-->
       <table class="e-table" cellspacing="0">
-        <tr>
-          <td>上级菜单</td>
-          <td>
-            <el-input v-model="form.pname" :disabled="true" style="width:300px"/>
-          </td>
-        </tr>
-        <tr>
-          <td>资源名称</td>
-          <td>
-            <el-select v-model="form.sourceSid" :disabled="isadd" @change="$forceUpdate()" style="width:300px">
-              <el-option
-                v-for="(item, i) in sourceNameData"
-                :key="i"
-                :label="item.sourceName"
-                :value="item.sid"
-              />
-            </el-select>
-          </td>
-        </tr>
         <tr>
           <td>菜单名称</td>
           <td>

demo-web-ui/src/views/userManage/userManage.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-tabs class="my-tabs" v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane label="用户列表" name="roleList">
+      <el-tab-pane label="学生信息" name="roleList">
         <user-manage-list :dataObj='dataObj' @status='isShow' @item='listObj'></user-manage-list>
       </el-tab-pane>
      <!-- <el-tab-pane label="新增用户" name="addrole">

demo-web-ui/src/views/workflow/form/form.vue

@@ -1,331 +1,281 @@
 <template>
-  <div class="app-container">
-    <!--Start 列表页面-->
-    <div v-show=" viewState == 1 ">
-      <el-menu :default-active="activeIndex" style="" class="el-menu-demo" mode="horizontal">
-        <el-menu-item
-          index="1"
-          style="margin-left: 0;text-align: center; background-color: #028ac8!important;color: #fff;">
-          流程定义
-        </el-menu-item>
-        <div class="new_" @click="handleAdd">新增</div>
-        <div class="new_out" @click="handleExport"></div>
-      </el-menu>
-
+  <el-tabs class="my-tabs" v-model="activeName" type="card" @tab-click="handleClick">
+    <el-tab-pane label="教师信息" name="roleList">
       <div class="container">
-        <div class="tab-header">
-          <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="表单名称" prop="formName">
-              <el-input
-                v-model="queryParams.formName"
-                placeholder="请输入表单名称"
-                clearable
-                size="small"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-      <!--      <el-row :gutter="10" class="mb8">-->
-      <!--        <el-col :span="1.5">-->
-      <!--          <el-button-->
-      <!--            type="primary"-->
-      <!--            plain-->
-      <!--            icon="el-icon-plus"-->
-      <!--            size="mini"-->
-      <!--            @click="handleAdd"-->
-      <!--          >新增-->
-      <!--          </el-button>-->
-      <!--        </el-col>-->
-      <!--        <el-col :span="1.5">-->
-      <!--          <el-button-->
-      <!--            type="success"-->
-      <!--            plain-->
-      <!--            icon="el-icon-edit"-->
-      <!--            size="mini"-->
-      <!--            :disabled="single"-->
-      <!--            @click="handleUpdate"-->
-      <!--          >修改-->
-      <!--          </el-button>-->
-      <!--        </el-col>-->
-      <!--        <el-col :span="1.5">-->
-      <!--          <el-button-->
-      <!--            type="danger"-->
-      <!--            plain-->
-      <!--            icon="el-icon-delete"-->
-      <!--            size="mini"-->
-      <!--            :disabled="multiple"-->
-      <!--            @click="handleDelete"-->
-      <!--          >删除-->
-      <!--          </el-button>-->
-      <!--        </el-col>-->
-      <!--        <el-col :span="1.5">-->
-      <!--          <el-button-->
-      <!--            type="warning"-->
-      <!--            plain-->
-      <!--            icon="el-icon-download"-->
-      <!--            size="mini"-->
-      <!--            @click="handleExport"-->
-      <!--          >导出-->
-      <!--          </el-button>-->
-<!--      &lt;!&ndash;        </el-col>&ndash;&gt;</el-row>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-
-
-      <el-table v-loading="loading" :data="formList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center"/>
-        <el-table-column label="表单主键" align="center" prop="formId"/>
-        <el-table-column label="表单名称" align="center" prop="formName"/>
-        <el-table-column label="备注" align="center" prop="remark"/>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table :data="tableData" border style="width: 100%;">
+          <el-table-column label="序号" width="70px" type="index" align="center">
+          </el-table-column>
+          <el-table-column label="操作" width="150px" align="center">
             <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-view"
-              @click="handleDetail(scope.row)"
-            >详情
+              <el-button type="primary" size="mini" @click="editRow(scope.row)">
+                修改
               </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-            >修改
-            </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-            >删除
+              <el-button type="danger" size="mini" @click.native.prevent="deleteRow(scope.row)">
+                删除
               </el-button>
             </template>
           </el-table-column>
+          <el-table-column prop="name" label="教师姓名" width="100px" align="center">
+          </el-table-column>
+          <el-table-column prop="infoId" label="教师工号" align="center" width="150px">
+          </el-table-column>
+          <el-table-column prop="sex" label="性别" align="center" width="70px">
+          </el-table-column>
+          <el-table-column prop="calss" label="所属班级" align="center" width="100px">
+          </el-table-column>
+          <el-table-column prop="department" label="系别" align="center" width="100px">
+          </el-table-column>
+          <el-table-column prop="speciality" label="专业" align="center" width="150px">
+          </el-table-column>
+          <el-table-column prop="studyYear" label="入职年份" align="center" width="150px">
+          </el-table-column>
+          <el-table-column prop="remarks" label="成绩录入" align="center">
+          </el-table-column>
         </el-table>
 
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
+        <pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" @pagination="pagination"/>
+        <!-- 编辑角色信息 -->
+        <el-dialog :title="dialogTitle + '教师信息'" :visible.sync="editDialog" width="40%">
+          <table class="e-table" cellspacing="0">
+            <tr>
+          <td>教师姓名</td>
+          <td>
+            <el-input v-model="form.name" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>教师工号</td>
+          <td>
+            <el-input v-model="form.infoId" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>性别</td>
+          <td>
+            <el-input v-model="form.sex" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>所属班级</td>
+          <td>
+            <el-input v-model="form.calss" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>系别</td>
+          <td>
+            <el-input v-model="form.department" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>专业</td>
+          <td>
+            <el-input v-model="form.speciality" style="width:300px"></el-input>
+          </td>
+        </tr>
 
-      <!-- 添加或修改流程表单对话框 -->
-      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-form-item label="表单名称" prop="formName">
-            <el-input v-model="form.formName" placeholder="请输入表单名称"/>
-          </el-form-item>
-          <el-form-item label="表单内容">
-            <editor v-model="form.formContent" :min-height="192"/>
-          </el-form-item>
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" placeholder="请输入备注"/>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </el-dialog>
-
-      <!--表单配置详情-->
-      <el-dialog :title="formTitle" :visible.sync="formConfOpen" width="60%" append-to-body>
-        <div class="test-form">
-          <parser :key="new Date().getTime()" :form-conf="formConf"/>
+        <tr>
+          <td>入职年份</td>
+          <td>
+            <el-input v-model="form.studyYear" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>资源描述</td>
+          <td>
+            <el-input type="textarea" v-model="form.remarks"></el-input>
+          </td>
+        </tr>
+          </table>
+          <div style="margin-top: 20px; text-align: center;">
+            <el-button type="primary" @click="save()">保存</el-button>
+            <!--<el-button @click="editDialog = false">关闭</el-button>-->
           </div>
         </el-dialog>
       </div>
+    </el-tab-pane>
+    <el-tab-pane label="新增教师" name="addrole">
+      <table class="e-table" cellspacing="0">
+        <tr>
+          <td>教师姓名</td>
+          <td>
+            <el-input v-model="form.name" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>教师工号</td>
+          <td>
+            <el-input v-model="form.infoId" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>性别</td>
+          <td>
+            <el-input v-model="form.sex" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>所属班级</td>
+          <td>
+            <el-input v-model="form.calss" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>系别</td>
+          <td>
+            <el-input v-model="form.department" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>专业</td>
+          <td>
+            <el-input v-model="form.speciality" style="width:300px"></el-input>
+          </td>
+        </tr>
 
-    <!--Start 新增页面-->
-    <form-add v-show=" viewState == 2"></form-add>
+        <tr>
+          <td>入职年份</td>
+          <td>
+            <el-input v-model="form.studyYear" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>资源描述</td>
+          <td>
+            <el-input type="textarea" v-model="form.remarks"></el-input>
+          </td>
+        </tr>
+      </table>
+      <div style="margin-top: 20px; text-align: center;">
+        <el-button type="primary" @click="save()">保存</el-button>
+        <!--<el-button @click="editDialog = false">关闭</el-button>-->
       </div>
+      <!--</el-dialog>-->
+      <!--</div>-->
+    </el-tab-pane>
+  </el-tabs>
 </template>
 
 <script>
-  import {listForm, getForm, delForm, addForm, updateForm, exportForm} from "@/api/workflow/form";
-  // import Editor from '@/components/Editor';
-  // import Parser from '@/components/parser/Parser'
-  import formAdd from "./formAdd";
+  import {
+    pageList,
+    saveSourcesInfo,
+    putSourcesInfo,
+    delSources,
+  } from '@/api/system/sources/index.js'
 
   export default {
-    name: "form",
-    components: {
-      Editor,
-      // Parser,
-      formAdd
-    },
     data() {
       return {
-        activeIndex: '1',
-        viewState: 1,
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 流程表单表格数据
-        formList: [],
-        // 弹出层标题
-        title: "",
-        formConf: {}, // 默认表单数据
-        formConfOpen: false,
-        formTitle: "",
-        // 是否显示弹出层
-        open: false,
-        // 查询参数
-        queryParams: {
-          size: 10, // 每页的数据条数
+        activeName: 'roleList',
+        dialogTitle: '',
+        editDialog: false,
+        form: {},
+        type:'js',
+        formBackup: Object.assign({}, this.form),
+        page: {
           total: 0, // 默认数据总数
           current: 1, // 默认开始页面
+          size: 10, // 每页的数据条数
           params: {
-            formName: null,
-            formContent: null,
-          }
-        },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {}
-      };
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 查询流程表单列表 */
-      getList() {
-        this.loading = true;
-        listForm(this.queryParams).then(response => {
-          this.formList = response.data.records;
-          this.total = response.data.total;
-          this.loading = false;
-        });
+            psid: '',
+            sourceId: '',
+            sourceName: ''
           },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
         },
-      // 表单重置
-      reset() {
-        this.form = {
-          formId: null,
-          formName: null,
-          formContent: null,
-          createTime: null,
-          updateTime: null,
-          createBy: null,
-          updateBy: null,
-          remark: null
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
+        tableData: [],
+        zylb: [],
+        sourceList: []
+      }
     },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
+    mounted() {
+      this.getPageList(this.page)
     },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.formId)
-        this.single = selection.length !== 1
-        this.multiple = !selection.length
+    methods: {
+      pagination(val) { // 分页
+        this.page.current = val.pageNum
+        this.page.size = val.pageSize
+        this.getPageList(this.page)
       },
-      /** 表单配置信息 */
-      handleDetail(row) {
-        this.formConfOpen = true;
-        this.formTitle = "流程表单配置详细";
-        this.formConf = JSON.parse(row.formContent)
+      resetSearch() { // 重置
+        this.page = {
+          total: 0, // 默认数据总数
+          current: 1, // 默认开始页面
+          size: 10, // 每页的数据条数
+          params: {
+            name:'',
+            psid: '',
+            sourceId: '',
+            sourceName: ''
           },
-      /** 新增按钮操作 */
-      handleAdd() {
-        // this.reset();
-        // this.open = true;
-        // this.title = "添加流程表单";
-        this.$router.push({path: '/tool/build/index', query: {formId: null}})
+        }
+        this.getPageList()
       },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        // this.reset();
-        // const formId = row.formId || this.ids
-        // getForm(formId).then(response => {
-        //   this.form = response.data;
-        //   this.open = true;
-        //   this.title = "修改流程表单";
-        // });
-        this.$router.push({path: '/tool/build/index', query: {formId: row.formId}})
+      getPageList() { // 获取列表
+        pageList(this.type).then((res) => {
+          this.tableData = res.data
+          this.page.total = res.data.total
+        })
       },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.formId != null) {
-              updateForm(this.form).then(response => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
+      handleClick(tab, event) {
+        if (tab.name == 'addrole') {
+          this.dialogTitle = '新增'
+          this.roleForm = Object.assign({}, this.formBackup)
         } else {
-              addForm(this.form).then(response => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
+          this.getPageList()
         }
+      },
+      save() {
+        if (this.form.sid) {
+          putSourcesInfo(this.form).then(res => {
+            this.editDialog = false
+            this.getPageList(this.page)
+            this.$message({
+              message: res.msg,
+              type: 'success'
+            })
+          })
+        } else {
+          saveSourcesInfo(this.form).then(res => {
+            this.getPageList()
+            this.activeName = "roleList"
+            this.$message({
+              message: res.msg,
+              type: 'success'
+            })
+          })
         }
-        });
+        this.reset()
+      },
+      reset() {
+        this.form = {}
       },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const formIds = row.formId || this.ids;
-        this.$confirm('是否确认删除流程表单编号为"' + formIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function () {
-          return delForm(formIds);
+      editRow(row) {
+        this.dialogTitle = '编辑'
+        this.editDialog = true
+        this.form = Object.assign({}, row)
+      },
+      deleteRow(row) {
+        this.$confirm('确定要删除该资源吗, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
+          delSources({sid: row.sid}).then(res => {
+            this.getPageList()
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
           })
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有流程表单数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function () {
-          return exportForm(queryParams);
-        }).then(response => {
-          this.download(response.msg);
         })
       }
-    }
+    },
   }
 </script>
 
-<style scoped>
-
+<style scoped="scoped" lang="scss">
+  .my-tabs {
+    margin-top: 10px;
+  }
 </style>

demo-web-ui/src/views/workflow/userManage/userManage.vue

@@ -0,0 +1,65 @@
+<template>
+  <div>
+    <el-tabs class="my-tabs" v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tab-pane label="用户列表" name="roleList">
+        <user-manage-list :dataObj='dataObj' @status='isShow' @item='listObj'></user-manage-list>
+      </el-tab-pane>
+     <!-- <el-tab-pane label="新增用户" name="addrole">
+        <user-manage-add @status='isShow' :dataObj='childObj'></user-manage-add>
+      </el-tab-pane>-->
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+  import userManageList from './userManageList.vue'
+  import userManageAdd from './userManageAdd.vue'
+
+  export default {
+    components: {
+      userManageList: userManageList,
+      userManageAdd: userManageAdd,
+    },
+    data() {
+      return {
+        activeName: 'roleList',
+        editDialog: false,
+        dataObj: {
+          isShow: ''
+        },
+        childObj: {}
+      };
+    },
+    mounted() {
+
+    },
+    methods: {
+      handleClick(tab, event) {
+        if (tab.name == 'addrole') {
+          this.dialogTitle = '新增'
+//        this.roleForm = Object.assign({}, this.formBackup)
+        } else {
+//					this.getroleOrgList()
+        }
+      },
+      isShow(val) {
+        if (!val) {
+          this.activeName = 'roleList'
+          this.dataObj.isShow = false
+          this.dataObj.isShow = true
+        } else {
+          this.activeName = 'addrole'
+        }
+      },
+      listObj(val) {
+        this.childObj = val
+      }
+    }
+  };
+</script>
+
+<style scoped="scoped">
+  .my-tabs {
+    margin-top: 10px;
+  }
+</style>

demo-web-ui/src/views/workflow/userManage/userManageAdd.vue

@@ -0,0 +1,267 @@
+<template>
+  <div>
+    <el-card class="box-card">
+      <table class="e-table" cellspacing="0">
+        <tr>
+          <td>姓名</td>
+          <td>
+            <el-input v-model="form.name" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>用户类型</td>
+          <td>
+            <el-select v-model="form.userType" @change="$forceUpdate()" style="width:300px">
+              <el-option
+                v-for="(item, i) in userTypeData"
+                :key="i"
+                :label="item.name"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </td>
+        </tr>
+        <tr>
+          <td>部门</td>
+          <td>
+            <el-select v-model="form.deptSid" placeholder="请选择" style="width:300px">
+              <el-option hidden :key="form.deptSid" :label="orgName" :value="form.deptSid"></el-option>
+              <el-tree :data="treedata" ref="Tree" show-checkbox accordion node-key="sid"
+                       :default-checked-keys="checkedId"
+                       :default-expand-all='true' :check-strictly='true' :props="defaultProps"
+                       @check-change="checkchange"
+              >
+              </el-tree>
+            </el-select>
+            <!--<el-select v-model="form.deptSid" @change="$forceUpdate()">
+                <el-option
+                  v-for="(item, i) in treedata"
+                  :key="i"
+                  :label="item.name"
+                  :value="item.sid">
+                </el-option>
+             </el-select>-->
+          </td>
+        </tr>
+        <tr>
+          <td>岗位</td>
+          <td>
+            <el-select v-model="form.postSid" @change="$forceUpdate()" style="width:300px">
+              <el-option
+                v-for="(item, i) in postSidData"
+                :key="i"
+                :label="item.name"
+                :value="item.sid">
+              </el-option>
+            </el-select>
+            <!--<el-input v-model="form.postSid"></el-input>-->
+          </td>
+        </tr>
+        <tr>
+          <td>手机号码</td>
+          <td>
+            <el-input v-model="form.mobile" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>手机验证码</td>
+          <td>
+            <el-input v-model="form.verificationCode" placeholder="请输入验证码" style="width:300px">
+              <el-button v-show="showCode" slot="append" @click.native="getIdentifying">获取验证码</el-button>
+              <el-button v-show="!showCode" slot="append">{{phoneCodeCount}} s</el-button>
+            </el-input>
+            <!--<el-input v-model="form.verificationCode"></el-input>-->
+          </td>
+        </tr>
+      </table>
+      <div style="margin-top: 20px; text-align: center;">
+        <el-button type="primary" @click="save()">保 存</el-button>
+        <!--<el-button type="warning" @click="cancel()">取 消</el-button>-->
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+  import {userAdd, userUpdata, userSingle, orgList, postList, getCode} from '@/api/system/userManage/index.js'
+
+  export default {
+    data() {
+      return {
+        form: {
+          sid: '',
+          name: '',
+          userType: '',
+          deptSid: '',
+          postSid: '',
+          mobile: '',
+          verificationCode: ''
+        },
+        form1: {
+          sid: '',
+        },
+        userTypeData: [{
+          value: '1',
+          name: '员工'
+        }, {
+          value: '2',
+          name: '客户'
+        }, {
+          value: '3',
+          name: '供应商'
+        }],
+        treedata: [],
+        checkedId: [],
+        orgName: '',
+        defaultProps: {
+          children: 'children',
+          label: 'name'
+        },
+        postSidData: [],
+        showCode: true,
+        phoneCodeCount: '',
+        timer: null,
+      };
+    },
+    props: ['dataObj'],
+    watch: {
+      dataObj: {
+        handler(val) {
+          this.form1.sid = val.sid
+          this.getUserSingle()
+          this.getOrgList()
+        },
+        deep: true,
+      },
+    },
+    mounted() {
+      this.getOrgList()
+    },
+    methods: {
+      getUserSingle() {
+        userSingle(this.form1).then(res => {
+          if (res.code == '200') {
+            this.form.sid = res.data.sid
+            this.form.name = res.data.name
+            this.form.userType = res.data.userType
+            this.form.deptSid = res.data.deptSid
+            this.orgName = res.data.departmentName
+            this.form.postSid = res.data.postSid
+            this.form.mobile = res.data.mobile
+          }
+        })
+      },
+      // 获取部门树形
+      getOrgList(row) {
+//      this.roleDialog = true
+        this.checkedId = []
+        this.Thisrow = row
+        this.loading = true
+        let params = {}
+        orgList(params).then(res => {
+          this.treedata = res.data
+        })
+
+      },
+      checkchange(data, checked, indeterminate) {
+        if (checked) {
+
+          this.form.deptSid = data.sid
+          this.orgName = data.name
+          let arr = []
+          arr = [data.sid];
+          this.$refs.Tree.setCheckedKeys(arr);
+          this.form.postSid = ''
+          this.getPost(data.sid)
+          return;
+        }
+      },
+      getPost(orgSid) {
+        let params = {
+          sid: orgSid
+        }
+        postList(params).then(res => {
+          this.postSidData = res.data
+        })
+      },
+      save() {
+        if (this.form.sid) {
+          userUpdata(this.form).then(res => {
+            if (res.code == '200') {
+              this.$message({
+                message: res.msg,
+                type: 'success'
+              })
+              this.$emit('status', false)
+            }
+          })
+        } else {
+          let orgSid = this.$refs.Tree.getCheckedKeys()
+          this.form.deptSid = orgSid.toString()
+          userAdd(this.form).then(res => {
+            if (res.code == '200') {
+              this.$message({
+                message: res.msg,
+                type: 'success'
+              })
+              this.$emit('status', false)
+            }
+          })
+          let arr = []
+          this.$refs.Tree.setCheckedKeys(arr);
+        }
+        this.reset()
+      },
+      reset() {
+        this.form = {
+          sid: '',
+          name: '',
+          userType: '',
+          deptSid: '',
+          postSid: '',
+          mobile: '',
+          verificationCode: ''
+        }
+      },
+      //获取验证码
+      getIdentifying() {
+        if (this.form.mobile == "") {
+          this.$alert('请填写手机号码', '', {
+            confirmButtonText: '确定'
+          })
+          return;
+        }
+        //验证码倒计时
+        const TIME_COUNT = 60;
+        if (!this.timer) {
+          this.phoneCodeCount = TIME_COUNT;
+          this.showCode = false;
+          this.timer = setInterval(() => {
+            if (this.phoneCodeCount > 0 && this.phoneCodeCount <= TIME_COUNT) {
+              this.phoneCodeCount--;
+            } else {
+              this.showCode = true;
+              clearInterval(this.timer);
+              this.timer = null;
+            }
+          }, 1000)
+        }
+
+        let obj = {
+          phone: this.form.mobile,
+        }
+        getCode(obj).then(res => {
+          if (res.code == '200') {
+            this.orginTranceNo = res.data.tranceNo;
+          }
+        })
+      },
+      cancel() {
+        this.$emit('status', false)
+      }
+    }
+  }
+</script>
+
+<style>
+</style>

demo-web-ui/src/views/workflow/userManage/userManageList.vue

@@ -0,0 +1,483 @@
+<template>
+  <div>
+    <div class="tab-header">
+      <el-form ref="form" :inline="true" :model="search" label-width="80px">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="用户名">
+              <el-input v-model="search.userName" clearable></el-input>
+            </el-form-item>
+            <el-form-item label="姓名">
+              <el-input v-model="search.name" clearable></el-input>
+            </el-form-item>
+            <el-form-item label="角色">
+              <el-select v-model="search.roleSid" filterable clearable placeholder="请选择">
+                <el-option v-for="item in roleListAll" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="部门">
+              <el-input v-model="search.orgName" clearable></el-input>
+<!--              <el-select v-model="search.roleSid" clearable placeholder="请选择">-->
+<!--                <el-option v-for="(item,i) in roleListAll" :key="i" :label="item.name" :value="item.sid"></el-option>-->
+<!--              </el-select>-->
+            </el-form-item>
+            <el-button @click="getOrgUserList(1)">查询</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- table -->
+    <el-table :data="userTable" border style="width: 100%;">
+      <el-table-column label="序号" width="50px" type="index" align="center">
+      </el-table-column>
+      <el-table-column label="操作" width="300px" align="center">
+        <template slot-scope="scope">
+          <el-button @click="setRole(scope.row)" type="primary" size="mini">
+            设置角色
+          </el-button>
+          <el-button @click="initPwd(scope.row)" type="danger" size="mini">
+            初始化密码
+          </el-button>
+          <!-- <el-button @click="del(scope.row)" type="danger" size="mini">
+             删除
+           </el-button>-->
+        </template>
+      </el-table-column>
+      <el-table-column prop="userName" label="用户名" align="center">
+        <template slot-scope="scope">
+          <!-- <span class="tablerow-click" @click="userinfoChange(scope.row)">-->{{ scope.row.userName }}<!--</span>-->
+        </template>
+      </el-table-column>
+      <el-table-column prop="userType" label="用户类型" align="center"></el-table-column>
+      <el-table-column prop="name" label="姓名" width="120px" align="center"></el-table-column>
+      <el-table-column prop="departmentName" label="部门" align="center"></el-table-column>
+      <el-table-column prop="postName" label="岗位" align="center"></el-table-column>
+      <el-table-column prop="isEnable" label="是否可用" align="center">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.isEnable"
+            active-value='1'
+            inactive-value='0'
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            @change="enabledChange($event,scope.row)">
+          </el-switch>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" @pagination="pagination"/>
+    <!-- 角色设置 -->
+    <el-dialog title="设置角色" :visible.sync="roleDialog" width="30%">
+      <el-form :model="roleForm" :rules="rules" ref="roleForm">
+        <el-form-item label="角色名称" :label-width="formLabelWidth" prop="roleSid">
+          <el-select v-model="roleForm.roleSid" placeholder="请选择" filterable multiple>
+            <el-option v-for="(item,i) in roleList" :key="i" :label="item.name" :value="item.sid"></el-option>
+          </el-select>
+          <!--<el-button type="primary" size='mini' @click="toNav('RoleAdminister')" style="margin-left: 10px;" circle icon="el-icon-plus"></el-button>-->
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="saveRole('roleForm')">保 存</el-button>
+        <el-button @click="roleDialog = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+    <!-- 部门设置 -->
+    <el-dialog title="部门设置" :visible.sync="bm_Dialog" width="30%">
+      <el-form :model="bm_Form" :rules="rules" ref="bm_Form">
+        <el-form-item label="部门名称" :label-width="formLabelWidth" prop="departmentSid">
+          <!-- <el-select v-model="bm_Form.departmentSid" placeholder="请选择">
+             <el-option v-for="item in bm_List"
+               :key="item.departmentSid"
+               :label="item.departmentName"
+               :value="item.departmentSid"
+             ></el-option>
+           </el-select> -->
+          <el-cascader
+            v-model="bm_Form.departmentSid"
+            :options="treedata"
+            :props="props"></el-cascader>
+          <el-button type="primary" size='mini' @click="toNav('deptManage')" style="margin-left: 10px;" circle
+                     icon="el-icon-plus"></el-button>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="saveOrg('bm_Form')">保 存</el-button>
+        <el-button @click="bm_Dialog = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+    <!-- 编辑信息 -->
+    <el-dialog title="编辑用户信息" :visible.sync="editDialog" width="40%">
+      <table class="e-table" cellspacing="0">
+        <tr>
+          <td>姓名</td>
+          <td>
+            <el-input v-model="form.name" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>用户类型</td>
+          <td>
+            <el-select v-model="form.userTypeKey" @change="$forceUpdate()" style="width:300px">
+              <el-option v-for="(item, i) in userTypeData" :key="i" :label="item.name" :value="item.value">
+              </el-option>
+            </el-select>
+          </td>
+        </tr>
+        <tr>
+          <td>部门</td>
+          <td>
+            <el-select v-model="form.deptSid" placeholder="请选择" @change="$forceUpdate()" style="width:300px">
+              <el-option hidden :key="form.deptSid" :label="orgName" :value="form.deptSid"></el-option>
+              <el-tree :data="treedata" ref="Tree" show-checkbox accordion node-key="sid" :default-checked-keys="checkedId" :default-expand-all='true' :check-strictly='true' :props="defaultProps" @check-change="checkchange">
+              </el-tree>
+            </el-select>
+          </td>
+        </tr>
+        <tr>
+          <td>岗位</td>
+          <td>
+            <el-select v-model="form.postSid" @change="$forceUpdate()" style="width:300px">
+              <el-option v-for="(item, i) in postSidData" :key="i" :label="item.name" :value="item.sid"></el-option>
+            </el-select>
+            <!--<el-input v-model="form.postSid"></el-input>-->
+          </td>
+        </tr>
+        <tr>
+          <td>手机号码</td>
+          <td>
+            <el-input v-model="form.userName" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>手机验证码</td>
+          <td>
+            <el-input v-model="form.verificationCode" placeholder="请输入验证码" style="width:300px">
+              <el-button v-show="showCode" slot="append" @click.native="getIdentifying">获取验证码</el-button>
+              <el-button v-show="!showCode" slot="append">{{ phoneCodeCount }} s</el-button>
+            </el-input>
+          </td>
+        </tr>
+      </table>
+      <div style="margin-top: 20px; text-align: center;">
+        <el-button type="primary" @click="save()">保 存</el-button>
+        <el-button @click="editDialog = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  userList,
+  delUser,
+  initPwd,
+  setRole,
+  orgList,
+  postList,
+  saveOrgRole,
+  roleList,
+  setRoleEnable,
+  userUpdata
+} from '@/api/system/userManage/index.js'
+
+export default {
+  data() {
+    return {
+      editDialog: false,
+      form: {},
+      userTypeData: [{
+        value: '1',
+        name: '员工'
+      }, {
+        value: '2',
+        name: '客户'
+      }, {
+        value: '3',
+        name: '供应商'
+      }],
+      checkedId: [],
+      orgName: '',
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      showCode: true,
+      postSidData: [],
+      phoneCodeCount: '',
+      timer: null,
+      roleListAll: [],
+      search: {
+        name: '',
+        userName: '',
+        roleSid: ''
+      },
+      props: {
+        value: 'sid',
+        label: 'name',
+        children: 'orgDepartmentVoList'
+      },
+      treedata: null,
+      page: {
+        total: 0, // 默认数据总数
+        current: 1, // 默认开始页面
+        size: 10 // 每页的数据条数
+      },
+      userTable: [],
+      clientTable: [],
+      // 设置角色
+      formLabelWidth: '100',
+      roleDialog: false,
+      roleList: [],
+      roleForm: {
+        roleSid: '',
+        userSid: ''
+      },
+      // 部门
+      bm_Dialog: false,
+      postSid: '',
+      bm_Form: { departmentSid: '' },
+      bm_List: [],
+      rules: {
+        roleSid: [{ required: true, message: '请选择角色名称', trigger: 'blur' }],
+        departmentSid: [{ required: true, message: '请选择部门名称', trigger: 'blur' }]
+      }
+    }
+  },
+  props: ['dataObj'],
+  watch: {
+    dataObj: {
+      handler(val) {
+        this.getOrgUserList()
+      },
+      deep: true
+    }
+  },
+  mounted() {
+    this.getOrgUserList()
+    this.getRoleList()
+    this.getOrgTree()
+    this.getOrgList()
+  },
+  methods: {
+    // 列表 + 初始化
+    getOrgUserList(flag) {
+      if (flag === '1') {
+        this.page.current = 1
+      }
+      let params = this.page
+      params.params = this.search
+      userList(params).then(res => {
+        this.page.total = res.data.total
+        this.userTable = res.data.records
+      })
+    },
+    getRoleList() {
+      var param = {}
+      roleList(param).then(res => {
+        if (res.code === '200') {
+          this.roleListAll = res.data
+        }
+      })
+    },
+    // 分页
+    pagination(val) {
+      this.page.current = val.pageNum
+      this.page.size = val.pageSize
+      this.getOrgUserList()
+    },
+    getOrgTree() { // 获取部门树形列表
+      function treeArr(data) {
+        if (data.length > 0) {
+          for (var i = 0; i < data.length; i++) {
+            if (data[i].orgDepartmentVoList.length > 0) {
+              treeArr(data[i].orgDepartmentVoList)
+            } else {
+              delete data[i].orgDepartmentVoList
+            }
+          }
+        }
+      }
+     // getOrgTree({organizationSid: this.$store.getters.userInfo.orgSid}).then(res => {
+     //   let tree = res.data[0].orgDepartmentVoList
+     //   treeArr(tree)
+     //   this.treedata = tree
+     // })
+    },
+    // 设置角色   设置 用户ID
+    setRole(row) {
+      this.roleForm.roleSid = []
+      this.roleDialog = true
+      this.roleForm.sid = row.sid
+      this.roleForm.userSid = row.sid
+      setRole(this.roleForm).then(res => {
+        this.roleList = res.data
+        for (let i = 0; i < res.data.length; i++) {
+          if (res.data[i].checked === '0') {
+            this.roleForm.roleSid.push(res.data[i].sid)
+          }
+        }
+     	// this.roleForm.roleSid = res.data.filter(item=> item.checked =='0')
+      })
+    },
+    // 设置角色  提交
+    saveRole(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.roleForm.roleSid = this.roleForm.roleSid.toString()
+          saveOrgRole(this.roleForm).then(res => {
+            if (res.code === '200') {
+              this.roleDialog = false
+              this.getOrgUserList()
+              this.$message({
+                message: res.msg,
+                type: 'success'
+              })
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    // 设置部门  提交
+    saveOrg(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          let params = { // 请求的参数
+            departmentSid: this.bm_Form.departmentSid[this.bm_Form.departmentSid.length - 1],
+            staffSid: this.bm_Form.staffSid
+          }
+          saveDepartment(params).then(res => {
+            if (res.code === '200') {
+              this.getOrgUserList()
+              this.bm_Dialog = false
+              this.$message({
+                message: res.msg,
+                type: 'success'
+              })
+            }
+          })
+        } else {
+          return false
+        }
+      });
+    },
+    // 设置部门  提交
+    save(formName) {
+      this.form.userType = this.form.userTypeKey;
+      userUpdata(this.form).then(res => {
+        if (res.code === '200') {
+          this.getOrgUserList()
+          this.bm_Dialog = false
+          this.$message({
+            message: res.msg,
+            type: 'success'
+          })
+          this.editDialog = false
+        }
+        this.reset()
+      })
+    },
+    initPwd(row) {
+      this.$confirm('此操作将初始化该用户密码, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        initPwd({sid: row.sid}).then(res => {
+          this.$message({
+            type: 'success',
+            message: res.msg
+          })
+        })
+      })
+    },
+   // 修改用户信息
+    userinfoChange(row) {
+      var postSid = row.postSid
+      this.editDialog = true
+      this.form = Object.assign({}, row)
+      this.postSid = postSid
+      this.$nextTick(() => {
+        this.$refs.Tree.setChecked(this.form.departmentSid, true, true)
+      })
+   	// this.$emit('status',true)
+   	// this.$emit('item',row)
+    },
+    // 删除
+    del(row) {
+      this.$confirm('此操作将删除该用户, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        delUser({ sid: row.sid }).then(res => {
+          this.$message({
+            type: 'success',
+            message: res.msg
+          });
+          this.getOrgUserList()
+        })
+      })
+    },
+    toNav(src) {
+      this.$router.push('/' + src)
+    },
+    // 获取部门树形
+    getOrgList(row) {
+      // this.roleDialog = true
+      this.checkedId = []
+      this.Thisrow = row
+      this.loading = true
+      let params = {}
+      orgList(params).then(res => {
+        this.treedata = res.data
+      })
+
+    },
+    checkchange(data, checked, indeterminate) {
+      if (checked) {
+        this.form.deptSid = data.sid
+        this.orgName = data.name
+        let arr = []
+        arr = [data.sid]
+        this.$refs.Tree.setCheckedKeys(arr)
+        this.form.postSid = ''
+        this.getPost(data.sid)
+        return
+      }
+    },
+    getPost(orgSid) {
+      let params = {
+        sid: orgSid
+      }
+      postList(params).then(res => {
+        this.postSidData = res.data
+      })
+      this.form.postSid = this.postSid
+    },
+    reset() {
+      this.form = {}
+    },
+    enabledChange(value, row) {
+      setRoleEnable({
+        sid: row.sid,
+        isEnable: value
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: res.msg
+        });
+      })
+    }
+  }
+}
+</script>
+
+<style scoped="scoped">
+.el-select > .el-input {
+  display: block;
+  width: 300px;
+}
+</style>
+