Commit Graph

1486 Commits

Author SHA1 Message Date
wuhongjian 50e730c9ff Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-12-08 14:57:55 +08:00
wuhongjian 2b00dd9130 组织树tootip问题修复 2022-12-08 11:48:10 +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 42c3ce4525 全局搜索 2022-12-07 10:16:31 +08:00
a0049873 1eb4e4f46e 数据资源左侧列表 2022-12-06 17:48:58 +08:00
wuhongjian 491f2910b1 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-12-05 17:39:02 +08:00
wuhongjian 6085e640d7 cookie过期时间更正 2022-12-05 17:38:59 +08:00
a0049873 3169ff030e Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-12-05 17:35:27 +08:00
a0049873 f3c6415726 催办功能开发 基础设施左侧树判断条件修改 2022-12-05 17:33:53 +08:00
gongjiale 15d0c850c4 修改jire问题 2022-12-05 15:40:55 +08:00
a0049873 5c45ee5ea5 BUG修改 2022-12-03 15:13:13 +08:00
a0049873 6423153f5c Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-12-02 17:45:52 +08:00
a0049873 dc2fe63682 登录BUG修改 2022-12-02 17:45:32 +08:00
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
guoyue b6e56cc0ea 知识库--模型规则详情 2022-12-02 17:29:20 +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
hucongqian 8b0e6b2519 Merge branch 'hi-ucs-dev' of http://10.16.3.230:8011/wuhongjian/hi-ucs-web into hi-ucs-dev 2022-12-02 09:46:15 +08:00
hucongqian 3bc9f34921 能力集市-知识库 2022-12-02 09:45:45 +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 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 6fc0d15dbf BUG修改 2022-11-29 17:47:55 +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 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 dfaef38641 前端ignore 2022-11-26 18:05:12 +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
a0049873 b8d254ddde 去除zt字段 2022-11-24 13:53:30 +08:00
a0049873 8da205988f 水印相关修改 2022-11-24 10:57:13 +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