lingling
/
welfare-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
280 Commits 1 Branch 0 Tags 7.8 MiB
Commit Graph

230 Commits

Author SHA1 Message Date
qinjie 4660e88510 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-11-03 16:42:11 +08:00
qinjie ea45949a7c 档案管理-项目档案 2021-11-03 16:41:57 +08:00
Yuanjianghong df5ceee7be 终端培训更新 2021-11-03 10:50:56 +08:00
Yuanjianghong ab0ff8a248 终端培训更新 2021-11-02 21:02:22 +08:00
qinjie 99873f6799 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-11-01 21:42:50 +08:00
qinjie e03af8e839 上传头像，等待继续封装 2021-11-01 21:42:12 +08:00
Yuanjianghong 418d8dce3d 终端培训更新 2021-11-01 20:51:15 +08:00
18571350067 5f1d4b31fd 课程管理更新 2021-11-01 20:12:23 +08:00
18571350067 82dce0315d 课程管理更新 2021-11-01 19:39:27 +08:00
18571350067 cb34056f4c Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-11-01 19:34:47 +08:00
Yuanjianghong aa17681e80 终端培训更新 2021-10-28 19:51:52 +08:00
18571350067 9085aa37af 保存后返回列表 2021-09-18 16:29:24 +08:00
18571350067 a7e8633c2e 课程、课件、题目 2021-09-18 15:30:49 +08:00
Yuanjianghong 15a836e28b 项目管理新增 2021-09-13 18:30:32 +08:00
Yuanjianghong 4c25eb3b75 项目管理新增 2021-09-13 16:30:02 +08:00
aoli.qu 10c77ddb1d 增加类型 2021-09-13 11:38:43 +08:00
18571350067 1b177f15f9 題目列表、課程列表、課件列表 2021-09-13 11:26:45 +08:00
qinjie 2053181a9d Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-09-13 09:33:56 +08:00
qinjie 63c6364262 档案管理 2021-09-13 09:33:42 +08:00
aoli.qu e40ac65817 人员管理列表开发及新增编辑页面开发 2021-09-11 17:15:52 +08:00
Yuanjianghong 8fbeb58010 项目管理更新 2021-09-11 16:42:41 +08:00
qinjie b19547a914 档案管理调整 2021-09-11 00:36:50 +08:00
qinjie 5e81d39c86 档案管理界面调整 2021-09-11 00:30:41 +08:00
qinjie 63fadefa5c select增加清除按钮配置 2021-09-10 23:53:56 +08:00
qinjie a9cf0a4dc0 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-09-10 23:52:40 +08:00
qinjie 6a473b1a6e 搜索区input、select增加清除按钮配置 2021-09-10 23:52:34 +08:00
Yuanjianghong a4ed1960f2 项目管理新增选择课程页面 2021-09-10 18:27:25 +08:00
Yuanjianghong 085e040ed2 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-09-10 16:54:22 +08:00
Yuanjianghong 6d5ec8c345 项目管理更新 2021-09-10 16:54:03 +08:00
qinjie c7a454541d 默认语言修改为中文简体 2021-09-10 16:52:50 +08:00
qinjie 6d7fa8f542 默认语言修改为中文 2021-09-10 16:46:56 +08:00
qinjie e06df98ce9 修改右上角显示用户名称 2021-09-10 15:55:38 +08:00
qinjie 2bfebe75ff 新增用户时用户和姓名位置调换 2021-09-09 23:40:15 +08:00
qinjie 8900de6b69 新增用户手机号码字段修改 2021-09-09 23:33:54 +08:00
qinjie 9b5b3b89c6 新增用户loginName改name 2021-09-09 23:29:07 +08:00
qinjie eca6748670 getLoginUser调整 2021-09-09 18:17:45 +08:00
qinjie c01a762812 移除验证码封装 2021-09-09 18:06:31 +08:00
qinjie f8978d2e44 getLoginUser调整 2021-09-09 18:05:25 +08:00
qinjie b1eb82aff6 修改获取用户名称 2021-09-09 17:58:53 +08:00
aoli.qu 790a5f8488 修改路由 2021-09-09 09:09:29 +08:00
qinjie 078b82a541 登陆界面移除默认登陆用户名和密码 2021-09-08 17:44:54 +08:00
qinjie 9c25a47261 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-09-08 17:39:54 +08:00
qinjie 87a00f07b9 档案管理 2021-09-08 17:39:48 +08:00
aoli.qu fc77d32c22 组织修改 2021-09-08 17:29:09 +08:00
aoli.qu 2d96581ee0 人员管理-单位管理功能开发 2021-09-08 15:10:14 +08:00
aoli.qu d9b743f4df 按钮权限修改 2021-09-06 12:39:58 +08:00
Yuanjianghong 2e71de1cec 暂存的修改 2021-09-06 11:59:37 +08:00
aoli.qu 0e62d9e1a4 动态路由修改 2021-09-06 11:33:31 +08:00
aoli.qu 0554c79f65 动态路由修改 2021-09-02 11:04:14 +08:00
aoli.qu 903e75936f Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into HEAD 2021-09-02 11:02:03 +08:00
qinjie c69726e30d 组织机构选择组件修改 2021-09-01 14:49:07 +08:00
qinjie 24d3811344 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-09-01 14:44:39 +08:00
qinjie e06874281e 组织结构树选中组件默认选中第一个节点 2021-09-01 14:44:31 +08:00
Yuanjianghong ee48577889 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-09-01 11:12:42 +08:00
Yuanjianghong ac89753655 修改 2021-09-01 11:12:32 +08:00
aoli.qu 63416eb973 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into HEAD 2021-09-01 11:12:18 +08:00
qinjie 2ade51f1c2 表格搜索组件新增组织机构树 2021-09-01 11:11:39 +08:00
qinjie 107eca865d 组织机构树选择组件调整 2021-09-01 10:31:10 +08:00
aoli.qu a665afac52 动态路由 2021-09-01 10:28:24 +08:00
qinjie ff40c9afa0 components 新增orgTree export 2021-09-01 10:13:58 +08:00
qinjie 07f3713fe5 ceshi 2021-09-01 09:00:52 +08:00
qinjie 385a56f457 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-09-01 08:58:39 +08:00
qinjie 493a39d96c 组织机构选择组件调整 2021-09-01 08:58:06 +08:00
Yuanjianghong 39ebbb6f7f 添加页面 2021-08-31 17:17:18 +08:00
Yuanjianghong d4062016cf 新增页面 2021-08-31 11:15:40 +08:00
aoli.qu 917bdee613 路由调整 2021-08-31 11:08:04 +08:00
aoli.qu ac57a0cb85 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 
# Conflicts:
#	src/core/lazy_use.js
 2021-08-31 10:07:56 +08:00
aoli.qu 3ae9351c71 解决冲突 2021-08-31 10:02:42 +08:00
aoli.qu 7339321e5f 用户管理、菜单管理、角色管理功能页面开发 2021-08-31 09:26:31 +08:00
qinjie cb2d422f19 路由模式改为hash 2021-08-30 17:42:30 +08:00
Yuanjianghong 43260db924 新增种类 2021-08-30 09:22:20 +08:00
Yuanjianghong c0056a2764 修改 2021-08-28 17:43:09 +08:00
Yuanjianghong 46ca4f3b72 暂存修改穿梭框 2021-08-28 14:54:27 +08:00
qinjie dd58d093f3 组织机构树选择组件使用说明 2021-08-28 10:57:09 +08:00
qinjie 64631ef5d0 引入并注册Empty，组织结构树选择组件新增起始节点 2021-08-28 10:42:15 +08:00
qinjie 8ed75d939c 人员档案管理 2021-08-28 09:09:04 +08:00
qinjie cded48a4e6 新增组织机构数选择组件 2021-08-28 08:37:30 +08:00
qinjie ee19890838 修改系统颜色方案，新增档案管理路由 2021-08-27 18:01:25 +08:00
Yuanjianghong ece529ec06 穿梭框测试提交 2021-08-27 17:52:21 +08:00
Yuanjianghong 86d80a3b1a 新增部门选择视图 2021-08-26 16:30:04 +08:00
Yuanjianghong 39d96927b2 项目管理新增页面保存 2021-08-25 18:13:09 +08:00
Yuanjianghong 0303c91ca3 新增页面 2021-08-25 16:52:11 +08:00
18571350067 303fb795ed Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-08-25 15:48:36 +08:00
覃杰 c4460facbd !36 封装搜索表单 
Merge pull request !36 from QuAoLi/auto-5159892-develop-1629876522888
 2021-08-25 07:48:06 +00:00
18571350067 ece8691b16 课程管理 2021-08-25 15:45:24 +08:00
18571350067 3386f62590 课程列表 2021-08-25 15:34:46 +08:00
aoli.qu 3c3e7065c6 封装搜索表单 2021-08-25 15:28:24 +08:00
18571350067 031e016105 1111 2021-08-24 17:37:44 +08:00
QuAoLi 4e955953e9 文件中心功能开发 2021-08-24 16:07:08 +08:00
aoli.qu ba8e580e10 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-08-24 15:08:45 +08:00
aoli.qu 6ee4855483 数据词典功能完善 2021-08-24 15:08:34 +08:00
qinjie f4b1244495 项目管理界面调整 2021-08-24 10:36:33 +08:00
Yuanjianghong 84761dc013 我不管，我要传一波 2021-08-23 18:04:50 +08:00
Yuanjianghong 0ee2b26b2f 增加菜单 2021-08-23 16:49:55 +08:00
Yuanjianghong 7f4f7282d4 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-08-23 16:41:58 +08:00
aoli.qu a36085c2ee 分页修改 2021-08-23 16:37:14 +08:00
aoli.qu 1147ff4168 修改 2021-08-23 15:55:24 +08:00
Yuanjianghong a8cf610db2 基础Index改名 2021-08-23 15:33:23 +08:00
aoli.qu 8d34b5449f 数据字典页面开发 2021-08-23 15:15:19 +08:00
Yuanjianghong 096e0a225f test 2021-08-23 15:07:05 +08:00
Yuanjianghong d759c41678 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-08-23 15:03:49 +08:00
Yuanjianghong 311cd10605 测试 2021-08-23 15:03:35 +08:00
qinjie fada038359 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-08-23 14:47:58 +08:00
qinjie 2a031b0384 新增TOKEN_NAME常量 2021-08-23 14:47:43 +08:00
覃杰 5994e07572 !26 request.js 加默认token 
Merge pull request !26 from 覃杰/auto-8533815-develop-1629701081563
 2021-08-23 06:45:17 +00:00
qinjie c586c74934 request.js 加默认token 2021-08-23 14:44:35 +08:00
Yuanjianghong ac2d6db1e8 新建项目管理列表页 2021-08-23 00:39:08 +08:00
qinjie 1e1f76391f Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-08-20 16:37:06 +08:00
Yuanjianghong 9140921d3b 解决大小写问题 2021-08-20 16:32:11 +08:00
qinjie 5039bc0deb init 2021-08-20 16:29:28 +08:00
qinjie 76d91d8323 文件大小写调整 2021-08-20 11:48:06 +08:00
aoli.qu 291a8fac65 前端框架搭建 2021-08-20 11:14:51 +08:00
aoli.qu 4884f098c8 init 2021-08-19 09:01:06 +08:00
aoli.qu 333d2c25ba Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 
# Conflicts:
#	package.json
#	public/index.html
#	src/App.vue
#	src/main.js
#	src/router/index.js
#	vue.config.js
 2021-08-11 16:04:42 +08:00
aoli.qu 778c9d514e init 2021-08-11 15:44:50 +08:00
qinjie d612488fa1 login 2021-08-10 10:55:38 +08:00
qinjie 9b4afea932 init 2021-08-10 10:34:58 +08:00
Yuanjianghong 8673a175e0 测试修改 2021-08-09 18:44:33 +08:00
Yuanjianghong b2e1164092 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-08-09 18:30:03 +08:00
Yuanjianghong 942099478d 测试提交 2021-08-09 18:27:36 +08:00
qinjie 48037df08a 11223344 2021-08-09 18:27:16 +08:00
qinjie 9e00d95646 111222333 2021-08-09 18:24:29 +08:00
qinjie cdedfcfc07 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-08-09 18:23:55 +08:00
qinjie 2901333cca 111222 2021-08-09 18:23:26 +08:00
Yuanjianghong 819ec095a6 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-08-09 18:20:22 +08:00
aoli.qu 8389a8fee3 test222 2021-08-09 18:15:44 +08:00
Yuanjianghong dbf5f6678a ceshi 2021-08-09 18:14:22 +08:00
QuAoLi bcc06812ff testPr 2021-08-09 18:00:02 +08:00
QuAoLi 93f6c38b87 test 2021-08-09 17:50:49 +08:00
QuAoLi 8ce050609a init 2021-08-09 17:28:48 +08:00