Commit Graph

1354 Commits

Author SHA1 Message Date
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
a0049873 778122d249 西海岸 基础设施开发 2022-11-18 18:33:04 +08:00
a0049873 97ddab81b8 BUG修改 2022-11-18 17:05:26 +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 bc73b269a6 政务云修改 2022-11-18 15:54:43 +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 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
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
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