Commit Graph

493 Commits

Author SHA1 Message Date
a0049873 ef987f2d42 Merge branch 'hi-ucs-dev' into release
# Conflicts:
#	front/public/static/config/basicConfig.js
#	front/src/App.vue
2022-12-08 13:43:39 +08:00
gongjiale 99ebdc2516 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-12-07 15:34:10 +08:00
gongjiale 1c739cca2e 修改UI 2022-12-07 15:33:59 +08:00
a0049873 cfcf580da2 拆分会客厅 2022-12-07 09:36:45 +08:00
a0049873 7a096d5dc1 批量审批开发 2022-12-06 11:19:50 +08:00
gongjiale 15d0c850c4 修改jire问题 2022-12-05 15:40:55 +08:00
a0049873 ddc0b15123 tab相关BUG修改 jira269 2022-12-03 16:27:24 +08:00
a0049873 5c45ee5ea5 BUG修改 2022-12-03 15:13:13 +08:00
gongjiale 073713cf95 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-12-02 16:06:06 +08:00
gongjiale 44f03b7e96 修改样式 2022-12-02 16:05:46 +08:00
a0049873 1c53bba435 通知开发 水印修改 BUG修改 2022-12-02 14:50:41 +08:00
gongjiale 8afd825ffc 11 2022-12-02 09:00:16 +08:00
a0049873 c07f9bdc4c BUG修改 2022-12-01 14:41:32 +08:00
a0049873 f92ac21530 Merge branch 'hi-ucs-dev' into release
# Conflicts:
#	front/public/static/config/basicConfig.js
#	front/src/App.vue
2022-12-01 12:33:32 +08:00
gongjiale ae9fe6c8c2 修改bug 2022-12-01 11:21:02 +08:00
a0049873 e64bd190cc 能力申请 市局隐藏附件 能力统计 无数据图片修改 2022-11-30 16:43:53 +08:00
gongjiale 38955b7748 修改门户 2022-11-30 14:37:26 +08:00
gongjiale a614479f50 需求 2022-11-29 17:37:48 +08:00
a0049873 77dc9be197 Merge branch 'hi-ucs-dev' into release
# Conflicts:
#	front/public/static/config/basicConfig.js
#	front/public/static/config/location.js
#	front/src/App.vue
#	front/src/views/personalCenter/components/MyPublish.vue
2022-11-28 17:38:34 +08:00
a0049873 d5722586e7 附件名称修改 2022-11-28 11:30:17 +08:00
a0049873 28f120bd6e 资金报表开发 2022-11-25 17:27:21 +08:00
a0049873 22176cac74 BUG修改 2022-11-25 11:58:12 +08:00
a0049873 7538cc94d0 添加附件名称 2022-11-24 20:51:16 +08:00
a0049873 5e9759544d BUG修改 2022-11-24 19:54:20 +08:00
a0049873 4ba21bd41e BUG修改 2022-11-24 17:34:45 +08:00
wuhongjian a7998206f2 西海岸bug修复 2022-11-24 16:11:34 +08:00
gongjiale 3730aea88b 修改样式 2022-11-24 09:54:25 +08:00
a0049873 a88baa4eac Merge branch 'hi-ucs-dev' into release
# Conflicts:
#	back/public/config/basicConfig.js
#	front/public/static/config/basicConfig.js
#	front/src/App.vue
2022-11-24 09:13:40 +08:00
gongjiale cdfd3fdb1c 按钮样式调整 2022-11-24 09:07:02 +08:00
gongjiale d636f949b3 样式修改 2022-11-23 22:30:12 +08:00
gongjiale 465674f7f9 样式修改 2022-11-23 22:29:28 +08:00
gongjiale 75da46da8c 提交资金报表 2022-11-23 18:36:45 +08:00
gongjiale 2b5c612d20 提交样式修改 2022-11-23 18:16:43 +08:00
gongjiale 8ccf8c5336 提交 2022-11-23 17:45:43 +08:00
gongjiale cecf903a6a 新需求 2022-11-23 17:25:00 +08:00
gongjiale c2c6f0f797 1.解决jire后台客户反馈能力统计-查询时,重置功能失效 2.解决jire后台客户反馈:能力统计-添加提供部门筛选条件; 2022-11-23 14:20:50 +08:00
gongjiale 6b0807da4e 资金报表页面 2022-11-22 17:31:58 +08:00
gongjiale 0328893a11 西海岸能力集市左侧联调地图 2022-11-22 14:37:20 +08:00
gongjiale 558663fbfa 查询按钮丢失 2022-11-21 10:47:54 +08:00
a0049873 d4f8a4c334 冲突解决 2022-11-21 09:32:05 +08:00
a0049873 72a900723f Merge branch 'hi-ucs-dev' into release 2022-11-18 15:43:18 +08:00
a0049873 23fd66cd98 点同意按钮 默认添加同意 2022-11-17 17:42:56 +08:00
a0049873 8939f054df 编目问题BUG修改 以及转办判断完善 2022-11-17 17:14:44 +08:00
gongjiale 177d0cc95d Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-17 15:37:35 +08:00
gongjiale 11994b6120 修改按钮统一样式 2022-11-17 15:37:09 +08:00
a0049873 f8bb9c9223 编目修改 组件服务 应用资源合并 2022-11-17 10:15:29 +08:00
wuhongjian 1ee871886f 后台管理登录bug修复 2022-11-15 19:27:22 +08:00
unknown ac544cee15 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-15 18:23:46 +08:00
unknown db469bd53d 新需求,能力申请新UI 2022-11-15 17:06:32 +08:00
a0049873 dbdaa313ff 样式修改 2022-11-15 15:23:13 +08:00