wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity
2,060 Commits 7 Branches 12 Tags 640 MiB
Commit Graph

260 Commits

Author SHA1 Message Date
guoyue 023f11c03a 能力集市--详情--描述信息tootlip样式：添加成全局样式（后续如果有需要，可直接加上类名） 2022-11-04 17:04:47 +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
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
wuhongjian 04fcdfde08 bug修复 2022-10-28 13:58:53 +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 94a940a1ab 金宏网-能力统计：资源申请量，点击跳转时，应该跳转到后台管理的能力统计-能力使用sheet页 2022-10-26 14:48:37 +08:00
guoyue 24dc1d09cd 更改气泡提示框按钮样式居中显示（全局更改） 2022-10-25 17:52:04 +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 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
wuhongjian 5deb9a3826 Merge branch 'hi-ucs-dev' into release 2022-10-20 16:20:24 +08:00
wuhongjian 1f3116f402 开启gzip 2022-10-20 16:15:59 +08:00
unknown 1a23d64064 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-19 11:50:11 +08:00
unknown 04471a122e ie浏览器提示信息 2022-10-19 11:48:31 +08:00
guoyue cdb47c705b 西海岸：基础设施--获取摄像头增加远雄url 2022-10-18 15:52:07 +08:00
wuhongjian 8e89d8d1b0 Merge branch 'hi-ucs-dev' into release 2022-10-18 15:24:25 +08:00
guoyue 4354abdf25 西海岸-视频资源申请-列表中包含西海岸开发分局添加申请附件个模板下载 2022-10-14 15:40:14 +08:00
wuhongjian 502068705b Merge branch 'hi-ucs-dev' into release 2022-10-14 11:24:10 +08:00
wuhongjian 79cdaa1146 bug修复 2022-10-13 21:40:56 +08:00
wuhongjian b79797b09a bug修复 2022-10-13 19:11:45 +08:00
wuhongjian 2c4752c97b bug修复 2022-10-13 18:13:19 +08:00
wuhongjian 0c83991e6c bug修复 2022-10-13 18:08:14 +08:00
wuhongjian 7877cd2474 bug修复 2022-10-13 15:45:21 +08:00
wuhongjian 54aa64de64 客户需求更新 2022-10-13 14:47:53 +08:00
wuhongjian 720b26a902 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-12 17:56:45 +08:00
wuhongjian 8f1658f2eb 客户需求 2022-10-12 17:56:41 +08:00
guoyue 5f8659f7f4 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-12 16:00:45 +08:00
guoyue f198ad5f5a 西海岸: 获取摄像头列表的api更改为配置文件形式 2022-10-12 16:00:41 +08:00
wuhongjian 70bb06cba6 更改token问题 2022-10-12 09:50:17 +08:00
guoyue 5db6afcb6c 西海岸：特殊用户增加可查看所有权限 2022-10-09 16:42:57 +08:00
guoyue af1c03d3ed 西海岸相关功能 合并代码 2022-10-09 14:29:51 +08:00
guoyue e83ddfe47e 浏览器增加提示：文件抽取引入js,css 2022-10-09 10:07:24 +08:00
unknown 4a78bfa72e 添加浏览器版本提示 2022-10-08 19:09:33 +08:00
guoyue 7d513edafc 配置环境 2022-10-08 16:00:37 +08:00
guoyue d13dbbb09a 谷歌浏览器64位和32位exe文件 2022-10-08 13:38:14 +08:00
851673013@qq.com a906b433f2 区市站点隐藏掉 2022-09-30 10:40:05 +08:00
851673013@qq.com a3c6162592 修改文件 2022-09-30 10:27:57 +08:00
a0049873 55da389003 隐藏趋势站点，能力云图 2022-09-27 16:49:10 +08:00
guoyue ae5978f408 add: 西海岸 测试环境 2022-09-26 17:26:06 +08:00
guoyue f26afc84c7 西海岸：顶部导航去掉技术文档 2022-09-23 10:37:21 +08:00
guoyue f6b6c4713d 西海岸-去掉融合服务和CIM 2022-09-21 18:48:35 +08:00
guoyue bff2aa9f97 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-19 19:24:02 +08:00
guoyue b2abd5f16e 新增研发展厅环境 2022-09-19 19:19:13 +08:00
guoyue 253b9f511a 能力集市-组件服务：智能算法支持类型选择 2022-09-19 19:18:49 +08:00
a0049873 e97fc9afa9 Merge branch 'hi-ucs-dev' into release 
# Conflicts:
#	front/public/static/config/basicConfig.js
 2022-09-19 11:08:15 +08:00
a0049873 6ef87c3c79 广场新增删选条件 2022-09-19 10:19:31 +08:00
a0049873 a653d9607f Merge branch 'hi-ucs-dev' into release 
# Conflicts:
#	front/public/static/config/basicConfig.js
 2022-09-14 10:50:43 +08:00
guoyue dfba732000 展厅dev环境 2022-09-13 18:04:46 +08:00
guoyue 59abe1614c 融合服务 CIM 技术文档 包头市局西海岸都支持 2022-09-08 15:46:08 +08:00
guoyue 7f3c5c0921 研发开发环境 2022-09-07 14:30:00 +08:00
guoyue 84e3f220dd 开发环境 2022-09-07 14:29:06 +08:00
guoyue 2e17b5cf80 技术文档：使用手册下载 2022-09-07 14:28:52 +08:00
wuhongjian 0c78639afa 配置文件更新 2022-08-29 09:58:43 +08:00
wuhongjian 48097bdd54 合并版本v0.8.7.2 2022-08-29 09:58:12 +08:00
wuhongjian 13226c8976 版本号更新 2022-08-27 14:26:03 +08:00
wuhongjian 66db5faf1b 详情页模糊化处理 2022-08-27 14:25:03 +08:00
wuhongjian 916ea5ecd2 bug修复 2022-08-25 19:06:53 +08:00
wuhongjian 9b77589c6e 配置文件更新 2022-08-25 15:20:06 +08:00
wuhongjian b923e7ac2d 配置文件更新 2022-08-25 15:07:19 +08:00
wuhongjian cd832f3f90 合并版本v0.8.7.2 2022-08-24 09:20:04 +08:00
gaoyuanwei 0c4015cb5c 亿点点修改 2022-08-23 17:47:24 +08:00
wuhongjian 931e3a0e0a 合并版本v0.8.7.1 2022-08-23 16:38:48 +08:00
a0049873 ded027bb64 新 申请流程 2022-08-23 13:59:43 +08:00
a0049873 73591c0ed2 CIM专区 图层 算法开发 2022-08-19 16:53:42 +08:00
a0049873 88e063fa04 CIM专区 初始化 2022-08-19 10:03:43 +08:00
wuhongjian 31e81a258c 配置文件更新 2022-08-16 16:28:26 +08:00
wuhongjian 307bd6c020 合并版本v0.8.6.1 2022-08-16 09:57:36 +08:00
wuhongjian 1f3774255a 配置更新 2022-08-16 09:55:42 +08:00
wuhongjian ce3f7ec183 配置更新 2022-08-12 17:17:03 +08:00
wuhongjian 94cc9163cf gis广场bug修复 2022-08-10 11:53:19 +08:00
wuhongjian e026c97a73 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-09 17:10:48 +08:00
wuhongjian 5a32f96150 bug修复 2022-08-09 17:09:58 +08:00
a0049873 4c4de0abea 应用广场开发 2022-08-09 16:36:47 +08:00
a0049873 ca4c907d8a 能力广场 2022-08-09 09:40:12 +08:00
wuhongjian 8a58e70fc6 合并版本v0.8.4.3 2022-08-08 09:19:39 +08:00
wuhongjian cf53e51913 西海岸需求更新 2022-08-06 16:36:20 +08:00
wuhongjian dca5dc511e bug修复，配置更新 2022-08-05 10:01:49 +08:00
wuhongjian 9601541628 合并版本v0.8.4.1 2022-08-02 16:06:08 +08:00
a0049873 e081c560a7 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	front/public/index.html
 2022-08-02 11:59:59 +08:00
a0049873 ee9ec45450 前台上架 驳回功能 2022-08-02 11:59:01 +08:00
wuhongjian 0a16dd5e84 合并版本v0.8.4.1 2022-08-02 10:19:04 +08:00
wuhongjian ff44fd4691 测试环境配置更新 2022-08-02 10:18:01 +08:00
wuhongjian 11362c536d 开发环境配置更新 2022-08-02 10:15:32 +08:00
guoyue c5d7351809 合并 2022-08-01 16:22:24 +08:00
a0049873 dafc2ac1be 后台挂载 部门校验 2022-08-01 14:34:44 +08:00
a0049873 80e9ddf3fc BUG修改 2022-08-01 11:07:58 +08:00
a0049873 328ab1102e 西海岸演示版本 2022-08-01 09:21:57 +08:00
wuhongjian c9a5bf9f69 合并版本v0.8.3.2 2022-07-28 16:58:01 +08:00
wuhongjian e47d7cf470 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-28 14:43:04 +08:00
wuhongjian b766bcf8fa bug修复 2022-07-28 14:42:44 +08:00
a0049873 bd839fd335 隐藏高级搜索 2022-07-28 14:21:20 +08:00
a0049873 fd3a7ef353 基础设施输入框 去除X 2022-07-28 09:40:05 +08:00
wuhongjian e8dc08504c 合并版本v0.8.3.1 2022-07-26 16:34:23 +08:00
a0049873 5dbaa26848 引入富文本编辑 2022-07-26 16:32:07 +08:00
wuhongjian 09f65b44ed Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-26 15:16:53 +08:00
wuhongjian b4e6f56c47 添加西海岸地图 2022-07-26 15:16:28 +08:00