Commit Graph

1997 Commits

Author SHA1 Message Date
a0049873 9ec04e7581 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-29 17:48:13 +08:00
a0049873 6fc0d15dbf BUG修改 2022-11-29 17:47:55 +08:00
gongjiale 2d381d808c Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-29 17:37:58 +08:00
gongjiale a614479f50 需求 2022-11-29 17:37:48 +08:00
a0049873 3d90e73659 已申请列表添加websocket 2022-11-29 17:37:10 +08:00
a0049873 bcbfd87eb7 运维管理员 部门联系人联系电话 2022-11-29 16:13:53 +08:00
a0049873 d065f76217 广场模式添加默认选中 应用领域 2022-11-29 14:49:34 +08:00
gongjiale 76a6edbe63 11 2022-11-29 14:06:00 +08:00
gongjiale 5fce2cdcce 修改 2022-11-29 14:03:05 +08:00
gongjiale dbdb6d7cea Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/src/views/assertReport/components/ReservoirBottom.vue
#	front/src/views/assertReport/components/ReservoirRight.vue
#	front/src/views/assertReport/components/ReservoirThumbnail.vue
#	front/src/views/assertReport/index.vue
2022-11-29 13:56:18 +08:00
gongjiale 4a6ea361b6 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/src/views/assertReport/components/ReservoirBottom.vue
#	front/src/views/assertReport/components/ReservoirRight.vue
#	front/src/views/assertReport/components/ReservoirThumbnail.vue
#	front/src/views/assertReport/index.vue
2022-11-29 13:51:02 +08:00
gongjiale 9acaa0e8d3 修改大屏 2022-11-29 13:14:43 +08:00
gongjiale 1d5e82356e 111 2022-11-29 12:36:15 +08:00
wuhongjian 97aec1843a Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-29 11:57:35 +08:00
wuhongjian 953fe9e18f bug修复 2022-11-29 11:57:33 +08:00
a0049873 274ca4b6bc 需求修改 2022-11-29 11:54:04 +08:00
gongjiale b8e51270fd 修改 2022-11-29 09:01:24 +08:00
a0049873 1ed8496d58 打包修改 2022-11-28 18:00:48 +08:00
a0049873 b8644679c9 BUG修改 2022-11-28 17:55:30 +08:00
gongjiale 4e2f7e9403 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-28 17:28:22 +08:00
gongjiale c7487a2442 大屏调整 2022-11-28 17:28:05 +08:00
a0049873 ebd71b3015 编目添加算法效果图片 2022-11-28 17:24:44 +08:00
a0049873 be50b4c5d6 上传文件超大小BUG修复 2022-11-28 17:06:52 +08:00
a0049873 0bff8b7d8b 西海岸待办列表相关开发 2022-11-28 16:46:57 +08:00
gongjiale 827d871e8d Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-28 15:33:35 +08:00
gongjiale b8695f4fc5 大屏修改 2022-11-28 15:32:45 +08:00
a0049873 689d308864 处理接口失败情况 2022-11-28 14:53:47 +08:00
a0049873 d5722586e7 附件名称修改 2022-11-28 11:30:17 +08:00
a0049873 4757078a15 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-28 11:25:40 +08:00
a0049873 04aacd14a6 添加点击 2022-11-28 11:25:09 +08:00
wuhongjian a9d9aa7695 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-28 01:40:51 +08:00
wuhongjian 8904da5a13 西海岸bug修复 2022-11-28 01:17:08 +08:00
gongjiale 427f478eb9 提交代码 2022-11-26 22:19:22 +08:00
wuhongjian d3d9ac328d Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-26 18:40:24 +08:00
wuhongjian 555672eeb8 西海岸bug修复 2022-11-26 18:39:45 +08:00
gongjiale 84abb2fde3 新增 2022-11-26 18:17:55 +08:00
gongjiale 56799d9cfe 提交 2022-11-26 18:13:20 +08:00
gongjiale dfaef38641 前端ignore 2022-11-26 18:05:12 +08:00
gongjiale 29051bbea7 新增ignore 2022-11-26 18:04:36 +08:00
a0049873 ea3f9b693a 被驳回 2022-11-25 20:06:25 +08:00
a0049873 56bc566a5e bug修改 2022-11-25 19:52:27 +08:00
a0049873 28f120bd6e 资金报表开发 2022-11-25 17:27:21 +08:00
a0049873 411f091383 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-25 11:58:46 +08:00
a0049873 22176cac74 BUG修改 2022-11-25 11:58:12 +08:00
wuhongjian cddba12138 客户问题修复 2022-11-25 10:32:32 +08:00
a0049873 7538cc94d0 添加附件名称 2022-11-24 20:51:16 +08:00
wuhongjian 8f899ecf3e Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-24 20:34:22 +08:00
wuhongjian 0fa3708f20 西海岸bug修复 2022-11-24 20:32:15 +08:00
a0049873 5e9759544d BUG修改 2022-11-24 19:54:20 +08:00
a0049873 4ba21bd41e BUG修改 2022-11-24 17:34:45 +08:00