Browse code Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/caseCommon/caseDetailRead.vue dev
commit d3c705c6c478670414dfd373bbd4eff5bd134b05 2 parents 59ca49d + 8078144 StephanieGitHub authored on 7 Nov 2019

Showing 18 changed files

• src/api/busAdmin/areaPersonliable.js
• src/api/callCase/callCase.js
• src/api/coorBusiness/case.js
• src/components/CaseCommon/caseDetail.vue
• src/components/CaseCommon/caseDetailRead.vue
• src/components/Map/ArcGISConfig.js
• src/components/Map/arcgisMap.vue
• src/components/Map/arcgisMapRead.vue
• src/router/index.js
• src/router/modules/suphandle.js
• src/router/modules/system.js
• src/views/busAdmin/areaPersonliable/areaPersonliable.vue
• src/views/busAdmin/areaPersonliable/areaSelectTree.vue
• src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue
• src/views/callCase/callCase.vue
• src/views/caseCommon/caseDetailSupervise.vue
• src/views/otherComment/highFreq/highFreqChart.vue
• src/views/supervise/components/caseDetailSupervise.vue

Ignore Space Show notes View src/api/busAdmin/areaPersonliable.js 0 → 100644

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

Ignore Space Show notes View src/api/coorBusiness/case.js

Ignore Space Show notes View src/components/CaseCommon/caseDetail.vue

Ignore Space Show notes View src/components/CaseCommon/caseDetailRead.vue

Ignore Space Show notes View src/components/Map/ArcGISConfig.js

Ignore Space Show notes View src/components/Map/arcgisMap.vue

Ignore Space Show notes View src/components/Map/arcgisMapRead.vue 0 → 100644

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

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

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

Ignore Space Show notes View src/views/busAdmin/areaPersonliable/areaPersonliable.vue 0 → 100644

Ignore Space Show notes View src/views/busAdmin/areaPersonliable/areaSelectTree.vue 0 → 100644

Ignore Space Show notes View src/views/busAdmin/areaPersonliable/editAreaPersonliable.vue 0 → 100644

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

Ignore Space Show notes View src/views/caseCommon/caseDetailSupervise.vue

Ignore Space Show notes View src/views/otherComment/highFreq/highFreqChart.vue

Ignore Space Show notes View src/views/supervise/components/caseDetailSupervise.vue

Show line notes below