Commit Graph

1527 Commits

Author SHA1 Message Date
wuhongjian c78b6e8f0f 680 2022-12-28 10:16:25 +08:00
wuhongjian 30dd5f364e 679 2022-12-28 09:45:57 +08:00
wuhongjian ce81d2a1cd 675修复 2022-12-28 09:39:23 +08:00
wuhongjian c05b9a91c3 676修复 2022-12-28 09:34:49 +08:00
gongjiale 883aa00cb3 问题修改 2022-12-26 18:05:49 +08:00
a0049873 84b0f2eba8 特殊字段添加编辑功能 上架左侧添加进度条 2022-12-21 09:06:36 +08:00
a0049873 bf9898abff 申请详情,算法优势、应用场景、计费标准信息展示内容有误 2022-12-19 17:03:31 +08:00
wuhongjian 00d277dd39 跳转问题调整 2022-12-16 17:27:57 +08:00
a0049873 307f5bb4ce 能力挂接根据账号筛选 2022-12-16 16:06:57 +08:00
gongjiale 18dbbfc42d 融合服务修改 2022-12-16 14:16:37 +08:00
gongjiale 68ad04a198 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-12-16 09:39:49 +08:00
gongjiale c01c2ec9af 111 2022-12-16 09:39:27 +08:00
wuhongjian b20d08fb14 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-12-16 09:31:46 +08:00
wuhongjian c35c26c220 西海岸视频播放 2022-12-16 09:31:38 +08:00
gongjiale 338040370b Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-12-15 17:27:50 +08:00
gongjiale 25ae58a82b 前台我的申请修改 2022-12-15 17:27:26 +08:00
a0049873 44d96c8154 会议室预约添加下拉 2022-12-15 16:55:31 +08:00
a0049873 4605fce6b7 上传组件提示调整 2022-12-13 14:32:03 +08:00
a0049873 05782a78be 资源申请跳转政务云 2022-12-13 14:24:47 +08:00
a0049873 5ad71c3ef1 需求修改 2022-12-13 11:55:23 +08:00
a0049873 95252d1f49 工作台我的已办不刷新
需求申请被驳回之后,点击修改,之前的附件名称被修改了,直接命名为附件,而非原附件名称
2022-12-13 11:36:05 +08:00
wuhongjian 90f9f54528 格式更新 2022-12-12 21:32:37 +08:00
gongjiale 49d0fd35a7 修改 2022-12-12 20:56:24 +08:00
wuhongjian 338f251563 bug修复 2022-12-12 20:01:49 +08:00
gongjiale e5e2047a94 提交政务云 2022-12-12 19:10:17 +08:00
gongjiale 6d00b050fc Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/src/views/personalCenter/components/MyApply.vue
2022-12-12 17:02:33 +08:00
gongjiale d482042bcb 提交部分 2022-12-12 17:01:29 +08:00
wuhongjian 8906f1f60a 修改所有个人中心新建窗口跳转详情 2022-12-12 16:27:34 +08:00
wuhongjian efba4dc7ba 资源申请跳转修复 2022-12-12 14:16:21 +08:00
wuhongjian 28d3d632ee Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-12-12 11:12:49 +08:00
wuhongjian 79c97721d8 层级问题修复 2022-12-12 11:12:46 +08:00
gongjiale 9937237959 提交市局修改 2022-12-10 20:25:43 +08:00
wuhongjian 4c59abaa7c 市局还原 2022-12-09 17:33:27 +08:00
a0049873 8b40129164 全局禁用图片事件 2022-12-09 10:20:08 +08:00
wuhongjian dd30c22954 Merge branch 'hi-ucs-dev' of http://10.16.3.230:8011/wuhongjian/hi-ucs-web into hi-ucs-dev 2022-12-08 17:33:17 +08:00
a0049873 764b797050 回显BUG修改 2022-12-08 16:19:41 +08:00
a0049873 9fccd6a690 BUG修改 2022-12-08 15:24:19 +08:00
a0049873 ac818979e8 BUG修改 2022-12-08 15:20:59 +08:00
a0049873 f32461bbdd 应用领域字符串BUG 2022-12-08 15:18:55 +08:00
gongjiale 9ae885b985 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-12-08 15:09:10 +08:00
gongjiale 3306e8b6ac 111 2022-12-08 15:08:59 +08:00
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