Commit Graph

331 Commits

Author SHA1 Message Date
joshen
09220ac580 Merge branch 'master-0628' into 'master'
Merge branch 'zcwy-zsx' into 'master-0628'

See merge request !49
2024-07-12 18:36:15 +08:00
joshen
c9b81f790e Merge branch 'zcwy-zsx' into 'master'
Zcwy zsx

See merge request !48
2024-07-12 18:26:51 +08:00
zhangsir
fda3d29588 放开 2024-07-12 10:15:43 +08:00
zhangsir
c8aa93c4d7 添加进行中状态 2024-07-10 17:07:18 +08:00
joshen
1aac94f161 Merge branch 'zcwy-zsx' into 'master-0628'
Zcwy zsx

See merge request !47
2024-06-28 13:55:48 +08:00
zhangsir
b3a9563185 注释 2024-06-28 13:51:03 +08:00
zhangsir
ad270b43e8 外链添加接口 2024-06-28 12:49:44 +08:00
zhangsir
54821e1101 外链添加接口 2024-06-28 12:36:26 +08:00
zhangsir
9094ca0dd0 添加接口 2024-06-25 19:53:33 +08:00
zhangsir
fdc2344560 添加接口 2024-06-25 19:37:29 +08:00
zhangsir
1f091bce39 添加接口 2024-06-25 15:36:49 +08:00
joshen
ffb967ac52 Merge branch 'zcwy-zsx' into 'master'
修改状态

See merge request !46
2024-05-28 09:57:15 +08:00
zhangsir
889c2e330c 修改状态 2024-05-28 09:31:21 +08:00
joshen
926a12cc94 Merge branch 'zcwy-zsx' into 'master'
修改状态

See merge request !45
2024-05-27 21:12:20 +08:00
zhangsir
e3b69efee5 修改状态 2024-05-27 18:04:41 +08:00
joshen
61f3e6d1d9 Merge branch 'zcwy-zsx' into 'master'
Zcwy zsx

See merge request !44
2024-05-16 21:41:54 +08:00
zhangsir
f57ee9ec9b 修改参数 2024-05-16 21:14:18 +08:00
zhangsir
225cf99e0e 发布增加参数 2024-04-29 09:12:45 +08:00
zhangsir
33c4002bac 修改时间的格式 2024-04-26 16:03:57 +08:00
zhangsir
e18bf55532 作业添加进入时间 2024-04-26 08:55:02 +08:00
joshen
4f8cd94a2b Merge branch 'zcwy-zsx' into 'master'
评估可编辑

See merge request !43
2024-04-09 18:22:06 +08:00
zhangsir
0373c1d9a2 评估可编辑 2024-04-03 09:48:31 +08:00
joshen
f7ad417b03 Merge branch 'zcwy-zsx' into 'master'
评估强制置空

See merge request !42
2024-03-22 10:43:04 +08:00
zhangsir
02d86de0c2 评估强制置空 2024-03-22 10:26:54 +08:00
joshen
c10cbb2946 Merge branch 'zcwy-zsx' into 'master'
评估

See merge request !41
2024-03-22 09:25:50 +08:00
zhangsir
a8e858de3d 评估 2024-03-22 08:58:07 +08:00
joshen
02cc04c79a Merge branch 'zcwy-zsx' into 'master'
评估修改

See merge request !40
2024-03-21 18:31:22 +08:00
zhangsir
1bbe922142 评估修改 2024-03-21 18:29:45 +08:00
joshen
4d5d69cadf Merge branch 'zcwy-zsx' into 'master'
评估弹窗

See merge request !39
2024-03-12 14:50:46 +08:00
zhangsir
4fd6e924bf 评估弹窗 2024-03-12 11:11:20 +08:00
joshen
763c2dc2b3 Merge branch 'zcwy-zsx' into 'master'
评估完成

See merge request !38
2024-03-05 09:19:28 +08:00
zhangsir
da8a4dc6e3 评估完成 2024-03-04 16:18:13 +08:00
joshen
b56c05644c Merge branch 'zcwy-zsx' into 'master'
Zcwy zsx

See merge request !37
2024-03-01 15:19:42 +08:00
zhangsir
49b2f9805b 名称是否显示 2024-02-27 09:56:05 +08:00
zhangsir
e247780528 修改项目名称显示隐藏 2024-02-27 09:31:10 +08:00
joshen
847fffa520 Merge branch 'zcwy-zsx' into 'master'
添加弹窗

See merge request !36
2024-02-23 10:02:28 +08:00
zhangsir
50f00fdeaf 修改弹窗语句 2024-02-23 09:21:03 +08:00
zhangsir
92116b7e99 Merge remote-tracking branch 'zcwyboe/dev0731' into dev0731
# Conflicts:
#	src/App.vue
#	src/api/ThirdApi.js
2024-02-22 16:03:54 +08:00
zhangsir
832a6d8f3b Merge branch 'zcwy-zsx' into dev0731 2024-02-22 15:52:48 +08:00
zhangsir
ffacb1c048 添加弹窗 2024-02-22 15:45:15 +08:00
joshen
b0a0f5811a Merge branch 'zcwyny0221' into 'master'
调试

See merge request !35
2024-02-21 15:25:46 +08:00
qinshengcheng
99e875f409 调试 2024-02-21 15:24:58 +08:00
joshen
b0d18f9722 Merge branch 'zcwyny0221' into 'master'
调试

See merge request !34
2024-02-21 15:20:57 +08:00
qinshengcheng
56a1d39680 调试 2024-02-21 15:19:08 +08:00
joshen
feebb8dd44 Merge branch 'zcwyny0221' into 'master'
调试

See merge request !33
2024-02-21 15:13:59 +08:00
qinshengcheng
42b2c2f51f 调试 2024-02-21 15:13:21 +08:00
670788339
f0e12d0657 验证537问题 2024-02-21 14:56:15 +08:00
qinshengcheng
7fa4eaeaed 测试调试 2024-02-21 14:45:20 +08:00
qinshengcheng
12e489660a 测试调试 2024-02-21 14:41:21 +08:00
joshen
b4a53c305b Merge branch 'dev0731' into 'zcwyny0220'
# Conflicts:
#   src/api/ThirdApi.js
2024-02-21 14:15:30 +08:00