群防群控前端备份
parent: 7ae541 | patch | commitdiff
liuyg
2021-08-10 17bed3a7f7e90b23afb5def223fd7a285ff6cc24
refs
author liuyg <376836862@qq.com>
Tuesday, August 10, 2021 08:40 +0800
committer liuyg <376836862@qq.com>
Tuesday, August 10, 2021 08:40 +0800
commit17bed3a7f7e90b23afb5def223fd7a285ff6cc24
tree 823e85a619120caca1db660978d12b597ce2191a tree | zip | gz
parent 7ae54152f328d08a3d95bc3313113ca476964165 view | diff
ee4e0076832e55cf23b41bdf0426e11e26bb8a5c view | diff 
冲突
30 files modified
2 files renamed
407 ■■■■■ changed files
public/map/popup/js/clientPopup.js 4 ●●●●● diff | view | raw | blame | history
public/map/popup/js/equipment-details.js 2 ●●●●● diff | view | raw | blame | history
public/map/popup/js/equipment-history.js 2 ●●●●● diff | view | raw | blame | history
public/map/popup/js/owner-details.js 2 ●●●●● diff | view | raw | blame | history
public/map/popup/js/personnel-information-management.js 2 ●●●●● diff | view | raw | blame | history
public/map/popup/js/police-details.js 2 ●●●●● diff | view | raw | blame | history
public/map/popup/js/realtime-equipment-history.js 2 ●●●●● diff | view | raw | blame | history
public/map/popup/js/realtime-police-details.js 8 ●●●●● diff | view | raw | blame | history
public/map/popup/js/route-name-layer.js 2 ●●●●● diff | view | raw | blame | history
public/map/popup/js/routename-and-peoplename.js 2 ●●●●● diff | view | raw | blame | history
public/map/widgets/aPoliceTeam/APoliceTeam.js 38 ●●●●● diff | view | raw | blame | history
public/map/widgets/alertSecurity/AlertSecurity.js 4 ●●●●● diff | view | raw | blame | history
public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js 12 ●●●●● diff | view | raw | blame | history
public/map/widgets/patrolManagement/PatrolManagement.js 40 ●●●●● diff | view | raw | blame | history
public/map/widgets/patrolManagement/PatrolManagement01.js 40 ●●●●● diff | view | raw | blame | history
public/map/widgets/patrolManagement/PatrolManagement_copy.js 38 ●●●●● diff | view | raw | blame | history
public/map/widgets/patrolManagement/template_copy.html diff | view | raw | blame | history
public/map/widgets/policeDispatching/PoliceDispatching.js 36 ●●●●● diff | view | raw | blame | history
public/map/widgets/realTimePolice/RealTimePolice.js 14 ●●●●● diff | view | raw | blame | history
public/map/widgets/securityMap/SecurityMap.js 2 ●●●●● diff | view | raw | blame | history
public/map/widgets/securityMap/SecurityMap_copy1.js 2 ●●●●● diff | view | raw | blame | history
src/api/alarm/alarm.js 1 ●●●●● diff | view | raw | blame | history
src/api/zc/zc.js 2 ●●●●● diff | view | raw | blame | history
src/router/views/index.js 28 ●●●●● diff | view | raw | blame | history
src/styles/element-ui.scss 9 ●●●●● diff | view | raw | blame | history
src/views/feedbackReport/feedbackReport.vue 3 ●●●●● diff | view | raw | blame | history
src/views/realTimePolice/real.vue 1 ●●●●● diff | view | raw | blame | history
src/views/system/dept.vue 2 ●●●●● diff | view | raw | blame | history
src/views/system/menu.vue 2 ●●●●● diff | view | raw | blame | history
src/views/system/user.vue 3 ●●●●● diff | view | raw | blame | history
src/views/zc/zc.vue 97 ●●●●● diff | view | raw | blame | history
vue.config.js 5 ●●●●● diff | view | raw | blame | history