冲突解决

src/routes.js

@@ -173,7 +173,6 @@ import Nursing from '@components/cdssManage/nursing/nursing.vue';  //护理关
 import AddNursing from '@components/cdssManage/nursing/Addnursing.vue';  //护理关联维护--添加关联
 import Drugroute from '@components/cdssManage/drugroute/Drugroute.vue';  //给药途径关联维护
 import AddDrugroute from '@components/cdssManage/drugroute/AddDrugroute.vue';  //给药途径关联维护--添加关联
-import Hemp from '@components/cdssManage/hemp/Hemp.vue'; //麻醉关联维护
 import Tcmdisease from '@components/cdssManage/tcmdisease/tcmdisease.vue';  //中医疾病关联维护
 import AddTcmdisease from '@components/cdssManage/tcmdisease/Addtcmdisease.vue';  //中医疾病关联维护--添加关联
 import Tcmdrome from '@components/cdssManage/tcmdrome/tcmdrome.vue';  //中医疾病关联维护
@@ -521,7 +520,6 @@ export default [
             { path: 'LT-HLGLWH-TJHYDXXYGBXDY', component: AddNursing, name: 'AddNursing' }, //护理关联维护--添加关联
 			{ path: 'YXSYK-GYTJGLWH', component: Drugroute, name: 'Drugroute' }, //给药途径关联维护
 			{ path: 'LT-GYTJGLWH-TJHYDXXYGBXDY', component: AddDrugroute, name: 'AddDrugroute' }, //给药途径关联维护--添加关联
-			{ path: 'YXSYK-HEMP', component: Hemp, name: 'Hemp' }, //麻醉关联维护
             { path: 'YXSYK-ZYJBGLWH', component: Tcmdisease, name: 'Tcmdisease' }, //中医疾病关联维护
             { path: 'LT-ZYJBGLWH-TJHYDXXYGBXDY', component: AddTcmdisease, name: 'AddTcmdisease' }, //中医疾病关联维护
             { path: 'YXSYK-ZYZHGLWH', component: Tcmdrome, name: 'Tcmdrome' }, //中医疾病关联维护