Browse code Merge branch 'toilet' of http://111.198.10.15:12003/gitbucket/git/codedev/baseResourceFront into toilet Conflicts: static/project.config.json toilet
1 parent a6a9342 commit 3d1365325fd8ff39ec16beb63ebe5c05d9742ce6 yangqianqian authored on 27 May 2021

Showing 20 changed files

• package.json
• src/api/system/bridge.js
• src/api/system/order.js
• src/main.js
• src/router/index.js
• src/router/modules/rule.js
• src/router/modules/statistics.js
• src/router/modules/toilet.js
• src/router/modules/work.js
• src/views/mapViews/mapView.vue
• src/views/overview/overview.vue
• src/views/rule/listRule.vue
• src/views/statistics/barChart.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 package.json

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

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

Ignore Space Show notes View src/main.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Show line notes below