Browse code Merge branch 'toilet' of http://111.198.10.15:12003/gitbucket/git/codedev/baseResourceFront into toilet Conflicts: static/project.config.json toilet
commit a6a93425fafc6e9ad6aa4a009804762dd5e43d8d 2 parents c30dce7 + 44f32bc yangqianqian authored on 14 May 2021

Showing 43 changed files

• src/api/login.js
• src/api/system/statistics.js
• src/api/system/toilet.js
• src/assets/global_images/icon-position.png
• src/assets/global_images/toilet-position.png
• src/assets/global_images/toiletPhoto.png
• src/icons/svg/toilet.svg
• src/layout/components/AppHeader.vue
• src/layout/components/TagsView/index.vue
• src/permission.js
• src/router/index.js
• src/router/modules/bridge.js
• src/router/modules/example.js
• src/router/modules/order.js
• src/router/modules/overview.js
• src/router/modules/toilet.js
• src/router/modules/work.js
• src/store/getters.js
• src/store/modules/app.js
• src/store/modules/permission.js
• src/store/modules/tagsView.js
• src/utils/auth.js
• src/views/alarmManage/components/alarmDetail.vue
• src/views/bridge/components/detail.vue
• src/views/bridge/components/editBridge.vue
• src/views/bridge/guangMing.vue
• src/views/bridge/huangzhou.vue
• src/views/bridge/yongSheng.vue
• src/views/mapViews/choosePointDialog.vue
• src/views/mapViews/mapView.vue
• src/views/overview/lampTabPane.vue
• src/views/overview/overview.vue
• src/views/rule/components/setThresh.vue
• src/views/rule/listRule.vue
• src/views/statistics/barChart.vue
• src/views/statistics/maintainStatistics.vue
• src/views/statistics/pieChart.vue
• src/views/statistics/workStatistics.vue
• src/views/toilet/components/detail.vue
• src/views/toilet/components/editToilet.vue
• src/views/toilet/listToilet.vue
• src/views/toilet/listWork.vue
• static/project.config.json

Ignore Space Show notes View src/api/login.js

Ignore Space Show notes View src/api/system/statistics.js

Ignore Space Show notes View src/api/system/toilet.js 0 → 100644

Ignore Space Show notes View src/assets/global_images/icon-position.png 0 → 100644

Ignore Space Show notes View src/assets/global_images/toilet-position.png 0 → 100644

Ignore Space Show notes View src/assets/global_images/toiletPhoto.png 0 → 100644

Ignore Space Show notes View src/icons/svg/toilet.svg 0 → 100644

Ignore Space Show notes View src/layout/components/AppHeader.vue

Ignore Space Show notes View src/layout/components/TagsView/index.vue

Ignore Space Show notes View src/permission.js

Ignore Space Show notes View src/router/index.js

Show notes View src/router/modules/bridge.js 100644 → 0

Ignore Space Show notes View src/router/modules/example.js

Show notes View src/router/modules/order.js 100644 → 0

Show notes View src/router/modules/overview.js 100644 → 0

Ignore Space Show notes View src/router/modules/toilet.js 0 → 100644

Ignore Space Show notes View src/router/modules/work.js 0 → 100644

Ignore Space Show notes View src/store/getters.js

Ignore Space Show notes View src/store/modules/app.js

Ignore Space Show notes View src/store/modules/permission.js

Ignore Space Show notes View src/store/modules/tagsView.js

Ignore Space Show notes View src/utils/auth.js

Show notes View src/views/alarmManage/components/alarmDetail.vue 100644 → 0

Show notes View src/views/bridge/components/detail.vue 100644 → 0

Show notes View src/views/bridge/components/editBridge.vue 100644 → 0

Show notes View src/views/bridge/guangMing.vue 100644 → 0

Show notes View src/views/bridge/huangzhou.vue 100644 → 0

Show notes View src/views/bridge/yongSheng.vue 100644 → 0

Ignore Space Show notes View src/views/mapViews/choosePointDialog.vue 0 → 100644

Ignore Space Show notes View src/views/mapViews/mapView.vue 0 → 100644

Show notes View src/views/overview/lampTabPane.vue 100644 → 0

Ignore Space Show notes View src/views/overview/overview.vue

Show notes View src/views/rule/components/setThresh.vue 100644 → 0

Ignore Space Show notes View src/views/rule/listRule.vue

Ignore Space Show notes View src/views/statistics/barChart.vue

Show notes View src/views/statistics/maintainStatistics.vue 100644 → 0

Ignore Space Show notes View src/views/statistics/pieChart.vue

Ignore Space Show notes View src/views/statistics/workStatistics.vue 0 → 100644

Ignore Space Show notes View src/views/toilet/components/detail.vue 0 → 100644

Ignore Space Show notes View src/views/toilet/components/editToilet.vue 0 → 100644

Ignore Space Show notes View src/views/toilet/listToilet.vue 0 → 100644

Ignore Space Show notes View src/views/toilet/listWork.vue 0 → 100644

Ignore Space Show notes View static/project.config.json

Show line notes below