Browse code Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/router/index.js dev
commit ecadcb0e64d2a7ece52defacc5a51b81f4d941ef 2 parents a8f3378 + a0cdfba StephanieGitHub authored on 29 Oct 2019

Showing 23 changed files

• .gitignore
• config/prod.env.js
• src/api/busAdmin/caseType.js
• src/api/busAdmin/timeLimit.js
• src/api/coorBusiness/case.js
• src/api/coorBusiness/dict.js
• src/components/CaseCommon/caseDetail.vue
• src/components/CaseCommon/radioMap.js
• src/router/index.js
• src/router/modules/bms.js
• src/views/busAdmin/CaseQuery/caseList.vue
• src/views/busAdmin/DictAdmin/dictList.vue
• src/views/busAdmin/TimeLimit/detailTimeLimit.vue
• src/views/busAdmin/TimeLimit/editTimeLimit.vue
• src/views/busAdmin/TimeLimit/listTimeLimit.vue
• src/views/busAdmin/areaAdmin/areaAdminList.vue
• src/views/busAdmin/caseType/detailCaseType.vue
• src/views/busAdmin/caseType/editCaseType.vue
• src/views/busAdmin/caseType/listCaseType.vue
• src/views/coorBusiness/delayed/index.vue
• src/views/coorBusiness/postponed/index.vue
• src/views/coorBusiness/secIsDelay/index.vue
• src/views/coorBusiness/secIsPostpone/index.vue

Ignore Space Show notes View .gitignore

Ignore Space Show notes View config/prod.env.js

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

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

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

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

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

Ignore Space Show notes View src/components/CaseCommon/radioMap.js

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/views/coorBusiness/delayed/index.vue

Ignore Space Show notes View src/views/coorBusiness/postponed/index.vue

Ignore Space Show notes View src/views/coorBusiness/secIsDelay/index.vue

Ignore Space Show notes View src/views/coorBusiness/secIsPostpone/index.vue

Show line notes below