Commit Graph

1829 Commits

Author SHA1 Message Date
wuhongjian cf1f925192 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-12-02 17:31:54 +08:00
wuhongjian 6c3a0ff07f 西海岸问题修复 2022-12-02 17:30:32 +08:00
gongjiale e0be8ddc03 111 2022-12-02 16:14:22 +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 3af92de1ec 通知样式修改 2022-12-02 16:02:45 +08:00
a0049873 beb0455e3d BUG修改 应用资源 模糊判断错误 2022-12-02 15:09:07 +08:00
a0049873 1c53bba435 通知开发 水印修改 BUG修改 2022-12-02 14:50:41 +08:00
gongjiale 8afd825ffc 11 2022-12-02 09:00:16 +08:00
wuhongjian 73c04f54d0 西海岸bug修复 2022-12-01 17:39:30 +08:00
a0049873 c07f9bdc4c BUG修改 2022-12-01 14:41:32 +08:00
gongjiale ae9fe6c8c2 修改bug 2022-12-01 11:21:02 +08:00
gongjiale 0993ece389 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-30 19:38:41 +08:00
gongjiale 0bb750af34 111 2022-11-30 19:38:35 +08:00
a0049873 4b2a3ac3b6 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-30 17:28:32 +08:00
a0049873 43d6cbc3bd 修改被驳回字样展示 2022-11-30 17:28:24 +08:00
gongjiale 27642b9964 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-30 17:04:32 +08:00
gongjiale 329fa49062 改bug 2022-11-30 17:04:25 +08:00
a0049873 e64bd190cc 能力申请 市局隐藏附件 能力统计 无数据图片修改 2022-11-30 16:43:53 +08:00
a0049873 7c7ac61f77 需求修改删除附件BUG修改 2022-11-30 15:32:27 +08:00
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
gongjiale b8e51270fd 修改 2022-11-29 09:01:24 +08:00
a0049873 1ed8496d58 打包修改 2022-11-28 18:00:48 +08:00