 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 |
|
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 |
|
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 |