Commit Graph

590 Commits

Author SHA1 Message Date
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 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 6fc0d15dbf BUG修改 2022-11-29 17:47:55 +08:00
a0049873 3d90e73659 已申请列表添加websocket 2022-11-29 17:37:10 +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
a0049873 ebd71b3015 编目添加算法效果图片 2022-11-28 17:24:44 +08:00
a0049873 0bff8b7d8b 西海岸待办列表相关开发 2022-11-28 16:46:57 +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 8904da5a13 西海岸bug修复 2022-11-28 01:17:08 +08:00
wuhongjian 555672eeb8 西海岸bug修复 2022-11-26 18:39:45 +08:00
a0049873 ea3f9b693a 被驳回 2022-11-25 20:06:25 +08:00
a0049873 56bc566a5e bug修改 2022-11-25 19:52:27 +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
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
wuhongjian 32573971ae Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-24 16:11:37 +08:00
wuhongjian a7998206f2 西海岸bug修复 2022-11-24 16:11:34 +08:00
a0049873 8b558b5389 BUG修改 2022-11-24 15:57:44 +08:00
a0049873 704cfb08dd BUG修改 2022-11-24 15:52:18 +08:00
a0049873 ce1de07732 西海岸 BUG修改 扎点缺清除 2022-11-24 15:25:53 +08:00
wuhongjian d244f48a60 西海岸问题修复 2022-11-24 09:52:26 +08:00
gongjiale fc7e457176 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-23 14:20:59 +08:00
gongjiale c2c6f0f797 1.解决jire后台客户反馈能力统计-查询时,重置功能失效 2.解决jire后台客户反馈:能力统计-添加提供部门筛选条件; 2022-11-23 14:20:50 +08:00
a0049873 7b843847a7 新增视频管理员角色 2022-11-23 10:40:25 +08:00
a0049873 c08980a531 西海岸需求变更 2022-11-22 19:29:50 +08:00
a0049873 6682746254 西海岸需求开发 2022-11-22 19:16:10 +08:00
chenchenzai 5a98693b05 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-22 18:27:13 +08:00
chenchenzai 3aed6a86ac 左侧树点击上图 2022-11-22 18:27:03 +08:00
a0049873 d844e709db 西海岸需求开发 点位打开弹窗 2022-11-22 17:42:54 +08:00
wuhongjian 6d83cd76e0 西海岸视频播放 2022-11-22 17:22:43 +08:00
chenchenzai d01ba547e2 多余标志位删除 2022-11-22 16:39:21 +08:00
chenchenzai 3c21b119b4 已申请列表预览视频 2022-11-22 16:31:39 +08:00
chenchenzai adb32a06c2 已申请列表预览视频 2022-11-22 16:22:56 +08:00
chenchenzai 40b050d75c Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-22 15:39:34 +08:00
chenchenzai 74818f5abc 视频播放修改 2022-11-22 15:34:26 +08:00
wuhongjian a24391ff1e Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-22 15:04:51 +08:00
wuhongjian 851eb37c35 西海岸添加关闭所有视频 2022-11-22 15:04:49 +08:00
a0049873 deb9842c07 附件上传 2022-11-22 14:58:04 +08:00