 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 |
|
a0049873
|
a88baa4eac
|
Merge branch 'hi-ucs-dev' into release
# Conflicts:
# back/public/config/basicConfig.js
# front/public/static/config/basicConfig.js
# front/src/App.vue
|
2022-11-24 09:13:40 +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 |
|
chenchenzai
|
6cfde21605
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-22 19:49:47 +08:00 |
|
chenchenzai
|
dbdd8243cb
|
个人中心视频预览
|
2022-11-22 19:49:40 +08:00 |
|
a0049873
|
c08980a531
|
西海岸需求变更
|
2022-11-22 19:29:50 +08:00 |
|
gongjiale
|
95657f9aee
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-22 19:16:27 +08:00 |
|
gongjiale
|
67375932bc
|
左侧提交
|
2022-11-22 19:16:10 +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 |
|
chenchenzai
|
21191413d2
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-22 17:30:57 +08:00 |
|
chenchenzai
|
c05ed0616c
|
地图弹窗包含视频数据数组清空
|
2022-11-22 17:30:39 +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 |
|
a0049873
|
f4cb66a062
|
视频预览弹窗
|
2022-11-22 14:51:18 +08:00 |
|
gongjiale
|
b48a1b5862
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-22 14:40:24 +08:00 |
|
gongjiale
|
0328893a11
|
西海岸能力集市左侧联调地图
|
2022-11-22 14:37:20 +08:00 |
|
a0049873
|
f85c4b1ccb
|
条数修改
|
2022-11-22 12:00:05 +08:00 |
|
a0049873
|
85b0ecc3dd
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
# front/src/views/home/infrastructureApplication.vue
|
2022-11-22 11:58:14 +08:00 |
|
a0049873
|
20f5dd7999
|
西海岸需求开发
|
2022-11-22 11:51:58 +08:00 |
|
chenchenzai
|
381eb8ac1e
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-22 11:25:07 +08:00 |
|
chenchenzai
|
57b89687d1
|
全部摄像头上图修改
|
2022-11-22 11:24:47 +08:00 |
|
gongjiale
|
c3c3fe9199
|
UI样式调整
|
2022-11-22 11:22:00 +08:00 |
|
a0049873
|
21e602bb9e
|
西海岸需求开发
|
2022-11-22 10:58:19 +08:00 |
|
a0049873
|
8ad683813c
|
西海岸需求开发
|
2022-11-22 10:57:30 +08:00 |
|
gongjiale
|
beb51f9b51
|
提交西海岸左側
|
2022-11-22 10:00:29 +08:00 |
|
wuhongjian
|
089716c2a8
|
配置文件更新
|
2022-11-21 20:42:03 +08:00 |
|
chenchenzai
|
4259e48c70
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-21 20:32:54 +08:00 |
|
chenchenzai
|
c619d24cf9
|
h5player播放接口添加
|
2022-11-21 20:32:28 +08:00 |
|
wuhongjian
|
1e3aa7db5a
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-21 19:21:47 +08:00 |
|
gongjiale
|
91d034c35d
|
bus事件
|
2022-11-21 19:17:16 +08:00 |
|
gongjiale
|
d70ca58781
|
bus事件
|
2022-11-21 19:16:13 +08:00 |
|
wuhongjian
|
df8aa20b3f
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-21 19:12:16 +08:00 |
|
chenchenzai
|
ffbf434cd7
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-21 19:12:05 +08:00 |
|
wuhongjian
|
3076ab83c2
|
配置文件更新
|
2022-11-21 19:11:44 +08:00 |
|
chenchenzai
|
2ee35c6814
|
西海岸视频地图修改1121
|
2022-11-21 19:10:39 +08:00 |
|
a0049873
|
bd88609e0b
|
西海岸需求开发
|
2022-11-21 18:49:01 +08:00 |
|
a0049873
|
828a011669
|
西海岸版本开发
|
2022-11-21 18:46:38 +08:00 |
|
gongjiale
|
879b43cea5
|
添加按鈕取消事件；修改UI
|
2022-11-21 18:22:58 +08:00 |
|
gongjiale
|
f795484416
|
西海岸左侧样式修改
|
2022-11-21 14:19:16 +08:00 |
|
gongjiale
|
88d86a6749
|
Revert "西海岸左侧样式修改"
This reverts commit f39257bdb0.
|
2022-11-21 14:16:21 +08:00 |
|
gongjiale
|
f39257bdb0
|
西海岸左侧样式修改
|
2022-11-21 14:14:45 +08:00 |
|
a0049873
|
3b4a6278cb
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
# front/src/views/home/videoSurveillance/index.vue
|
2022-11-21 13:52:50 +08:00 |
|
a0049873
|
1d02b59509
|
查询修改
|
2022-11-21 13:48:57 +08:00 |
|
gongjiale
|
e1905140f4
|
暂存 staged
|
2022-11-21 12:26:18 +08:00 |
|
gongjiale
|
3e225ddce2
|
标签视频添加
|
2022-11-21 12:21:21 +08:00 |
|
chenchenzai
|
cde4f5d82e
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-21 11:16:51 +08:00 |
|
chenchenzai
|
d055a89f09
|
西海岸视频监控
|
2022-11-21 11:15:40 +08:00 |
|
a0049873
|
dce08fa047
|
政务云找回
|
2022-11-21 10:54:48 +08:00 |
|
a0049873
|
de09c71c8b
|
被覆盖
|
2022-11-21 10:51:54 +08:00 |
|
unknown
|
fc1e1714a9
|
地图点击视频监控出现弹窗
|
2022-11-20 17:55:55 +08:00 |
|
unknown
|
c6798ff28e
|
西海岸基础设施视频监控页面地图修改1
|
2022-11-20 14:08:35 +08:00 |
|
a0049873
|
5767fa4c49
|
西海岸 待申请列表相关开发
|
2022-11-19 17:16:19 +08:00 |
|
a0049873
|
9fe01b9d10
|
政务云资源模糊查
|
2022-11-19 16:05:31 +08:00 |
|
wuhongjian
|
4534ddda4d
|
单点问题修复
|
2022-11-18 19:16:56 +08:00 |
|
a0049873
|
778122d249
|
西海岸 基础设施开发
|
2022-11-18 18:33:04 +08:00 |
|
a0049873
|
97ddab81b8
|
BUG修改
|
2022-11-18 17:05:26 +08:00 |
|
a0049873
|
3672378961
|
Merge branch 'hi-ucs-dev' into release
|
2022-11-18 16:43:06 +08:00 |
|
gongjiale
|
281143503a
|
添加
|
2022-11-18 16:40:34 +08:00 |
|
gongjiale
|
1ae34481d7
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-18 16:38:51 +08:00 |
|
gongjiale
|
e48f8cc6ce
|
能力上架修改
|
2022-11-18 16:38:42 +08:00 |
|
a0049873
|
df7d94b0bf
|
Merge branch 'hi-ucs-dev' into release
|
2022-11-18 15:54:55 +08:00 |
|
a0049873
|
bc73b269a6
|
政务云修改
|
2022-11-18 15:54:43 +08:00 |
|
a0049873
|
72a900723f
|
Merge branch 'hi-ucs-dev' into release
|
2022-11-18 15:43:18 +08:00 |
|
a0049873
|
84ea475d64
|
西海岸版本 基础设施开发
|
2022-11-18 15:38:56 +08:00 |
|
a0049873
|
8a02cc43b4
|
政务云资源对接
|
2022-11-18 15:37:00 +08:00 |
|
unknown
|
938ad4cd9b
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-18 11:19:23 +08:00 |
|
unknown
|
74925cc9e0
|
西海岸基础设施修改
|
2022-11-18 11:18:56 +08:00 |
|
gongjiale
|
8f04b9403e
|
修改
|
2022-11-18 10:56:19 +08:00 |
|
a0049873
|
cf1e1452c3
|
分离西海岸基础设施
|
2022-11-18 10:30:24 +08:00 |
|
a0049873
|
51271131b6
|
UI修改
|
2022-11-17 16:52:16 +08:00 |
|
gongjiale
|
b3899dbfaf
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-17 15:38:09 +08:00 |
|
gongjiale
|
177d0cc95d
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-17 15:37:35 +08:00 |
|
unknown
|
9796982337
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-17 15:37:22 +08:00 |
|
gongjiale
|
11994b6120
|
修改按钮统一样式
|
2022-11-17 15:37:09 +08:00 |
|
unknown
|
8d15818d1b
|
新手指南删除底部蓝色图片
|
2022-11-17 15:35:42 +08:00 |
|
a0049873
|
904c7cbbb5
|
UI样式修改
|
2022-11-17 15:35:00 +08:00 |
|
a0049873
|
b5f18ecedc
|
能力统计echarts修改
|
2022-11-17 15:13:30 +08:00 |
|
a0049873
|
f8bb9c9223
|
编目修改 组件服务 应用资源合并
|
2022-11-17 10:15:29 +08:00 |
|
a0049873
|
65894066b5
|
水印相关功能
|
2022-11-16 16:25:56 +08:00 |
|
unknown
|
2c69d3829b
|
头部菜单修改
|
2022-11-16 16:20:41 +08:00 |
|
gongjiale
|
2f55fca391
|
修改UI
|
2022-11-16 15:10:45 +08:00 |
|
unknown
|
ac544cee15
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-15 18:23:46 +08:00 |
|
unknown
|
6d806547ef
|
模糊搜索ui修改
|
2022-11-15 18:23:26 +08:00 |
|
a0049873
|
e60f697325
|
BUG修改
|
2022-11-15 16:17:25 +08:00 |
|
a0049873
|
f094da8cd5
|
西海岸屏蔽我的申请新增的三个类型
|
2022-11-15 16:13:56 +08:00 |
|
gongjiale
|
3eab1e693f
|
UI样式修改
|
2022-11-15 14:57:22 +08:00 |
|
a0049873
|
1d41742942
|
Merge branch 'hi-ucs-dev' into release
# Conflicts:
# front/public/static/config/basicConfig.js
|
2022-11-15 10:30:15 +08:00 |
|
a0049873
|
3003da8c03
|
配置文件修改
|
2022-11-15 09:40:20 +08:00 |
|
a0049873
|
cccea9db0b
|
BUG修改
|
2022-11-14 17:48:35 +08:00 |
 huangweixiong
|
16214e4cb2
|
baseUrl获取方式修改
|
2022-11-14 17:27:41 +08:00 |
|
a0049873
|
5290ea7de2
|
登录用户名加密
|
2022-11-14 16:46:06 +08:00 |
|
a0049873
|
786ca5438b
|
使用场景
|
2022-11-14 13:52:39 +08:00 |
|
wuhongjian
|
b420643982
|
打包问题修复
|
2022-11-14 11:27:48 +08:00 |
|
wuhongjian
|
adeaa3d2d7
|
Merge branch 'hi-ucs-dev' into release
|
2022-11-14 10:00:26 +08:00 |
|
a0049873
|
1c64743bd1
|
推荐能力 如果返回>9 截取数组
|
2022-11-14 09:54:02 +08:00 |
|
a0049873
|
cb60a8736d
|
首页通过资源申请跳转 默认进入政务云资源tab
|
2022-11-14 09:51:46 +08:00 |
|
a0049873
|
11a959022c
|
BUG修改
|
2022-11-14 09:40:54 +08:00 |
|
a0049873
|
f8ff6805c1
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-11 19:47:52 +08:00 |
|
a0049873
|
b756c7f17f
|
被覆盖代码修复
|
2022-11-11 19:47:32 +08:00 |
|
wuhongjian
|
7a14485775
|
bug修复
|
2022-11-11 19:40:59 +08:00 |
|
a0049873
|
688c7eb295
|
前端模糊查
|
2022-11-11 19:35:40 +08:00 |
|
a0049873
|
722385e3a8
|
云资源状态调整
|
2022-11-11 19:06:41 +08:00 |
|
a0049873
|
d16763eaac
|
政务云 调整
|
2022-11-11 18:54:43 +08:00 |
|
a0049873
|
65d35e4501
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
# front/src/api/personalCenter.js
# front/src/views/personalCenter/components/ApplyDetails.vue
# front/src/views/personalCenter/components/MyApply.vue
|
2022-11-11 18:43:49 +08:00 |
|
a0049873
|
05fa35237b
|
云资源相关开发
|
2022-11-11 18:32:47 +08:00 |
|
gongjiale
|
412ef09be8
|
11
|
2022-11-11 16:59:50 +08:00 |
|
gongjiale
|
27a8de9a93
|
能力上架回滚
|
2022-11-11 16:48:58 +08:00 |
|
a0049873
|
b0d8af59b4
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-11 15:05:55 +08:00 |
|
a0049873
|
8f95bf12cb
|
我的申请 新增数据资源申请功能
|
2022-11-11 15:05:39 +08:00 |
|
gongjiale
|
a65014ace5
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-11 14:26:38 +08:00 |
|
gongjiale
|
9161acb57c
|
能力上架样式修改
|
2022-11-11 14:26:19 +08:00 |
|
unknown
|
79357c6e9a
|
会议室全部修改为会客厅
|
2022-11-11 10:33:16 +08:00 |
|
gongjiale
|
99d821ab7e
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-10 15:44:48 +08:00 |
|
gongjiale
|
8c3c47a434
|
第一步
|
2022-11-10 15:44:34 +08:00 |
|
a0049873
|
62b2091fd6
|
全局搜索调整
|
2022-11-10 15:18:29 +08:00 |
|
a0049873
|
6abc05dcf6
|
全局搜索添加排序
|
2022-11-10 15:12:33 +08:00 |
|
wuhongjian
|
c9d710c3bb
|
配置文件更新
|
2022-11-09 17:57:55 +08:00 |
|
wuhongjian
|
a6334a6790
|
Merge branch 'hi-ucs-dev' into release
|
2022-11-09 15:37:04 +08:00 |
|
unknown
|
f00373baa4
|
我的申请视频播放接口替换
|
2022-11-09 11:39:02 +08:00 |
|
unknown
|
a5be25cec4
|
还原
|
2022-11-08 16:44:11 +08:00 |
|
unknown
|
d89ae93ae2
|
视频播放
|
2022-11-08 15:08:07 +08:00 |
|
a0049873
|
383289ea94
|
门户如果未选中类型进行全局搜索
|
2022-11-07 14:43:28 +08:00 |
 guoyue
|
799749ecdc
|
删除无用代码
|
2022-11-04 17:05:22 +08:00 |
|
guoyue
|
023f11c03a
|
能力集市--详情--描述信息tootlip样式：添加成全局样式（后续如果有需要，可直接加上类名）
|
2022-11-04 17:04:47 +08:00 |
|
guoyue
|
99f962c74f
|
修复应用领域不能选中bug
|
2022-11-04 17:00:45 +08:00 |
|
guoyue
|
4a2e8f4a62
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-04 14:10:07 +08:00 |
|
guoyue
|
2962cb6e9d
|
需求中心：tooltip 样式更改
|
2022-11-04 14:09:53 +08:00 |
|
gongjiale
|
0f479dfec4
|
问题修改
|
2022-11-04 13:59:28 +08:00 |
|
gongjiale
|
d88430ec93
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-04 09:05:11 +08:00 |
|
unknown
|
4c77bb2405
|
申购车中展开收起修改
|
2022-11-03 17:59:48 +08:00 |
|
gongjiale
|
7b334a0224
|
修改
|
2022-11-03 17:43:41 +08:00 |
|
gongjiale
|
14f82809f6
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-11-03 14:34:02 +08:00 |
|
gongjiale
|
7da4dc814a
|
修改部分
|
2022-11-03 14:33:53 +08:00 |
|
unknown
|
92c6bf687b
|
会议室预约时间选择器限制
|
2022-11-03 10:02:39 +08:00 |
|
guoyue
|
4f41648fa4
|
修复应用资源详情返回未选中bug
|
2022-11-03 09:22:18 +08:00 |
|
guoyue
|
91b2f229ee
|
智能算法详情增加说明文字
|
2022-11-02 16:52:46 +08:00 |
|
gongjiale
|
65026d0e65
|
修改样式
|
2022-11-02 14:35:57 +08:00 |
|
unknown
|
e4cdac8bb9
|
服务详情收藏错误
|
2022-11-01 18:05:32 +08:00 |
|
a0049873
|
72229ea4fb
|
修改城市云脑顺序
|
2022-11-01 15:35:30 +08:00 |
|
a0049873
|
3950122864
|
全局搜索功能优化
|
2022-11-01 14:41:17 +08:00 |
|
a0049873
|
33e9cfe960
|
修改表格宽度
|
2022-11-01 14:32:01 +08:00 |
|
a0049873
|
2a2eb0fbc3
|
调换首页应用资源位置
|
2022-11-01 13:56:55 +08:00 |
|
a0049873
|
1f371a53fc
|
Merge branch 'hi-ucs-dev' into release
|
2022-11-01 09:24:20 +08:00 |
|
a0049873
|
ad6a1c14de
|
BUg修改
|
2022-10-31 20:23:26 +08:00 |
|
a0049873
|
493151d9f0
|
BUG修改
|
2022-10-31 19:45:21 +08:00 |
|
a0049873
|
4532029b66
|
Merge branch 'hi-ucs-dev' into release
# Conflicts:
# front/public/static/config/basicConfig.js
|
2022-10-31 18:59:29 +08:00 |
|
gongjiale
|
d130bcf1aa
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-31 17:47:56 +08:00 |
|
gongjiale
|
2156e70433
|
左侧树修改
|
2022-10-31 17:47:38 +08:00 |
|
unknown
|
1ad52d954c
|
bug修改，我的申请
|
2022-10-31 16:29:19 +08:00 |
|
a0049873
|
15426bccdc
|
能力申请 应用系统对接
|
2022-10-31 16:03:12 +08:00 |
|
a0049873
|
72cd80df26
|
Merge branch 'hi-ucs-dev' into release
|
2022-10-31 15:45:17 +08:00 |
|
gongjiale
|
511f4690c1
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-31 14:50:38 +08:00 |
|
guoyue
|
50c2d6264d
|
renren-admin改为ucs-admin
|
2022-10-31 14:08:04 +08:00 |
|
guoyue
|
5f155dc69a
|
更改图片字段
|
2022-10-31 14:07:39 +08:00 |
|
guoyue
|
2774650d96
|
新手指南--资源下架跳转到我的发布
|
2022-10-28 17:04:37 +08:00 |
|
gongjiale
|
90237e4f6d
|
Merge branch 'hi-ucs-pre' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-28 16:40:35 +08:00 |
|
gongjiale
|
6967b3f1da
|
1.完成能力集市：基础设施-会客厅，字数太多时，展示不美观的问题；
2.完成融合服务：打包模式，点击发布时间，只能按照正序排，不能按照倒序排列的问题；
3完成.融合服务：打包模式，点击收藏量，只能按照正序排，不能按照倒序排列的问题
|
2022-10-28 16:37:48 +08:00 |
|
wuhongjian
|
ed6a7e85b2
|
bug修复
|
2022-10-28 13:59:44 +08:00 |
|
wuhongjian
|
04fcdfde08
|
bug修复
|
2022-10-28 13:58:53 +08:00 |
|
guoyue
|
2f34e4acbc
|
合并
|
2022-10-27 19:39:34 +08:00 |
|
guoyue
|
cc00873328
|
我的申请：查看详情按钮位置调整
|
2022-10-27 19:33:42 +08:00 |
|
a0049873
|
fbcd40f2a6
|
BUG修改
|
2022-10-27 18:05:28 +08:00 |
|
wuhongjian
|
9a2c2c07d1
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-27 15:48:26 +08:00 |
|
wuhongjian
|
09d56091fa
|
测试问题修复
|
2022-10-27 15:48:24 +08:00 |
|
guoyue
|
c1da555ceb
|
西海岸：摄像头提示文字预览视频更改为观看视频
|
2022-10-27 15:04:49 +08:00 |
|
guoyue
|
3e310fb7ea
|
合并
|
2022-10-27 14:40:35 +08:00 |
|
guoyue
|
e29e0f0526
|
算法广场和能力广场容错处理pic为空
|
2022-10-27 13:50:29 +08:00 |
|
guoyue
|
3e1b6b8a22
|
修复 需求中心：需求申请时，应用领域无法进行选择
|
2022-10-27 13:47:19 +08:00 |
|
a0049873
|
f36e2bbffc
|
BUG修改
|
2022-10-27 11:44:25 +08:00 |
|
a0049873
|
e65419c06e
|
Merge branch 'hi-ucs-dev' into release
# Conflicts:
# back/public/config/basicConfig.js
# front/public/static/config/basicConfig.js
|
2022-10-27 10:52:53 +08:00 |
|
a0049873
|
4930027d67
|
能力上架 新增转办功能
|
2022-10-27 10:50:09 +08:00 |
|
guoyue
|
46ad5e747d
|
算法广场和gis广场 传参参数更改
|
2022-10-26 20:28:58 +08:00 |
|
guoyue
|
5132d3ec60
|
算法广场兼容
|
2022-10-26 20:10:06 +08:00 |
|
guoyue
|
b61722857d
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-26 19:40:10 +08:00 |
|
guoyue
|
355ee77e79
|
fix：算法广场和GIS广场图片bug
|
2022-10-26 17:10:15 +08:00 |
|
guoyue
|
fef67d9cc4
|
门户：新手指引：能力下架，跳转页面不对，应该跳转到我的申请-上架能力页面
|
2022-10-26 16:25:44 +08:00 |
|
a0049873
|
1e3b315d35
|
BUg修改
|
2022-10-26 15:04:55 +08:00 |
|
guoyue
|
82718e3d02
|
合并
|
2022-10-26 15:03:29 +08:00 |
|
guoyue
|
d28628f35a
|
fix：消息跳转获取列表bug
|
2022-10-26 15:01:54 +08:00 |
|
a0049873
|
3ef7da2d6c
|
金宏网-能力统计：资源申请量，点击跳转时，应该跳转到后台管理的能力统计-能力使用sheet页
|
2022-10-26 14:49:00 +08:00 |
|
a0049873
|
94a940a1ab
|
金宏网-能力统计：资源申请量，点击跳转时，应该跳转到后台管理的能力统计-能力使用sheet页
|
2022-10-26 14:48:37 +08:00 |
|
a0049873
|
330f8de5e4
|
全局搜索 搜索逻辑修改
|
2022-10-26 10:39:32 +08:00 |
|
a0049873
|
d8a08c6470
|
基础设施 去表格
|
2022-10-26 09:56:05 +08:00 |
|
wuhongjian
|
00e4e9671b
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-26 09:38:13 +08:00 |
|
wuhongjian
|
c634d85688
|
去掉视频资源列表
|
2022-10-26 09:38:11 +08:00 |
|
a0049873
|
1f727a6cbd
|
修改会议室默认图片
|
2022-10-26 09:37:47 +08:00 |
|
a0049873
|
b600caa357
|
添加admin权限
|
2022-10-26 09:19:01 +08:00 |
|
guoyue
|
5fea910701
|
合并
|
2022-10-25 18:00:40 +08:00 |
|
guoyue
|
05899ab616
|
能力分类进入能力集市，应用领域有选中时，展开
|
2022-10-25 17:53:17 +08:00 |
|
guoyue
|
b561eff3ea
|
查看详情按钮样式更改
|
2022-10-25 17:52:39 +08:00 |
|
guoyue
|
24dc1d09cd
|
更改气泡提示框按钮样式居中显示（全局更改）
|
2022-10-25 17:52:04 +08:00 |
|
guoyue
|
7ff2d13afe
|
算法广场，GIS广场接口里联调
|
2022-10-25 17:51:39 +08:00 |
|
a0049873
|
983b2c0534
|
更改头部样式
|
2022-10-25 15:11:47 +08:00 |
|
wuhongjian
|
8f33c9f375
|
bug修复
|
2022-10-25 11:30:05 +08:00 |
|
a0049873
|
5cbeba19b8
|
会议室列表
|
2022-10-25 10:58:25 +08:00 |
|
a0049873
|
b30a72555f
|
判断用户后台权限
|
2022-10-25 09:48:40 +08:00 |
|
wuhongjian
|
11b42afde3
|
一键组会内容添加
|
2022-10-25 09:21:38 +08:00 |
|
guoyue
|
79ee811854
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-24 17:44:26 +08:00 |
|
guoyue
|
1a40a09286
|
算法广场和GIS广场增加区域筛选，api待联调
|
2022-10-24 17:44:10 +08:00 |
|
a0049873
|
0726f4a927
|
添加角色控制
|
2022-10-24 15:20:58 +08:00 |
|
a0049873
|
8a31a4e285
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-24 14:54:14 +08:00 |
|
a0049873
|
314b68b3a3
|
静态数据
|
2022-10-24 14:54:03 +08:00 |
|
wuhongjian
|
84f1b03c42
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-24 14:26:25 +08:00 |
|
wuhongjian
|
aaa16a1105
|
bug修复
|
2022-10-24 14:26:22 +08:00 |
|
a0049873
|
e1a805d4bd
|
客户端下载
|
2022-10-24 14:12:35 +08:00 |
|
a0049873
|
98a420f0c3
|
接口文件
|
2022-10-24 13:50:23 +08:00 |
|
a0049873
|
52be0acd83
|
一键组会
|
2022-10-24 11:28:37 +08:00 |
|
wuhongjian
|
a8aba6b4f1
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-24 09:51:40 +08:00 |
|
wuhongjian
|
e0481ba5a5
|
配置更新
|
2022-10-24 09:51:37 +08:00 |
|
gongjiale
|
70a015cb01
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-22 15:29:52 +08:00 |
|
gongjiale
|
1427424073
|
pageWithAttrs
|
2022-10-22 15:29:21 +08:00 |
|
guoyue
|
6b1fc28b4b
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-22 14:29:55 +08:00 |
|
guoyue
|
b226e777f7
|
西海岸：增加我的发布侧边栏
|
2022-10-22 14:29:18 +08:00 |
|
a0049873
|
25763b72e3
|
Merge branch 'hi-ucs-dev' into release
# Conflicts:
# front/public/static/config/basicConfig.js
|
2022-10-22 11:10:07 +08:00 |
|
a0049873
|
30328e575d
|
视频会议
|
2022-10-22 11:08:52 +08:00 |
|
a0049873
|
a296f5a0d6
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-21 17:32:59 +08:00 |
|
a0049873
|
7e9108e7d6
|
BUG修改
|
2022-10-21 17:32:45 +08:00 |
|
guoyue
|
0461d44c85
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-21 17:00:22 +08:00 |
|
guoyue
|
f4a53c91b1
|
修复首页点击能力集市，搜索，基础设施进入能力集市，页面不显示bug
|
2022-10-21 17:00:09 +08:00 |
|
wuhongjian
|
6da86d7340
|
Merge branch 'hi-ucs-dev' into release
|
2022-10-21 16:46:36 +08:00 |
|
wuhongjian
|
67574732c7
|
bug修复
|
2022-10-21 16:45:53 +08:00 |
|
unknown
|
44da94a71e
|
所属部门自动搜索
|
2022-10-21 16:35:26 +08:00 |
|
guoyue
|
b5f9531943
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-21 11:47:38 +08:00 |
|
guoyue
|
549dda54b3
|
消息通知：跳转逻辑更改
|
2022-10-21 11:47:28 +08:00 |
|
a0049873
|
672e6164ba
|
平均分改评分
|
2022-10-21 10:09:59 +08:00 |
|
wuhongjian
|
5deb9a3826
|
Merge branch 'hi-ucs-dev' into release
|
2022-10-20 16:20:24 +08:00 |