Commit Graph

1288 Commits

Author SHA1 Message Date
chenjianxing 21d7beb82f 编辑用例去掉继续创建选项 2020-05-22 16:39:31 +08:00
chenjianxing 6ae916a191 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-22 16:32:33 +08:00
chenjianxing 1f3ca6f5f2 文件下载方法 2020-05-22 16:31:55 +08:00
chenjianxing bdac9282fc 项目列表去掉工作空间字段 2020-05-22 16:17:54 +08:00
chenjianxing 6977ee496b excel导入导出国际化 2020-05-22 16:08:22 +08:00
shiziyuan9527 9b0a2f1f3a 校验特殊字符 2020-05-22 15:52:42 +08:00
shiziyuan9527 9ec6dd2170 创建编辑工作空间时校验特殊字符 2020-05-22 15:49:59 +08:00
q4speed 4896115c1c Merge remote-tracking branch 'origin/dev' into dev 2020-05-22 13:25:44 +08:00
q4speed 44cfaf811a 增加创建人列 2020-05-22 13:25:16 +08:00
chenjianxing f415a121a5 无项目时创建模块报错 2020-05-22 10:39:30 +08:00
chenjianxing 0ace484dd0 fix 多个tag下不同项目下用例保存 2020-05-22 10:28:17 +08:00
chenjianxing 8574b1467f 创建用例有刷新保留查询条件 2020-05-22 10:07:04 +08:00
chenjianxing 5270f9de65 筛选条件天加进行中 2020-05-22 09:37:54 +08:00
chenjianxing 9b091fbf00 用例详情不显示创建下一个选项 2020-05-22 09:34:34 +08:00
chenjianxing cf83d9efae Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-22 09:25:39 +08:00
chenjianxing 3981cc8741 国际化 2020-05-22 09:24:00 +08:00
shiziyuan9527 e07dadd9be bug fix 2020-05-21 23:18:25 +08:00
shiziyuan9527 37648bb560 用户角色选择时优化细节 2020-05-21 22:40:01 +08:00
shiziyuan9527 d3b3b6e1fb 新建/编辑用户角色选择时,校验必填项 2020-05-21 22:26:17 +08:00
shiziyuan9527 3323d6f8c3 修改新建用户时角色选择项 2020-05-21 18:45:47 +08:00
q4speed 601e329f0d 测试运行后自动跳转到报告 2020-05-21 18:10:16 +08:00
q4speed 2eee9e2617 修复饼图样式,不需要显示name 2020-05-21 18:09:23 +08:00
q4speed 7f8707391b 添加后恢复初始状态 2020-05-21 16:20:18 +08:00
q4speed d6da86b7b5 Merge remote-tracking branch 'origin/dev' into dev 2020-05-21 15:56:43 +08:00
q4speed 162bc3d418 拖拽 2020-05-21 15:56:29 +08:00
chenjianxing e0a0bbffef 添加子节点时名称为空 2020-05-21 14:52:52 +08:00
chenjianxing 647f3eac34 修改节点时填充原名称 2020-05-21 14:51:24 +08:00
chenjianxing 18b4250dbf Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-21 14:42:34 +08:00
q4speed 1f4e2e14da 修复参数key 和 value填反了的bug 2020-05-21 14:41:47 +08:00
chenjianxing d031adf090 模版名称校验 2020-05-21 14:41:08 +08:00
q4speed 77db7f8464 Merge remote-tracking branch 'origin/dev' into dev 2020-05-21 14:18:13 +08:00
q4speed e342112b6f 修复特殊字符问题 2020-05-21 14:17:55 +08:00
wenyann 96ee2a6caf 修改 2020-05-21 14:06:15 +08:00
wenyann d72c5c833f Merge remote-tracking branch 'origin/dev' into dev 2020-05-21 14:05:02 +08:00
wenyann 9887cf5904 修改 2020-05-21 14:04:34 +08:00
chenjianxing 0b0e8f69d8 fix 测试步骤长度限制 2020-05-21 12:08:18 +08:00
chenjianxing f456f9a8e0 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-21 12:01:55 +08:00
chenjianxing 72229c3f15 过滤条件添加p3 2020-05-21 12:01:35 +08:00
wenyann 94dd8372a4 Merge remote-tracking branch 'origin/dev' into dev 2020-05-21 12:00:06 +08:00
wenyann 0560f85bf4 修改 2020-05-21 11:59:36 +08:00
wenyann 5ce5b89e89 修改 2020-05-21 11:59:29 +08:00
wenyann 71b3657833 修改 2020-05-21 11:59:16 +08:00
chenjianxing 6a78349954 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-21 11:55:29 +08:00
chenjianxing ff9bbd9d69 fix 添加步骤顺序 2020-05-21 11:55:05 +08:00
Captain.B 5fe5ba8822 i18n key 2020-05-21 11:35:54 +08:00
chenjianxing 750f09d53b 测试步骤长度限制 2020-05-21 11:08:15 +08:00
chenjianxing a64c63cc7d 备注长度限制 2020-05-21 09:13:44 +08:00
shiziyuan9527 abf1135a7a 新建/编辑用户时增加角色选择项 2020-05-20 21:55:01 +08:00
Captain.B 159d94abfb download log 2020-05-20 20:30:04 +08:00
wenyann 2f1c847e87 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
2020-05-20 17:27:03 +08:00
wenyann 7f06194cff 邮件服务设置 2020-05-20 17:22:45 +08:00
q4speed 5a0863e9a8 修复请求失败数显示错误的bug,修改断言显示格式 2020-05-20 16:28:12 +08:00
q4speed df9f21d270 修复断言显示错误 2020-05-20 15:33:44 +08:00
q4speed 385bd44b77 修复失败率bug 2020-05-20 15:31:03 +08:00
q4speed b3724c0fe2 修复标题bug 2020-05-20 15:25:42 +08:00
q4speed c082e68290 文本断限制在200字符 2020-05-20 15:21:39 +08:00
q4speed ce1203b426 修复保存后无法重新创建的问题 2020-05-20 14:50:03 +08:00
q4speed d1a4686993 Merge remote-tracking branch 'origin/dev' into dev 2020-05-20 14:21:48 +08:00
q4speed d769d79c5e 最近测试报告增加时间 2020-05-20 14:21:34 +08:00
Captain.B 5142f5bf37 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-05-20 14:17:18 +08:00
q4speed 55e6ab076f 修复特殊字符造成脚本错误的bug 2020-05-20 12:09:38 +08:00
q4speed 1096b6bef0 修复测试名称超长问题 2020-05-20 11:25:15 +08:00
q4speed f5bdeb1695 增加场景的按钮,修复复制后id重复问题 2020-05-19 19:07:25 +08:00
q4speed 7ab5fa1987 Merge remote-tracking branch 'origin/dev' into dev 2020-05-19 18:49:13 +08:00
q4speed d8d79cd2ee 修复响应时间断言添加不成功的bug 2020-05-19 18:49:02 +08:00
chenjianxing ef4f372c08 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-19 18:20:57 +08:00
q4speed b377d398ab 修复场景名显示null的bug 2020-05-19 18:10:00 +08:00
chenjianxing 8c4afc465b Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-19 18:09:57 +08:00
chenjianxing 4cbed26f30 fix 节点拖拽 2020-05-19 18:09:44 +08:00
q4speed d94f031a12 Merge remote-tracking branch 'origin/dev' into dev 2020-05-19 17:48:28 +08:00
q4speed c1eb7cc3fe 名字做链接 2020-05-19 17:47:50 +08:00
Captain.B fcc35cccbf Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-05-19 16:44:20 +08:00
shiziyuan9527 b65e327588 删除无用代码 2020-05-19 16:32:16 +08:00
shiziyuan9527 dbf0c4fd08 Merge remote-tracking branch 'origin/dev' into dev 2020-05-19 16:27:54 +08:00
shiziyuan9527 cbf4c3a8cc 系统用户列表角色列 2020-05-19 16:27:40 +08:00
Captain.B f91f0cc91a role 去掉下划线 2020-05-19 15:21:19 +08:00
Captain.B f0853e4c4d label width 2020-05-19 15:17:21 +08:00
shiziyuan9527 037e75053c 系统用户列表修改 2020-05-19 14:34:11 +08:00
q4speed f7d1ce5fa3 Merge remote-tracking branch 'origin/dev' into dev 2020-05-19 14:26:30 +08:00
q4speed cc4b5015d1 所属测试 2020-05-19 14:26:18 +08:00
shiziyuan9527 4be23ee265 修改样式 2020-05-19 14:08:04 +08:00
q4speed b9b5c6eb8e Merge remote-tracking branch 'origin/dev' into dev 2020-05-19 11:11:41 +08:00
q4speed 0a78845eb1 修复正则bug 2020-05-19 11:11:29 +08:00
Captain.B df14618621 js 里的属性使用 computed 国际化, 不能放在 data 里 2020-05-19 10:05:05 +08:00
chenjianxing 81922206ca Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-18 17:33:29 +08:00
chenjianxing d030b9ee8b 修复样式 2020-05-18 17:32:48 +08:00
q4speed 9d03bc48d4 缩小日历 2020-05-18 17:01:42 +08:00
q4speed 9e703f10b3 v-else 2020-05-18 16:54:48 +08:00
q4speed 86034d4e74 Merge remote-tracking branch 'origin/dev' into dev 2020-05-18 16:48:55 +08:00
q4speed a4dfcf3f09 修改报告按钮显示条件 2020-05-18 16:46:55 +08:00
Captain.B 6262c9c26f Merge remote-tracking branch 'origin/dev' into dev 2020-05-18 16:42:11 +08:00
Captain.B af8e42351b bug fix 2020-05-18 16:41:53 +08:00
shiziyuan9527 84a3887d72 退出清空Storage 2020-05-18 16:41:28 +08:00
Captain.B 92dad7b483 :gutter="20" 2020-05-18 16:12:10 +08:00
Captain.B 38ea45e9cc bug fix 2020-05-18 16:10:52 +08:00
Captain.B 89dc2bf75a Merge remote-tracking branch 'origin/dev' into dev 2020-05-18 16:06:48 +08:00
Captain.B a2dca5cb61 bug fix 2020-05-18 16:06:31 +08:00
q4speed 33977c94bd Merge remote-tracking branch 'origin/dev' into dev 2020-05-18 16:03:00 +08:00
q4speed b92cd0bedb 修复路由问题 2020-05-18 16:02:47 +08:00
Captain.B 17d627afe9 Merge remote-tracking branch 'origin/dev' into dev 2020-05-18 15:51:29 +08:00
Captain.B ba3fe5a1ab i18n 2020-05-18 15:51:13 +08:00
q4speed 2c72992390 修复路由问题 2020-05-18 15:45:11 +08:00
q4speed 7991950025 Merge remote-tracking branch 'origin/dev' into dev 2020-05-18 15:32:44 +08:00
q4speed bb7d818a33 修复测试关联报告查询错误的bug
首页增加测试日历功能
2020-05-18 15:32:20 +08:00
Captain.B 515dc1cf3d status 2020-05-18 15:13:02 +08:00
q4speed d80976f56a Merge remote-tracking branch 'origin/dev' into dev 2020-05-18 14:52:07 +08:00
q4speed c0e01074c3 增加测试关联到报告的功能 2020-05-18 14:51:53 +08:00
Captain.B a168f9e17a loading 2020-05-18 14:48:25 +08:00
Captain.B 7638513556 heatmap 2020-05-18 14:45:11 +08:00
Captain.B ffdf8ef805 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-05-18 14:17:50 +08:00
Captain.B bc31e3366d calendar heatmap 2020-05-18 14:17:22 +08:00
q4speed 78aaf1ebf3 跳转链接 2020-05-18 14:14:23 +08:00
q4speed 902b3f3225 Merge remote-tracking branch 'origin/dev' into dev 2020-05-18 13:54:37 +08:00
q4speed fd52e37069 首页 2020-05-18 13:54:21 +08:00
q4speed be60ba1c11 拆分状态组件 2020-05-18 13:54:05 +08:00
shiziyuan9527 2315c97940 修改样式 2020-05-18 11:57:02 +08:00
shiziyuan9527 08d392c3a3 ms-container 2020-05-18 11:44:53 +08:00
shiziyuan9527 926d1bad1e ms-container 2020-05-18 11:37:33 +08:00
q4speed f225344411 让边框更明显,以便明显区分场景 2020-05-18 11:14:00 +08:00
q4speed b8f65d8759 ms-container 2020-05-18 10:33:05 +08:00
chenjianxing be6d48f497 修改缺陷字段名称 2020-05-18 09:34:16 +08:00
chenjianxing 676502bbf7 系统设置页面样式 2020-05-17 17:10:48 +08:00
chenjianxing 71dd8d531d 前端国际化 2020-05-17 16:31:01 +08:00
chenjianxing 9abc4a7981 测试计划状态修改 2020-05-17 14:02:06 +08:00
chenjianxing 5892cd3f29 测试报告缺陷数 2020-05-17 10:26:24 +08:00
chenjianxing bb081b451c 修复样式 2020-05-16 19:50:29 +08:00
chenjianxing 8dd6f350f0 ms- 2020-05-16 19:35:11 +08:00
chenjianxing a4ab4e238b 批量删除测试用例 2020-05-16 15:06:24 +08:00
chenjianxing df3f4ad784 测试计划-测试用例批量删除 2020-05-16 14:52:42 +08:00
chenjianxing f810e19fe2 用例缺陷 2020-05-16 14:30:55 +08:00
chenjianxing 4687f01425 修复编辑节点回车页面刷新 2020-05-15 18:31:55 +08:00
chenjianxing 1fc354e556 修改测试跟踪首页 2020-05-15 17:42:42 +08:00
chenjianxing 7eee038ea3 测试跟踪首页数据 2020-05-15 17:07:47 +08:00
chenjianxing 6ad8cac646 接口调整 2020-05-15 15:22:31 +08:00
chenjianxing 8a5a855759 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-15 15:11:08 +08:00
chenjianxing ccde2f50a2 测试用例首页跳转 2020-05-15 15:10:46 +08:00
chenjianxing 7364f84da0 测试跟踪首页 2020-05-15 13:55:56 +08:00
q4speed cee0e9a345 Merge remote-tracking branch 'origin/dev' into dev 2020-05-15 11:24:09 +08:00
q4speed e694e2ff90 支持多场景 2020-05-15 11:23:52 +08:00
q4speed 36998d0243 修复断言匹配规则bug 2020-05-15 11:23:31 +08:00
q4speed d02aca33af 修复端口bug 2020-05-15 11:21:51 +08:00
chenjianxing ff387a1b0c 测试跟踪首页计划列表 2020-05-15 10:44:42 +08:00
Captain.B 3a5943ff5a 如果用户没有设置过语言,使用默认语言 2020-05-14 19:26:10 +08:00
Captain.B c474ae5656 查询默认的语言配置的时候保存cookie 2020-05-14 19:19:21 +08:00
wenyann c066d99492 修改 2020-05-14 19:11:31 +08:00
wenyann 1252568220 修改 2020-05-14 19:03:33 +08:00
wenyann e0f99b4d8a 设置默认语言 2020-05-14 18:36:09 +08:00
chenjianxing 8ca36edc88 测试用例列表样式 2020-05-14 17:03:03 +08:00
chenjianxing bd0365135e Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-14 16:46:10 +08:00
chenjianxing a560fc8de4 修复样式 2020-05-14 16:45:49 +08:00
wenyann 9e4a38015c Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 16:32:36 +08:00
wenyann f59ae61a06 查询默认语言 2020-05-14 16:32:04 +08:00
chenjianxing 8e8b4dc7b7 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-14 16:25:46 +08:00
chenjianxing dd2bbeda5b Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-14 16:25:24 +08:00
Captain.B 23afff82af Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 16:25:12 +08:00
Captain.B 6952030e18 resource pool page 2020-05-14 16:24:25 +08:00
chenjianxing 2237c87f01 修改测试用例列表样式 2020-05-14 16:23:43 +08:00
wenyann 818b5faa03 查询默认语言 2020-05-14 16:19:42 +08:00
q4speed 26dae54302 Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 15:16:33 +08:00
q4speed b4f300d275 i18n 2020-05-14 15:03:44 +08:00
Captain.B 95639d7194 Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 14:58:55 +08:00
Captain.B 97ed3c8fb1 i18n 2020-05-14 14:58:30 +08:00
q4speed 566cbc634b Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 14:53:16 +08:00
q4speed 0c42cee9ae 修复post body格式不正确的bug 2020-05-14 14:52:36 +08:00
Captain.B af7215cec6 Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 14:52:35 +08:00
Captain.B 6f76bbfe9f i18n 2020-05-14 14:52:16 +08:00
chenjianxing c141e127f0 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-14 14:35:54 +08:00
chenjianxing b24825a8a4 优化测试报告预览 2020-05-14 14:35:21 +08:00
q4speed bbbae267ca Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 14:33:54 +08:00
q4speed 96a70308e3 默认加载所有语言文件 2020-05-14 14:33:38 +08:00
chenjianxing ca47e1d5ff Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-14 13:21:43 +08:00
chenjianxing f835d627a1 fix 节点拖拽 2020-05-14 13:20:28 +08:00
q4speed 43183f4ba5 Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 13:13:56 +08:00
q4speed 1b7938c167 修复直接用url打开页面时,无法正确定位一级菜单的问题 2020-05-14 13:13:42 +08:00
chenjianxing a7b0255e2b 测试计划-测绘用例添加所属模块字段 2020-05-14 12:50:09 +08:00
chenjianxing 0147fe152a 测试计划-编辑测试用例后保留搜索条件 2020-05-14 12:43:43 +08:00
chenjianxing 479dd28d05 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-14 11:53:31 +08:00
chenjianxing 2957e5acef 饼图样式 2020-05-14 11:53:14 +08:00
chenjianxing 2b3e148463 重命名节点更新模块字段 2020-05-14 11:41:45 +08:00
Captain.B d082ebc7d2 zh-tw 2020-05-14 11:34:15 +08:00
chenjianxing d569ef8582 解决面包屑key重复 2020-05-14 10:09:04 +08:00
chenjianxing 8c286795f7 拖拽节点更新模块字段 2020-05-14 09:34:11 +08:00
shiziyuan9527 a8dd83b3cc i18n 2020-05-13 18:12:15 +08:00
shiziyuan9527 96e275c095 用户角色国际化 2020-05-13 17:58:26 +08:00
Captain.B 6c2df5f122 float right 2020-05-13 16:29:19 +08:00
Captain.B bef5533656 菜单 2020-05-13 16:26:51 +08:00
shiziyuan9527 3bb0c0eb1a 语言切换入口 2020-05-13 16:07:18 +08:00
q4speed 05a2cf846e Merge remote-tracking branch 'origin/dev' into dev 2020-05-13 14:46:28 +08:00
q4speed 0cfc8c331b 先去掉描述 2020-05-13 14:46:12 +08:00
Captain.B 9d53c76e42 页面 2020-05-13 14:19:31 +08:00
q4speed cdf2d75e6f Merge remote-tracking branch 'origin/dev' into dev 2020-05-13 13:00:00 +08:00
q4speed 709c207fcc 场景公用变量和Header 2020-05-13 12:59:41 +08:00
chenjianxing c88030d1d2 节点操作点击事件禁止冒泡 2020-05-13 11:59:56 +08:00
chenjianxing 4c9f59d7d8 测试计划节点无法拖动 2020-05-13 11:56:51 +08:00
chenjianxing 93ae49263a 抽取表格过滤排序代码 2020-05-12 20:11:14 +08:00
chenjianxing dd7409681b Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-12 19:19:57 +08:00
chenjianxing 833560a70e fix 节点数报错 2020-05-12 19:19:11 +08:00
王振 8f9ad16870 测试用例步骤编辑自适应文本高度 2020-05-12 18:54:35 +08:00
shiziyuan9527 0a2169b09e bug fix 点击个人信息切换英文 2020-05-12 17:50:18 +08:00
q4speed f334bee3cb 去掉console.log 2020-05-12 16:37:01 +08:00
q4speed dc5fbd083b 修复固定值问题 2020-05-12 16:32:06 +08:00
q4speed 80a50999a7 Merge remote-tracking branch 'origin/dev' into dev 2020-05-12 15:27:10 +08:00
q4speed eddc19fa75 增加提取功能的JMX内容 2020-05-12 15:26:55 +08:00
shiziyuan9527 17be7deb21 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/business/components/settings/system/User.vue
2020-05-12 15:23:42 +08:00
shiziyuan9527 a05782e6c1 设置系统管理员入口 2020-05-12 15:19:40 +08:00
Captain.B d9f6e6147e i18n 2020-05-12 14:56:02 +08:00
Captain.B 34ef1be442 i18n 2020-05-12 14:44:56 +08:00
王振 158f4b2d71 fix typo 2020-05-12 11:32:49 +08:00
q4speed bc294c354c Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/i18n/zh-CN.js
2020-05-12 11:27:36 +08:00
q4speed 796f00f403 增加提取功能的页面 2020-05-12 11:25:04 +08:00
Captain.B 101401d6fc 样式 2020-05-12 11:24:38 +08:00
q4speed 3c10555c9e 修复按钮显示及禁用bug 2020-05-12 11:22:19 +08:00
shiziyuan9527 5ad9d37bda 删除无用代码 2020-05-12 11:01:56 +08:00
Captain.B 290df82611 样式 2020-05-12 10:56:41 +08:00
Captain.B f3766f3ef2 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev
 Conflicts:
	frontend/src/business/components/settings/personal/PersonSetting.vue
2020-05-12 10:55:24 +08:00
Captain.B a89052bc6e 样式 2020-05-12 10:53:51 +08:00
wenyann d7ccef6ee5 Merge remote-tracking branch 'origin/dev' into dev 2020-05-12 10:46:45 +08:00
wenyann 433bd0f8c1 密码 2020-05-12 10:46:21 +08:00
王振 833050a9ef 修改样式 2020-05-11 23:40:19 +08:00
王振 96b8c89071 修改关联测试用例弹框样式 2020-05-11 22:12:23 +08:00
BugKing 5719f67c04
Update zh-CN.js 2020-05-11 18:25:22 +08:00
shiziyuan9527 d183914eff i18n 2020-05-11 18:08:00 +08:00
Captain.B 2903d6d593 日志详情和日志下载 2020-05-11 17:29:25 +08:00
wenyann bd7841ddcc Merge remote-tracking branch 'origin/dev' into dev 2020-05-11 16:12:26 +08:00
wenyann 54a3155461 id唯一性校验 2020-05-11 16:11:55 +08:00
shiziyuan9527 0db3832e08 管理员只能修改成员角色信息 frontend 2020-05-11 15:49:17 +08:00
shiziyuan9527 dff0c8a008 修改util.js 2020-05-11 15:33:40 +08:00
shiziyuan9527 12da2509d2 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	backend/src/main/java/io/metersphere/service/UserService.java
2020-05-11 14:48:17 +08:00
shiziyuan9527 5abece2d37 优化工作空间和组织相关部分 2020-05-11 14:44:53 +08:00
q4speed 599774ef0a 修复断言背景色 2020-05-11 14:25:48 +08:00
q4speed c80344813b 修复加载问题 2020-05-11 14:25:28 +08:00
wenyann 4a958d6f44 Merge remote-tracking branch 'origin/dev' into dev 2020-05-11 14:13:16 +08:00
wenyann 8880599f29 修改密码 2020-05-11 14:12:29 +08:00
q4speed f07078fdf6 修复element ui国际化文件加载失败的bug 2020-05-11 11:48:52 +08:00
wenyann 68efed66fe Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-10 21:32:10 +08:00
chenjianxing 7883b6ff43 用例导入时显示导入中 2020-05-09 20:06:32 +08:00
chenjianxing b941ffebf5 测试用例执行人显示名称 2020-05-09 19:26:42 +08:00
chenjianxing e50241158f Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-09 19:03:35 +08:00
chenjianxing 08d3ec19ef 测试详筛选排序 2020-05-09 18:39:47 +08:00
chenjianxing f014d5267d fix 测试用例查询 2020-05-09 18:07:23 +08:00
chenjianxing 4df45d190c 测试用例筛选排序 2020-05-09 17:55:13 +08:00
wenyann a690ffecde Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev
 Conflicts:
	frontend/src/i18n/en-US.js
2020-05-09 17:40:17 +08:00
wenyann 6924832fee demo 2020-05-09 17:38:30 +08:00
q4speed 7854c999c9 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 16:03:44 +08:00
q4speed 29a78a42c7 API翻译同步 2020-05-09 16:03:30 +08:00
Captain.B 02b1f1f80b 使用operator button 2020-05-09 16:03:07 +08:00
Captain.B 3cfc37a2f7 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 15:58:36 +08:00
Captain.B 7ad65837fb 使用operator button 2020-05-09 15:44:33 +08:00
shiziyuan9527 f0427d4705 组织,工作空间管理员无法移除自身 2020-05-09 15:40:57 +08:00
q4speed c1035e00ae Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 15:33:00 +08:00
q4speed 85bf0d0ba1 修正指针形状 2020-05-09 15:31:49 +08:00
Captain.B 1a685ab202 删除不用的代码 2020-05-09 15:28:58 +08:00
q4speed efec984b90 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 14:51:51 +08:00
q4speed 2a7be35de1 API报告页面 2020-05-09 14:51:37 +08:00
Captain.B f3c04ce4eb Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-05-09 13:23:37 +08:00
chenjianxing 7c9004aaaa 测试用例,继续创建下一个 2020-05-09 13:01:32 +08:00
wenyann 6012004200 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 12:08:06 +08:00
wenyann 998134b1f1 修改用户密码 2020-05-09 12:06:09 +08:00
chenjianxing 18e2cc8960 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-09 11:36:19 +08:00
chenjianxing de3faf3ca5 用例模块等允许带空格 2020-05-09 11:36:01 +08:00
shiziyuan9527 0752a0c54b 修改个人信息 2020-05-09 11:05:03 +08:00
Captain.B 74075ddefc 样式 2020-05-09 11:01:09 +08:00
wenyann 43e5381a22 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 10:52:10 +08:00
chenjianxing 366ae5e95c 更新最近计划 2020-05-09 10:44:15 +08:00
chenjianxing e20f091f7a fix 模版编辑 2020-05-09 09:33:53 +08:00
chenjianxing 7dbd070736 浏览器回退,遮罩层无法关闭 2020-05-08 19:25:05 +08:00
wenyann b5760cd2b4 性能测试样式修改 2020-05-08 19:09:09 +08:00
chenjianxing 90c2e0d1f5 测试报告模版 2020-05-08 18:54:47 +08:00
chenjianxing 845439661e date picker 2020-05-08 18:43:12 +08:00
Captain.B 841019d4a7 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev
 Conflicts:
	frontend/src/i18n/zh-CN.js
2020-05-08 18:03:34 +08:00
Captain.B 843d7ed3b1 日志下载 2020-05-08 18:02:58 +08:00
wenyann b8f10e2ea0 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-08 17:42:03 +08:00
shiziyuan9527 bd023c1f27 修改Dialog按钮 2020-05-08 17:21:58 +08:00
wenyann 62ee448245 demo 2020-05-08 17:19:28 +08:00
chenjianxing 45ac65da59 报告图表 2020-05-08 17:06:29 +08:00
shiziyuan9527 6dc6cc8459 修改方法命名 2020-05-08 16:05:01 +08:00
chenjianxing b876ca0acc Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-08 15:59:44 +08:00
chenjianxing 48a6ae3952 测试报告组件编辑 2020-05-08 15:59:03 +08:00
shiziyuan9527 7d586af28b 优化代码 2020-05-08 15:34:45 +08:00
chenjianxing cff0b05b32 获取测试报告数据 2020-05-08 14:06:33 +08:00
shiziyuan9527 d38fe65d2b 优化代码 2020-05-08 12:11:02 +08:00
q4speed ae288e8ace Merge remote-tracking branch 'origin/dev' into dev 2020-05-08 11:04:19 +08:00
q4speed 6745d8b5fc 修复key value不能正确显示的问题 2020-05-08 11:04:04 +08:00
chenjianxing 2a3b1a2036 导航栏样式 2020-05-08 00:38:26 +08:00
chenjianxing e5e7737f29 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-08 00:23:12 +08:00
chenjianxing c5fb011819 uuid 2020-05-08 00:22:35 +08:00
q4speed b5e7b74633 Merge remote-tracking branch 'origin/dev' into dev 2020-05-08 00:00:05 +08:00
q4speed 39aed31aa5 生成report 2020-05-07 23:59:51 +08:00
shiziyuan9527 775950ec02 修改按钮 2020-05-07 18:03:22 +08:00
shiziyuan9527 f36c375467 阻止按钮回车事件 2020-05-07 16:03:40 +08:00
shiziyuan9527 74c8be756a 代码优化 2020-05-07 14:35:56 +08:00
Captain.B 02ab2f230a Merge remote-tracking branch 'origin/dev' into dev 2020-05-07 13:37:22 +08:00
Captain.B 17c8a98f56 修改资源池状态 2020-05-07 13:37:05 +08:00
shiziyuan9527 dee5790ae7 i18n 2020-05-07 11:37:39 +08:00
王振 dae2f9c41c 修改移动用例弹框文本 2020-05-07 11:19:45 +08:00
chenjianxing d0ebd18be5 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-06 20:29:57 +08:00
chenjianxing d511800cc8 查看编辑测试用例报告 2020-05-06 20:29:41 +08:00
shiziyuan9527 6f7848ee0d i18n 2020-05-06 18:04:56 +08:00
Captain.B 52aee15dc5 Merge remote-tracking branch 'origin/dev' into dev 2020-05-06 17:31:25 +08:00
Captain.B cb24a51d7c label 2020-05-06 17:31:11 +08:00
shiziyuan9527 04cdf5ac06 修改菜单栏激活 2020-05-06 17:19:48 +08:00
chenjianxing 61256ee9e2 修改表结构 2020-05-06 16:42:58 +08:00
chenjianxing 52ead84a20 merge 2020-05-06 16:21:25 +08:00
chenjianxing 4dc949864b 测试报告模版curd 2020-05-06 16:03:39 +08:00
shiziyuan9527 cc53d07cd4 删除无用代码 2020-05-06 15:08:53 +08:00
shiziyuan9527 6a0c8a5c3d 性能报告头部面包屑 2020-05-06 15:01:05 +08:00
q4speed 94b7ceb1e9 Merge remote-tracking branch 'origin/dev' into dev 2020-05-06 14:21:23 +08:00
q4speed 2bed94efce NaN 2020-05-06 14:21:10 +08:00
shiziyuan9527 b0c5bd52ec 组织,工作空间相关资源关联删除 2020-05-06 14:12:03 +08:00
q4speed 69586479ba Merge remote-tracking branch 'origin/dev' into dev 2020-05-05 19:49:48 +08:00
q4speed 53048f1f3f 生成jmx, run jmx, 未完待续 2020-05-05 19:49:32 +08:00
Captain.B 0fa7a87cff height 2020-04-30 18:10:06 +08:00
q4speed 1cae0333f9 Merge remote-tracking branch 'origin/dev' into dev 2020-04-30 16:50:59 +08:00
q4speed d97f72315c 生成jmx 2020-04-30 16:50:43 +08:00
Captain.B 0851c4fd19 loading 2020-04-30 16:04:52 +08:00
Captain.B 589846cad8 显示日志 2020-04-30 16:00:35 +08:00
Captain.B cec3af5062 选择资源池加上校验 2020-04-30 15:18:18 +08:00
chenjianxing e370620c97 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-29 19:01:16 +08:00
chenjianxing 1bd57e5186 测试报告列表 2020-04-29 19:00:58 +08:00
chenjianxing 2124226f0f 测试模版列表 2020-04-29 16:08:31 +08:00
Captain.B 563a16a0cf Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-04-29 15:54:59 +08:00
Captain.B 6cb04e0685 log save +1 2020-04-29 15:51:54 +08:00
chenjianxing 1c155bd982 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-29 15:50:21 +08:00
chenjianxing 09e4ce9ea2 测试报告图表 2020-04-29 15:49:38 +08:00
shiziyuan9527 73781d57c9 报告-请求统计添加合计行 2020-04-29 10:50:30 +08:00
chenjianxing 19c21dab23 测试报告sql 2020-04-28 21:14:09 +08:00
chenjianxing 1bd0a16ae4 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-28 16:42:06 +08:00
chenjianxing de5f9c993b 测试用例报告模版页面 2020-04-28 16:41:42 +08:00
shiziyuan9527 56d8182e01 代码优化 2020-04-28 11:38:30 +08:00
shiziyuan9527 e5ead937d7 修改消息提示 2020-04-27 18:20:23 +08:00
chenjianxing 0f32c916ba Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-27 17:36:15 +08:00
chenjianxing 362620b887 修改样式 2020-04-27 17:36:00 +08:00
q4speed 181c406826 Merge remote-tracking branch 'origin/dev' into dev 2020-04-27 17:10:36 +08:00
q4speed ec113b1b16 api测试保存jmx 2020-04-27 17:10:21 +08:00
shiziyuan9527 afbc7b5060 修改变量命名 2020-04-27 15:14:43 +08:00
shiziyuan9527 ca497f71b6 搜索框搜索 2020-04-27 14:14:37 +08:00
chenjianxing cdde7781c2 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-27 09:43:26 +08:00
chenjianxing e4b02ec997 删除计划前校验 2020-04-27 09:43:08 +08:00
shiziyuan9527 25baf6f133 删除无用样式 2020-04-26 17:42:26 +08:00
chenjianxing 4b96010d3a Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-26 16:56:08 +08:00
chenjianxing 6854a6f5d3 测试用例批量移动 2020-04-26 16:55:50 +08:00
shiziyuan9527 e0a47493ab 修改图表 2020-04-26 15:27:24 +08:00
chenjianxing bc518448a6 fix 测试用例 2020-04-26 14:25:22 +08:00
chenjianxing d02edcb1b3 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-26 10:40:45 +08:00
chenjianxing 2262f83c41 创建用例设置默认值 2020-04-26 10:40:12 +08:00
q4speed 573d42230a fix null 2020-04-26 10:33:12 +08:00
chenjianxing 4e98172502 样式 2020-04-26 09:45:36 +08:00
shiziyuan9527 f3b9026421 修改消息提示 2020-04-24 18:04:45 +08:00
shiziyuan9527 dcef65f719 修改消息提示 2020-04-24 17:56:17 +08:00
shiziyuan9527 0bf42358e7 修改消息提示 2020-04-24 17:36:28 +08:00
chenjianxing 288dd65b70 修改测试计划阶段 2020-04-24 17:00:24 +08:00
q4speed 874f3c627e Merge remote-tracking branch 'origin/dev' into dev 2020-04-24 16:03:04 +08:00
q4speed ec0a630c1b message 2020-04-24 16:02:52 +08:00
chenjianxing 89cea4833e Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-24 15:08:43 +08:00
chenjianxing 83ce0f228a 编辑时更新测试用例状态 2020-04-24 15:08:21 +08:00
chenjianxing 1b728ce0cf 上一个下一个自动保存 2020-04-24 14:12:41 +08:00
q4speed 5c40ea5327 Merge remote-tracking branch 'origin/dev' into dev 2020-04-24 14:09:22 +08:00
q4speed 290532224a NaN 2020-04-24 14:09:10 +08:00
chenjianxing c6479e7183 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-24 13:56:57 +08:00
chenjianxing 6e3ec26fc0 克隆测试用例 2020-04-24 13:56:32 +08:00
Captain.B 9e5aad7831 Merge remote-tracking branch 'origin/dev' into dev 2020-04-24 09:51:24 +08:00
Captain.B dcd33833af check status 2020-04-24 09:51:08 +08:00
chenjianxing bccc1e3b1c 点击测试用例展示详情 2020-04-24 09:42:48 +08:00
chenjianxing 2f81508a0e Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-24 00:39:06 +08:00
chenjianxing 8f09b254ab fix bug 2020-04-24 00:38:41 +08:00
Captain.B d0ddd8d869 Merge remote-tracking branch 'origin/dev' into dev 2020-04-23 18:51:55 +08:00
Captain.B cebfba849e reporting 2020-04-23 18:51:00 +08:00
shiziyuan9527 618ab09d97 Merge remote-tracking branch 'origin/dev' into dev 2020-04-23 17:26:13 +08:00
shiziyuan9527 39eb3135d4 修改表头 2020-04-23 17:25:57 +08:00
chenjianxing 6705bd98fd Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-23 17:25:27 +08:00
chenjianxing d2b65e104e 封装表格操作按钮 2020-04-23 17:25:04 +08:00
q4speed 1294739df6 run button 2020-04-23 17:08:48 +08:00
chenjianxing 2290c94fec 修改包名 2020-04-23 16:40:04 +08:00
q4speed 39fc93946b Merge remote-tracking branch 'origin/dev' into dev 2020-04-23 15:40:19 +08:00
q4speed 6ac1c90931 api测试界面,未完待续 2020-04-23 15:40:06 +08:00
chenjianxing 096aa4da2d Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-23 15:34:59 +08:00
chenjianxing 0af7abd6a8 修复顶级菜单样式 2020-04-23 15:34:38 +08:00
q4speed 2636c8b7f9 Merge remote-tracking branch 'origin/dev' into dev 2020-04-23 15:23:03 +08:00
q4speed 97976ea417 api测试界面,未完待续 2020-04-23 15:22:09 +08:00
chenjianxing 6744bd1ce8 修改表头 2020-04-23 14:58:08 +08:00
chenjianxing a58623ba24 测试用例筛选 2020-04-23 14:49:08 +08:00
chenjianxing 7d99ac3e8b 修改表头 2020-04-23 12:22:24 +08:00
shiziyuan9527 8ac8088655 报告-测试概览 2020-04-23 11:05:39 +08:00
Captain.B 3484e9361f 修改页面 2020-04-23 10:13:41 +08:00
Captain.B 5ec45caf4d Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-04-23 09:51:06 +08:00
Captain.B 6320bb0173 修改页面 2020-04-23 09:50:20 +08:00
chenjianxing 83c6442b94 样式 2020-04-23 09:38:09 +08:00
chenjianxing 78a325b75b Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-22 18:47:07 +08:00
chenjianxing c40e871e00 表头组件 2020-04-22 18:46:41 +08:00
q4speed b2d0e0cf3b Merge remote-tracking branch 'origin/dev' into dev 2020-04-22 17:30:07 +08:00
q4speed 6aa69cee66 api测试,未完待续 2020-04-22 17:29:54 +08:00
chenjianxing 653460fd8e Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-22 15:51:31 +08:00
chenjianxing 844eb8b9e2 代码重构 2020-04-22 15:51:09 +08:00
Captain.B 57120bb1a0 Merge remote-tracking branch 'origin/dev' into dev 2020-04-22 11:11:16 +08:00
Captain.B 59468b492c 加上loading 2020-04-22 11:10:37 +08:00
shiziyuan9527 192f7922ad 报告-错误记录 2020-04-22 10:59:31 +08:00
Captain.B a1f24eca5e 显示运行测试的log 2020-04-22 10:41:38 +08:00
Captain.B 9cc2a9d9f1 显示运行测试的log 2020-04-22 10:30:35 +08:00
chenjianxing ca98ce4277 fix 面包屑 2020-04-22 10:06:23 +08:00
chenjianxing 68ad0c54d9 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-21 23:07:59 +08:00
chenjianxing b32a6f1377 测试用例面包屑 2020-04-21 23:07:36 +08:00
shiziyuan9527 fb67139539 报告-请求统计 2020-04-21 17:57:01 +08:00
chenjianxing 68c7c8f92f Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-21 16:26:59 +08:00
chenjianxing 6e9e053198 优化测试详情编辑 2020-04-21 16:26:37 +08:00
q4speed 8dc3249347 修复空数据 2020-04-21 15:43:52 +08:00
chenjianxing fcddbfcb48 fix 我的实例 2020-04-21 13:56:10 +08:00
chenjianxing eb61f51fd0 国际化 2020-04-21 13:19:46 +08:00
chenjianxing 3fd4e2ee6c 样式 2020-04-21 10:05:51 +08:00
chenjianxing 6816c13272 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-20 18:58:31 +08:00
chenjianxing a2521651c4 调整样式 2020-04-20 18:58:19 +08:00
q4speed cf9e263588 Merge remote-tracking branch 'origin/dev' into dev 2020-04-20 18:40:15 +08:00
q4speed 98a5ede3f6 api测试界面,未完待续 2020-04-20 18:40:02 +08:00
chenjianxing 2fce8bfa5f 修改样式 2020-04-20 17:08:36 +08:00
chenjianxing 9fa9a2df6b Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-20 14:24:36 +08:00
chenjianxing 54d28eaf0c 编辑测试详情添加上一个、下一个快速选项 2020-04-20 14:24:17 +08:00
q4speed d2817334b7 Merge remote-tracking branch 'origin/dev' into dev 2020-04-17 18:38:57 +08:00
q4speed f7a11e9405 api界面,未完待续 2020-04-17 18:38:38 +08:00
shiziyuan9527 0ed0021895 修改响应时间图表 2020-04-17 18:25:17 +08:00
chenjianxing eb7c2ddba0 测试详情搜索 2020-04-17 18:17:55 +08:00
chenjianxing 084e1285bf 分页标 2020-04-17 18:10:03 +08:00
chenjianxing b6b0aca9e0 快速定位我的用例 2020-04-17 17:30:55 +08:00
chenjianxing c640f4566e 批量更改执行人和执行结果 2020-04-17 16:21:39 +08:00
Captain.B de742839a8 use _ instead of - 2020-04-17 09:50:15 +08:00
shiziyuan9527 1e4d780e76 修改测试概览图表 2020-04-16 19:38:53 +08:00
Captain.B 23fecbb283 最小1024分辨率 2020-04-16 16:31:03 +08:00
Captain.B 30f6745b90 bease -> base 2020-04-16 11:20:04 +08:00
chenjianxing 7dba9bea5f Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-15 18:33:14 +08:00
chenjianxing d65c129f3a 导出模版 2020-04-15 18:32:57 +08:00
q4speed 155b340e11 Merge remote-tracking branch 'origin/dev' into dev 2020-04-15 18:25:50 +08:00
q4speed f9f1809f3e api界面,未完待续 2020-04-15 18:25:34 +08:00
chenjianxing 98379ac9e1 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-15 16:58:28 +08:00
chenjianxing 276961d97b 测试用例导入 2020-04-15 16:58:04 +08:00
shiziyuan9527 d943d41829 修改测试概览图表 2020-04-15 14:52:38 +08:00
Captain.B 44549ee5b6 enum add status saved 2020-04-15 14:34:15 +08:00
shiziyuan9527 12512357c5 修改报告持续时间 2020-04-14 15:06:55 +08:00
Captain.B 7ba0e97125 saveLocalStorage 2020-04-13 11:03:09 +08:00
Captain.B 336b6c4af6 status 2020-04-13 10:28:00 +08:00
Captain.B 45f4ac0193 style 2020-04-11 15:10:38 +08:00
shiziyuan9527 0a223f14ed 修改性能测试状态 2020-04-10 18:05:33 +08:00
shiziyuan9527 1578329cec 修改分页 2020-04-10 17:59:04 +08:00
shiziyuan9527 6948f4042d 修改分页 2020-04-10 17:46:50 +08:00
q4speed 1788e22351 Merge remote-tracking branch 'origin/dev' into dev 2020-04-10 16:23:53 +08:00
q4speed a116bfe8ab 统一表格分页样式 2020-04-10 16:23:38 +08:00
shiziyuan9527 e9d3876264 修改样式 2020-04-10 14:59:23 +08:00
shiziyuan9527 7d6b494b46 修改报告持续时间 2020-04-10 14:44:09 +08:00
Captain.B 22e809bbae chart width 100% 2020-04-10 14:19:14 +08:00
chenjianxing 117fc81343 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-10 12:00:26 +08:00
chenjianxing b8296dbff9 修改样式 2020-04-10 12:00:15 +08:00
Captain.B d4c33c53f6 btn 禁用事件 2020-04-10 11:50:09 +08:00
Captain.B 2d17d227eb 部分查询 2020-04-10 11:36:18 +08:00
Captain.B ed9d972bee 页面上的部分查询 2020-04-10 11:25:42 +08:00
Captain.B 2a2690e00b Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev
 Conflicts:
	frontend/src/business/components/settings/system/Organization.vue
2020-04-10 11:16:44 +08:00
Captain.B 9120825caa 页面上的部分查询 2020-04-10 11:14:11 +08:00
shiziyuan9527 271304bc52 添加按钮onkeydown事件 2020-04-10 10:57:34 +08:00
Captain.B 026a03c21d btn block keydown event 2020-04-10 10:29:44 +08:00
Captain.B af04f5974d btn block keydown event 2020-04-10 10:28:52 +08:00
Captain.B 4f88cc20f0 style 2020-04-10 10:00:54 +08:00
Captain.B 42b93d04b8 Merge remote-tracking branch 'origin/dev' into dev 2020-04-09 19:27:55 +08:00
Captain.B 1beb5523a6 style 2020-04-09 19:27:36 +08:00
chenjianxing 7f4a0e98d2 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-09 18:57:36 +08:00
chenjianxing c23c875aee 统计样式 2020-04-09 18:57:12 +08:00
shiziyuan9527 97662e56f3 报告时间 2020-04-09 18:07:47 +08:00
chenjianxing 7ba029b96d merge 2020-04-09 17:57:49 +08:00
chenjianxing 78c82517c9 修改测试用例head 2020-04-09 17:47:07 +08:00
q4speed e82c57e826 401 login 2020-04-09 17:41:37 +08:00
Captain.B bccd0cc317 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-04-09 16:25:50 +08:00
Captain.B de2fee1772 style 2020-04-09 16:25:28 +08:00
shiziyuan9527 96c9a84a2b 报告持续时间 2020-04-09 16:25:25 +08:00
Captain.B 31b6a9e1ad style 2020-04-09 16:17:15 +08:00
Captain.B abcc06c318 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-04-09 16:04:26 +08:00
Captain.B 37f41a85fb 修改 url 和组件 2020-04-09 16:04:15 +08:00
q4speed e4c66377eb 修复样式 2020-04-09 16:03:15 +08:00
Captain.B 6485f7f533 去掉微软字体 2020-04-09 15:06:06 +08:00
Captain.B 27617e578a Merge remote-tracking branch 'origin/dev' into dev 2020-04-09 15:05:15 +08:00
Captain.B 0b62e3aa2c 全局css 2020-04-09 15:04:56 +08:00
chenjianxing d60dc5ec3c Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-09 14:48:08 +08:00
chenjianxing 9b34bb2819 国际化 2020-04-09 14:47:53 +08:00
q4speed c0c2b430e0 修复样式 2020-04-09 14:29:50 +08:00
q4speed 0b364d8c7d 修复样式 2020-04-09 14:25:41 +08:00
q4speed 9ad2e81f88 Merge remote-tracking branch 'origin/dev' into dev 2020-04-09 14:22:59 +08:00
q4speed 71315f7dd1 修复样式 2020-04-09 14:22:44 +08:00
chenjianxing 3c59765b2a 测试详情添加测试计划菜单栏 2020-04-09 13:51:04 +08:00
Captain.B 64c46ea715 Merge remote-tracking branch 'origin/dev' into dev 2020-04-09 12:01:10 +08:00
Captain.B bade858cb5 loading 2020-04-09 12:00:52 +08:00
chenjianxing f735d4c953 界面优化 2020-04-09 11:44:54 +08:00
q4speed ba64fa565c Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/business/components/api/head/ApiHeaderMenus.vue
2020-04-09 11:28:55 +08:00
q4speed 41c672b40a 修复样式 2020-04-09 11:26:00 +08:00
q4speed aa61aae9a5 修复样式 2020-04-09 11:24:12 +08:00
chenjianxing 51fa6ed5b0 fix test case 2020-04-09 10:25:18 +08:00
shiziyuan9527 05d6aef53c bug fix 2020-04-08 19:10:30 +08:00
chenjianxing 35eac9e66f 优化测试用例编辑 2020-04-08 18:57:39 +08:00
chenjianxing 86c21cfbc2 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-08 18:51:52 +08:00
chenjianxing bcc2b7ea90 优化测试详情编辑页面 2020-04-08 18:51:31 +08:00
Captain.B 045569cb73 loading 2020-04-08 18:48:56 +08:00
shiziyuan9527 ccc99edd36 修改ChartsData 2020-04-08 16:44:52 +08:00
chenjianxing b64fa89e0c 菜单栏创建测试计划 2020-04-08 16:27:24 +08:00
chenjianxing 54201699a4 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-08 15:42:30 +08:00
chenjianxing 11956de1ea 子页面激活菜单栏 2020-04-08 15:42:06 +08:00
王振 f6715fbe52 修改性能测试报告查看图标 2020-04-08 14:21:55 +08:00
Captain.B 0f6607cdc2 loading 2020-04-07 19:12:12 +08:00