Commit Graph

129 Commits

Author SHA1 Message Date
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
覃杰 3b1251ce56 !32 项目管理界面调整
Merge pull request !32 from 覃杰/auto-8533815-develop-1629772598612
2021-08-24 02:37:16 +00:00
qinjie f4b1244495 项目管理界面调整 2021-08-24 10:36:33 +08:00
覃杰 cd95638137 !31 基础Index改名
Merge pull request !31 from hbzgyjh/auto-5488917-develop-1629704016740
2021-08-23 10:06:32 +00: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
QuAoLi b38bf0ea65 !30 数据字典页面开发
Merge pull request !30 from QuAoLi/auto-5159892-develop-1629702938832
2021-08-23 08:40:36 +00: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
QuAoLi 491d065fde !29 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop
Merge pull request !29 from hbzgyjh/auto-5488917-develop-1629702597636
2021-08-23 07:11:00 +00:00
Yuanjianghong 6cc22073f5 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-08-23 15:08:52 +08:00
Yuanjianghong 096e0a225f test 2021-08-23 15:07:05 +08:00
QuAoLi 9bd74b306f !28 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop
Merge pull request !28 from hbzgyjh/auto-5488917-develop-1629702263956
2021-08-23 07:05:21 +00: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
覃杰 9139e58b6e !27 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop
Merge pull request !27 from 覃杰/auto-8533815-develop-1629701284138
2021-08-23 06:49:15 +00: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
覃杰 eff110fb52 !25 新建项目管理列表页
Merge pull request !25 from hbzgyjh/auto-5488917-develop-1629650376630
2021-08-23 06:44:55 +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
覃杰 7c1b325b3f !23 init
Merge pull request !23 from 覃杰/auto-8533815-develop-1629448176303
2021-08-20 08:39:41 +00:00
qinjie 1e1f76391f Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-08-20 16:37:06 +08:00
qinjie 8b90525e3d 文件格式编码改为uft-8 2021-08-20 16:36:52 +08:00
覃杰 a9effadb66 !24 解决大小写问题
Merge pull request !24 from hbzgyjh/auto-5488917-develop-1629448366895
2021-08-20 08:33:09 +00:00
Yuanjianghong 9140921d3b 解决大小写问题 2021-08-20 16:32:11 +08:00
qinjie 5039bc0deb init 2021-08-20 16:29:28 +08:00
覃杰 1fd2c069c9 !22 文件大小写调整
Merge pull request !22 from 覃杰/auto-8533815-develop-1629431293710
2021-08-20 03:48:40 +00:00
qinjie 76d91d8323 文件大小写调整 2021-08-20 11:48:06 +08:00
覃杰 a7cec8cd89 !20 前端框架搭建
Merge pull request !20 from QuAoLi/auto-5159892-develop-1629429322309
2021-08-20 03:16:26 +00:00
aoli.qu 291a8fac65 前端框架搭建 2021-08-20 11:14:51 +08:00
QuAoLi 1cbeef1491 !19 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop
Merge pull request !19 from QuAoLi/auto-5159892-develop-1629335112649
2021-08-19 08:32:52 +00:00
aoli.qu 9a905ce885 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop
# Conflicts:
#	vue.config.js
2021-08-19 09:04:55 +08:00
aoli.qu 4884f098c8 init 2021-08-19 09:01:06 +08:00
覃杰 321e16b5b8 !18 大娃代理设置
Merge pull request !18 from 覃杰/auto-8533815-develop-1629103572782
2021-08-16 08:46:47 +00:00
qinjie 7b7882d057 大娃代理设置 2021-08-16 16:46:07 +08:00
覃杰 1f5ad5da7e !17 格式自动改了
Merge pull request !17 from 覃杰/auto-8533815-develop-1628786615583
2021-08-12 16:44:00 +00:00
qinjie c6c12c2693 格式自动改了 2021-08-13 00:43:28 +08:00
QuAoLi fe02441ae0 !16 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop
Merge pull request !16 from QuAoLi/auto-5159892-develop-1628669124277
2021-08-11 08:36:06 +00:00
aoli.qu cfa8c52c92 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop
# Conflicts:
#	src/router/index.js
2021-08-11 16:32:25 +08:00
aoli.qu 5a6b5fad69 update 2021-08-11 16:10:34 +08:00
覃杰 d1125d6964 !15 测试
Merge pull request !15 from hbzgyjh/auto-5488917-develop-1628564598480
2021-08-11 08:06:34 +00: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
Yuanjianghong e79b79d281 测试 2021-08-10 11:03:14 +08:00