Commit Graph

1957 Commits

Author SHA1 Message Date
a0049873 baebd9f62b 需求修改回显 2022-11-30 15:23:19 +08:00
a0049873 95d27d57e0 需求中心BUG修改 2022-11-30 15:00:41 +08:00
a0049873 fe0b29a9fa 西海岸BUG修改 2022-11-30 14:45:19 +08:00
gongjiale 818e6e5dc9 修改 2022-11-30 14:43:35 +08:00
gongjiale 3183fc7342 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-30 14:37:51 +08:00
gongjiale 38955b7748 修改门户 2022-11-30 14:37:26 +08:00
a0049873 951ddbc77b 西海岸BUG修改 2022-11-30 11:56:34 +08:00
a0049873 ddf1a7e6b3 添加已撤回标识 2022-11-30 11:47:43 +08:00
a0049873 1e8a6495a3 BUG修改 2022-11-30 10:25:58 +08:00
a0049873 743d88bdf8 加载问题 2022-11-30 09:56:28 +08:00
a0049873 9902f9779a BUG修改 2022-11-30 09:47:23 +08:00
wuhongjian b0b4368667 西海岸问题修复 2022-11-29 23:45:47 +08:00
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
a0049873 4e76f66495 Merge branch 'hi-ucs-dev' into release 2022-11-29 09:02:03 +08:00
gongjiale b8e51270fd 修改 2022-11-29 09:01:24 +08:00
a0049873 c74b6a6bc0 Merge branch 'hi-ucs-dev' into release 2022-11-28 18:01:30 +08:00
a0049873 1ed8496d58 打包修改 2022-11-28 18:00:48 +08:00
a0049873 b8644679c9 BUG修改 2022-11-28 17:55:30 +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
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