Merge branch 'fanxing' of http://192.168.9.26/platform/fanxing_new into fanxing
# Conflicts: # src/api/apiList.js # src/router/index.js # src/views/Show.vue
Showing
20 changed files
with
2472 additions
and
23 deletions
src/components/video.vue
0 → 100644
src/views/search/event.vue
0 → 100644
src/views/search/illegal.vue
0 → 100644
src/views/search/pedestrian.vue
0 → 100644
src/views/search/publicFlow.vue
0 → 100644
src/views/search/traficflow.vue
0 → 100644
-
Please register or sign in to post a comment