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/.editorconfig

@@ -1,14 +1,14 @@
-# http://editorconfig.org
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 2
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.md]
-insert_final_newline = false
-trim_trailing_whitespace = false
+# http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false

demo-web-ui/.env.development

@@ -1,10 +1,11 @@
-# just a flag
-ENV = 'development'
-
-# base api
-VUE_APP_BASE_API = '/api'
-
-## 配置测试和本地开发时的 接口地址
-##VUE_APP_URL = "http://26077a35f5.wicp.vip"
-VUE_APP_URL = "http://anrui.yyundong.com"
-##VUE_APP_URL = "http://1mn7264414.qicp.vip"
+# just a flag
+ENV = 'development'
+
+# base api
+VUE_APP_BASE_API = '/api'
+
+## 配置测试和本地开发时的 接口地址
+##VUE_APP_URL = "http://26077a35f5.wicp.vip"
+# 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

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

demo-web-ui/.env.staging

@@ -1,8 +1,8 @@
-NODE_ENV = production
-
-# just a flag
-ENV = 'staging'
-
-# base api
-VUE_APP_BASE_API = '/stage-api'
-
+NODE_ENV = production
+
+# just a flag
+ENV = 'staging'
+
+# base api
+VUE_APP_BASE_API = '/stage-api'
+

demo-web-ui/.eslintignore

@@ -1,4 +1,4 @@
-build/*.js
-src/assets
-public
-dist
+build/*.js
+src/assets
+public
+dist

demo-web-ui/.eslintrc.js

@@ -1,199 +1,199 @@
-module.exports = {
-  root: true,
-  parserOptions: {
-    parser: 'babel-eslint',
-    sourceType: 'module'
-  },
-  env: {
-    browser: true,
-    node: true,
-    es6: true,
-  },
-  extends: ['plugin:vue/recommended', 'eslint:recommended'],
-
-  // add your custom rules here
-  //it is base on https://github.com/vuejs/eslint-config-vue
-  rules: {
-    "vue/max-attributes-per-line": [2, {
-      "singleline": 10,
-      "multiline": {
-        "max": 1,
-        "allowFirstLine": false
-      }
-    }],
-    "vue/singleline-html-element-content-newline": "off",
-    "vue/multiline-html-element-content-newline":"off",
-    "vue/name-property-casing": ["error", "PascalCase"],
-    "vue/no-v-html": "off",
-    'accessor-pairs': 2,
-    'arrow-spacing': [2, {
-      'before': true,
-      'after': true
-    }],
-    'block-spacing': [2, 'always'],
-    'brace-style': [2, '1tbs', {
-      'allowSingleLine': true
-    }],
-    'camelcase': [0, {
-      'properties': 'always'
-    }],
-    'comma-dangle': [2, 'never'],
-    'comma-spacing': [2, {
-      'before': false,
-      'after': true
-    }],
-    'comma-style': [2, 'last'],
-    'constructor-super': 2,
-    'curly': [2, 'multi-line'],
-    'dot-location': [2, 'property'],
-    'eol-last': 2,
-    'eqeqeq': ["error", "always", {"null": "ignore"}],
-    'generator-star-spacing': [2, {
-      'before': true,
-      'after': true
-    }],
-    'handle-callback-err': [2, '^(err|error)$'],
-    // 'indent': [2, 2, {
-    //   'SwitchCase': 1
-    // }],
-    'indent': 'off',
-    'jsx-quotes': [2, 'prefer-single'],
-    'key-spacing': [2, {
-      'beforeColon': false,
-      'afterColon': true
-    }],
-    'keyword-spacing': [2, {
-      'before': true,
-      'after': true
-    }],
-    'new-cap': [2, {
-      'newIsCap': true,
-      'capIsNew': false
-    }],
-    'new-parens': 2,
-    'no-array-constructor': 2,
-    'no-caller': 2,
-    'no-console': 'off',
-    'no-class-assign': 2,
-    'no-cond-assign': 2,
-    'no-const-assign': 2,
-    'no-control-regex': 0,
-    'no-delete-var': 2,
-    'no-dupe-args': 2,
-    'no-dupe-class-members': 2,
-    'no-dupe-keys': 2,
-    'no-duplicate-case': 2,
-    'no-empty-character-class': 2,
-    'no-empty-pattern': 2,
-    'no-eval': 2,
-    'no-ex-assign': 2,
-    'no-extend-native': 2,
-    'no-extra-bind': 2,
-    'no-extra-boolean-cast': 2,
-    'no-extra-parens': [2, 'functions'],
-    'no-fallthrough': 2,
-    'no-floating-decimal': 2,
-    'no-func-assign': 2,
-    'no-implied-eval': 2,
-    'no-inner-declarations': [2, 'functions'],
-    'no-invalid-regexp': 2,
-    'no-irregular-whitespace': 2,
-    'no-iterator': 2,
-    'no-label-var': 2,
-    'no-labels': [2, {
-      'allowLoop': false,
-      'allowSwitch': false
-    }],
-    'no-lone-blocks': 2,
-    'no-mixed-spaces-and-tabs': 2,
-    'no-multi-spaces': 2,
-    'no-multi-str': 2,
-    'no-multiple-empty-lines': [2, {
-      'max': 1
-    }],
-    'no-native-reassign': 2,
-    'no-negated-in-lhs': 2,
-    'no-new-object': 2,
-    'no-new-require': 2,
-    'no-new-symbol': 2,
-    'no-new-wrappers': 2,
-    'no-obj-calls': 2,
-    'no-octal': 2,
-    'no-octal-escape': 2,
-    'no-path-concat': 2,
-    'no-proto': 2,
-    'no-redeclare': 2,
-    'no-regex-spaces': 2,
-    'no-return-assign': [2, 'except-parens'],
-    'no-self-assign': 2,
-    'no-self-compare': 2,
-    'no-sequences': 2,
-    'no-shadow-restricted-names': 2,
-    'no-spaced-func': 2,
-    'no-sparse-arrays': 2,
-    'no-this-before-super': 2,
-    'no-throw-literal': 2,
-    'no-trailing-spaces': 2,
-    'no-undef': 2,
-    'no-undef-init': 2,
-    'no-unexpected-multiline': 2,
-    'no-unmodified-loop-condition': 2,
-    'no-unneeded-ternary': [2, {
-      'defaultAssignment': false
-    }],
-    'no-unreachable': 2,
-    'no-unsafe-finally': 2,
-    'no-unused-vars': [2, {
-      'vars': 'all',
-      'args': 'none'
-    }],
-    'no-useless-call': 2,
-    'no-useless-computed-key': 2,
-    'no-useless-constructor': 2,
-    'no-useless-escape': 0,
-    'no-whitespace-before-property': 2,
-    'no-with': 2,
-    'one-var': [2, {
-      'initialized': 'never'
-    }],
-    'operator-linebreak': [2, 'after', {
-      'overrides': {
-        '?': 'before',
-        ':': 'before'
-      }
-    }],
-    'padded-blocks': [2, 'never'],
-    'quotes': [2, 'single', {
-      'avoidEscape': true,
-      'allowTemplateLiterals': true
-    }],
-    'semi': [2, 'never'],
-    'semi-spacing': [2, {
-      'before': false,
-      'after': true
-    }],
-    'space-before-blocks': [2, 'always'],
-    'space-before-function-paren': [2, 'never'],
-    'space-in-parens': [2, 'never'],
-    'space-infix-ops': 2,
-    'space-unary-ops': [2, {
-      'words': true,
-      'nonwords': false
-    }],
-    'spaced-comment': [2, 'always', {
-      'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
-    }],
-    'template-curly-spacing': [2, 'never'],
-    'use-isnan': 2,
-    'valid-typeof': 2,
-    'wrap-iife': [2, 'any'],
-    'yield-star-spacing': [2, 'both'],
-    'yoda': [2, 'never'],
-    'prefer-const': 2,
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-    'object-curly-spacing': [2, 'always', {
-      objectsInObjects: false
-    }],
-    'array-bracket-spacing': [2, 'never']
-  }
-}
+module.exports = {
+  root: true,
+  parserOptions: {
+    parser: 'babel-eslint',
+    sourceType: 'module'
+  },
+  env: {
+    browser: true,
+    node: true,
+    es6: true,
+  },
+  extends: ['plugin:vue/recommended', 'eslint:recommended'],
+
+  // add your custom rules here
+  //it is base on https://github.com/vuejs/eslint-config-vue
+  rules: {
+    "vue/max-attributes-per-line": [2, {
+      "singleline": 10,
+      "multiline": {
+        "max": 1,
+        "allowFirstLine": false
+      }
+    }],
+    "vue/singleline-html-element-content-newline": "off",
+    "vue/multiline-html-element-content-newline":"off",
+    "vue/name-property-casing": ["error", "PascalCase"],
+    "vue/no-v-html": "off",
+    'accessor-pairs': 2,
+    'arrow-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'block-spacing': [2, 'always'],
+    'brace-style': [2, '1tbs', {
+      'allowSingleLine': true
+    }],
+    'camelcase': [0, {
+      'properties': 'always'
+    }],
+    'comma-dangle': [2, 'never'],
+    'comma-spacing': [2, {
+      'before': false,
+      'after': true
+    }],
+    'comma-style': [2, 'last'],
+    'constructor-super': 2,
+    'curly': [2, 'multi-line'],
+    'dot-location': [2, 'property'],
+    'eol-last': 2,
+    'eqeqeq': ["error", "always", {"null": "ignore"}],
+    'generator-star-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'handle-callback-err': [2, '^(err|error)$'],
+    // 'indent': [2, 2, {
+    //   'SwitchCase': 1
+    // }],
+    'indent': 'off',
+    'jsx-quotes': [2, 'prefer-single'],
+    'key-spacing': [2, {
+      'beforeColon': false,
+      'afterColon': true
+    }],
+    'keyword-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'new-cap': [2, {
+      'newIsCap': true,
+      'capIsNew': false
+    }],
+    'new-parens': 2,
+    'no-array-constructor': 2,
+    'no-caller': 2,
+    'no-console': 'off',
+    'no-class-assign': 2,
+    'no-cond-assign': 2,
+    'no-const-assign': 2,
+    'no-control-regex': 0,
+    'no-delete-var': 2,
+    'no-dupe-args': 2,
+    'no-dupe-class-members': 2,
+    'no-dupe-keys': 2,
+    'no-duplicate-case': 2,
+    'no-empty-character-class': 2,
+    'no-empty-pattern': 2,
+    'no-eval': 2,
+    'no-ex-assign': 2,
+    'no-extend-native': 2,
+    'no-extra-bind': 2,
+    'no-extra-boolean-cast': 2,
+    'no-extra-parens': [2, 'functions'],
+    'no-fallthrough': 2,
+    'no-floating-decimal': 2,
+    'no-func-assign': 2,
+    'no-implied-eval': 2,
+    'no-inner-declarations': [2, 'functions'],
+    'no-invalid-regexp': 2,
+    'no-irregular-whitespace': 2,
+    'no-iterator': 2,
+    'no-label-var': 2,
+    'no-labels': [2, {
+      'allowLoop': false,
+      'allowSwitch': false
+    }],
+    'no-lone-blocks': 2,
+    'no-mixed-spaces-and-tabs': 2,
+    'no-multi-spaces': 2,
+    'no-multi-str': 2,
+    'no-multiple-empty-lines': [2, {
+      'max': 1
+    }],
+    'no-native-reassign': 2,
+    'no-negated-in-lhs': 2,
+    'no-new-object': 2,
+    'no-new-require': 2,
+    'no-new-symbol': 2,
+    'no-new-wrappers': 2,
+    'no-obj-calls': 2,
+    'no-octal': 2,
+    'no-octal-escape': 2,
+    'no-path-concat': 2,
+    'no-proto': 2,
+    'no-redeclare': 2,
+    'no-regex-spaces': 2,
+    'no-return-assign': [2, 'except-parens'],
+    'no-self-assign': 2,
+    'no-self-compare': 2,
+    'no-sequences': 2,
+    'no-shadow-restricted-names': 2,
+    'no-spaced-func': 2,
+    'no-sparse-arrays': 2,
+    'no-this-before-super': 2,
+    'no-throw-literal': 2,
+    'no-trailing-spaces': 2,
+    'no-undef': 2,
+    'no-undef-init': 2,
+    'no-unexpected-multiline': 2,
+    'no-unmodified-loop-condition': 2,
+    'no-unneeded-ternary': [2, {
+      'defaultAssignment': false
+    }],
+    'no-unreachable': 2,
+    'no-unsafe-finally': 2,
+    'no-unused-vars': [2, {
+      'vars': 'all',
+      'args': 'none'
+    }],
+    'no-useless-call': 2,
+    'no-useless-computed-key': 2,
+    'no-useless-constructor': 2,
+    'no-useless-escape': 0,
+    'no-whitespace-before-property': 2,
+    'no-with': 2,
+    'one-var': [2, {
+      'initialized': 'never'
+    }],
+    'operator-linebreak': [2, 'after', {
+      'overrides': {
+        '?': 'before',
+        ':': 'before'
+      }
+    }],
+    'padded-blocks': [2, 'never'],
+    'quotes': [2, 'single', {
+      'avoidEscape': true,
+      'allowTemplateLiterals': true
+    }],
+    'semi': [2, 'never'],
+    'semi-spacing': [2, {
+      'before': false,
+      'after': true
+    }],
+    'space-before-blocks': [2, 'always'],
+    'space-before-function-paren': [2, 'never'],
+    'space-in-parens': [2, 'never'],
+    'space-infix-ops': 2,
+    'space-unary-ops': [2, {
+      'words': true,
+      'nonwords': false
+    }],
+    'spaced-comment': [2, 'always', {
+      'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
+    }],
+    'template-curly-spacing': [2, 'never'],
+    'use-isnan': 2,
+    'valid-typeof': 2,
+    'wrap-iife': [2, 'any'],
+    'yield-star-spacing': [2, 'both'],
+    'yoda': [2, 'never'],
+    'prefer-const': 2,
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+    'object-curly-spacing': [2, 'always', {
+      objectsInObjects: false
+    }],
+    'array-bracket-spacing': [2, 'never']
+  }
+}

demo-web-ui/.gitignore

@@ -1,16 +1,16 @@
-.DS_Store
-node_modules/
-dist/
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-package-lock.json
-tests/**/coverage/
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
+.DS_Store
+node_modules/
+dist/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+package-lock.json
+tests/**/coverage/
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln

demo-web-ui/.project

@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>anrui-system-ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.aptana.ide.core.unifiedBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.aptana.projects.webnature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1629107336958</id>
-			<name></name>
-			<type>26</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>anrui-system-ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1629107336958</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

demo-web-ui/.travis.yml

@@ -1,5 +1,5 @@
-language: node_js
-node_js: 10
-script: npm run test
-notifications:
-  email: false
+language: node_js
+node_js: 10
+script: npm run test
+notifications:
+  email: false

demo-web-ui/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2017-present PanJiaChen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2017-present PanJiaChen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

demo-web-ui/README.md

@@ -1,90 +1,90 @@
-# vue-admin-template
-
-English | [简体中文](./README-zh.md)
-
-> A minimal vue admin template with Element UI & axios & iconfont & permission control & lint
-
-**Live demo:** http://panjiachen.github.io/vue-admin-template
-
-
-**The current version is `v4.0+` build on `vue-cli`. If you want to use the old version , you can switch branch to [tag/3.11.0](https://github.com/PanJiaChen/vue-admin-template/tree/tag/3.11.0), it does not rely on `vue-cli`**
-
-## Build Setup
-
-```bash
-# clone the project
-git clone https://github.com/PanJiaChen/vue-admin-template.git
-
-# enter the project directory
-cd vue-admin-template
-
-# install dependency
-npm install
-
-# develop
-npm run dev
-```
-
-This will automatically open http://localhost:9528
-
-## Build
-
-```bash
-# build for test environment
-npm run build:stage
-
-# build for production environment
-npm run build:prod
-```
-
-## Advanced
-
-```bash
-# preview the release environment effect
-npm run preview
-
-# preview the release environment effect + static resource analysis
-npm run preview -- --report
-
-# code format check
-npm run lint
-
-# code format check and auto fix
-npm run lint -- --fix
-```
-
-Refer to [Documentation](https://panjiachen.github.io/vue-element-admin-site/guide/essentials/deploy.html) for more information
-
-## Demo
-
-![demo](https://github.com/PanJiaChen/PanJiaChen.github.io/blob/master/images/demo.gif)
-
-## Extra
-
-If you want router permission && generate menu by user roles , you can use this branch [permission-control](https://github.com/PanJiaChen/vue-admin-template/tree/permission-control)
-
-For `typescript` version, you can use [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) (Credits: [@Armour](https://github.com/Armour))
-
-## Related Project
-
-- [vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)
-
-- [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
-
-- [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template)
-
-- [awesome-project](https://github.com/PanJiaChen/vue-element-admin/issues/2312)
-
-## Browsers support
-
-Modern browsers and Internet Explorer 10+.
-
-| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari |
-| --------- | --------- | --------- | --------- |
-| IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions
-
-## License
-
-[MIT](https://github.com/PanJiaChen/vue-admin-template/blob/master/LICENSE) license.
-
-Copyright (c) 2017-present PanJiaChen
+# vue-admin-template
+
+English | [简体中文](./README-zh.md)
+
+> A minimal vue admin template with Element UI & axios & iconfont & permission control & lint
+
+**Live demo:** http://panjiachen.github.io/vue-admin-template
+
+
+**The current version is `v4.0+` build on `vue-cli`. If you want to use the old version , you can switch branch to [tag/3.11.0](https://github.com/PanJiaChen/vue-admin-template/tree/tag/3.11.0), it does not rely on `vue-cli`**
+
+## Build Setup
+
+```bash
+# clone the project
+git clone https://github.com/PanJiaChen/vue-admin-template.git
+
+# enter the project directory
+cd vue-admin-template
+
+# install dependency
+npm install
+
+# develop
+npm run dev
+```
+
+This will automatically open http://localhost:9528
+
+## Build
+
+```bash
+# build for test environment
+npm run build:stage
+
+# build for production environment
+npm run build:prod
+```
+
+## Advanced
+
+```bash
+# preview the release environment effect
+npm run preview
+
+# preview the release environment effect + static resource analysis
+npm run preview -- --report
+
+# code format check
+npm run lint
+
+# code format check and auto fix
+npm run lint -- --fix
+```
+
+Refer to [Documentation](https://panjiachen.github.io/vue-element-admin-site/guide/essentials/deploy.html) for more information
+
+## Demo
+
+![demo](https://github.com/PanJiaChen/PanJiaChen.github.io/blob/master/images/demo.gif)
+
+## Extra
+
+If you want router permission && generate menu by user roles , you can use this branch [permission-control](https://github.com/PanJiaChen/vue-admin-template/tree/permission-control)
+
+For `typescript` version, you can use [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) (Credits: [@Armour](https://github.com/Armour))
+
+## Related Project
+
+- [vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)
+
+- [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
+
+- [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template)
+
+- [awesome-project](https://github.com/PanJiaChen/vue-element-admin/issues/2312)
+
+## Browsers support
+
+Modern browsers and Internet Explorer 10+.
+
+| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari |
+| --------- | --------- | --------- | --------- |
+| IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions
+
+## License
+
+[MIT](https://github.com/PanJiaChen/vue-admin-template/blob/master/LICENSE) license.
+
+Copyright (c) 2017-present PanJiaChen

demo-web-ui/babel.config.js

@@ -1,16 +1,16 @@
-module.exports = {
- /* presets: [
-    // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
-    '@vue/cli-plugin-babel/preset'
-  ],*/
-  presets: [ [ "@vue/app", { useBuiltIns: "entry" } ] ],
-
-  'env': {
-    'development': {
-      // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().
-      // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
-      // https://panjiachen.github.io/vue-element-admin-site/guide/advanced/lazy-loading.html
-      'plugins': ['dynamic-import-node']
-    }
-  }
-}
+module.exports = {
+ /* presets: [
+    // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
+    '@vue/cli-plugin-babel/preset'
+  ],*/
+  presets: [ [ "@vue/app", { useBuiltIns: "entry" } ] ],
+
+  'env': {
+    'development': {
+      // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().
+      // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
+      // https://panjiachen.github.io/vue-element-admin-site/guide/advanced/lazy-loading.html
+      'plugins': ['dynamic-import-node']
+    }
+  }
+}

demo-web-ui/build/index.js

@@ -1,35 +1,35 @@
-const { run } = require('runjs')
-const chalk = require('chalk')
-const config = require('../vue.config.js')
-const rawArgv = process.argv.slice(2)
-const args = rawArgv.join(' ')
-
-if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
-  const report = rawArgv.includes('--report')
-
-  run(`vue-cli-service build ${args}`)
-
-  const port = 9526
-  const publicPath = config.publicPath
-
-  var connect = require('connect')
-  var serveStatic = require('serve-static')
-  const app = connect()
-
-  app.use(
-    publicPath,
-    serveStatic('./dist', {
-      index: ['index.html', '/']
-    })
-  )
-
-  app.listen(port, function () {
-    console.log(chalk.green(`> Preview at  http://localhost:${port}${publicPath}`))
-    if (report) {
-      console.log(chalk.green(`> Report at  http://localhost:${port}${publicPath}report.html`))
-    }
-
-  })
-} else {
-  run(`vue-cli-service build ${args}`)
-}
+const { run } = require('runjs')
+const chalk = require('chalk')
+const config = require('../vue.config.js')
+const rawArgv = process.argv.slice(2)
+const args = rawArgv.join(' ')
+
+if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
+  const report = rawArgv.includes('--report')
+
+  run(`vue-cli-service build ${args}`)
+
+  const port = 9526
+  const publicPath = config.publicPath
+
+  var connect = require('connect')
+  var serveStatic = require('serve-static')
+  const app = connect()
+
+  app.use(
+    publicPath,
+    serveStatic('./dist', {
+      index: ['index.html', '/']
+    })
+  )
+
+  app.listen(port, function () {
+    console.log(chalk.green(`> Preview at  http://localhost:${port}${publicPath}`))
+    if (report) {
+      console.log(chalk.green(`> Report at  http://localhost:${port}${publicPath}report.html`))
+    }
+
+  })
+} else {
+  run(`vue-cli-service build ${args}`)
+}

demo-web-ui/jest.config.js

@@ -1,24 +1,24 @@
-module.exports = {
-  moduleFileExtensions: ['js', 'jsx', 'json', 'vue'],
-  transform: {
-    '^.+\\.vue$': 'vue-jest',
-    '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$':
-      'jest-transform-stub',
-    '^.+\\.jsx?$': 'babel-jest'
-  },
-  moduleNameMapper: {
-    '^@/(.*)$': '<rootDir>/src/$1'
-  },
-  snapshotSerializers: ['jest-serializer-vue'],
-  testMatch: [
-    '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'
-  ],
-  collectCoverageFrom: ['src/utils/**/*.{js,vue}', '!src/utils/auth.js', '!src/utils/request.js', 'src/components/**/*.{js,vue}'],
-  coverageDirectory: '<rootDir>/tests/unit/coverage',
-  // 'collectCoverage': true,
-  'coverageReporters': [
-    'lcov',
-    'text-summary'
-  ],
-  testURL: 'http://localhost/'
-}
+module.exports = {
+  moduleFileExtensions: ['js', 'jsx', 'json', 'vue'],
+  transform: {
+    '^.+\\.vue$': 'vue-jest',
+    '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$':
+      'jest-transform-stub',
+    '^.+\\.jsx?$': 'babel-jest'
+  },
+  moduleNameMapper: {
+    '^@/(.*)$': '<rootDir>/src/$1'
+  },
+  snapshotSerializers: ['jest-serializer-vue'],
+  testMatch: [
+    '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'
+  ],
+  collectCoverageFrom: ['src/utils/**/*.{js,vue}', '!src/utils/auth.js', '!src/utils/request.js', 'src/components/**/*.{js,vue}'],
+  coverageDirectory: '<rootDir>/tests/unit/coverage',
+  // 'collectCoverage': true,
+  'coverageReporters': [
+    'lcov',
+    'text-summary'
+  ],
+  testURL: 'http://localhost/'
+}

demo-web-ui/jsconfig.json

@@ -1,9 +1,9 @@
-{
-  "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-        "@/*": ["src/*"]
-    }
-  },
-  "exclude": ["node_modules", "dist"]
-}
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "paths": {
+        "@/*": ["src/*"]
+    }
+  },
+  "exclude": ["node_modules", "dist"]
+}

demo-web-ui/mock/index.js

@@ -1,57 +1,57 @@
-const Mock = require('mockjs')
-const { param2Obj } = require('./utils')
-
-const user = require('./user')
-const table = require('./table')
-
-const mocks = [
-  ...user,
-  ...table
-]
-
-// for front mock
-// please use it cautiously, it will redefine XMLHttpRequest,
-// which will cause many of your third-party libraries to be invalidated(like progress event).
-function mockXHR() {
-  // mock patch
-  // https://github.com/nuysoft/Mock/issues/300
-  Mock.XHR.prototype.proxy_send = Mock.XHR.prototype.send
-  Mock.XHR.prototype.send = function() {
-    if (this.custom.xhr) {
-      this.custom.xhr.withCredentials = this.withCredentials || false
-
-      if (this.responseType) {
-        this.custom.xhr.responseType = this.responseType
-      }
-    }
-    this.proxy_send(...arguments)
-  }
-
-  function XHR2ExpressReqWrap(respond) {
-    return function(options) {
-      let result = null
-      if (respond instanceof Function) {
-        const { body, type, url } = options
-        // https://expressjs.com/en/4x/api.html#req
-        result = respond({
-          method: type,
-          body: JSON.parse(body),
-          query: param2Obj(url)
-        })
-      } else {
-        result = respond
-      }
-      return Mock.mock(result)
-    }
-  }
-
-  for (const i of mocks) {
-    Mock.mock(new RegExp(i.url), i.type || 'get', XHR2ExpressReqWrap(i.response))
-  }
-}
-
-module.exports = {
-  mocks,
-  mockXHR
-}
-
+const Mock = require('mockjs')
+const { param2Obj } = require('./utils')
+
+const user = require('./user')
+const table = require('./table')
+
+const mocks = [
+  ...user,
+  ...table
+]
+
+// for front mock
+// please use it cautiously, it will redefine XMLHttpRequest,
+// which will cause many of your third-party libraries to be invalidated(like progress event).
+function mockXHR() {
+  // mock patch
+  // https://github.com/nuysoft/Mock/issues/300
+  Mock.XHR.prototype.proxy_send = Mock.XHR.prototype.send
+  Mock.XHR.prototype.send = function() {
+    if (this.custom.xhr) {
+      this.custom.xhr.withCredentials = this.withCredentials || false
+
+      if (this.responseType) {
+        this.custom.xhr.responseType = this.responseType
+      }
+    }
+    this.proxy_send(...arguments)
+  }
+
+  function XHR2ExpressReqWrap(respond) {
+    return function(options) {
+      let result = null
+      if (respond instanceof Function) {
+        const { body, type, url } = options
+        // https://expressjs.com/en/4x/api.html#req
+        result = respond({
+          method: type,
+          body: JSON.parse(body),
+          query: param2Obj(url)
+        })
+      } else {
+        result = respond
+      }
+      return Mock.mock(result)
+    }
+  }
+
+  for (const i of mocks) {
+    Mock.mock(new RegExp(i.url), i.type || 'get', XHR2ExpressReqWrap(i.response))
+  }
+}
+
+module.exports = {
+  mocks,
+  mockXHR
+}
+

demo-web-ui/mock/mock-server.js

@@ -1,81 +1,81 @@
-const chokidar = require('chokidar')
-const bodyParser = require('body-parser')
-const chalk = require('chalk')
-const path = require('path')
-const Mock = require('mockjs')
-
-const mockDir = path.join(process.cwd(), 'mock')
-
-function registerRoutes(app) {
-  let mockLastIndex
-  const { mocks } = require('./index.js')
-  const mocksForServer = mocks.map(route => {
-    return responseFake(route.url, route.type, route.response)
-  })
-  for (const mock of mocksForServer) {
-    app[mock.type](mock.url, mock.response)
-    mockLastIndex = app._router.stack.length
-  }
-  const mockRoutesLength = Object.keys(mocksForServer).length
-  return {
-    mockRoutesLength: mockRoutesLength,
-    mockStartIndex: mockLastIndex - mockRoutesLength
-  }
-}
-
-function unregisterRoutes() {
-  Object.keys(require.cache).forEach(i => {
-    if (i.includes(mockDir)) {
-      delete require.cache[require.resolve(i)]
-    }
-  })
-}
-
-// for mock server
-const responseFake = (url, type, respond) => {
-  return {
-    url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`),
-    type: type || 'get',
-    response(req, res) {
-      console.log('request invoke:' + req.path)
-      res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
-    }
-  }
-}
-
-module.exports = app => {
-  // parse app.body
-  // https://expressjs.com/en/4x/api.html#req.body
-  app.use(bodyParser.json())
-  app.use(bodyParser.urlencoded({
-    extended: true
-  }))
-
-  const mockRoutes = registerRoutes(app)
-  var mockRoutesLength = mockRoutes.mockRoutesLength
-  var mockStartIndex = mockRoutes.mockStartIndex
-
-  // watch files, hot reload mock server
-  chokidar.watch(mockDir, {
-    ignored: /mock-server/,
-    ignoreInitial: true
-  }).on('all', (event, path) => {
-    if (event === 'change' || event === 'add') {
-      try {
-        // remove mock routes stack
-        app._router.stack.splice(mockStartIndex, mockRoutesLength)
-
-        // clear routes cache
-        unregisterRoutes()
-
-        const mockRoutes = registerRoutes(app)
-        mockRoutesLength = mockRoutes.mockRoutesLength
-        mockStartIndex = mockRoutes.mockStartIndex
-
-        console.log(chalk.magentaBright(`\n > Mock Server hot reload success! changed  ${path}`))
-      } catch (error) {
-        console.log(chalk.redBright(error))
-      }
-    }
-  })
-}
+const chokidar = require('chokidar')
+const bodyParser = require('body-parser')
+const chalk = require('chalk')
+const path = require('path')
+const Mock = require('mockjs')
+
+const mockDir = path.join(process.cwd(), 'mock')
+
+function registerRoutes(app) {
+  let mockLastIndex
+  const { mocks } = require('./index.js')
+  const mocksForServer = mocks.map(route => {
+    return responseFake(route.url, route.type, route.response)
+  })
+  for (const mock of mocksForServer) {
+    app[mock.type](mock.url, mock.response)
+    mockLastIndex = app._router.stack.length
+  }
+  const mockRoutesLength = Object.keys(mocksForServer).length
+  return {
+    mockRoutesLength: mockRoutesLength,
+    mockStartIndex: mockLastIndex - mockRoutesLength
+  }
+}
+
+function unregisterRoutes() {
+  Object.keys(require.cache).forEach(i => {
+    if (i.includes(mockDir)) {
+      delete require.cache[require.resolve(i)]
+    }
+  })
+}
+
+// for mock server
+const responseFake = (url, type, respond) => {
+  return {
+    url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`),
+    type: type || 'get',
+    response(req, res) {
+      console.log('request invoke:' + req.path)
+      res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
+    }
+  }
+}
+
+module.exports = app => {
+  // parse app.body
+  // https://expressjs.com/en/4x/api.html#req.body
+  app.use(bodyParser.json())
+  app.use(bodyParser.urlencoded({
+    extended: true
+  }))
+
+  const mockRoutes = registerRoutes(app)
+  var mockRoutesLength = mockRoutes.mockRoutesLength
+  var mockStartIndex = mockRoutes.mockStartIndex
+
+  // watch files, hot reload mock server
+  chokidar.watch(mockDir, {
+    ignored: /mock-server/,
+    ignoreInitial: true
+  }).on('all', (event, path) => {
+    if (event === 'change' || event === 'add') {
+      try {
+        // remove mock routes stack
+        app._router.stack.splice(mockStartIndex, mockRoutesLength)
+
+        // clear routes cache
+        unregisterRoutes()
+
+        const mockRoutes = registerRoutes(app)
+        mockRoutesLength = mockRoutes.mockRoutesLength
+        mockStartIndex = mockRoutes.mockStartIndex
+
+        console.log(chalk.magentaBright(`\n > Mock Server hot reload success! changed  ${path}`))
+      } catch (error) {
+        console.log(chalk.redBright(error))
+      }
+    }
+  })
+}

demo-web-ui/mock/table.js

@@ -1,29 +1,29 @@
-const Mock = require('mockjs')
-
-const data = Mock.mock({
-  'items|30': [{
-    id: '@id',
-    title: '@sentence(10, 20)',
-    'status|1': ['published', 'draft', 'deleted'],
-    author: 'name',
-    display_time: '@datetime',
-    pageviews: '@integer(300, 5000)'
-  }]
-})
-
-module.exports = [
-  {
-    url: '/vue-admin-template/table/list',
-    type: 'get',
-    response: config => {
-      const items = data.items
-      return {
-        code: 20000,
-        data: {
-          total: items.length,
-          items: items
-        }
-      }
-    }
-  }
-]
+const Mock = require('mockjs')
+
+const data = Mock.mock({
+  'items|30': [{
+    id: '@id',
+    title: '@sentence(10, 20)',
+    'status|1': ['published', 'draft', 'deleted'],
+    author: 'name',
+    display_time: '@datetime',
+    pageviews: '@integer(300, 5000)'
+  }]
+})
+
+module.exports = [
+  {
+    url: '/vue-admin-template/table/list',
+    type: 'get',
+    response: config => {
+      const items = data.items
+      return {
+        code: 20000,
+        data: {
+          total: items.length,
+          items: items
+        }
+      }
+    }
+  }
+]

demo-web-ui/mock/user.js

@@ -1,84 +1,84 @@
-
-const tokens = {
-  admin: {
-    token: 'admin-token'
-  },
-  editor: {
-    token: 'editor-token'
-  }
-}
-
-const users = {
-  'admin-token': {
-    roles: ['admin'],
-    introduction: 'I am a super administrator',
-    avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif',
-    name: 'Super Admin'
-  },
-  'editor-token': {
-    roles: ['editor'],
-    introduction: 'I am an editor',
-    avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif',
-    name: 'Normal Editor'
-  }
-}
-
-module.exports = [
-  // user login
-  {
-    url: '/vue-admin-template/user/login',
-    type: 'post',
-    response: config => {
-      const { username } = config.body
-      const token = tokens[username]
-
-      // mock error
-      if (!token) {
-        return {
-          code: 60204,
-          message: 'Account and password are incorrect.'
-        }
-      }
-
-      return {
-        code: 20000,
-        data: token
-      }
-    }
-  },
-
-  // get user info
-  {
-    url: '/vue-admin-template/user/info\.*',
-    type: 'get',
-    response: config => {
-      const { token } = config.query
-      const info = users[token]
-
-      // mock error
-      if (!info) {
-        return {
-          code: 50008,
-          message: 'Login failed, unable to get user details.'
-        }
-      }
-
-      return {
-        code: 20000,
-        data: info
-      }
-    }
-  },
-
-  // user logout
-  {
-    url: '/vue-admin-template/user/logout',
-    type: 'post',
-    response: _ => {
-      return {
-        code: 20000,
-        data: 'success'
-      }
-    }
-  }
-]
+
+const tokens = {
+  admin: {
+    token: 'admin-token'
+  },
+  editor: {
+    token: 'editor-token'
+  }
+}
+
+const users = {
+  'admin-token': {
+    roles: ['admin'],
+    introduction: 'I am a super administrator',
+    avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif',
+    name: 'Super Admin'
+  },
+  'editor-token': {
+    roles: ['editor'],
+    introduction: 'I am an editor',
+    avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif',
+    name: 'Normal Editor'
+  }
+}
+
+module.exports = [
+  // user login
+  {
+    url: '/vue-admin-template/user/login',
+    type: 'post',
+    response: config => {
+      const { username } = config.body
+      const token = tokens[username]
+
+      // mock error
+      if (!token) {
+        return {
+          code: 60204,
+          message: 'Account and password are incorrect.'
+        }
+      }
+
+      return {
+        code: 20000,
+        data: token
+      }
+    }
+  },
+
+  // get user info
+  {
+    url: '/vue-admin-template/user/info\.*',
+    type: 'get',
+    response: config => {
+      const { token } = config.query
+      const info = users[token]
+
+      // mock error
+      if (!info) {
+        return {
+          code: 50008,
+          message: 'Login failed, unable to get user details.'
+        }
+      }
+
+      return {
+        code: 20000,
+        data: info
+      }
+    }
+  },
+
+  // user logout
+  {
+    url: '/vue-admin-template/user/logout',
+    type: 'post',
+    response: _ => {
+      return {
+        code: 20000,
+        data: 'success'
+      }
+    }
+  }
+]

demo-web-ui/mock/utils.js

@@ -1,25 +1,25 @@
-/**
- * @param {string} url
- * @returns {Object}
- */
-function param2Obj(url) {
-  const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
-  if (!search) {
-    return {}
-  }
-  const obj = {}
-  const searchArr = search.split('&')
-  searchArr.forEach(v => {
-    const index = v.indexOf('=')
-    if (index !== -1) {
-      const name = v.substring(0, index)
-      const val = v.substring(index + 1, v.length)
-      obj[name] = val
-    }
-  })
-  return obj
-}
-
-module.exports = {
-  param2Obj
-}
+/**
+ * @param {string} url
+ * @returns {Object}
+ */
+function param2Obj(url) {
+  const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
+  if (!search) {
+    return {}
+  }
+  const obj = {}
+  const searchArr = search.split('&')
+  searchArr.forEach(v => {
+    const index = v.indexOf('=')
+    if (index !== -1) {
+      const name = v.substring(0, index)
+      const val = v.substring(index + 1, v.length)
+      obj[name] = val
+    }
+  })
+  return obj
+}
+
+module.exports = {
+  param2Obj
+}

demo-web-ui/package.json

@@ -1,72 +1,72 @@
-{
-  "name": "admin-template",
-  "version": "4.4.0",
-  "description": "A vue admin template with Element UI & axios & iconfont & permission control & lint",
-  "author": "Pan <panfree23@gmail.com>",
-  "scripts": {
-    "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
-    "preview": "node build/index.js --preview",
-    "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
-    "lint": "eslint --ext .js,.vue src",
-    "test:unit": "jest --clearCache && vue-cli-service test:unit",
-    "test:ci": "npm run lint && npm run test:unit"
-  },
-  "dependencies": {
-    "axios": "0.18.1",
-    "bpmn-js": "^9.2.2",
-    "core-js": "^3.19.3",
-    "element-ui": "2.13.2",
-    "js-cookie": "2.2.0",
-    "normalize.css": "7.0.0",
-    "nprogress": "0.2.0",
-    "path-to-regexp": "2.4.0",
-    "portfinder": "^1.0.21",
-    "qs": "^6.9.4",
-    "sass-resources-loader": "^2.1.1",
-    "viewerjs": "^1.9.0",
-    "vue": "2.6.10",
-    "vue-amap": "^0.5.10",
-    "vue-router": "3.0.6",
-    "vuex": "3.1.0",
-    "vuex-persistedstate": "^4.0.0",
-    "xcrud": "^0.4.19"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "4.4.4",
-    "@vue/cli-plugin-eslint": "4.4.4",
-    "@vue/cli-plugin-unit-jest": "4.4.4",
-    "@vue/cli-service": "4.4.4",
-    "@vue/test-utils": "1.0.0-beta.29",
-    "autoprefixer": "9.5.1",
-    "babel-eslint": "10.1.0",
-    "babel-jest": "23.6.0",
-    "babel-plugin-dynamic-import-node": "2.3.3",
-    "babel-polyfill": "^6.26.0",
-    "chalk": "2.4.2",
-    "connect": "3.6.6",
-    "css-loader": "^6.7.1",
-    "eslint": "6.7.2",
-    "eslint-plugin-vue": "6.2.2",
-    "html-webpack-plugin": "3.2.0",
-    "mockjs": "1.0.1-beta3",
-    "runjs": "4.3.2",
-    "sass": "1.26.8",
-    "sass-loader": "8.0.2",
-    "script-ext-html-webpack-plugin": "2.1.3",
-    "serve-static": "1.13.2",
-    "svg-sprite-loader": "4.1.3",
-    "svgo": "1.2.2",
-    "vue-template-compiler": "2.6.10"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions"
-  ],
-  "engines": {
-    "node": ">=8.9",
-    "npm": ">= 3.0.0"
-  },
-  "license": "MIT"
-}
+{
+  "name": "admin-template",
+  "version": "4.4.0",
+  "description": "A vue admin template with Element UI & axios & iconfont & permission control & lint",
+  "author": "Pan <panfree23@gmail.com>",
+  "scripts": {
+    "dev": "vue-cli-service serve",
+    "build:prod": "vue-cli-service build",
+    "build:stage": "vue-cli-service build --mode staging",
+    "preview": "node build/index.js --preview",
+    "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
+    "lint": "eslint --ext .js,.vue src",
+    "test:unit": "jest --clearCache && vue-cli-service test:unit",
+    "test:ci": "npm run lint && npm run test:unit"
+  },
+  "dependencies": {
+    "axios": "0.18.1",
+    "bpmn-js": "^9.2.2",
+    "core-js": "^3.19.3",
+    "element-ui": "2.13.2",
+    "js-cookie": "2.2.0",
+    "normalize.css": "7.0.0",
+    "nprogress": "0.2.0",
+    "path-to-regexp": "2.4.0",
+    "portfinder": "^1.0.21",
+    "qs": "^6.9.4",
+    "sass-resources-loader": "^2.1.1",
+    "viewerjs": "^1.9.0",
+    "vue": "2.6.10",
+    "vue-amap": "^0.5.10",
+    "vue-router": "3.0.6",
+    "vuex": "3.1.0",
+    "vuex-persistedstate": "^4.0.0",
+    "xcrud": "^0.4.19"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "4.4.4",
+    "@vue/cli-plugin-eslint": "4.4.4",
+    "@vue/cli-plugin-unit-jest": "4.4.4",
+    "@vue/cli-service": "4.4.4",
+    "@vue/test-utils": "1.0.0-beta.29",
+    "autoprefixer": "9.5.1",
+    "babel-eslint": "10.1.0",
+    "babel-jest": "23.6.0",
+    "babel-plugin-dynamic-import-node": "2.3.3",
+    "babel-polyfill": "^6.26.0",
+    "chalk": "2.4.2",
+    "connect": "3.6.6",
+    "css-loader": "^6.7.1",
+    "eslint": "6.7.2",
+    "eslint-plugin-vue": "6.2.2",
+    "html-webpack-plugin": "3.2.0",
+    "mockjs": "1.0.1-beta3",
+    "runjs": "4.3.2",
+    "sass": "1.26.8",
+    "sass-loader": "8.0.2",
+    "script-ext-html-webpack-plugin": "2.1.3",
+    "serve-static": "1.13.2",
+    "svg-sprite-loader": "4.1.3",
+    "svgo": "1.2.2",
+    "vue-template-compiler": "2.6.10"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions"
+  ],
+  "engines": {
+    "node": ">=8.9",
+    "npm": ">= 3.0.0"
+  },
+  "license": "MIT"
+}

demo-web-ui/postcss.config.js

@@ -1,8 +1,8 @@
-// https://github.com/michael-ciniawsky/postcss-load-config
-
-module.exports = {
-  'plugins': {
-    // to edit target browsers: use "browserslist" field in package.json
-    'autoprefixer': {}
-  }
-}
+// https://github.com/michael-ciniawsky/postcss-load-config
+
+module.exports = {
+  'plugins': {
+    // to edit target browsers: use "browserslist" field in package.json
+    'autoprefixer': {}
+  }
+}

demo-web-ui/public/index.html

@@ -1,17 +1,17 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= webpackConfig.name %></title>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but <%= webpackConfig.name %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <title><%= webpackConfig.name %></title>
+  </head>
+  <body>
+    <noscript>
+      <strong>We're sorry but <%= webpackConfig.name %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    </noscript>
+    <div id="app"></div>
+    <!-- built files will be auto injected -->
+  </body>
+</html>

demo-web-ui/src/App.vue

@@ -1,14 +1,14 @@
-<template>
-  <div id="app">
-    <router-view />
-  </div>
-</template>
-
-<script>
-  export default {
-    name: 'App',
-    mounted() {
-      
-    },
-  }
-</script>
+<template>
+  <div id="app">
+    <router-view />
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'App',
+    mounted() {
+      
+    },
+  }
+</script>

demo-web-ui/src/api/Common/Upload.js

@@ -1,30 +1,30 @@
-import request from '@/utils/request'
-// 上传图片
-export function imageUpload(data){
-	return request({
-		url: '/jlcyry/file/upload',
-		method: 'post',
-		data,
-		headers:{'Content-Type':'multipart/form-data'}
-	})
-}
-// 移动端管理--新增上传插件
-export const uploadFile = '/api/portal/v1/appsubsetversion/save'
-// 移动端管理--更新上传插件
-export const upload_UpdateFile = '/api/portal/v1/appsubsetversion/update'
-// 移动端管理--框架更新上传插件
-export const upload_frameFile = '/api/portal/v1/appversion/save'
-// 移动端管理--上传icon(图标)
-export const uploadFileIcon = '/api/portal/file/upload'
-
-// 图片上传
-export const uploadImgFile = '/api/portal/file/upload'
-
-// 移除图片
-export function deleteFilesOss(data) {
-  return request({
-    url: '/base/v1/baseVehicleAppendixs/deleteFilesOss', // data,
-    method: 'post',
-    params: { fullPath: data }
-  })
-}
+import request from '@/utils/request'
+// 上传图片
+export function imageUpload(data){
+	return request({
+		url: '/jlcyry/file/upload',
+		method: 'post',
+		data,
+		headers:{'Content-Type':'multipart/form-data'}
+	})
+}
+// 移动端管理--新增上传插件
+export const uploadFile = '/api/portal/v1/appsubsetversion/save'
+// 移动端管理--更新上传插件
+export const upload_UpdateFile = '/api/portal/v1/appsubsetversion/update'
+// 移动端管理--框架更新上传插件
+export const upload_frameFile = '/api/portal/v1/appversion/save'
+// 移动端管理--上传icon(图标)
+export const uploadFileIcon = '/api/portal/file/upload'
+
+// 图片上传
+export const uploadImgFile = '/api/portal/file/upload'
+
+// 移除图片
+export function deleteFilesOss(data) {
+  return request({
+    url: '/base/v1/baseVehicleAppendixs/deleteFilesOss', // data,
+    method: 'post',
+    params: { fullPath: data }
+  })
+}

demo-web-ui/src/api/Common/areaPicker.js

@@ -1,25 +1,25 @@
-import request from '@/utils/request'
-
-//区域获取省
-export function getProvince(data) {
-  return request({
-    url: '/system/region/getProvince',
-    method: 'get'
-  })
-}
-//根据省sid获取该省的所有市
-export function getCity(data) {
-  return request({
-    url: '/system/region/getCity',
-    method: 'get',
-    params: data
-  })
-}
-//根据市sid获取该市的所有县区
-export function getCounty(data) {
-  return request({
-    url: '/system/region/getCounty',
-    method: 'get',
-    params: data
-  })
-}
+import request from '@/utils/request'
+
+//区域获取省
+export function getProvince(data) {
+  return request({
+    url: '/system/region/getProvince',
+    method: 'get'
+  })
+}
+//根据省sid获取该省的所有市
+export function getCity(data) {
+  return request({
+    url: '/system/region/getCity',
+    method: 'get',
+    params: data
+  })
+}
+//根据市sid获取该市的所有县区
+export function getCounty(data) {
+  return request({
+    url: '/system/region/getCounty',
+    method: 'get',
+    params: data
+  })
+}

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

@@ -1,54 +1,53 @@
-import request from '@/utils/request'
-import qs from 'qs'
-
-class user {
-  login(data) { // 登录
-    return request({
-      url: '/system/user/login',
-      method: 'post',
-      data
-    })
-  }
-
-  logout(data) { // 退出
-    return request({
-      url: '/portal/v1/sysuser/signOut',
-      method: 'post',
-      data: qs.stringify(data)
-    })
-  }
-
-  updatePassword(data) { // 退出修改密码
-    return request({
-      url: '/portal/v1/sysuser/updatePassword',
-      method: 'post',
-      data: qs.stringify(data)
-    })
-  }
-
-  reGetPwd(data) {
-    return request({
-      url: '/portal/v1/sysuser/reGetPwd',
-      method: 'post',
-      params: data,
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded'
-      }
-    })
-  }
-  selectPasswordByUserSid(data) {
-    return request({
-      url: '/portal/v1/sysuser/selectPasswordByUserSid/' + data,
-      method: 'get'
-    })
-  }
-  getOrgListByUserSid(data) {
-    return request({
-      url: '/portal/v1/sysuser/getOrgListByUserSid',
-      method: 'get',
-      params: data
-    })
-  }
-}
-
-export default new user()
+import request from '@/utils/request'
+import qs from 'qs'
+
+class user {
+  login(data) { // 登录
+    return request({
+      url: '/system/user/login',
+      method: 'post',
+      data
+    })
+  }
+  logout(data) { // 退出
+    return request({
+      url: '/portal/v1/sysuser/signOut',
+      method: 'post',
+      data: qs.stringify(data)
+    })
+  }
+
+  updatePassword(data) { // 退出修改密码
+    return request({
+      url: '/portal/v1/sysuser/updatePassword',
+      method: 'post',
+      data: qs.stringify(data)
+    })
+  }
+
+  reGetPwd(data) { //修改密码
+    return request({
+      url: '/portal/v1/sysuser/reGetPwd',
+      method: 'post',
+      params: data,
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded'
+      }
+    })
+  }
+  selectPasswordByUserSid(data) {
+    return request({
+      url: '/portal/v1/sysuser/selectPasswordByUserSid/' + data,
+      method: 'get'
+    })
+  }
+  getOrgListByUserSid(data) {
+    return request({
+      url: '/portal/v1/sysuser/getOrgListByUserSid',
+      method: 'get',
+      params: data
+    })
+  }
+}
+
+export default new user()

demo-web-ui/src/api/flow/read.js

@@ -1,37 +1,37 @@
-import request from '@/utils/request'
-
-// 查看待阅和已阅列表
-export function pagerList(data) {
-  return request({
-    url: '/message/v1/messagelist/todoAllReadList',
-    method: 'post',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
-
-// 待阅列表--修改为已阅
-export function changeRead(data) {
-  return request({
-    url: '/message/v1/messagelist/changeRead?sids=' + data,
-    method: 'get'
-  })
-}
-
-// 待阅列表--修改为已阅
-export function getToBeReadNum(data) {
-  return request({
-    url: '/message/v1/messagelist/getTodoNum/' + data,
-    method: 'get'
-  })
-}
-
-// 待办已办待阅已阅获取人员
-export function sysstaffinfo() {
-  return request({
-    url: '/portal/v1/sysstaffinfo/v1/sysstaffinfo/selectStaffLists',
-    method: 'get'
-  })
-}
+import request from '@/utils/request'
+
+// 查看待阅和已阅列表
+export function pagerList(data) {
+  return request({
+    url: '/message/v1/messagelist/todoAllReadList',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 待阅列表--修改为已阅
+export function changeRead(data) {
+  return request({
+    url: '/message/v1/messagelist/changeRead?sids=' + data,
+    method: 'get'
+  })
+}
+
+// 待阅列表--修改为已阅
+export function getToBeReadNum(data) {
+  return request({
+    url: '/message/v1/messagelist/getTodoNum/' + data,
+    method: 'get'
+  })
+}
+
+// 待办已办待阅已阅获取人员
+export function sysstaffinfo() {
+  return request({
+    url: '/portal/v1/sysstaffinfo/v1/sysstaffinfo/selectStaffLists',
+    method: 'get'
+  })
+}

demo-web-ui/src/api/flow/todo.js

@@ -1,133 +1,133 @@
-import request from '@/utils/request'
-
-// 读取xml文件
-export function readXml(deployId, token) {
-  return request({
-    url: '/portal/v1/flow/readXml/' + deployId,
-    method: 'get',
-    params: token
-  })
-}
-// 读取image文件
-export function getFlowViewer(procInsId, token) {
-  return request({
-    url: '/portal/v1/flow/flowViewer/' + procInsId,
-    method: 'get',
-    params: token
-  })
-}
-// 查看总代办列表
-export function pagerList(params) {
-  return request({
-    url: '/portal/v1/flow/todoAllTaskList/' + params.params.userSid,
-    method: 'post',
-    data: params,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
-
-// 查看总已办列表
-export function getList(params) {
-  return request({
-    url: '/portal/v1/flow/doneAllTaskList/' + params.params.userSid,
-    method: 'post',
-    data: params,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
-
-// 待办已办待阅已阅获取人员
-export function sysstaffinfo() {
-  return request({
-    url: '/portal/v1/sysstaffinfo/selectStaffLists',
-    method: 'get'
-  })
-}
-
-// 代办任务同意办理
-export function businessAgree(params) {
-  return request({
-    url: '/portal/v1/flow/complete',
-    method: 'post',
-    data: params,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
-
-// 代办任务驳回任务
-export function rejectTask(params) {
-  return request({
-    url: '/portal/v1/flow/reject/' + params.businessSid,
-    method: 'post',
-    data: params,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
-
-// 代办任务终止任务
-export function breakTask(params) {
-  return request({
-    url: '/portal/v1/flow/breakProcess/' + params.businessSid,
-    method: 'post',
-    data: params,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
-
-// 代办任务撤回任务
-export function revokeTask(params) {
-  return request({
-    url: '/portal/v1/flow/revokeProcess/' + params.userSid + '/' + params.businessSid,
-    method: 'post',
-    data: params,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
-
-// 已办任务列表--终止
-export function breakProcess(params) {
-  return request({
-    url: '/flowable/v1/flow/breakProcess',
-    method: 'post',
-    data: params,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
-
-// 审批记录--保存评论
-export function commentSave(data) {
-  return request({
-    url: '/flowable/v1/processcomment/save',
-    method: 'post',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
-
-// 根据流程定义id，节点id，终端及类型查询流程与业务表单url
-export function selectUrl(params) {
-  return request({
-    url: '/flowable/v1/flowable/proUrl/selectPcUrlByTaskDefKey',
-    method: 'post',
-    data: params,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
+import request from '@/utils/request'
+
+// 读取xml文件
+export function readXml(deployId, token) {
+  return request({
+    url: '/portal/v1/flow/readXml/' + deployId,
+    method: 'get',
+    params: token
+  })
+}
+// 读取image文件
+export function getFlowViewer(procInsId, token) {
+  return request({
+    url: '/portal/v1/flow/flowViewer/' + procInsId,
+    method: 'get',
+    params: token
+  })
+}
+// 查看总代办列表
+export function pagerList(params) {
+  return request({
+    url: '/portal/v1/flow/todoAllTaskList/' + params.params.userSid,
+    method: 'post',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 查看总已办列表
+export function getList(params) {
+  return request({
+    url: '/portal/v1/flow/doneAllTaskList/' + params.params.userSid,
+    method: 'post',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 待办已办待阅已阅获取人员
+export function sysstaffinfo() {
+  return request({
+    url: '/portal/v1/sysstaffinfo/selectStaffLists',
+    method: 'get'
+  })
+}
+
+// 代办任务同意办理
+export function businessAgree(params) {
+  return request({
+    url: '/portal/v1/flow/complete',
+    method: 'post',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 代办任务驳回任务
+export function rejectTask(params) {
+  return request({
+    url: '/portal/v1/flow/reject/' + params.businessSid,
+    method: 'post',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 代办任务终止任务
+export function breakTask(params) {
+  return request({
+    url: '/portal/v1/flow/breakProcess/' + params.businessSid,
+    method: 'post',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 代办任务撤回任务
+export function revokeTask(params) {
+  return request({
+    url: '/portal/v1/flow/revokeProcess/' + params.userSid + '/' + params.businessSid,
+    method: 'post',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 已办任务列表--终止
+export function breakProcess(params) {
+  return request({
+    url: '/flowable/v1/flow/breakProcess',
+    method: 'post',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 审批记录--保存评论
+export function commentSave(data) {
+  return request({
+    url: '/flowable/v1/processcomment/save',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 根据流程定义id，节点id，终端及类型查询流程与业务表单url
+export function selectUrl(params) {
+  return request({
+    url: '/flowable/v1/flowable/proUrl/selectPcUrlByTaskDefKey',
+    method: 'post',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}

demo-web-ui/src/api/flow/todoForBusiness.js

@@ -1,24 +1,24 @@
-import request from '@/utils/request'
-import qs from 'qs'
-// 读取xml文件
-export function readXml (deployId) {
-  return request({
-    url: '/portal/v1/flow/readXml/' + deployId,
-    method: 'get'
-  })
-}
-// 读取image文件
-export function getFlowViewer (procInsId) {
-  return request({
-    url: '/portal/v1/flow/flowViewer/' + procInsId,
-    method: 'get'
-  })
-}
-// 任务流转记录
-export function flowRecord(query) {
-  return request({
-    url: '/portal/v1/flow/task/flowRecord/' + query.procInsId + "/" + query.deployId,
-    method: 'get',
-    params: query
-  })
-}
+import request from '@/utils/request'
+import qs from 'qs'
+// 读取xml文件
+export function readXml (deployId) {
+  return request({
+    url: '/portal/v1/flow/readXml/' + deployId,
+    method: 'get'
+  })
+}
+// 读取image文件
+export function getFlowViewer (procInsId) {
+  return request({
+    url: '/portal/v1/flow/flowViewer/' + procInsId,
+    method: 'get'
+  })
+}
+// 任务流转记录
+export function flowRecord(query) {
+  return request({
+    url: '/portal/v1/flow/task/flowRecord/' + query.procInsId + "/" + query.deployId,
+    method: 'get',
+    params: query
+  })
+}

demo-web-ui/src/api/jlcyry/staffOrg/staffOrg.js

@@ -1,42 +1,42 @@
-import request from '@/utils/request'
-import qs from 'qs';
-class staffOrg {
-  staffBingingList(data) { // 人员绑定审核列表
-    return request({
-      url: '/jlcyry/staffOrg/staffBingingList',
-      method: 'post',
-      data: data,
-      headers: {
-        'Content-Type': 'application/json',
-        'token' : "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiIxOCIsImlzcyI6IldCSyIsImV4cCI6MTYwMjg5ODM0NH0.VBtcZcQm_1eLqThHXPM6YZrIHQFy3_LJtBkEONgcoos"
-      }
-    })
-  }
-  staffOrgBingingDetails(data) { //人员绑定列表点击审核的初始化页面数据
-    return request({
-      url: '/jlcyry/staffOrg/staffOrgBingingDetails/'+ data.userName,
-      method: 'get',
-      params: data
-    })
-  }
-  verify(data) { //人员绑定审核
-    return request({
-      url: '/jlcyry/staffOrg/verifyStaffOrg',
-      method: 'post',
-      data: data,
-      headers: {'Content-Type': 'application/json'}
-    })
-  }
-
-  setUpDepartment(data) { //人员绑定部门
-    return request({
-      url: '/system/v1/departmentStaffs/setUpDepartment',
-      method: 'post',
-      data: data,
-      headers: {'Content-Type': 'application/json'}
-    })
-  }
-
-}
-
-export default new staffOrg()
+import request from '@/utils/request'
+import qs from 'qs';
+class staffOrg {
+  staffBingingList(data) { // 人员绑定审核列表
+    return request({
+      url: '/jlcyry/staffOrg/staffBingingList',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json',
+        'token' : "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiIxOCIsImlzcyI6IldCSyIsImV4cCI6MTYwMjg5ODM0NH0.VBtcZcQm_1eLqThHXPM6YZrIHQFy3_LJtBkEONgcoos"
+      }
+    })
+  }
+  staffOrgBingingDetails(data) { //人员绑定列表点击审核的初始化页面数据
+    return request({
+      url: '/jlcyry/staffOrg/staffOrgBingingDetails/'+ data.userName,
+      method: 'get',
+      params: data
+    })
+  }
+  verify(data) { //人员绑定审核
+    return request({
+      url: '/jlcyry/staffOrg/verifyStaffOrg',
+      method: 'post',
+      data: data,
+      headers: {'Content-Type': 'application/json'}
+    })
+  }
+
+  setUpDepartment(data) { //人员绑定部门
+    return request({
+      url: '/system/v1/departmentStaffs/setUpDepartment',
+      method: 'post',
+      data: data,
+      headers: {'Content-Type': 'application/json'}
+    })
+  }
+
+}
+
+export default new staffOrg()

demo-web-ui/src/api/orgRegist/index.js

@@ -1,60 +1,60 @@
-import request from '@/utils/request'
-import qs from 'qs';
-// 获取机构的单位类别
-export function getDwType(data) {
-  return request({
-    url: '/system/dictCommon/getDwType',
-    method: 'get',
-    params: data
-  })
-}
-//获取机构的人员类别
-export function getRylb(data) {
-  return request({
-    url: '/system/dictCommon/getRylb',
-    method: 'get'
-  })
-}
-
-//获取验证码(注册)
-export function getVerificationCode(data) {
-  return request({
-    url: '/system/organization/getVerificationCode',
-    method: 'get',
-    params: data
-  })
-}
-//获取机构信息列表
-export function verifyList(data) {
-  return request({
-    url: '/system/organization/verifyList',
-    method: 'post',
-    data: qs.stringify(data),
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-//机构信息保存
-export function saveOrg(data) {
-  return request({
-    url: '/system/organization/save',
-    method: 'post',
-    data: qs.stringify(data),
-  })
-}
-
-//入职单位下拉框
-export function inductionUnitList(data) {
-  return request({
-    url: '/system/organization/inductionUnitList',
-    method: 'post',
-    data: qs.stringify(data),
-  })
-}
-
-export function download(data) { // 下载授权证书
-  return request({
-    url: 'system/organization/download',
-    method: 'get',
-  })
-}
+import request from '@/utils/request'
+import qs from 'qs';
+// 获取机构的单位类别
+export function getDwType(data) {
+  return request({
+    url: '/system/dictCommon/getDwType',
+    method: 'get',
+    params: data
+  })
+}
+//获取机构的人员类别
+export function getRylb(data) {
+  return request({
+    url: '/system/dictCommon/getRylb',
+    method: 'get'
+  })
+}
+
+//获取验证码(注册)
+export function getVerificationCode(data) {
+  return request({
+    url: '/system/organization/getVerificationCode',
+    method: 'get',
+    params: data
+  })
+}
+//获取机构信息列表
+export function verifyList(data) {
+  return request({
+    url: '/system/organization/verifyList',
+    method: 'post',
+    data: qs.stringify(data),
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+
+//机构信息保存
+export function saveOrg(data) {
+  return request({
+    url: '/system/organization/save',
+    method: 'post',
+    data: qs.stringify(data),
+  })
+}
+
+//入职单位下拉框
+export function inductionUnitList(data) {
+  return request({
+    url: '/system/organization/inductionUnitList',
+    method: 'post',
+    data: qs.stringify(data),
+  })
+}
+
+export function download(data) { // 下载授权证书
+  return request({
+    url: 'system/organization/download',
+    method: 'get',
+  })
+}

demo-web-ui/src/api/orgRegist/organization.js

@@ -1,22 +1,22 @@
-import request from '@/utils/request'
-import qs from 'qs';
-class organization{
-  inductionUnitList(data) { // 绑定单位 入职单位下拉框
-    return request({
-      url: '/system/organization/inductionUnitList',
-      method: 'post',
-      data: qs.stringify(data),
-    })
-  }
-  save(data) { // 人员机构关系保存
-    return request({
-      url: '/jlcyry/staffOrg/save',
-      method: 'post',
-      data: data,
-      headers: {'Content-Type': 'application/json'}
-    })
-  }
-
-}
-
-export default new organization()
+import request from '@/utils/request'
+import qs from 'qs';
+class organization{
+  inductionUnitList(data) { // 绑定单位 入职单位下拉框
+    return request({
+      url: '/system/organization/inductionUnitList',
+      method: 'post',
+      data: qs.stringify(data),
+    })
+  }
+  save(data) { // 人员机构关系保存
+    return request({
+      url: '/jlcyry/staffOrg/save',
+      method: 'post',
+      data: data,
+      headers: {'Content-Type': 'application/json'}
+    })
+  }
+
+}
+
+export default new organization()

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

@@ -1,33 +1,33 @@
-import request from '@/utils/request'
-import qs from 'qs'
-let tokens = window.sessionStorage.getItem('token');
-//
-export function rolemenus(data) {
-  return request({
-    url: '/system/v1/rolemenus/'+data.roleSid,
-    method: 'get',
-    params: data
-  })
-}
-
-// 获取左侧菜单
-export function getrolemenus(data) {
-  return request({
-    url: '/portal/v1/sysmenu/sourcemenutree',
-    method: 'POST',
-    async: false,
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens}
-  })
-}
-
-// 获取角色的主页菜单
-export function sourcesofrole(data) {
-  return request({
-    url: '/system/v1/rolemenus/sourcesofrole',
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
+import request from '@/utils/request'
+import qs from 'qs'
+let tokens = window.sessionStorage.getItem('token');
+//
+export function rolemenus(data) {
+  return request({
+    url: '/system/v1/rolemenus/'+data.roleSid,
+    method: 'get',
+    params: data
+  })
+}
+
+// 获取左侧菜单
+export function getrolemenus(data) {
+  return request({
+    url: 'v1/SysMenu/list',
+    method: 'POST',
+    async: false,
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens}
+  })
+}
+
+// 获取角色的主页菜单
+export function sourcesofrole(data) {
+  return request({
+    url: '/system/v1/rolemenus/sourcesofrole',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}

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

@@ -1,69 +1,69 @@
-import request from '@/utils/request'
-import qs from 'qs'
-
-// 获取角色 不分页列表
-export function roleList(data) {
-  return request({
-    url: '/system/v1/roles/list/',
-    method: 'post',
-    data: qs.stringify(data)
-  })
-}
-
-
-//获取角色 分页列表
-export function rolePageList(data) {
-  return request({
-    url: '/system/v1/roles/pagelist',
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-//保存 角色信息
-export function saveRoleInfo(data) {
-  return request({
-    url: '/system/v1/roles',
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-//根据sid 获取单个角色 信息
-export function getRoleInfo(data) {
-  return request({
-    url: '/system/v1/roles/' + data.sid,
-    method: 'GET',
-    data: qs.stringify(data)
-  })
-}
-
-//根据sid 修改单个角色 信息
-export function putRoleInfo(data) {
-  return request({
-    url: '/system/v1/roles/' + data.sid,
-    method: 'PUT',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-//根据sid 删除单个角色 信息
-export function delRole(data) {
-  return request({
-    url: '/system/v1/roles/' + data.sid,
-    method: 'DELETE',
-    data: qs.stringify(data)
-  })
-}
-
-//根据sid 设置单个角色 的状态
-export function setRoleEnable(data) {
-  return request({
-    url: `/system/v1/roles/setIsEnable/${data.sid}/${data.isEnable}`,
-    method: 'POST',
-    data: qs.stringify(data)
-  })
-}
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取角色 不分页列表
+export function roleList(data) {
+  return request({
+    url: '/system/v1/roles/list/',
+    method: 'post',
+    data: qs.stringify(data)
+  })
+}
+
+
+//获取角色 分页列表
+export function rolePageList(data) {
+  return request({
+    url: '/system/v1/roles/pagelist',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+
+//保存 角色信息
+export function saveRoleInfo(data) {
+  return request({
+    url: '/system/v1/roles',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+
+//根据sid 获取单个角色 信息
+export function getRoleInfo(data) {
+  return request({
+    url: '/system/v1/roles/' + data.sid,
+    method: 'GET',
+    data: qs.stringify(data)
+  })
+}
+
+//根据sid 修改单个角色 信息
+export function putRoleInfo(data) {
+  return request({
+    url: '/system/v1/roles/' + data.sid,
+    method: 'PUT',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+
+//根据sid 删除单个角色 信息
+export function delRole(data) {
+  return request({
+    url: '/system/v1/roles/' + data.sid,
+    method: 'DELETE',
+    data: qs.stringify(data)
+  })
+}
+
+//根据sid 设置单个角色 的状态
+export function setRoleEnable(data) {
+  return request({
+    url: `/system/v1/roles/setIsEnable/${data.sid}/${data.isEnable}`,
+    method: 'POST',
+    data: qs.stringify(data)
+  })
+}

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

@@ -1,32 +1,32 @@
-import request from '@/utils/request'
-import qs from 'qs'
-//获取单位级别
-export function getDwJb(data) {
-  return request({
-    url: '/system/dictCommon/getDwJb',
-    method: 'GET',
-  })
-}
-// 获取机构单位类别
-export function getDwType(data) {
-  return request({
-    url: '/system/dictCommon/getDwType',
-    method: 'get',
-    params: data
-  })
-}
-//获取机构人员类别
-export function getRylb(data) {
-  return request({
-    url: '/system/dictCommon/getRylb',
-    method: 'get'
-  })
-}
-
-// 根据Type值获取数据对象
-export function getDicts(typeCode) {
-  return request({
-    url: '/system/dictCommon/dicts/'+typeCode,
-    method: 'get'
-  })
-}
+import request from '@/utils/request'
+import qs from 'qs'
+//获取单位级别
+export function getDwJb(data) {
+  return request({
+    url: '/system/dictCommon/getDwJb',
+    method: 'GET',
+  })
+}
+// 获取机构单位类别
+export function getDwType(data) {
+  return request({
+    url: '/system/dictCommon/getDwType',
+    method: 'get',
+    params: data
+  })
+}
+//获取机构人员类别
+export function getRylb(data) {
+  return request({
+    url: '/system/dictCommon/getRylb',
+    method: 'get'
+  })
+}
+
+// 根据Type值获取数据对象
+export function getDicts(typeCode) {
+  return request({
+    url: '/system/dictCommon/dicts/'+typeCode,
+    method: 'get'
+  })
+}

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

@@ -1,10 +1,10 @@
-import request from '@/utils/request'
-
-export function listPage(data) {
-  return request({
-    url: '/portal/v1/sysmapping/listPage',
-    method: 'post',
-    data: data,
-    headers: { 'Content-Type': 'application/json' }
-  })
-}
+import request from '@/utils/request'
+
+export function listPage(data) {
+  return request({
+    url: '/portal/v1/sysmapping/listPage',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}

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

@@ -1,125 +1,125 @@
-import request from '@/utils/request'
-import qs from 'qs'
-
-// let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY'
-let tokens = window.sessionStorage.getItem('token')
-// 获取菜单 分页列表
-export function pageList(data) {
-  return request({
-    url: '/portal/v1/sysorganization/listPage',
-    method: 'POST',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-// 查询左侧部门列表
-export function orgList(data) {
-  return request({
-    url: '/portal/v1/sysorganization/list',
-    method: 'get',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-// 编辑部门信息
-export function postOrgtree(data) {
-  return request({
-    url: '/portal/v1/sysorganization/update/' + data.sid,
-    method: 'POST',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-// 获取 机构分页列表（编辑部门信息）
-export function putOrgtree(data) {
-  return request({
-    url: '/portal/v1/sysorganization/update/' + data.sid,
-    method: 'POST',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-
-// 新增部门信息
-export function addOrgTree(data) {
-  return request({
-    url: '/portal/v1/sysorganization/save',
-    method: 'POST',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-// 回显
-export function selectBySid(data) {
-  return request({
-    url: 'portal/v1/sysorganization/fetchBySid/' + data,
-    method: 'get',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-// 树 节点名称 删除
-export function delOrgtree(data) {
-  return request({
-    url: `/portal/v1/sysorganization/delBySid/` + data.sid,
-    method: 'get',
-    data: qs.stringify(data),
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-// 查询主管人员 旧的:/portal/v1/sysstafforg/staffinfoList
-export function getStaff(data) {
-  return request({
-    url: 'portal/v1/sysstaffinfo/getStaffNameByDeptSid',
-    method: 'get',
-    params: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-// 查询分管人员
-export function getStaffName(params) {
-  return request({
-    url: '/portal/v1/sysstaffinfo/getStaffName',
-    method: 'get',
-    params: params,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-// 查看二维码
-export function getQrCode(data) {
-  return request({
-    url: '/portal/v1/sysorganization/getQrCode/' + data.sid,
-    method: 'post',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
+import request from '@/utils/request'
+import qs from 'qs'
+
+// let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY'
+let tokens = window.sessionStorage.getItem('token')
+// 获取菜单 分页列表
+export function pageList(data) {
+  return request({
+    url: '/portal/v1/sysorganization/listPage',
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+// 查询左侧部门列表
+export function orgList(data) {
+  return request({
+    url: '/portal/v1/sysorganization/list',
+    method: 'get',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+// 编辑部门信息
+export function postOrgtree(data) {
+  return request({
+    url: '/portal/v1/sysorganization/update/' + data.sid,
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+// 获取 机构分页列表（编辑部门信息）
+export function putOrgtree(data) {
+  return request({
+    url: '/portal/v1/sysorganization/update/' + data.sid,
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+
+// 新增部门信息
+export function addOrgTree(data) {
+  return request({
+    url: '/portal/v1/sysorganization/save',
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+// 回显
+export function selectBySid(data) {
+  return request({
+    url: 'portal/v1/sysorganization/fetchBySid/' + data,
+    method: 'get',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+// 树 节点名称 删除
+export function delOrgtree(data) {
+  return request({
+    url: `/portal/v1/sysorganization/delBySid/` + data.sid,
+    method: 'get',
+    data: qs.stringify(data),
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+// 查询主管人员 旧的:/portal/v1/sysstafforg/staffinfoList
+export function getStaff(data) {
+  return request({
+    url: 'portal/v1/sysstaffinfo/getStaffNameByDeptSid',
+    method: 'get',
+    params: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+// 查询分管人员
+export function getStaffName(params) {
+  return request({
+    url: '/portal/v1/sysstaffinfo/getStaffName',
+    method: 'get',
+    params: params,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+// 查看二维码
+export function getQrCode(data) {
+  return request({
+    url: '/portal/v1/sysorganization/getQrCode/' + data.sid,
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}

demo-web-ui/src/api/system/dictType/dictCommon.js

@@ -1,58 +1,58 @@
-import request from '@/utils/request'
-import qs from 'qs'
-let tokens = window.sessionStorage.getItem('token');
-
-//获取字典子集 分页列表
-export function dictCommonList(data) {
-  return request({
-    url: '/portal/v1/dictcommons/pageList',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-//保存 字典子级
-export function savedictCommon(data) {
-  return request({
-    url: '/portal/v1/dictcommons/save',
-    method: 'POST',
-    data:  data ,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
-  })
-}
-
-//根据sid 获取单个菜单 信息
-export function getRoleInfo(data) {
-  return request({
-    url: '/system/v1/menus/' + data.sid,
-    method: 'GET',
-    data: qs.stringify(data)
-  })
-}
-
-//根据sid 修改 数据字典
-export function putdictCommon(data) {
-  return request({
-    url: '/portal/v1/dictcommons/update/' + data.sid,
-    method: 'POST',
-    data:  data ,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-
-//根据sid 删除菜单 信息
-export function deldictCommon(data) {
-  return request({
-    url: '/portal/v1/dictcommons/delete/' + data.sid,
-    method: 'DELETE',
-    data:  data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
+import request from '@/utils/request'
+import qs from 'qs'
+let tokens = window.sessionStorage.getItem('token');
+
+//获取字典子集 分页列表
+export function dictCommonList(data) {
+  return request({
+    url: '/portal/v1/dictcommons/pageList',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+
+//保存 字典子级
+export function savedictCommon(data) {
+  return request({
+    url: '/portal/v1/dictcommons/save',
+    method: 'POST',
+    data:  data ,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+
+//根据sid 获取单个菜单 信息
+export function getRoleInfo(data) {
+  return request({
+    url: '/system/v1/menus/' + data.sid,
+    method: 'GET',
+    data: qs.stringify(data)
+  })
+}
+
+//根据sid 修改 数据字典
+export function putdictCommon(data) {
+  return request({
+    url: '/portal/v1/dictcommons/update/' + data.sid,
+    method: 'POST',
+    data:  data ,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+
+//根据sid 删除菜单 信息
+export function deldictCommon(data) {
+  return request({
+    url: '/portal/v1/dictcommons/delete/' + data.sid,
+    method: 'DELETE',
+    data:  data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}

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

@@ -1,74 +1,74 @@
-import request from '@/utils/request'
-import qs from 'qs'
-let tokens = window.sessionStorage.getItem('token')
-
-// 获取菜单 分页列表
-export function pageList(data) {
-  return request({
-    url: '/portal/v1/dicttypes/pageList',
-    method: 'POST',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-
-// 根据sid 修改
-export function putDictType(data) {
-  return request({
-    url: '/portal/v1/dicttypes/update/' + data.sid,
-    method: 'POST',
-    data: qs.stringify(data)
-  })
-}
-
-// 保存 角色信息
-export function saveDictType(data) {
-  return request({
-    url: '/portal/v1/dicttypes/save',
-    method: 'POST',
-    data: data,
-    headers: { 'Content-Type': 'application/json', 'token': tokens }
-  })
-}
-
-// 根据sid 获取单个菜单 信息
-export function getRoleInfo(data) {
-  return request({
-    url: '/system/v1/menus/' + data.sid,
-    method: 'GET',
-    data: qs.stringify(data)
-  })
-}
-
-// 数据字段--映射管理保存
-export function saveMappingList(data) {
-  return request({
-    url: '/portal/v1/sysmapping/saveMappingList',
-    method: 'POST',
-    data: data,
-    headers: { 'Content-Type': 'application/json', 'token': tokens }
-  })
-}
-
-// 数据字段--映射管理保存
-export function selectMappingListInfo(data) {
-  return request({
-    url: '/portal/v1/sysmapping/selectMappingListInfo',
-    method: 'post',
-    data: data,
-    headers: { 'Content-Type': 'application/json', 'token': tokens }
-  })
-}
-
-// 根据sid 删除菜单 信息
-export function delDictType(data) {
-  return request({
-    url: '/portal/v1/dicttypes/delete/' + data.sid,
-    method: 'DELETE',
-    data: data,
-    headers: { 'Content-Type': 'application/json', 'token': tokens }
-  })
-}
+import request from '@/utils/request'
+import qs from 'qs'
+let tokens = window.sessionStorage.getItem('token')
+
+// 获取菜单 分页列表
+export function pageList(data) {
+  return request({
+    url: '/portal/v1/dicttypes/pageList',
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+
+// 根据sid 修改
+export function putDictType(data) {
+  return request({
+    url: '/portal/v1/dicttypes/update/' + data.sid,
+    method: 'POST',
+    data: qs.stringify(data)
+  })
+}
+
+// 保存 角色信息
+export function saveDictType(data) {
+  return request({
+    url: '/portal/v1/dicttypes/save',
+    method: 'POST',
+    data: data,
+    headers: { 'Content-Type': 'application/json', 'token': tokens }
+  })
+}
+
+// 根据sid 获取单个菜单 信息
+export function getRoleInfo(data) {
+  return request({
+    url: '/system/v1/menus/' + data.sid,
+    method: 'GET',
+    data: qs.stringify(data)
+  })
+}
+
+// 数据字段--映射管理保存
+export function saveMappingList(data) {
+  return request({
+    url: '/portal/v1/sysmapping/saveMappingList',
+    method: 'POST',
+    data: data,
+    headers: { 'Content-Type': 'application/json', 'token': tokens }
+  })
+}
+
+// 数据字段--映射管理保存
+export function selectMappingListInfo(data) {
+  return request({
+    url: '/portal/v1/sysmapping/selectMappingListInfo',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json', 'token': tokens }
+  })
+}
+
+// 根据sid 删除菜单 信息
+export function delDictType(data) {
+  return request({
+    url: '/portal/v1/dicttypes/delete/' + data.sid,
+    method: 'DELETE',
+    data: data,
+    headers: { 'Content-Type': 'application/json', 'token': tokens }
+  })
+}

demo-web-ui/src/api/system/flowable/definition.js

@@ -1,125 +1,125 @@
-import request from "@/utils/request";
-
-// 查询流程定义列表
-export function listDefinition(query) {
-  console.log(query);
-  return request({
-    // url: '/flowable/definition/list',
-    url: "/flowable/definition/pagerList",
-    method: "post",
-    params: query
-  });
-}
-
-// 读取xml文件
-export function readXml(deployId) {
-  return request({
-    url: "/v1/flowable/definition/readXml/" + deployId,
-    method: "get"
-  });
-}
-
-// 保存模型
-export function saveXml(data) {
-  return request({
-    url: "/v1/flowable/definition/save",
-    method: "post",
-    data: data
-  });
-}
-
-// 部署流程实例
-export function definitionStart(procDefId, data) {
-  return request({
-    url: "/v1/flowable/definition/start/" + procDefId,
-    method: "post",
-    data: data
-  });
-}
-
-// 获取流程变量
-export function getProcessVariables(taskId) {
-  return request({
-    url: "/v1/flowable/task/processVariables/" + taskId,
-    method: "get"
-  });
-}
-
-// 激活/挂起流程
-export function updateState(params) {
-  return request({
-    url: "/flowable/definition/updateState",
-    method: "put",
-    params: params
-  });
-}
-
-// 指定流程办理人员列表
-export function userList(query) {
-  return request({
-    url: "/v1/flowable/definition/userList",
-    method: "get",
-    params: query
-  });
-}
-
-// 指定流程办理组列表
-export function roleList(query) {
-  return request({
-    url: "/flowable/definition/roleList",
-    method: "get",
-    params: query
-  });
-}
-
-// 读取image文件
-export function readImage(deployId) {
-  return request({
-    url: "/flowable/definition/readImage/" + deployId,
-    method: "get"
-  });
-}
-
-// 读取image文件
-export function getFlowViewer(procInsId) {
-  return request({
-    url: "/v1/flowable/task/flowViewer/" + procInsId,
-    method: "get"
-  });
-}
-
-// 新增流程定义
-export function addDeployment(data) {
-  return request({
-    url: "/system/deployment",
-    method: "post",
-    data: data
-  });
-}
-
-// 修改流程定义
-export function updateDeployment(data) {
-  return request({
-    url: "/system/deployment",
-    method: "put",
-    data: data
-  });
-}
-
-// 删除流程定义
-export function delDeployment(query) {
-  return request({
-    url: "/v1/flowable/definition/delete",
-    method: "delete",
-    params: query
-  });
-}
-
-// 导出流程定义
-export function exportDeployment(query) {
-  return request({
-    url: "/system/deployment/export",
-    method: "get",
-    params: query
-  });
-}
+import request from "@/utils/request";
+
+// 查询流程定义列表
+export function listDefinition(query) {
+  console.log(query);
+  return request({
+    // url: '/flowable/definition/list',
+    url: "/flowable/definition/pagerList",
+    method: "post",
+    params: query
+  });
+}
+
+// 读取xml文件
+export function readXml(deployId) {
+  return request({
+    url: "/v1/flowable/definition/readXml/" + deployId,
+    method: "get"
+  });
+}
+
+// 保存模型
+export function saveXml(data) {
+  return request({
+    url: "/v1/flowable/definition/save",
+    method: "post",
+    data: data
+  });
+}
+
+// 部署流程实例
+export function definitionStart(procDefId, data) {
+  return request({
+    url: "/v1/flowable/definition/start/" + procDefId,
+    method: "post",
+    data: data
+  });
+}
+
+// 获取流程变量
+export function getProcessVariables(taskId) {
+  return request({
+    url: "/v1/flowable/task/processVariables/" + taskId,
+    method: "get"
+  });
+}
+
+// 激活/挂起流程
+export function updateState(params) {
+  return request({
+    url: "/flowable/definition/updateState",
+    method: "put",
+    params: params
+  });
+}
+
+// 指定流程办理人员列表
+export function userList(query) {
+  return request({
+    url: "/v1/flowable/definition/userList",
+    method: "get",
+    params: query
+  });
+}
+
+// 指定流程办理组列表
+export function roleList(query) {
+  return request({
+    url: "/flowable/definition/roleList",
+    method: "get",
+    params: query
+  });
+}
+
+// 读取image文件
+export function readImage(deployId) {
+  return request({
+    url: "/flowable/definition/readImage/" + deployId,
+    method: "get"
+  });
+}
+
+// 读取image文件
+export function getFlowViewer(procInsId) {
+  return request({
+    url: "/v1/flowable/task/flowViewer/" + procInsId,
+    method: "get"
+  });
+}
+
+// 新增流程定义
+export function addDeployment(data) {
+  return request({
+    url: "/system/deployment",
+    method: "post",
+    data: data
+  });
+}
+
+// 修改流程定义
+export function updateDeployment(data) {
+  return request({
+    url: "/system/deployment",
+    method: "put",
+    data: data
+  });
+}
+
+// 删除流程定义
+export function delDeployment(query) {
+  return request({
+    url: "/v1/flowable/definition/delete",
+    method: "delete",
+    params: query
+  });
+}
+
+// 导出流程定义
+export function exportDeployment(query) {
+  return request({
+    url: "/system/deployment/export",
+    method: "get",
+    params: query
+  });
+}

demo-web-ui/src/api/system/flowable/finished.js

@@ -1,80 +1,80 @@
-import request from '@/utils/request'
-import da from "element-ui/src/locale/lang/da";
-
-// 查询已办任务列表
-export function finishedList(data) {
-  return request({
-    url: '/v1/flowable/task/doneList',
-    method: 'post',
-    data: data
-  })
-}
-
-// 任务流转记录
-export function flowRecord(data) {
-  return request({
-    url: '/v1/flowable/task/flowRecord',
-    method: 'post',
-    data: data
-  })
-}
-
-// 撤回任务
-export function revokeProcess(data) {
-  return request({
-    url: '/flowable/task/revokeProcess',
-    method: 'post',
-    data: data
-  })
-}
-
-// 部署流程实例
-export function deployStart(deployId) {
-  return request({
-    url: '/flowable/process/startFlow/' + deployId,
-    method: 'get',
-  })
-}
-
-// 查询流程定义详细
-export function getDeployment(id) {
-  return request({
-    url: '/system/deployment/' + id,
-    method: 'get'
-  })
-}
-
-// 新增流程定义
-export function addDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改流程定义
-export function updateDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除流程定义
-export function delDeployment(id) {
-  return request({
-    url: '/system/deployment/' + id,
-    method: 'delete'
-  })
-}
-
-// 导出流程定义
-export function exportDeployment(query) {
-  return request({
-    url: '/system/deployment/export',
-    method: 'get',
-    params: query
-  })
-}
+import request from '@/utils/request'
+import da from "element-ui/src/locale/lang/da";
+
+// 查询已办任务列表
+export function finishedList(data) {
+  return request({
+    url: '/v1/flowable/task/doneList',
+    method: 'post',
+    data: data
+  })
+}
+
+// 任务流转记录
+export function flowRecord(data) {
+  return request({
+    url: '/v1/flowable/task/flowRecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 撤回任务
+export function revokeProcess(data) {
+  return request({
+    url: '/flowable/task/revokeProcess',
+    method: 'post',
+    data: data
+  })
+}
+
+// 部署流程实例
+export function deployStart(deployId) {
+  return request({
+    url: '/flowable/process/startFlow/' + deployId,
+    method: 'get',
+  })
+}
+
+// 查询流程定义详细
+export function getDeployment(id) {
+  return request({
+    url: '/system/deployment/' + id,
+    method: 'get'
+  })
+}
+
+// 新增流程定义
+export function addDeployment(data) {
+  return request({
+    url: '/system/deployment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改流程定义
+export function updateDeployment(data) {
+  return request({
+    url: '/system/deployment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除流程定义
+export function delDeployment(id) {
+  return request({
+    url: '/system/deployment/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出流程定义
+export function exportDeployment(query) {
+  return request({
+    url: '/system/deployment/export',
+    method: 'get',
+    params: query
+  })
+}

demo-web-ui/src/api/system/flowable/form.js

@@ -1,64 +1,64 @@
-import request from '@/utils/request'
-
-// 查询流程表单列表
-export function listForm(query) {
-  return request({
-    url: '/v1/flowable/form/list',
-    method: 'post',
-    data: query
-  })
-}
-
-// 查询流程表单详细
-export function getForm(formId) {
-  return request({
-    url: '/v1/flowable/form/' + formId,
-    method: 'get'
-  })
-}
-
-// 新增流程表单
-export function addForm(data) {
-  return request({
-    url: '/v1/flowable/form/add',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':1
-    }
-  })
-}
-
-// 修改流程表单
-export function updateForm(data) {
-  return request({
-    url: '/v1/flowable/form',
-    method: 'put',
-    data: data
-  })
-}
-// 挂载表单
-export function addDeployForm(data) {
-  return request({
-    url: '/v1/flowable/form/addDeployForm',
-    method: 'post',
-    data: data
-  })
-}
-
-// 删除流程表单
-export function delForm(formId) {
-  return request({
-    url: '/v1/flowable/form/' + formId,
-    method: 'delete'
-  })
-}
-
-// 导出流程表单
-export function exportForm(query) {
-  return request({
-    url: '/v1/flowable/form/export',
-    method: 'get',
-    params: query
-  })
-}
+import request from '@/utils/request'
+
+// 查询流程表单列表
+export function listForm(query) {
+  return request({
+    url: '/v1/flowable/form/list',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询流程表单详细
+export function getForm(formId) {
+  return request({
+    url: '/v1/flowable/form/' + formId,
+    method: 'get'
+  })
+}
+
+// 新增流程表单
+export function addForm(data) {
+  return request({
+    url: '/v1/flowable/form/add',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':1
+    }
+  })
+}
+
+// 修改流程表单
+export function updateForm(data) {
+  return request({
+    url: '/v1/flowable/form',
+    method: 'put',
+    data: data
+  })
+}
+// 挂载表单
+export function addDeployForm(data) {
+  return request({
+    url: '/v1/flowable/form/addDeployForm',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除流程表单
+export function delForm(formId) {
+  return request({
+    url: '/v1/flowable/form/' + formId,
+    method: 'delete'
+  })
+}
+
+// 导出流程表单
+export function exportForm(query) {
+  return request({
+    url: '/v1/flowable/form/export',
+    method: 'get',
+    params: query
+  })
+}

demo-web-ui/src/api/system/flowable/process.js

@@ -1,98 +1,98 @@
-import request from '@/utils/request'
-import da from "element-ui/src/locale/lang/da";
-
-// 我的发起的流程
-export function myProcessList(data) {
-  return request({
-    url: '/v1/flowable/task/myprocess',
-    method: 'post',
-    data: data
-  })
-}
-
-// 完成任务
-export function complete(data) {
-  return request({
-    url: '/flowable/task/complete',
-    method: 'post',
-    data: data
-  })
-}
-
-// 取消申请
-export function stopProcess(data) {
-  return request({
-    url: '/v1/flowable/task/stopProcess',
-    method: 'post',
-    data: data
-  })
-}
-
-// 驳回任务
-export function rejectTask(data) {
-  return request({
-    url: '/v1/flowable/task/reject',
-    method: 'post',
-    data: data
-  })
-}
-
-// 可退回任务列表
-export function returnList(data) {
-  return request({
-    url: '/v1/flowable/task/returnList',
-    method: 'post',
-    data: data
-  })
-}
-
-// 部署流程实例
-export function deployStart(deployId) {
-  return request({
-    url: '/flowable/process/startFlow/' + deployId,
-    method: 'get',
-  })
-}
-
-// 查询流程定义详细
-export function getDeployment(id) {
-  return request({
-    url: '/system/deployment/' + id,
-    method: 'get'
-  })
-}
-
-// 新增流程定义
-export function addDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改流程定义
-export function updateDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除流程定义
-export function delDeployment(id) {
-  return request({
-    url: '/system/deployment/' + id,
-    method: 'delete'
-  })
-}
-
-// 导出流程定义
-export function exportDeployment(query) {
-  return request({
-    url: '/system/deployment/export',
-    method: 'get',
-    params: query
-  })
-}
+import request from '@/utils/request'
+import da from "element-ui/src/locale/lang/da";
+
+// 我的发起的流程
+export function myProcessList(data) {
+  return request({
+    url: '/v1/flowable/task/myprocess',
+    method: 'post',
+    data: data
+  })
+}
+
+// 完成任务
+export function complete(data) {
+  return request({
+    url: '/flowable/task/complete',
+    method: 'post',
+    data: data
+  })
+}
+
+// 取消申请
+export function stopProcess(data) {
+  return request({
+    url: '/v1/flowable/task/stopProcess',
+    method: 'post',
+    data: data
+  })
+}
+
+// 驳回任务
+export function rejectTask(data) {
+  return request({
+    url: '/v1/flowable/task/reject',
+    method: 'post',
+    data: data
+  })
+}
+
+// 可退回任务列表
+export function returnList(data) {
+  return request({
+    url: '/v1/flowable/task/returnList',
+    method: 'post',
+    data: data
+  })
+}
+
+// 部署流程实例
+export function deployStart(deployId) {
+  return request({
+    url: '/flowable/process/startFlow/' + deployId,
+    method: 'get',
+  })
+}
+
+// 查询流程定义详细
+export function getDeployment(id) {
+  return request({
+    url: '/system/deployment/' + id,
+    method: 'get'
+  })
+}
+
+// 新增流程定义
+export function addDeployment(data) {
+  return request({
+    url: '/system/deployment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改流程定义
+export function updateDeployment(data) {
+  return request({
+    url: '/system/deployment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除流程定义
+export function delDeployment(id) {
+  return request({
+    url: '/system/deployment/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出流程定义
+export function exportDeployment(query) {
+  return request({
+    url: '/system/deployment/export',
+    method: 'get',
+    params: query
+  })
+}

demo-web-ui/src/api/system/flowable/todo.js

@@ -1,116 +1,116 @@
-import request from '@/utils/request'
-import da from "element-ui/src/locale/lang/da";
-
-// 查询待办任务列表
-export function todoList(data) {
-  return request({
-    url: '/v1/flowable/task/todoList',
-    method: 'post',
-    data: data
-  })
-}
-
-// 完成任务
-export function complete(data) {
-  return request({
-    url: '/v1/flowable/task/complete',
-    method: 'post',
-    data: data
-  })
-}
-
-// 委派任务
-export function delegate(data) {
-  return request({
-    url: '/flowable/task/delegate',
-    method: 'post',
-    data: data
-  })
-}
-
-// 退回任务
-export function returnTask(data) {
-  return request({
-    url: '/v1/flowable/task/return',
-    method: 'post',
-    data: data
-  })
-}
-
-// 驳回任务
-export function rejectTask(data) {
-  return request({
-    url: '/v1/flowable/task/reject',
-    method: 'post',
-    data: data
-  })
-}
-
-// 可退回任务列表
-export function returnList(data) {
-  return request({
-    url: '/v1/flowable/task/returnList',
-    method: 'post',
-    data: data
-  })
-}
-
-// 下一节点
-export function getNextFlowNode(data) {
-  return request({
-    url: '/v1/flowable/task/nextFlowNode',
-    method: 'post',
-    data: data
-  })
-}
-
-// 部署流程实例
-export function deployStart(deployId) {
-  return request({
-    url: '/flowable/process/startFlow/' + deployId,
-    method: 'get',
-  })
-}
-
-// 查询流程定义详细
-export function getDeployment(id) {
-  return request({
-    url: '/system/deployment/' + id,
-    method: 'get'
-  })
-}
-
-// 新增流程定义
-export function addDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改流程定义
-export function updateDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除流程定义
-export function delDeployment(id) {
-  return request({
-    url: '/system/deployment/' + id,
-    method: 'delete'
-  })
-}
-
-// 导出流程定义
-export function exportDeployment(query) {
-  return request({
-    url: '/system/deployment/export',
-    method: 'get',
-    params: query
-  })
-}
+import request from '@/utils/request'
+import da from "element-ui/src/locale/lang/da";
+
+// 查询待办任务列表
+export function todoList(data) {
+  return request({
+    url: '/v1/flowable/task/todoList',
+    method: 'post',
+    data: data
+  })
+}
+
+// 完成任务
+export function complete(data) {
+  return request({
+    url: '/v1/flowable/task/complete',
+    method: 'post',
+    data: data
+  })
+}
+
+// 委派任务
+export function delegate(data) {
+  return request({
+    url: '/flowable/task/delegate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 退回任务
+export function returnTask(data) {
+  return request({
+    url: '/v1/flowable/task/return',
+    method: 'post',
+    data: data
+  })
+}
+
+// 驳回任务
+export function rejectTask(data) {
+  return request({
+    url: '/v1/flowable/task/reject',
+    method: 'post',
+    data: data
+  })
+}
+
+// 可退回任务列表
+export function returnList(data) {
+  return request({
+    url: '/v1/flowable/task/returnList',
+    method: 'post',
+    data: data
+  })
+}
+
+// 下一节点
+export function getNextFlowNode(data) {
+  return request({
+    url: '/v1/flowable/task/nextFlowNode',
+    method: 'post',
+    data: data
+  })
+}
+
+// 部署流程实例
+export function deployStart(deployId) {
+  return request({
+    url: '/flowable/process/startFlow/' + deployId,
+    method: 'get',
+  })
+}
+
+// 查询流程定义详细
+export function getDeployment(id) {
+  return request({
+    url: '/system/deployment/' + id,
+    method: 'get'
+  })
+}
+
+// 新增流程定义
+export function addDeployment(data) {
+  return request({
+    url: '/system/deployment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改流程定义
+export function updateDeployment(data) {
+  return request({
+    url: '/system/deployment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除流程定义
+export function delDeployment(id) {
+  return request({
+    url: '/system/deployment/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出流程定义
+export function exportDeployment(query) {
+  return request({
+    url: '/system/deployment/export',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -1,104 +1,104 @@
-import request from '@/utils/request'
-
-let tokens = window.sessionStorage.getItem('token')
-
-// 获取菜单 分页列表
-export function pageList(data) {
-  return request({
-    url: '/portal/v1/sysfunction/listAllVoForSource',
-    method: 'POST',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-
-// 新增
-export function savePost(data) {
-  return request({
-    url: '/portal/v1/sysfunction/save',
-    method: 'POST',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-
-// 模块名称
-export function sourceList(data) {
-  return request({
-    url: '/portal/v1/syssource/listAll',
-    method: 'POST',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-
-// 删除
-export function delOrgroles(data) {
-  return request({
-    url: '/portal/v1/sysfunction/delBySids/' + data.sid,
-    method: 'get',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-
-// 修改
-export function getSingleData(data) {
-  return request({
-    url: '/portal/v1/sysfunction/fetchBySid/' + data.id,
-    method: 'get',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-
-export function putOrgroles(data) {
-  return request({
-    url: '/portal/v1/sysfunction/update/' + data.sid,
-    method: 'POST',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-
-// 功能是否可用状态
-export function IsEnable(data) {
-  return request({
-    url: '/portal/v1/sysfunction/updateIsEnable/' + data.sid + '/' + data.isEnable,
-    method: 'POST',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-
-// 获取模块下的菜单
-export function getMenusForFunction(data) {
-  return request({
-    url: '/portal/v1/sysmenu/getMenusForFunction',
-    method: 'POST',
-    data: data,
-    headers: { 'Content-Type': 'application/json' }
-  })
-}
-
+import request from '@/utils/request'
+
+let tokens = window.sessionStorage.getItem('token')
+
+// 获取菜单 分页列表
+export function pageList(data) {
+  return request({
+    url: '/portal/v1/sysfunction/listAllVoForSource',
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+
+// 新增
+export function savePost(data) {
+  return request({
+    url: '/portal/v1/sysfunction/save',
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+
+// 模块名称
+export function sourceList(data) {
+  return request({
+    url: 'v1/SysMenu/list',
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+
+// 删除
+export function delOrgroles(data) {
+  return request({
+    url: '/portal/v1/sysfunction/delBySids/' + data.sid,
+    method: 'get',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+
+// 修改
+export function getSingleData(data) {
+  return request({
+    url: '/portal/v1/sysfunction/fetchBySid/' + data.id,
+    method: 'get',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+
+export function putOrgroles(data) {
+  return request({
+    url: '/portal/v1/sysfunction/update/' + data.sid,
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+
+// 功能是否可用状态
+export function IsEnable(data) {
+  return request({
+    url: '/portal/v1/sysfunction/updateIsEnable/' + data.sid + '/' + data.isEnable,
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+
+// 获取模块下的菜单
+export function getMenusForFunction(data) {
+  return request({
+    url: '/portal/v1/sysmenu/getMenusForFunction',
+    method: 'POST',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+

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

@@ -1,9 +1,9 @@
-import request from '@/utils/request'
-
-// 获取当前用户的待办数量
-export function getTodoNum(data) {
-  return request({
-    url: '/portal/v1/flow/getTodoNum/' + data,
-    method: 'get'
-  })
-}
+import request from '@/utils/request'
+
+// 获取当前用户的待办数量
+export function getTodoNum(data) {
+  return request({
+    url: '/portal/v1/flow/getTodoNum/' + data,
+    method: 'get'
+  })
+}

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

@@ -1,49 +1,49 @@
-import request from '@/utils/request'
-
-// 获取菜单 分页列表
-export function pageList(data) {
-  return request({
-    url: '/portal/v1/sysflowcc/listPage',
-    method: 'post',
-    data: data,
-    headers: { 'Content-Type': 'application/json' }
-  })
-}
-
-// 新增
-export function save(data) {
-  return request({
-    url: '/portal/v1/sysflowcc/save',
-    method: 'post',
-    data: data,
-    headers: { 'Content-Type': 'application/json' }
-  })
-}
-
-// 初始化应用
-export function fetchSid(data) {
-  return request({
-    url: '/portal/v1/sysflowcc/fetchDetailsBySid/' + data,
-    method: 'get'
-  })
-}
-
-// 删除
-export function delBySids(data) {
-  return request({
-    url: '/portal/v1/sysflowcc/delBySids',
-    method: 'DELETE',
-    data: data,
-    headers: { 'Content-Type': 'application/json' }
-  })
-}
-
-// 查询角色列表
-export function roleList(data){
-  return request({
-    url: '/portal/v1/sysrole/listAll',
-    method: 'post',
-    data: data,
-    headers: { 'Content-Type': 'application/json' }
-  })
-}
+import request from '@/utils/request'
+
+// 获取菜单 分页列表
+export function pageList(data) {
+  return request({
+    url: '/portal/v1/sysflowcc/listPage',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 新增
+export function save(data) {
+  return request({
+    url: '/portal/v1/sysflowcc/save',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 初始化应用
+export function fetchSid(data) {
+  return request({
+    url: '/portal/v1/sysflowcc/fetchDetailsBySid/' + data,
+    method: 'get'
+  })
+}
+
+// 删除
+export function delBySids(data) {
+  return request({
+    url: '/portal/v1/sysflowcc/delBySids',
+    method: 'DELETE',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 查询角色列表
+export function roleList(data){
+  return request({
+    url: '/portal/v1/sysrole/listAll',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}

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

@@ -1,16 +1,16 @@
-import request from '@/utils/request'
-import qs from 'qs'
-//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY'
-let tokens = window.sessionStorage.getItem('token');
-//获取菜单 分页列表
-export function logPageList(data) {
-  return request({
-    url: '/portal/v1/systemlog/listPage',
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
-  })
-}
-
+import request from '@/utils/request'
+import qs from 'qs'
+//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY'
+let tokens = window.sessionStorage.getItem('token');
+//获取菜单 分页列表
+export function logPageList(data) {
+  return request({
+    url: '/portal/v1/systemlog/listPage',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+

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

@@ -1,109 +1,109 @@
-import request from '@/utils/request'
-import qs from 'qs'
-//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY'
-
-let tokens = window.sessionStorage.getItem('token');
-
-//获取菜单 分页列表
-export function pageList(data) {
-  return request({
-    url: '/portal/v1/sysmenu/listAllVoForSource',
-    method: 'POST',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-
-// 新增保存 菜单信息
-export function saveMenusInfo(data) {
-  return request({
-    url: '/portal/v1/sysmenu/save',
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-// 修改保存 菜单信息
-export function putMenusInfo(data) {
-  return request({
-    url: '/portal/v1/sysmenu/update/' + data.sid,
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-//根据sid 删除单个 资源信息
-export function delMenus(data) {
-  return request({
-    url: '/portal/v1/sysmenu/delBySids/' + data.sid,
-    method: 'get',
-    data: qs.stringify(data),
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-
-// 修改状态
-export function IsEnable(data) {
-  return request({
-    url: '/portal/v1/sysmenu/updateIsEnable/' + data.sid + '/' + data.isEnable,
-    method: 'POST',
-    /* data: qs.stringify(data),*/
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-
-
-// 获取菜单 不分页列表
-export function roleList(data) {
-  return request({
-    url: '/system/v1/menus/list',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-//获取菜单 分页列表
-export function menusPageList(data) {
-  return request({
-    url: '/system/v1/menus/pagelist',
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-//获取菜单 树形分页列表
-export function menusTreelist(data) {
-  return request({
-    url: '/system/v1/menus/treelist',
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-
-//根据sid 获取单个菜单 信息
-export function getRoleInfo(data) {
-  return request({
-    url: '/system/v1/menus/' + data.sid,
-    method: 'GET',
-    data: qs.stringify(data)
-  })
-}
-
-
-
-
+import request from '@/utils/request'
+import qs from 'qs'
+//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY'
+
+let tokens = window.sessionStorage.getItem('token');
+
+//获取菜单 分页列表
+export function pageList(data) {
+  return request({
+    url: 'v1/SysMenu/list',
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+
+// 新增保存 菜单信息
+export function saveMenusInfo(data) {
+  return request({
+    url: 'v1/SysMenu/save',
+    method: 'POST',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 修改保存 菜单信息
+export function putMenusInfo(data) {
+  return request({
+    url: 'v1/SysMenu/alterSysMenu',
+    method: 'POST',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+//根据sid 删除单个 资源信息
+export function delMenus(data) {
+  return request({
+    url: 'v1/SysMenu/deleteSysMenu/' + data.sid,
+    method: 'get',
+    data: qs.stringify(data),
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+
+// 修改状态
+export function IsEnable(data) {
+  return request({
+    url: '/portal/v1/sysmenu/updateIsEnable/' + data.sid + '/' + data.isEnable,
+    method: 'POST',
+    /* data: qs.stringify(data),*/
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+
+
+// 获取菜单 不分页列表
+export function roleList(data) {
+  return request({
+    url: '/system/v1/menus/list',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+//获取菜单 分页列表
+export function menusPageList(data) {
+  return request({
+    url: '/system/v1/menus/pagelist',
+    method: 'POST',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+//获取菜单 树形分页列表
+export function menusTreelist(data) {
+  return request({
+    url: '/system/v1/menus/treelist',
+    method: 'POST',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+
+//根据sid 获取单个菜单 信息
+export function getRoleInfo(data) {
+  return request({
+    url: '/system/v1/menus/' + data.sid,
+    method: 'GET',
+    data: qs.stringify(data)
+  })
+}
+
+
+
+

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

@@ -1,59 +1,59 @@
-import request from '@/utils/request'
-import qs from 'qs'
-
-// 获取菜单 分页列表
-export function pageList(data) {
-  return request({
-    url: '/portal/v1/sysmobilemenu/list',
-    method: 'get',
-    data
-  })
-}
-
-// 新增插件
-export function save(data) {
-  return request({
-    url: '/portal/v1/appsubsetversion/save',
-    method: 'get',
-    data: data
-  })
-}
-
-// 更新插件
-export function putMenusInfo(data) {
-  return request({
-    url: '/portal/v1/sysmenu/update/' + data.sid,
-    method: 'POST',
-    data: data,
-    headers: { 'Content-Type': 'application/json' }
-  })
-}
-
-// 新增/编辑应用
-export function saveOrUpdate(data) {
-  return request({
-    url: '/portal/v1/sysmobilemenu/saveOrUpdate',
-    method: 'post',
-    data: data,
-    headers: { 'Content-Type': 'application/json' }
-  })
-}
-
-// 初始化应用
-export function details(data) {
-  return request({
-    url: '/portal/v1/sysmobilemenu/details',
-    method: 'get',
-    params: data
-  })
-}
-
-// 根据sid应用
-export function deleteMenu(data) {
-  return request({
-    url: '/portal/v1/sysmobilemenu/deleteMenu',
-    method: 'DELETE',
-    params: data
-  })
-}
-
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获取菜单 分页列表
+export function pageList(data) {
+  return request({
+    url: '/portal/v1/sysmobilemenu/list',
+    method: 'get',
+    data
+  })
+}
+
+// 新增插件
+export function save(data) {
+  return request({
+    url: '/portal/v1/appsubsetversion/save',
+    method: 'get',
+    data: data
+  })
+}
+
+// 更新插件
+export function putMenusInfo(data) {
+  return request({
+    url: '/portal/v1/sysmenu/update/' + data.sid,
+    method: 'POST',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 新增/编辑应用
+export function saveOrUpdate(data) {
+  return request({
+    url: '/portal/v1/sysmobilemenu/saveOrUpdate',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 初始化应用
+export function details(data) {
+  return request({
+    url: '/portal/v1/sysmobilemenu/details',
+    method: 'get',
+    params: data
+  })
+}
+
+// 根据sid应用
+export function deleteMenu(data) {
+  return request({
+    url: '/portal/v1/sysmobilemenu/deleteMenu',
+    method: 'DELETE',
+    params: data
+  })
+}
+

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

@@ -1,36 +1,36 @@
-import request from '@/utils/request'
-import qs from 'qs'
-let tokens = window.sessionStorage.getItem('token');
-class user{
-  verifyList(data){ // 获取列表
-    return request({
-      url: '/system/organization/verifyList',
-      method: 'post',
-      data: data,
-      headers: {'Content-Type': 'application/json'}
-    })
-  }
-  orgRegisterDetails(data){ // 单位注册信息详情
-    return request({
-      url: '/system/organization/organizationRegisterDetails/'+data.organizationSid,
-      method: 'get',
-      params: data
-    })
-  }
-  verify(data){ // 审核
-    return request({
-      url: '/system/organization/verify',
-      method: 'post',
-      data: qs.stringify(data)
-    })
-  }
-  // 删除机构信息
-  del(data) {
-    return request({
-      url: '/system/organization/delete/'+data.sid,
-      method: 'DELETE',
-      data
-    })
-  }
-}
-export default new user()
+import request from '@/utils/request'
+import qs from 'qs'
+let tokens = window.sessionStorage.getItem('token');
+class user{
+  verifyList(data){ // 获取列表
+    return request({
+      url: '/system/organization/verifyList',
+      method: 'post',
+      data: data,
+      headers: {'Content-Type': 'application/json'}
+    })
+  }
+  orgRegisterDetails(data){ // 单位注册信息详情
+    return request({
+      url: '/system/organization/organizationRegisterDetails/'+data.organizationSid,
+      method: 'get',
+      params: data
+    })
+  }
+  verify(data){ // 审核
+    return request({
+      url: '/system/organization/verify',
+      method: 'post',
+      data: qs.stringify(data)
+    })
+  }
+  // 删除机构信息
+  del(data) {
+    return request({
+      url: '/system/organization/delete/'+data.sid,
+      method: 'DELETE',
+      data
+    })
+  }
+}
+export default new user()

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

@@ -1,20 +1,20 @@
-import request from '@/utils/request'
-
-// 获取菜单 分页列表
-export function getList(data) {
-  return request({
-    url: '/portal/v1/sysuserdefaultorg/getList',
-    method: 'get',
-    params: data
-  })
-}
-
-// 新增插件
-export function saveOrUpdate(data) {
-  return request({
-    url: '/portal/v1/sysuserdefaultorg/saveOrUpdate',
-    method: 'post',
-    data: data,
-    headers: { 'Content-Type': 'application/json' }
-  })
-}
+import request from '@/utils/request'
+
+// 获取菜单 分页列表
+export function getList(data) {
+  return request({
+    url: '/portal/v1/sysuserdefaultorg/getList',
+    method: 'get',
+    params: data
+  })
+}
+
+// 新增插件
+export function saveOrUpdate(data) {
+  return request({
+    url: '/portal/v1/sysuserdefaultorg/saveOrUpdate',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}

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

@@ -1,87 +1,87 @@
-import request from '@/utils/request'
-import qs from 'qs'
-//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMTE1MjUwfQ.gtn_mVsbwH6ztl835rWmIY4DxeNmRe_TOt-Q0TdldIE'
-let tokens = window.sessionStorage.getItem('token');
-//获取菜单 分页列表
-export function pageList(data) {
-  return request({
-    url: '/portal/v1/syspost/listPage',
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
-  })
-}
-
-// 查询部门列表
-export function orgList(data){
-  return request({
-    url: '/portal/v1/sysorganization/list',
-    method: 'get',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-// 新增
-export function savePost(data){
-  return request({
-    url: '/portal/v1/syspost/save',
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-// 修改
-export function putOrgroles(data){
-  return request({
-    url: '/portal/v1/syspost/update/' +data.sid,
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-
-// 删除
-export function delOrgroles(data){
-  return request({
-    url: '/portal/v1/syspost/delBySids/' + data.sids,
-    method: 'get',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-
-export function pullDown(data){
-  return request({
-    url: '/portal/v1/dictcommons/typeValues',
-      method: 'get',
-      params: data
-  })
-}
-
-// 查询岗位列表
-export function selectList(data){
-  return request({
-    url: '/portal/v1/syspost/selectList',
-    method: 'get',
-    params: data
-  })
-}
-
-// 查询所有流程名称
-export function selectFlowList(){
-  return request({
-    url: '/flowable/v1/flow/selectFlowList',
-    method: 'get'
-  })
-}
-
+import request from '@/utils/request'
+import qs from 'qs'
+//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMTE1MjUwfQ.gtn_mVsbwH6ztl835rWmIY4DxeNmRe_TOt-Q0TdldIE'
+let tokens = window.sessionStorage.getItem('token');
+//获取菜单 分页列表
+export function pageList(data) {
+  return request({
+    url: '/portal/v1/syspost/listPage',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+
+// 查询部门列表
+export function orgList(data){
+  return request({
+    url: '/portal/v1/sysorganization/list',
+    method: 'get',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+// 新增
+export function savePost(data){
+  return request({
+    url: '/portal/v1/syspost/save',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+// 修改
+export function putOrgroles(data){
+  return request({
+    url: '/portal/v1/syspost/update/' +data.sid,
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+
+// 删除
+export function delOrgroles(data){
+  return request({
+    url: '/portal/v1/syspost/delBySids/' + data.sids,
+    method: 'get',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+
+export function pullDown(data){
+  return request({
+    url: '/portal/v1/dictcommons/typeValues',
+      method: 'get',
+      params: data
+  })
+}
+
+// 查询岗位列表
+export function selectList(data){
+  return request({
+    url: '/portal/v1/syspost/selectList',
+    method: 'get',
+    params: data
+  })
+}
+
+// 查询所有流程名称
+export function selectFlowList(){
+  return request({
+    url: '/flowable/v1/flow/selectFlowList',
+    method: 'get'
+  })
+}
+

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

@@ -1,83 +1,83 @@
-import request from '@/utils/request'
-
-export default {
-
-  // 分页列表
-  pagerList: function (params) {
-    return request({
-      url: '/portal/v1/regions/pagerList',
-      method: 'post',
-      data: params,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
-  },
-
-  // 新增保存
-  save: function (regionDto) {
-    return request({
-      url: '/portal/v1/regions/save',
-      method: 'post',
-      data: regionDto,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
-  },
-
-  // // 根据省sid获取该省的所有市
-  // getCity: function (sid) {
-  //   return request({
-  //     url: '/portal/v1/regions/getCity',
-  //     method: 'get',
-  //     params: {
-  //       sid
-  //     }
-  //   })
-  // },
-  //
-  // // 根据市sid获取该省的所有县区
-  // getCounty: function (sid) {
-  //   return request({
-  //     url: '/portal/v1/regions/getCounty',
-  //     method: 'get',
-  //     params: {
-  //       sid
-  //     }
-  //   })
-  // },
-
-  // 删除
-  delete: function (sid) {
-    return request({
-      url: '/portal/v1/regions/delete/' + sid,
-      method: 'delete',
-      data: sid
-    })
-  },
-
-  //点击修改回显数据
-  updateEcho: function (sid) {
-    return request({
-      url: '/portal/v1/regions/getOne/' + sid,
-      method: 'post',
-      params: {
-        sid
-      }
-    })
-  },
-
-  // 区域修改保存
-  // system/region/update/{sid}
-  update: function (params,sid) {
-    return request({
-      url: '/portal/v1/regions/update/' + sid,
-      method: 'post',
-      data: params,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
-  }
-}
+import request from '@/utils/request'
+
+export default {
+
+  // 分页列表
+  pagerList: function (params) {
+    return request({
+      url: '/portal/v1/regions/pagerList',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 新增保存
+  save: function (regionDto) {
+    return request({
+      url: '/portal/v1/regions/save',
+      method: 'post',
+      data: regionDto,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // // 根据省sid获取该省的所有市
+  // getCity: function (sid) {
+  //   return request({
+  //     url: '/portal/v1/regions/getCity',
+  //     method: 'get',
+  //     params: {
+  //       sid
+  //     }
+  //   })
+  // },
+  //
+  // // 根据市sid获取该省的所有县区
+  // getCounty: function (sid) {
+  //   return request({
+  //     url: '/portal/v1/regions/getCounty',
+  //     method: 'get',
+  //     params: {
+  //       sid
+  //     }
+  //   })
+  // },
+
+  // 删除
+  delete: function (sid) {
+    return request({
+      url: '/portal/v1/regions/delete/' + sid,
+      method: 'delete',
+      data: sid
+    })
+  },
+
+  //点击修改回显数据
+  updateEcho: function (sid) {
+    return request({
+      url: '/portal/v1/regions/getOne/' + sid,
+      method: 'post',
+      params: {
+        sid
+      }
+    })
+  },
+
+  // 区域修改保存
+  // system/region/update/{sid}
+  update: function (params,sid) {
+    return request({
+      url: '/portal/v1/regions/update/' + sid,
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  }
+}

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

@@ -1,178 +1,178 @@
-import request from '@/utils/request'
-import qs from 'qs'
-//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjI5OTQxNjI1fQ.aOFOz0h7c8YQs-ti2GLpqeWu4AE9mifx_043hLJQf8g'
-let tokens = window.sessionStorage.getItem('token');
-// 业务角色 列表
-export function roleOrgList(data){
-  return request({
-    url: '/portal/v1/sysrole/listPage',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
-  })
-}
-
-export function postList(data){
-  return request({
-    url: '/portal/v1/syspost/list',
-    method: 'get',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-// 获取数据字典下拉列表
-export function typeValues(data) {
-  return request({
-    url: '/portal/v1/dictcommons/typeValues',
-    method: 'get',
-    params: data
-  })
-}
-
-// 设置是否可用：isEnable：1可用，0不可用
-export function setRoleEnable(data) {
-  return request({
-    url: '/portal/v1/sysrole/setIsEnable/' + data.sid + '/' + data.isEnable,
-    method: 'POST',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
-
-/**
- * <新增 保存角色>
- * @orgSid 机构SID
- * @remarks 备注
- * @roleName 角色名称
- * */
-export function saveOrgroles(data) {
-  return request({
-    url: '/portal/v1/sysrole/save',
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
-  })
-}
-/**
- * <根据SID 修改角色>
- * @sid    角色SID
- * @orgSid 机构SID
- * @remarks 备注
- * @roleName 角色名称
- * */
-export function putOrgroles(data) {
-  return request({
-    url: `/portal/v1/sysrole/update/${data.sid}`,
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
-  })
-}
-
-/**
- * <根据SID 删除角色>
- * @sid    角色SID
- * */
-export function delOrgroles(data) {
-  return request({
-    url: `/portal/v1/sysrole/delBySids/${data.sid}`,
-    method: 'get',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
-  })
-}
-// 移动端授权
-export function getRoleMenuList(data) {
-  return request({
-    url: '/portal/v1/sysmobilemenurole/getRoleMenuList',
-    method: 'post',
-    params: { roleSid: data }
-  })
-}
-
-// 菜单授权保存
-export function saveRoleMenuList(data) {
-  return request({
-    url: `/portal/v1/sysmobilemenurole/saveRoleMenuList`,
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-
-// 菜单授权
-export function roleMenuTree(data) {
-  return request({
-    url: `/portal/v1/sysmenu/listAllByRoleSid`,
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-
-// 菜单授权保存
-export function saveorgrolemenus(data) {
-  return request({
-    url: `/portal/v1/sysmenurole/updateRoleAndMenu`,
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-// 资源授权
-export function sourceMenuTree(data) {
-  return request({
-    url: `/portal/v1/syssource/listAllByRoleSid`,
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
-  })
-}
-// 资源授权保存
-export function saveSource(data) {
-  return request({
-    url: `/portal/v1/syssourcerole/updateRoleAndSource`,
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
-  })
-}
-// 功能授权
-export function funMenuTree(data) {
-  return request({
-    url: `/portal/v1/sysfunction/getFunctionAuthorization/` + data.roleSid,
-    method: 'get'
-  })
-}
-// 功能授权保存
-export function savefunMenu(data) {
-  return request({
-    url: `/portal/v1/sysrolefunction/updateRoleAndFunction`,
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
-  })
-}
+import request from '@/utils/request'
+import qs from 'qs'
+//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjI5OTQxNjI1fQ.aOFOz0h7c8YQs-ti2GLpqeWu4AE9mifx_043hLJQf8g'
+let tokens = window.sessionStorage.getItem('token');
+// 业务角色 列表
+export function roleOrgList(data){
+  return request({
+    url: '/portal/v1/sysrole/listPage',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+
+export function postList(data){
+  return request({
+    url: '/portal/v1/syspost/list',
+    method: 'get',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+
+// 获取数据字典下拉列表
+export function typeValues(data) {
+  return request({
+    url: '/portal/v1/dictcommons/typeValues',
+    method: 'get',
+    params: data
+  })
+}
+
+// 设置是否可用：isEnable：1可用，0不可用
+export function setRoleEnable(data) {
+  return request({
+    url: '/portal/v1/sysrole/setIsEnable/' + data.sid + '/' + data.isEnable,
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+/**
+ * <新增 保存角色>
+ * @orgSid 机构SID
+ * @remarks 备注
+ * @roleName 角色名称
+ * */
+export function saveOrgroles(data) {
+  return request({
+    url: '/portal/v1/sysrole/save',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+/**
+ * <根据SID 修改角色>
+ * @sid    角色SID
+ * @orgSid 机构SID
+ * @remarks 备注
+ * @roleName 角色名称
+ * */
+export function putOrgroles(data) {
+  return request({
+    url: `/portal/v1/sysrole/update/${data.sid}`,
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+
+/**
+ * <根据SID 删除角色>
+ * @sid    角色SID
+ * */
+export function delOrgroles(data) {
+  return request({
+    url: `/portal/v1/sysrole/delBySids/${data.sid}`,
+    method: 'get',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+// 移动端授权
+export function getRoleMenuList(data) {
+  return request({
+    url: '/portal/v1/sysmobilemenurole/getRoleMenuList',
+    method: 'post',
+    params: { roleSid: data }
+  })
+}
+
+// 菜单授权保存
+export function saveRoleMenuList(data) {
+  return request({
+    url: `/portal/v1/sysmobilemenurole/saveRoleMenuList`,
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+
+// 菜单授权
+export function roleMenuTree(data) {
+  return request({
+    url: `/portal/v1/sysmenu/listAllByRoleSid`,
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+
+// 菜单授权保存
+export function saveorgrolemenus(data) {
+  return request({
+    url: `/portal/v1/sysmenurole/updateRoleAndMenu`,
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+// 资源授权
+export function sourceMenuTree(data) {
+  return request({
+    url: `/portal/v1/syssource/listAllByRoleSid`,
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+// 资源授权保存
+export function saveSource(data) {
+  return request({
+    url: `/portal/v1/syssourcerole/updateRoleAndSource`,
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+// 功能授权
+export function funMenuTree(data) {
+  return request({
+    url: `/portal/v1/sysfunction/getFunctionAuthorization/` + data.roleSid,
+    method: 'get'
+  })
+}
+// 功能授权保存
+export function savefunMenu(data) {
+  return request({
+    url: `/portal/v1/sysrolefunction/updateRoleAndFunction`,
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}

demo-web-ui/src/api/system/roleAdminister/rolemenus.js

@@ -1,31 +1,31 @@
-import request from '@/utils/request'
-import qs from 'qs'
-
-/**
- * < 业务角色授权时菜单列表（拥有的菜单选中）>
- * @orgTypeKeys 单位性质（类别
- * @roleSid 业务角色sid
- * @userType 用户类型只能为1或2
- * */
-export function roleMenuTree(data){
-  return request({
-    url: '/system/v1/orgrolemenus/menutree',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-/**
- * < 保存角色授权的菜单项 >
- * @roleMenus[] 角色权限列表 {menuSid 菜单sid} {orgSid 单位sid} {roleSid 角色sid}
- * @roleSid 业务角色sid
- * */
-export function saveorgrolemenus(data){
-  return request({
-    url: '/system/v1/orgrolemenus',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
+import request from '@/utils/request'
+import qs from 'qs'
+
+/**
+ * < 业务角色授权时菜单列表（拥有的菜单选中）>
+ * @orgTypeKeys 单位性质（类别
+ * @roleSid 业务角色sid
+ * @userType 用户类型只能为1或2
+ * */
+export function roleMenuTree(data){
+  return request({
+    url: '/system/v1/orgrolemenus/menutree',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+
+/**
+ * < 保存角色授权的菜单项 >
+ * @roleMenus[] 角色权限列表 {menuSid 菜单sid} {orgSid 单位sid} {roleSid 角色sid}
+ * @roleSid 业务角色sid
+ * */
+export function saveorgrolemenus(data){
+  return request({
+    url: '/system/v1/orgrolemenus',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}

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

@@ -1,21 +1,21 @@
-import request from '@/utils/request'
-import qs from 'qs'
-
-//角色授权时菜单列表（拥有的菜单选中）
-export function getrolemenus(data) {
-  return request({
-    url: `/system/v1/rolemenus/${data.roleSid}`,
-    method: 'GET',
-    params: data
-  })
-}
-
-//保存 角色授权时菜单列表
-export function saverolemenus(data) {
-  return request({
-    url: `/system/v1/rolemenus`,
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
+import request from '@/utils/request'
+import qs from 'qs'
+
+//角色授权时菜单列表（拥有的菜单选中）
+export function getrolemenus(data) {
+  return request({
+    url: `/system/v1/rolemenus/${data.roleSid}`,
+    method: 'GET',
+    params: data
+  })
+}
+
+//保存 角色授权时菜单列表
+export function saverolemenus(data) {
+  return request({
+    url: `/system/v1/rolemenus`,
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}

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

@@ -1,111 +1,141 @@
-import request from '@/utils/request'
-import qs from 'qs'
-//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY'
-let tokens = window.sessionStorage.getItem('token');
-//获取菜单 分页列表
-export function pageList(data) {
-  return request({
-    url: '/portal/v1/syssource/listPage',
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
-  })
-}
-//保存 资源信息
-export function saveSourcesInfo(data) {
-  return request({
-    url: '/portal/v1/syssource/save',
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
-  })
-}
-// 修改 保存 资源信息
-export function putSourcesInfo(data) {
-  return request({
-    url: '/portal/v1/syssource/update/' + data.sid,
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
-  })
-}
-//根据sid 删除单个 资源信息
-export function delSources(data) {
-  return request({
-    url: '/portal/v1/syssource/delBySids/' + data.sid,
-    method: 'get',
-    data: qs.stringify(data),
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
-  })
-}
-// 获取获取资源类别
-export function getZzylb(data) {
-return request({
-    url: '/portal/v1/syssource/listAll',
-    method: 'post',
-    headers: {'Content-Type': 'application/json'}
-})
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// 获取资源 不分页列表
-export function sourcesList(data) {
-  return request({
-    url: '/system/v1/sources/list',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-// 获取资源列表 不分页下拉
-export function getsourceList(data) {
-  return request({
-    url: '/system/v1/sources/sourceList',
-    method: 'post'
-  })
-}
-
-
-////获取资源 分页列表
-//export function sourcesPageList(data) {
-//return request({
-//  url: '/system/v1/sources/pagelist',
-//  method: 'POST',
-//  data: data,
-//  headers: {'Content-Type': 'application/json'}
-//})
-//}
-
-
-
-//根据sid 获取单个 资源信息
-export function getSourcesInfo(data) {
-  return request({
-    url: '/system/v1/sources/' + data.sid,
-    method: 'GET',
-    data: qs.stringify(data)
-  })
-}
-
+import request from '@/utils/request'
+import qs from 'qs'
+//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY'
+let tokens = window.sessionStorage.getItem('token');
+//获取菜单 分页列表
+export function pageList(data) {
+  return request({
+    url: 'v1/sysinfo/selectInfoList',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+//保存 资源信息
+export function saveSourcesInfo(data) {
+  return request({
+    url: 'v1/sysinfo/saveInfo',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+// 修改 保存 资源信息
+export function putSourcesInfo(data) {
+  return request({
+    url: 'v1/sysinfo/alterInfo',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+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: 'v1/sysinfo/deleteInfo/' + data.sid,
+    method: 'get',
+    data: qs.stringify(data),
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+// 获取获取资源类别
+export function getZzylb(data) {
+return request({
+    url: '/portal/v1/syssource/listAll',
+    method: 'post',
+    headers: {'Content-Type': 'application/json'}
+})
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// 获取资源 不分页列表
+export function sourcesList(data) {
+  return request({
+    url: '/system/v1/sources/list',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+
+// 获取资源列表 不分页下拉
+export function getsourceList(data) {
+  return request({
+    url: '/system/v1/sources/sourceList',
+    method: 'post'
+  })
+}
+
+
+////获取资源 分页列表
+//export function sourcesPageList(data) {
+//return request({
+//  url: '/system/v1/sources/pagelist',
+//  method: 'POST',
+//  data: data,
+//  headers: {'Content-Type': 'application/json'}
+//})
+//}
+
+
+
+//根据sid 获取单个 资源信息
+export function getSourcesInfo(data) {
+  return request({
+    url: '/system/v1/sources/' + data.sid,
+    method: 'GET',
+    data: qs.stringify(data)
+  })
+}
+

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

@@ -1,84 +1,84 @@
-import request from '@/utils/request'
-import qs from 'qs'
-
-export function verifyList(data){ // 用户列表
-  return request({
-    url: '/system/user/verifyList',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-// admin用户列表
-export function userListByAdmin(data){
-  return request({
-    url: '/system/user/userListByAdmin',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-// 设置角色
-export function psotUserRole(data){
-  return request({
-    url: '/system/v1/userrole',
-    method: 'post',
-    data: qs.stringify(data)
-  })
-}
-
-// 用户初始化密码
-export function initPwd(data){
-  return request({
-    url: 'system/user/initPwd/'+data.sid,
-    method: 'POST',
-    data: qs.stringify(data)
-  })
-}
-
-// 用户删除接口
-export function delUser(data){
-  return request({
-    url: '/system/user/delete/'+data.sid,
-    method: 'DELETE',
-    params: data
-  })
-}
-
-// 初始化设置角色
-export function initUserRole(data){
-  return request({
-    url: '/system/v1/userroles/initUserRole/'+ data.userSid,
-    method: 'get',
-    params: data
-  })
-}
-
-// 保存角色
-export function saveUserRole(data){
-  return request({
-    url: '/system/v1/userroles',
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-// 用户信息
-export function getUserINfo(data){
-  return request({
-    url: '/system/user/userRegisterDetails',
-    method: 'get',
-    params: data
-  })
-}
-
-// 单位信息
-export function getOrgINfo(data){
-  return request({
-    url: '/system/organization/organizationRegisterDetails/'+ data.organizationSid,
-    method: 'get',
-    params: data
-  })
-}
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function verifyList(data){ // 用户列表
+  return request({
+    url: '/system/user/verifyList',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+// admin用户列表
+export function userListByAdmin(data){
+  return request({
+    url: '/system/user/userListByAdmin',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+
+// 设置角色
+export function psotUserRole(data){
+  return request({
+    url: '/system/v1/userrole',
+    method: 'post',
+    data: qs.stringify(data)
+  })
+}
+
+// 用户初始化密码
+export function initPwd(data){
+  return request({
+    url: 'system/user/initPwd/'+data.sid,
+    method: 'POST',
+    data: qs.stringify(data)
+  })
+}
+
+// 用户删除接口
+export function delUser(data){
+  return request({
+    url: '/system/user/delete/'+data.sid,
+    method: 'DELETE',
+    params: data
+  })
+}
+
+// 初始化设置角色
+export function initUserRole(data){
+  return request({
+    url: '/system/v1/userroles/initUserRole/'+ data.userSid,
+    method: 'get',
+    params: data
+  })
+}
+
+// 保存角色
+export function saveUserRole(data){
+  return request({
+    url: '/system/v1/userroles',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+
+// 用户信息
+export function getUserINfo(data){
+  return request({
+    url: '/system/user/userRegisterDetails',
+    method: 'get',
+    params: data
+  })
+}
+
+// 单位信息
+export function getOrgINfo(data){
+  return request({
+    url: '/system/organization/organizationRegisterDetails/'+ data.organizationSid,
+    method: 'get',
+    params: data
+  })
+}

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

@@ -1,43 +1,43 @@
-import request from '@/utils/request'
-import qs from 'qs'
-
-
-//获取菜单 分页列表
-export function login1(data) {
-  return request({
-    url: '/portal/v1/sysuser/login',
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-//  'token':tokens
-    }
-  })
-}
-
-
-
-
-
-class user {
-  login(data) { // 登录
-    return request({
-      url: '/portal/v1/sysuser/login',
-      method: 'post',
-      data
-    })
-  }
-  logout() {  // 退出
-    return request({
-      url: '/vue-admin-template/user/logout',
-      method: 'post'
-    })
-  }
-  updatePassword(data) { // 退出修改密码
-    return request({
-      url: '/system/user/updatePassword',
-      method: 'post',
-      data: qs.stringify(data)
-    })
-  }
-}
-
+import request from '@/utils/request'
+import qs from 'qs'
+
+
+//获取菜单 分页列表
+export function login1(data) {
+  return request({
+    url: '/portal/v1/sysuser/login',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+//  'token':tokens
+    }
+  })
+}
+
+
+
+
+
+class user {
+  login(data) { // 登录
+    return request({
+      url: '/portal/v1/sysuser/login',
+      method: 'post',
+      data
+    })
+  }
+  logout() {  // 退出
+    return request({
+      url: '/vue-admin-template/user/logout',
+      method: 'post'
+    })
+  }
+  updatePassword(data) { // 退出修改密码
+    return request({
+      url: '/system/user/updatePassword',
+      method: 'post',
+      data: qs.stringify(data)
+    })
+  }
+}
+

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

@@ -1,43 +1,43 @@
-import request from '@/utils/request'
-import qs from 'qs'
-class user{
-  verifyList(data){ // 请求审核列表
-    return request({
-      url: '/system/user/verifyList',
-      method: 'post',
-      data: data,
-      headers: {'Content-Type': 'application/json'}
-    })
-  }
-  userRegisterDetails(data){ // 获取审核内容
-  console.log(data)
-    return request({
-      url: '/system/user/userRegisterDetails',
-      method: 'get',
-      params: data
-    })
-  }
-  verify(data){ // 审核通过不通过
-    return request({
-      url: '/system/user/verify',
-      method: 'post',
-      data: qs.stringify(data)
-    })
-  }
-  userDelete(data){ // 删除
-   return request({
-     url: '/system/user/delete/{sid}',
-     method: 'delete',
-     data: qs.stringify(data)
-   })
-  }
-  userNameDelete(data){ // 删除个人注册审核
-   return request({
-     url: '/system/staffApply/deleteByUserName',
-     method: 'delete',
-     data: qs.stringify(data)
-   })
-  }
-
-}
-export default new user()
+import request from '@/utils/request'
+import qs from 'qs'
+class user{
+  verifyList(data){ // 请求审核列表
+    return request({
+      url: '/system/user/verifyList',
+      method: 'post',
+      data: data,
+      headers: {'Content-Type': 'application/json'}
+    })
+  }
+  userRegisterDetails(data){ // 获取审核内容
+  console.log(data)
+    return request({
+      url: '/system/user/userRegisterDetails',
+      method: 'get',
+      params: data
+    })
+  }
+  verify(data){ // 审核通过不通过
+    return request({
+      url: '/system/user/verify',
+      method: 'post',
+      data: qs.stringify(data)
+    })
+  }
+  userDelete(data){ // 删除
+   return request({
+     url: '/system/user/delete/{sid}',
+     method: 'delete',
+     data: qs.stringify(data)
+   })
+  }
+  userNameDelete(data){ // 删除个人注册审核
+   return request({
+     url: '/system/staffApply/deleteByUserName',
+     method: 'delete',
+     data: qs.stringify(data)
+   })
+  }
+
+}
+export default new user()

demo-web-ui/src/api/system/userAdminister/client.js

@@ -1,32 +1,32 @@
-import request from '@/utils/request'
-import qs from 'qs'
-
-// 委托人分页列表
-export function clientList(data){
-  return request({
-    url: '/jlcyry/v1/clientalterrecords/pagerList',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-// 变更选择委托人列表
-export function setclientList(data){
-  return request({
-    url: '/jlcyry/v1/clientalterrecords/staffClientList',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-// 变更为被委托人
-export function doClientAlter(data){
-  return request({
-    url: '/jlcyry/v1/clientalterrecords/doClientAlter',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 委托人分页列表
+export function clientList(data){
+  return request({
+    url: '/jlcyry/v1/clientalterrecords/pagerList',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+
+// 变更选择委托人列表
+export function setclientList(data){
+  return request({
+    url: '/jlcyry/v1/clientalterrecords/staffClientList',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+
+// 变更为被委托人
+export function doClientAlter(data){
+  return request({
+    url: '/jlcyry/v1/clientalterrecords/doClientAlter',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}

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

@@ -1,69 +1,69 @@
-import request from '@/utils/request'
-import qs from 'qs'
-let tokens = window.sessionStorage.getItem('token');
-// 单位用户列表
-export function orgUserList(data){
-  return request({
-    url: '/system/user/userListByOrg',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-
-// 设置角色
-export function psotUserRole(data){
-  return request({
-    url: '/system/v1/userrole',
-    method: 'post',
-    data: qs.stringify(data)
-  })
-}
-
-/**
- *  获取角色列表
- *  orgSid 用户SID
- *  roleName 角色名称
- * */
-export function orgrolesList(data){
-  return request({
-    url: '/system/v1/orgroles/list',
-    method: 'post',
-    headers: {'Content-Type': 'application/json'},
-    data
-  })
-}
-/**
- * 保存 设置角色  /system/v1/orguserroles
- * */
- export function saveOrgRole(data){
-   return request({
-     url: '/system/v1/orguserroles',
-     method: 'post',
-     headers: {'Content-Type': 'application/json'},
-     data
-   })
- }
-
-/**
- * 部门机构列表 /system/v1/departments/departmentOrgList/{organizationSid}
- * */
- export function getOrgList(organizationSid){
-   return request({
-     url: '/system/v1/departments/departmentOrgList/' + organizationSid,
-     method: 'get'
-   })
- }
-/**
- * 保存 设置部门  /system/v1/orguserroles
- * */
- export function saveDepartment(data){
-   return request({
-     url: '/system/v1/departmentStaffs/setUpDepartment',
-     method: 'post',
-     headers: {'Content-Type': 'application/json'},
-     data
-   })
- }
-
+import request from '@/utils/request'
+import qs from 'qs'
+let tokens = window.sessionStorage.getItem('token');
+// 单位用户列表
+export function orgUserList(data){
+  return request({
+    url: '/system/user/userListByOrg',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+
+
+// 设置角色
+export function psotUserRole(data){
+  return request({
+    url: '/system/v1/userrole',
+    method: 'post',
+    data: qs.stringify(data)
+  })
+}
+
+/**
+ *  获取角色列表
+ *  orgSid 用户SID
+ *  roleName 角色名称
+ * */
+export function orgrolesList(data){
+  return request({
+    url: '/system/v1/orgroles/list',
+    method: 'post',
+    headers: {'Content-Type': 'application/json'},
+    data
+  })
+}
+/**
+ * 保存 设置角色  /system/v1/orguserroles
+ * */
+ export function saveOrgRole(data){
+   return request({
+     url: '/system/v1/orguserroles',
+     method: 'post',
+     headers: {'Content-Type': 'application/json'},
+     data
+   })
+ }
+
+/**
+ * 部门机构列表 /system/v1/departments/departmentOrgList/{organizationSid}
+ * */
+ export function getOrgList(organizationSid){
+   return request({
+     url: '/system/v1/departments/departmentOrgList/' + organizationSid,
+     method: 'get'
+   })
+ }
+/**
+ * 保存 设置部门  /system/v1/orguserroles
+ * */
+ export function saveDepartment(data){
+   return request({
+     url: '/system/v1/departmentStaffs/setUpDepartment',
+     method: 'post',
+     headers: {'Content-Type': 'application/json'},
+     data
+   })
+ }
+

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

@@ -1,150 +1,150 @@
-import request from '@/utils/request'
-import qs from 'qs'
-// 用户列表
-//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjI5OTQxNjI1fQ.aOFOz0h7c8YQs-ti2GLpqeWu4AE9mifx_043hLJQf8g'
-let tokens = window.sessionStorage.getItem('token');
-export function userList(data){
-  return request({
-    url: '/portal/v1/sysuser/listPage',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-// 新增
-export function userAdd(data){
-  return request({
-    url: '/portal/v1/sysuser/save',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-// 更新
-export function userUpdata(data){
-  return request({
-    url: '/portal/v1/sysuser/update/' +data.sid,
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-
-// 删除
-export function delUser(data){
-  return request({
-    url: '/portal/v1/sysuser/delBySid/' +data.sid,
-    method: 'get',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
-  })
-}
-// 初始化密码
-export function initPwd(data){
-  return request({
-    url: '/portal/v1/sysuser/initPwd/' +data.sid,
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
-  })
-}
-// 根据sid查询一条信息
-export function userSingle(data){
-  return request({
-    url: '/portal/v1/sysuser/fetchBySid/' +data.sid,
-    method: 'get',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-// 单条用户的角色列表
-export function setRole(data){
-  return request({
-    url: '/portal/v1/sysrole/listAllByUserSid/' +data.sid,
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-// 角色列表
-export function saveOrgRole(data){
-  return request({
-    url: '/portal/v1/sysuserrole/update',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-// 查询角色列表
-export function roleList(data){
-  return request({
-    url: '/portal/v1/sysrole/listAll',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-// 查询部门列表
-export function orgList(data){
-  return request({
-    url: '/portal/v1/sysorganization/list',
-    method: 'get',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-// 查询岗位列表
-export function postList(data){
-  return request({
-    url: '/portal/v1/syspost/fetchByOrgSid/'+data.sid,
-    method: 'get',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-
-// 获取验证码
-export function getCode(data){
-  return request({
-    url: '/portal/v1/sysuser/sendMessageCode/'+data.phone,
-    method: 'get',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
-    }
-  })
-}
-
-// 设置是否可用：isEnable：1可用，0不可用
-export function setRoleEnable(data) {
-  return request({
-    url: '/portal/v1/sysuser/setIsEnable/' + data.sid + '/' + data.isEnable,
-    method: 'post',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
+import request from '@/utils/request'
+import qs from 'qs'
+// 用户列表
+//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjI5OTQxNjI1fQ.aOFOz0h7c8YQs-ti2GLpqeWu4AE9mifx_043hLJQf8g'
+let tokens = window.sessionStorage.getItem('token');
+export function userList(data){
+  return request({
+    url: '/portal/v1/sysuser/listPage',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+// 新增
+export function userAdd(data){
+  return request({
+    url: '/portal/v1/sysuser/save',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+// 更新
+export function userUpdata(data){
+  return request({
+    url: '/portal/v1/sysuser/update/' +data.sid,
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+
+// 删除
+export function delUser(data){
+  return request({
+    url: '/portal/v1/sysuser/delBySid/' +data.sid,
+    method: 'get',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+// 初始化密码
+export function initPwd(data){
+  return request({
+    url: '/portal/v1/sysuser/initPwd/' +data.sid,
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+// 根据sid查询一条信息
+export function userSingle(data){
+  return request({
+    url: '/portal/v1/sysuser/fetchBySid/' +data.sid,
+    method: 'get',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+// 单条用户的角色列表
+export function setRole(data){
+  return request({
+    url: '/portal/v1/sysrole/listAllByUserSid/' +data.sid,
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+// 角色列表
+export function saveOrgRole(data){
+  return request({
+    url: '/portal/v1/sysuserrole/update',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+// 查询角色列表
+export function roleList(data){
+  return request({
+    url: '/portal/v1/sysrole/listAll',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+// 查询部门列表
+export function orgList(data){
+  return request({
+    url: '/portal/v1/sysorganization/list',
+    method: 'get',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+// 查询岗位列表
+export function postList(data){
+  return request({
+    url: '/portal/v1/syspost/fetchByOrgSid/'+data.sid,
+    method: 'get',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+
+// 获取验证码
+export function getCode(data){
+  return request({
+    url: '/portal/v1/sysuser/sendMessageCode/'+data.phone,
+    method: 'get',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':tokens
+    }
+  })
+}
+
+// 设置是否可用：isEnable：1可用，0不可用
+export function setRoleEnable(data) {
+  return request({
+    url: '/portal/v1/sysuser/setIsEnable/' + data.sid + '/' + data.isEnable,
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}

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

@@ -1,56 +1,54 @@
-import request from '@/utils/request'
-import qs from 'qs'
-//登录
-export function login(data) {
-  return request({
-    url: '/portal/v1/sysuser/login',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-// 用户注册
-export function registUser(data) {
-  return request({
-    url: '/system/user/save',
-    method: 'post',
-    data,
-    headers:{'Content-Type':'application/x-www-form-urlencoded;'}
-  })
-}
-// 获取手机验证码
-export function getVerificationCode(data) {
-  return request({
-    url: '/system/user/getVerificationCode',
-    method: 'get',
-    params: data
-  })
-}
-
-// 获取登录验证码
-export function imgCode() {
-  return request({
-    url: '/system/api/defaultBlendCode?temm=' + new Date().getTime(),
-    method: 'get'
-  })
-}
-
-// 获取用信息
-export function getInfo(token) {
-  return request({
-    url: '/system/user/loginDetails',
-    method: 'post',
-  })
-}
-
-// 根据token值获取登录后的用户信息
-export function loginDetails(data) {
-  return request({
-    url: '/portal/v1/sysuser/loginDetails',
-    method: 'post',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
+import request from '@/utils/request'
+import qs from 'qs'
+//登录
+export function login(data) {
+  return request({
+    url: '/v1/sysuser/login',
+    method: 'post',
+    data: data,
+  })
+}
+// 用户注册
+export function registUser(data) {
+  return request({
+    url: 'v1/sysuser/register',
+    method: 'post',
+    data,
+  })
+}
+// 获取手机验证码
+export function getVerificationCode(data) {
+  return request({
+    url: '/system/user/getVerificationCode',
+    method: 'get',
+    params: data
+  })
+}
+
+// 获取登录验证码
+export function imgCode() {
+  return request({
+    url: '/system/api/defaultBlendCode?temm=' + new Date().getTime(),
+    method: 'get'
+  })
+}
+
+// 获取用信息
+export function getInfo(token) {
+  return request({
+    url: '/system/user/loginDetails',
+    method: 'post',
+  })
+}
+
+// 根据token值获取登录后的用户信息
+export function loginDetails(data) {
+  return request({
+    url: '/v1/sysuser/loginDetails',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}

demo-web-ui/src/api/workflow/finished.js

@@ -1,87 +1,87 @@
-import request from '@/utils/request'
-import da from "element-ui/src/locale/lang/da";
-
-const tokens = window.sessionStorage.getItem('token')
-
-// 查询已办任务列表
-export function finishedList(query) {
-  return request({
-    url: '/flowable/task/finishedList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 任务流转记录
-export function flowRecord(query) {
-  return request({
-    url: '/portal/v1/flow/task/flowRecordAndComment/' + query.procInsId + '/' + query.deployId,
-    method: 'get',
-    params: query
-  })
-}
-
-// 撤回任务
-export function revokeProcess(data) {
-  const userSid = data.userSid
-  return request({
-    url: '/portal/v1/flow/task/revokeProcess/' + userSid,
-    method: 'post',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
-
-// 部署流程实例
-export function deployStart(deployId) {
-  return request({
-    url: '/flowable/process/startFlow/' + deployId,
-    method: 'get'
-  })
-}
-
-// 查询流程定义详细
-export function getDeployment(id) {
-  return request({
-    url: '/system/deployment/' + id,
-    method: 'get'
-  })
-}
-
-// 新增流程定义
-export function addDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改流程定义
-export function updateDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除流程定义
-export function delDeployment(id) {
-  return request({
-    url: '/system/deployment/' + id,
-    method: 'delete'
-  })
-}
-
-// 导出流程定义
-export function exportDeployment(query) {
-  return request({
-    url: '/system/deployment/export',
-    method: 'get',
-    params: query
-  })
-}
+import request from '@/utils/request'
+import da from "element-ui/src/locale/lang/da";
+
+const tokens = window.sessionStorage.getItem('token')
+
+// 查询已办任务列表
+export function finishedList(query) {
+  return request({
+    url: '/flowable/task/finishedList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 任务流转记录
+export function flowRecord(query) {
+  return request({
+    url: '/portal/v1/flow/task/flowRecordAndComment/' + query.procInsId + '/' + query.deployId,
+    method: 'get',
+    params: query
+  })
+}
+
+// 撤回任务
+export function revokeProcess(data) {
+  const userSid = data.userSid
+  return request({
+    url: '/portal/v1/flow/task/revokeProcess/' + userSid,
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
+
+// 部署流程实例
+export function deployStart(deployId) {
+  return request({
+    url: '/flowable/process/startFlow/' + deployId,
+    method: 'get'
+  })
+}
+
+// 查询流程定义详细
+export function getDeployment(id) {
+  return request({
+    url: '/system/deployment/' + id,
+    method: 'get'
+  })
+}
+
+// 新增流程定义
+export function addDeployment(data) {
+  return request({
+    url: '/system/deployment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改流程定义
+export function updateDeployment(data) {
+  return request({
+    url: '/system/deployment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除流程定义
+export function delDeployment(id) {
+  return request({
+    url: '/system/deployment/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出流程定义
+export function exportDeployment(query) {
+  return request({
+    url: '/system/deployment/export',
+    method: 'get',
+    params: query
+  })
+}

demo-web-ui/src/api/workflow/flow.js

@@ -1,92 +1,92 @@
-import request from '@/utils/request'
-
-const tokens = window.sessionStorage.getItem('token')
-
-export default {
-// 查询待办任务列表
-  getNextNodes: function (query) {
-    return request({
-      url: '/portal/v1/flow/getNextTasks/'+query.taskId,
-      method: 'post',
-      headers: {
-        'Content-Type': 'application/json',
-        'token': tokens
-      }
-    })
-  },
-  businessStart: function(params) {
-    const procDefId = params.procDefId
-    const userSid = params.userSid
-    const variables = params.variables
-    return request({
-      url: '/portal/v1/flow/businessStart/' + procDefId + '/' + userSid,
-      method: 'POST',
-      data: variables,
-      headers: {
-        'Content-Type': 'application/json',
-        'token': tokens
-      }
-    })
-  },
-  processPagerList: function(params) {
-    const pageNum = params.current
-    const pageSize = params.size
-    return request({
-      url: '/portal/v1/flow/processPagerList',
-      method: 'POST',
-      data: {
-        pageNum: pageNum,
-        pageSize: pageSize
-      }
-    })
-  },
-  myProcessList: function(params) {
-    let userSid=params.params.userSid;
-    return request({
-      url: '/portal/v1/flow/myprocess/'+userSid,
-      method: 'POST',
-      data: params,
-      headers: {
-        'Content-Type': 'application/json',
-        'token': tokens
-      }
-    })
-  },
-  todoTaskList: function(params) {
-    let userSid=params.params.userSid;
-    return request({
-      url: '/portal/v1/flow/todoTaskList/'+userSid,
-      method: 'POST',
-      data: params,
-      headers: {
-        'Content-Type': 'application/json',
-        'token': tokens
-      }
-    })
-  },
-  doneTaskList: function(params) {
-    let userSid=params.params.userSid;
-    return request({
-      url: '/portal/v1/flow/doneTaskList/'+userSid,
-      method: 'POST',
-      data: params,
-      headers: {
-        'Content-Type': 'application/json',
-        'token': tokens
-      }
-    })
-  }
-
-}
-// 任务流转记录
-export function complete(data) {
-  return request({
-    url: '/portal/v1/flow/complete',
-    method: 'post',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json',
-      'token': tokens
-    }
-  })
-}
+import request from '@/utils/request'
+
+const tokens = window.sessionStorage.getItem('token')
+
+export default {
+// 查询待办任务列表
+  getNextNodes: function (query) {
+    return request({
+      url: '/portal/v1/flow/getNextTasks/'+query.taskId,
+      method: 'post',
+      headers: {
+        'Content-Type': 'application/json',
+        'token': tokens
+      }
+    })
+  },
+  businessStart: function(params) {
+    const procDefId = params.procDefId
+    const userSid = params.userSid
+    const variables = params.variables
+    return request({
+      url: '/portal/v1/flow/businessStart/' + procDefId + '/' + userSid,
+      method: 'POST',
+      data: variables,
+      headers: {
+        'Content-Type': 'application/json',
+        'token': tokens
+      }
+    })
+  },
+  processPagerList: function(params) {
+    const pageNum = params.current
+    const pageSize = params.size
+    return request({
+      url: '/portal/v1/flow/processPagerList',
+      method: 'POST',
+      data: {
+        pageNum: pageNum,
+        pageSize: pageSize
+      }
+    })
+  },
+  myProcessList: function(params) {
+    let userSid=params.params.userSid;
+    return request({
+      url: '/portal/v1/flow/myprocess/'+userSid,
+      method: 'POST',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json',
+        'token': tokens
+      }
+    })
+  },
+  todoTaskList: function(params) {
+    let userSid=params.params.userSid;
+    return request({
+      url: '/portal/v1/flow/todoTaskList/'+userSid,
+      method: 'POST',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json',
+        'token': tokens
+      }
+    })
+  },
+  doneTaskList: function(params) {
+    let userSid=params.params.userSid;
+    return request({
+      url: '/portal/v1/flow/doneTaskList/'+userSid,
+      method: 'POST',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json',
+        'token': tokens
+      }
+    })
+  }
+
+}
+// 任务流转记录
+export function complete(data) {
+  return request({
+    url: '/portal/v1/flow/complete',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}

demo-web-ui/src/api/workflow/form.js

@@ -1,64 +1,64 @@
-import request from '@/utils/request'
-
-// 查询流程表单列表
-export function listForm(query) {
-  return request({
-    url: '/v1/flowable/form/list',
-    method: 'post',
-    data: query
-  })
-}
-
-// 查询流程表单详细
-export function getForm(formId) {
-  return request({
-    url: '/v1/flowable/form/' + formId,
-    method: 'get'
-  })
-}
-
-// 新增流程表单
-export function addForm(data) {
-  return request({
-    url: '/v1/flowable/form/add',
-    method: 'post',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-      'token':1
-    }
-  })
-}
-
-// 修改流程表单
-export function updateForm(data) {
-  return request({
-    url: '/v1/flowable/form',
-    method: 'put',
-    data: data
-  })
-}
-// 挂载表单
-export function addDeployForm(data) {
-  return request({
-    url: '/v1/flowable/form/addDeployForm',
-    method: 'post',
-    data: data
-  })
-}
-
-// 删除流程表单
-export function delForm(formId) {
-  return request({
-    url: '/v1/flowable/form/' + formId,
-    method: 'delete'
-  })
-}
-
-// 导出流程表单
-export function exportForm(query) {
-  return request({
-    url: '/v1/flowable/form/export',
-    method: 'get',
-    params: query
-  })
-}
+import request from '@/utils/request'
+
+// 查询流程表单列表
+export function listForm(query) {
+  return request({
+    url: '/v1/flowable/form/list',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询流程表单详细
+export function getForm(formId) {
+  return request({
+    url: '/v1/flowable/form/' + formId,
+    method: 'get'
+  })
+}
+
+// 新增流程表单
+export function addForm(data) {
+  return request({
+    url: '/v1/flowable/form/add',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+      'token':1
+    }
+  })
+}
+
+// 修改流程表单
+export function updateForm(data) {
+  return request({
+    url: '/v1/flowable/form',
+    method: 'put',
+    data: data
+  })
+}
+// 挂载表单
+export function addDeployForm(data) {
+  return request({
+    url: '/v1/flowable/form/addDeployForm',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除流程表单
+export function delForm(formId) {
+  return request({
+    url: '/v1/flowable/form/' + formId,
+    method: 'delete'
+  })
+}
+
+// 导出流程表单
+export function exportForm(query) {
+  return request({
+    url: '/v1/flowable/form/export',
+    method: 'get',
+    params: query
+  })
+}

demo-web-ui/src/api/workflow/info.js

@@ -1,29 +1,29 @@
-import request from '@/utils/request'
-
-// 代办、已办基础信息页面
-// 详情编辑回显(订金收取)  已改
-export function fetchSid(data) {
-  return request({
-    url: '/buscenter/v1/busmaindeposit/selectDepositBySid/' + data,
-    method: 'get',
-    params: data
-  })
-}
-
-// 详细编辑回显(预定车辆) 已改
-export function selectSid(data) {
-  return request({
-    url: '/buscenter/v1/busmaindeposit/selectDepositVehBySid/' + data,
-    method: 'get',
-    params: data
-  })
-}
-
-//合同管理编辑回显
-export function getOneContract(data) {
-  return request({
-    url: "/base/v1/commoncontract/fetchSid/" + data,
-    method: "get"
-  });
-}
-
+import request from '@/utils/request'
+
+// 代办、已办基础信息页面
+// 详情编辑回显(订金收取)  已改
+export function fetchSid(data) {
+  return request({
+    url: '/buscenter/v1/busmaindeposit/selectDepositBySid/' + data,
+    method: 'get',
+    params: data
+  })
+}
+
+// 详细编辑回显(预定车辆) 已改
+export function selectSid(data) {
+  return request({
+    url: '/buscenter/v1/busmaindeposit/selectDepositVehBySid/' + data,
+    method: 'get',
+    params: data
+  })
+}
+
+//合同管理编辑回显
+export function getOneContract(data) {
+  return request({
+    url: "/base/v1/commoncontract/fetchSid/" + data,
+    method: "get"
+  });
+}
+

demo-web-ui/src/api/workflow/process.js

@@ -1,101 +1,101 @@
-import request from '@/utils/request'
-import da from "element-ui/src/locale/lang/da";
-
-// 我的发起的流程
-export function myProcessList(data) {
-  return request({
-    url: '/v1/flowable/task/myprocess',
-    method: 'post',
-    data: data
-  })
-}
-
-// 完成任务
-export function complete(data) {
-  return request({
-    url: '/flowable/task/complete',
-    method: 'post',
-    data: data
-  })
-}
-
-// 取消申请
-export function stopProcess(data) {
-  return request({
-    url: '/portal/v1/flow/task/stopProcess',
-    method: 'post',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
-
-// 驳回任务
-export function rejectTask(data) {
-  return request({
-    url: '/v1/flowable/task/reject',
-    method: 'post',
-    data: data
-  })
-}
-
-// 可退回任务列表
-export function returnList(data) {
-  return request({
-    url: '/v1/flowable/task/returnList',
-    method: 'post',
-    data: data
-  })
-}
-
-// 部署流程实例
-export function deployStart(deployId) {
-  return request({
-    url: '/flowable/process/startFlow/' + deployId,
-    method: 'get',
-  })
-}
-
-// 查询流程定义详细
-export function getDeployment(id) {
-  return request({
-    url: '/system/deployment/' + id,
-    method: 'get'
-  })
-}
-
-// 新增流程定义
-export function addDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改流程定义
-export function updateDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除流程定义
-export function delDeployment(id) {
-  return request({
-    url: '/portal/v1/flow/deleteProcess/' + id,
-    method: 'delete'
-  })
-}
-
-// 导出流程定义
-export function exportDeployment(query) {
-  return request({
-    url: '/system/deployment/export',
-    method: 'get',
-    params: query
-  })
-}
+import request from '@/utils/request'
+import da from "element-ui/src/locale/lang/da";
+
+// 我的发起的流程
+export function myProcessList(data) {
+  return request({
+    url: '/v1/flowable/task/myprocess',
+    method: 'post',
+    data: data
+  })
+}
+
+// 完成任务
+export function complete(data) {
+  return request({
+    url: '/flowable/task/complete',
+    method: 'post',
+    data: data
+  })
+}
+
+// 取消申请
+export function stopProcess(data) {
+  return request({
+    url: '/portal/v1/flow/task/stopProcess',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 驳回任务
+export function rejectTask(data) {
+  return request({
+    url: '/v1/flowable/task/reject',
+    method: 'post',
+    data: data
+  })
+}
+
+// 可退回任务列表
+export function returnList(data) {
+  return request({
+    url: '/v1/flowable/task/returnList',
+    method: 'post',
+    data: data
+  })
+}
+
+// 部署流程实例
+export function deployStart(deployId) {
+  return request({
+    url: '/flowable/process/startFlow/' + deployId,
+    method: 'get',
+  })
+}
+
+// 查询流程定义详细
+export function getDeployment(id) {
+  return request({
+    url: '/system/deployment/' + id,
+    method: 'get'
+  })
+}
+
+// 新增流程定义
+export function addDeployment(data) {
+  return request({
+    url: '/system/deployment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改流程定义
+export function updateDeployment(data) {
+  return request({
+    url: '/system/deployment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除流程定义
+export function delDeployment(id) {
+  return request({
+    url: '/portal/v1/flow/deleteProcess/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出流程定义
+export function exportDeployment(query) {
+  return request({
+    url: '/system/deployment/export',
+    method: 'get',
+    params: query
+  })
+}

demo-web-ui/src/api/workflow/todo.js

@@ -1,129 +1,129 @@
-import request from '@/utils/request'
-import da from "element-ui/src/locale/lang/da";
-
-// 查询待办任务列表
-export function todoList(query) {
-  return request({
-    url: '/flowable/task/todoList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 完成任务
-export function complete(data) {
-  return request({
-    url: '/flowable/task/complete',
-    method: 'post',
-    data: data
-  })
-}
-
-// 委派任务
-export function delegate(data) {
-  return request({
-    url: '/flowable/task/delegate',
-    method: 'post',
-    data: data
-  })
-}
-
-// 退回任务
-export function returnTask(data) {
-  return request({
-    url: '/flowable/task/return',
-    method: 'post',
-    data: data
-  })
-}
-
-// 驳回任务
-export function rejectTask(data) {
-  return request({
-    url: '/portal/v1/flow/task/reject',
-    method: 'post',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
-
-// 可退回任务列表
-export function returnList(data) {
-  return request({
-    url: '/flowable/task/returnList',
-    method: 'post',
-    data: data
-  })
-}
-
-// 下一节点
-export function getNextFlowNode(data) {
-  return request({
-    url: '/flowable/task/nextFlowNode',
-    method: 'post',
-    data: data
-  })
-}
-
-// 部署流程实例
-export function deployStart(deployId) {
-  return request({
-    url: '/flowable/process/startFlow/' + deployId,
-    method: 'get',
-  })
-}
-
-// 查询流程定义详细
-export function getDeployment(id) {
-  return request({
-    url: '/system/deployment/' + id,
-    method: 'get'
-  })
-}
-
-// 新增流程定义
-export function addDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改流程定义
-export function updateDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除流程定义
-export function delDeployment(id) {
-  return request({
-    url: '/system/deployment/' + id,
-    method: 'delete'
-  })
-}
-
-// 导出流程定义
-export function exportDeployment(query) {
-  return request({
-    url: '/system/deployment/export',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查看总代办列表
-export function taskList (data) {
-  return request({
-    url: '/portal/v1/flow/todoAllTaskList/' + data,
-    method: 'post',
-    data: data
-  })
-}
-
+import request from '@/utils/request'
+import da from "element-ui/src/locale/lang/da";
+
+// 查询待办任务列表
+export function todoList(query) {
+  return request({
+    url: '/flowable/task/todoList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 完成任务
+export function complete(data) {
+  return request({
+    url: '/flowable/task/complete',
+    method: 'post',
+    data: data
+  })
+}
+
+// 委派任务
+export function delegate(data) {
+  return request({
+    url: '/flowable/task/delegate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 退回任务
+export function returnTask(data) {
+  return request({
+    url: '/flowable/task/return',
+    method: 'post',
+    data: data
+  })
+}
+
+// 驳回任务
+export function rejectTask(data) {
+  return request({
+    url: '/portal/v1/flow/task/reject',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 可退回任务列表
+export function returnList(data) {
+  return request({
+    url: '/flowable/task/returnList',
+    method: 'post',
+    data: data
+  })
+}
+
+// 下一节点
+export function getNextFlowNode(data) {
+  return request({
+    url: '/flowable/task/nextFlowNode',
+    method: 'post',
+    data: data
+  })
+}
+
+// 部署流程实例
+export function deployStart(deployId) {
+  return request({
+    url: '/flowable/process/startFlow/' + deployId,
+    method: 'get',
+  })
+}
+
+// 查询流程定义详细
+export function getDeployment(id) {
+  return request({
+    url: '/system/deployment/' + id,
+    method: 'get'
+  })
+}
+
+// 新增流程定义
+export function addDeployment(data) {
+  return request({
+    url: '/system/deployment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改流程定义
+export function updateDeployment(data) {
+  return request({
+    url: '/system/deployment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除流程定义
+export function delDeployment(id) {
+  return request({
+    url: '/system/deployment/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出流程定义
+export function exportDeployment(query) {
+  return request({
+    url: '/system/deployment/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查看总代办列表
+export function taskList (data) {
+  return request({
+    url: '/portal/v1/flow/todoAllTaskList/' + data,
+    method: 'post',
+    data: data
+  })
+}
+

demo-web-ui/src/components/AreaPicker/index.vue

@@ -1,151 +1,151 @@
-<template>
-  <div class="AreaPicker">
-    <el-select v-model="form.province"
-      @change="changeProvince(form.province)"
-      filterable
-      placeholder="请选择省份"
-      :loading="loading == 'province'">
-      <el-option
-        v-for="item in province_list"
-        :key="item.sid"
-        :label="item.name"
-        :value="item.sid"
-        >
-      </el-option>
-    </el-select>
-    <el-select v-model="form.city"
-      @change='changeCity(form.city)'
-      filterable
-      placeholder="请选择市"
-      :loading="loading == 'city'"
-      style="margin-left: 8px;">
-      <el-option
-        v-for="item in city_list"
-        :key="item.sid"
-        :label="item.name"
-        :value="item.sid">
-      </el-option>
-    </el-select>
-    <el-select v-model="form.county"
-      @change='changeCounty(form.county)'
-      filterable
-      :loading="loading == 'county'"
-      placeholder="请选择县/区"
-      style="margin-left: 8px;">
-      <el-option
-        v-for="item in county_list"
-        :key="item.sid"
-        :label="item.name"
-        :value="item.sid">
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
-<script>
-  import {
-  	getProvince,
-  	getCity,
-  	getCounty
-  } from '@/api/Common/areaPicker.js'
-  export default {
-    props:{
-      province:{
-        type: String,
-        default: ''
-      },
-      city:{
-        type: String,
-        default: ''
-      },
-      county:{
-        type: String,
-        default: ''
-      }
-    },
-    data() {
-      return {
-        province_list: [],
-        city_list: [],
-        county_list: [],
-        form:{
-          province: this.province,
-          city: this.city,
-          county: this.county
-        },
-        loading: false
-      }
-    },
-    watch:{
-      province:function(newVal,oldVal){
-        this.form.province = newVal
-      },
-      city:function(newVal,oldVal){
-        this.form.city = newVal
-      },
-      county:function(newVal,oldVal){
-        this.form.county = newVal
-      }
-    },
-    async mounted() {
-      let provincelist =  await getProvince()
-      this.province_list = provincelist.data
-      if(this.province){
-        let citylist =  await getCity({ sid: this.province })
-        this.city_list = citylist.data
-      }
-      if(this.city){
-        let countylist =  await getCounty({ sid: this.city })
-        this.county_list = countylist.data
-      }
-      this.loading = false
-    },
-    methods: {
-      changeProvince(val){
-        console.log(val)
-        getCity({ sid: val }).then(res => {
-          this.city_list = res.data
-          this.loading = false
-        })
-        let obj = {};
-        obj = this.province_list.find((item)=>{
-            return item.sid === val;//筛选出匹配数据
-        });
-        console.log(obj)
-        this.form.city = ''
-        this.form.county = ''
-        this.city_list = []
-        this.county_list = []
-        this.loading = 'city'
-        this.$emit('areaPicker', obj.sidPath)
-      },
-      changeCity(val){
-        let obj = {};
-        obj = this.city_list.find((item)=>{
-            return item.sid === val;//筛选出匹配数据
-        });
-        console.log(obj)
-        this.form.county = ''
-        this.county_list = []
-        this.loading = 'county'
-        this.$emit('areaPicker', obj.sidPath)
-        getCounty({ sid: val }).then(res => {
-          this.county_list = res.data
-          this.loading = false
-        })
-      },
-      changeCounty(val){
-        let obj = {};
-        obj = this.county_list.find((item)=>{
-            return item.sid === val;//筛选出匹配数据
-        });
-        this.$emit('areaPicker', obj.sidPath)
-      }
-    }
-  }
-</script>
-
-
-<style>
-
-</style>
+<template>
+  <div class="AreaPicker">
+    <el-select v-model="form.province"
+      @change="changeProvince(form.province)"
+      filterable
+      placeholder="请选择省份"
+      :loading="loading == 'province'">
+      <el-option
+        v-for="item in province_list"
+        :key="item.sid"
+        :label="item.name"
+        :value="item.sid"
+        >
+      </el-option>
+    </el-select>
+    <el-select v-model="form.city"
+      @change='changeCity(form.city)'
+      filterable
+      placeholder="请选择市"
+      :loading="loading == 'city'"
+      style="margin-left: 8px;">
+      <el-option
+        v-for="item in city_list"
+        :key="item.sid"
+        :label="item.name"
+        :value="item.sid">
+      </el-option>
+    </el-select>
+    <el-select v-model="form.county"
+      @change='changeCounty(form.county)'
+      filterable
+      :loading="loading == 'county'"
+      placeholder="请选择县/区"
+      style="margin-left: 8px;">
+      <el-option
+        v-for="item in county_list"
+        :key="item.sid"
+        :label="item.name"
+        :value="item.sid">
+      </el-option>
+    </el-select>
+  </div>
+</template>
+
+<script>
+  import {
+  	getProvince,
+  	getCity,
+  	getCounty
+  } from '@/api/Common/areaPicker.js'
+  export default {
+    props:{
+      province:{
+        type: String,
+        default: ''
+      },
+      city:{
+        type: String,
+        default: ''
+      },
+      county:{
+        type: String,
+        default: ''
+      }
+    },
+    data() {
+      return {
+        province_list: [],
+        city_list: [],
+        county_list: [],
+        form:{
+          province: this.province,
+          city: this.city,
+          county: this.county
+        },
+        loading: false
+      }
+    },
+    watch:{
+      province:function(newVal,oldVal){
+        this.form.province = newVal
+      },
+      city:function(newVal,oldVal){
+        this.form.city = newVal
+      },
+      county:function(newVal,oldVal){
+        this.form.county = newVal
+      }
+    },
+    async mounted() {
+      let provincelist =  await getProvince()
+      this.province_list = provincelist.data
+      if(this.province){
+        let citylist =  await getCity({ sid: this.province })
+        this.city_list = citylist.data
+      }
+      if(this.city){
+        let countylist =  await getCounty({ sid: this.city })
+        this.county_list = countylist.data
+      }
+      this.loading = false
+    },
+    methods: {
+      changeProvince(val){
+        console.log(val)
+        getCity({ sid: val }).then(res => {
+          this.city_list = res.data
+          this.loading = false
+        })
+        let obj = {};
+        obj = this.province_list.find((item)=>{
+            return item.sid === val;//筛选出匹配数据
+        });
+        console.log(obj)
+        this.form.city = ''
+        this.form.county = ''
+        this.city_list = []
+        this.county_list = []
+        this.loading = 'city'
+        this.$emit('areaPicker', obj.sidPath)
+      },
+      changeCity(val){
+        let obj = {};
+        obj = this.city_list.find((item)=>{
+            return item.sid === val;//筛选出匹配数据
+        });
+        console.log(obj)
+        this.form.county = ''
+        this.county_list = []
+        this.loading = 'county'
+        this.$emit('areaPicker', obj.sidPath)
+        getCounty({ sid: val }).then(res => {
+          this.county_list = res.data
+          this.loading = false
+        })
+      },
+      changeCounty(val){
+        let obj = {};
+        obj = this.county_list.find((item)=>{
+            return item.sid === val;//筛选出匹配数据
+        });
+        this.$emit('areaPicker', obj.sidPath)
+      }
+    }
+  }
+</script>
+
+
+<style>
+
+</style>

demo-web-ui/src/components/Breadcrumb/index.vue

@@ -1,78 +1,78 @@
-<template>
-  <el-breadcrumb class="app-breadcrumb" separator="/">
-    <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
-        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
-      </el-breadcrumb-item>
-    </transition-group>
-  </el-breadcrumb>
-</template>
-
-<script>
-import pathToRegexp from 'path-to-regexp'
-
-export default {
-  data() {
-    return {
-      levelList: null
-    }
-  },
-  watch: {
-    $route() {
-      this.getBreadcrumb()
-    }
-  },
-  created() {
-    this.getBreadcrumb()
-  },
-  methods: {
-    getBreadcrumb() {
-      // only show routes with meta.title
-      let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
-      const first = matched[0]
-
-      if (!this.isDashboard(first)) {
-        matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched)
-      }
-
-      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
-    },
-    isDashboard(route) {
-      const name = route && route.name
-      if (!name) {
-        return false
-      }
-      return name.trim().toLocaleLowerCase() === 'Dashboard'.toLocaleLowerCase()
-    },
-    pathCompile(path) {
-      // To solve this problem https://github.com/PanJiaChen/vue-element-admin/issues/561
-      const { params } = this.$route
-      var toPath = pathToRegexp.compile(path)
-      return toPath(params)
-    },
-    handleLink(item) {
-      const { redirect, path } = item
-      if (redirect) {
-        this.$router.push(redirect)
-        return
-      }
-      this.$router.push(this.pathCompile(path))
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.app-breadcrumb.el-breadcrumb {
-  display: inline-block;
-  font-size: 14px;
-  line-height: 50px;
-  margin-left: 8px;
-
-  .no-redirect {
-    color: #97a8be;
-    cursor: text;
-  }
-}
-</style>
+<template>
+  <el-breadcrumb class="app-breadcrumb" separator="/">
+    <transition-group name="breadcrumb">
+      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
+        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
+        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
+      </el-breadcrumb-item>
+    </transition-group>
+  </el-breadcrumb>
+</template>
+
+<script>
+import pathToRegexp from 'path-to-regexp'
+
+export default {
+  data() {
+    return {
+      levelList: null
+    }
+  },
+  watch: {
+    $route() {
+      this.getBreadcrumb()
+    }
+  },
+  created() {
+    this.getBreadcrumb()
+  },
+  methods: {
+    getBreadcrumb() {
+      // only show routes with meta.title
+      let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
+      const first = matched[0]
+
+      if (!this.isDashboard(first)) {
+        matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched)
+      }
+
+      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
+    },
+    isDashboard(route) {
+      const name = route && route.name
+      if (!name) {
+        return false
+      }
+      return name.trim().toLocaleLowerCase() === 'Dashboard'.toLocaleLowerCase()
+    },
+    pathCompile(path) {
+      // To solve this problem https://github.com/PanJiaChen/vue-element-admin/issues/561
+      const { params } = this.$route
+      var toPath = pathToRegexp.compile(path)
+      return toPath(params)
+    },
+    handleLink(item) {
+      const { redirect, path } = item
+      if (redirect) {
+        this.$router.push(redirect)
+        return
+      }
+      this.$router.push(this.pathCompile(path))
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.app-breadcrumb.el-breadcrumb {
+  display: inline-block;
+  font-size: 14px;
+  line-height: 50px;
+  margin-left: 8px;
+
+  .no-redirect {
+    color: #97a8be;
+    cursor: text;
+  }
+}
+</style>

demo-web-ui/src/components/ButtonBar/index.vue

@@ -1,130 +1,130 @@
-<template>
-  <!--标题按钮部分开始-->
-  <div class="tab-header webtop">
-    <!--标题-->
-    <div>{{ viewTitle }}<span style="padding-left: 10px">{{ version }}</span><span style="padding-left: 10px">{{ time }}</span></div>
-    <!--start 按钮部分开始 :icon="item.icon"-->
-    <div>
-      <el-button v-for="item in btnList" :key="item.btnKey" :type="item.type" :size="item.size" :disabled="btndisabled" @click="btnHandle(item.btnKey)">
-        <svg-icon v-if="item.icon" :iconClass="item.icon"/>{{ item.btnLabel }}
-      </el-button>
-    </div>
-    <!--end 按钮部分结束-->
-  </div>
-  <!--标题按钮部分结束-->
-</template>
-
-<script>
-export default {
-  name: 'ButtonBar',
-  props: {
-    viewTitle: String,
-    version: {
-      type: String,
-      default: ''
-    },
-    time: {
-      type: String,
-      default: ''
-    },
-    btndisabled: { type: Boolean, default: false }
-  },
-  data() {
-    return {
-      currentPath: this.$route.path,
-      userSid: this.$store.getters.userInfo ? this.$store.getters.userInfo.userSid : '',
-      btnList: [
-        {
-          type: 'primary',
-          size: 'small',
-          icon: 'plus',
-          btnKey: 'toAdd',
-          btnLabel: '新增'
-        },
-        {
-          type: 'primary',
-          size: 'small',
-          icon: 'edit',
-          btnKey: 'toEdit',
-          btnLabel: '编辑'
-        },
-        {
-          type: 'primary',
-          size: 'small',
-          icon: 'submit',
-          btnKey: 'doSubmit',
-          btnLabel: '提交'
-        },
-        {
-          type: 'danger',
-          size: 'small',
-          icon: 'del',
-          btnKey: 'doDel',
-          btnLabel: '删除'
-        },
-        {
-          type: 'success',
-          size: 'small',
-          icon: 'Import',
-          btnKey: 'doImport',
-          btnLabel: '导入'
-        },
-        {
-          type: 'success',
-          size: 'small',
-          icon: 'export',
-          btnKey: 'build',
-          btnLabel: '导出'
-        },
-        {
-          type: 'info',
-          size: 'small',
-          icon: 'cross',
-          btnKey: 'doClose',
-          btnLabel: '关闭'
-        }
-      ]
-    }
-  },
-  created: function() {
-    this.initPermission()
-  },
-  methods: {
-    initPermission() {
-      console.log('*******************当前路径    ' + this.currentPath)
-      console.log('*******************当前用户    ' + this.userSid)
-      const params = {
-        currentPath: this.currentPath,
-        userSid: this.userSid
-      }
-      // req
-      //   .buttonPermission(params)
-      //   .then(resp => {
-      //     if (resp.success) {
-      //       this.btnList = resp.data
-      //     }
-      //   })
-      //   .catch(e => {
-      //     console.log('请求权限按钮组出错：' + e)
-      //   })
-    },
-    btnHandle(btnKey) {
-      this.$emit('btnhandle', btnKey)
-    },
-    setButtonList(value) {
-      this.btnList = value
-    }
-  }
-}
-</script>
-
-<style scoped>
-.svg-icon {
-  width: 1em;
-  height: 1em;
-  vertical-align: -0.16em;
-  fill: currentColor;
-  overflow: hidden;
-  margin-right: 3px;
-}
-</style>
+<template>
+  <!--标题按钮部分开始-->
+  <div class="tab-header webtop">
+    <!--标题-->
+    <div>{{ viewTitle }}<span style="padding-left: 10px">{{ version }}</span><span style="padding-left: 10px">{{ time }}</span></div>
+    <!--start 按钮部分开始 :icon="item.icon"-->
+    <div>
+      <el-button v-for="item in btnList" :key="item.btnKey" :type="item.type" :size="item.size" :disabled="btndisabled" @click="btnHandle(item.btnKey)">
+        <svg-icon v-if="item.icon" :iconClass="item.icon"/>{{ item.btnLabel }}
+      </el-button>
+    </div>
+    <!--end 按钮部分结束-->
+  </div>
+  <!--标题按钮部分结束-->
+</template>
+
+<script>
+export default {
+  name: 'ButtonBar',
+  props: {
+    viewTitle: String,
+    version: {
+      type: String,
+      default: ''
+    },
+    time: {
+      type: String,
+      default: ''
+    },
+    btndisabled: { type: Boolean, default: false }
+  },
+  data() {
+    return {
+      currentPath: this.$route.path,
+      userSid: this.$store.getters.userInfo ? this.$store.getters.userInfo.userSid : '',
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'submit',
+          btnKey: 'doSubmit',
+          btnLabel: '提交'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'Import',
+          btnKey: 'doImport',
+          btnLabel: '导入'
+        },
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'build',
+          btnLabel: '导出'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ]
+    }
+  },
+  created: function() {
+    this.initPermission()
+  },
+  methods: {
+    initPermission() {
+      console.log('*******************当前路径    ' + this.currentPath)
+      console.log('*******************当前用户    ' + this.userSid)
+      const params = {
+        currentPath: this.currentPath,
+        userSid: this.userSid
+      }
+      // req
+      //   .buttonPermission(params)
+      //   .then(resp => {
+      //     if (resp.success) {
+      //       this.btnList = resp.data
+      //     }
+      //   })
+      //   .catch(e => {
+      //     console.log('请求权限按钮组出错：' + e)
+      //   })
+    },
+    btnHandle(btnKey) {
+      this.$emit('btnhandle', btnKey)
+    },
+    setButtonList(value) {
+      this.btnList = value
+    }
+  }
+}
+</script>
+
+<style scoped>
+.svg-icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.16em;
+  fill: currentColor;
+  overflow: hidden;
+  margin-right: 3px;
+}
+</style>

demo-web-ui/src/components/E-image/index.vue

@@ -1,45 +1,45 @@
-<template>
-  <el-image
-    :preview-src-list="[url]"
-    class="block-img"
-    :src="url"
-    @click.stop="handleClickItem"></el-image>
-</template>
-
-<script>
-  export default {
-    props: {
-      url: {
-        type: String,
-        default: ''
-      },
-    },
-    data() {
-      return {
-      }
-    },
-    methods: {
-      handleClickItem() {
-        // 获取遮罩层dom
-        let domImageMask = document.querySelector(".el-image-viewer__mask");
-        if (!domImageMask) {
-          return;
-        }
-        domImageMask.addEventListener("click", () => {
-          // 点击遮罩层时调用关闭按钮的 click 事件
-          document.querySelector(".el-image-viewer__close").click();
-        });
-      }
-    }
-  }
-</script>
-
-<style>
-  .block-img{
-    width: 30px;
-    height: 30px;
-  }
-  .el-icon-circle-close{
-    color: white;
-  }
-</style>
+<template>
+  <el-image
+    :preview-src-list="[url]"
+    class="block-img"
+    :src="url"
+    @click.stop="handleClickItem"></el-image>
+</template>
+
+<script>
+  export default {
+    props: {
+      url: {
+        type: String,
+        default: ''
+      },
+    },
+    data() {
+      return {
+      }
+    },
+    methods: {
+      handleClickItem() {
+        // 获取遮罩层dom
+        let domImageMask = document.querySelector(".el-image-viewer__mask");
+        if (!domImageMask) {
+          return;
+        }
+        domImageMask.addEventListener("click", () => {
+          // 点击遮罩层时调用关闭按钮的 click 事件
+          document.querySelector(".el-image-viewer__close").click();
+        });
+      }
+    }
+  }
+</script>
+
+<style>
+  .block-img{
+    width: 30px;
+    height: 30px;
+  }
+  .el-icon-circle-close{
+    color: white;
+  }
+</style>