01

src/router/index.js

@@ -126,14 +126,14 @@ export const xt_constantRouterMap = [
   // 本地开始
   // /////////////////////////////
   {
-    path:'/sign',
+    path: '/sign',
     component: Layout,
     redirct: '/sign/index',
     children: [{
       path: '/sign',
-      component:() => import('@/xt_pages/sign/index'),
-      name:'sign',
-      meta: {title:'signWeight',icon:'table',noCache:true}
+      component: () => import('@/xt_pages/sign/index'),
+      name: 'sign',
+      meta: { title: 'signWeight', icon: 'table', noCache: true }
     }]
   },
   {
@@ -159,131 +159,11 @@ export const xt_constantRouterMap = [
       { path: '/qcd/pa/person/lapseto', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/lapseto'), name: 'paPersonLapseto', meta: { title: '转归' }},
       { path: '/qcd/pa/person/weight', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/weight'), name: 'paPersonWeight', meta: { title: '体重' }},
       { path: '/qcd/pa/person/bloodpressure', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/bloodPressure'), name: 'paPersonBloodPressure', meta: { title: '血压' }},
-      { path: '/qcd/pa/person/indicators', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/indicators'), name: 'paPersonIndicators', meta: { title: '指标控制' }}
-    ]
-  },
-  {
-<<<<<<< .mine
-    path: 'statistics',
-    component: Layout,
-    redirect: '/statistics/index',
-    children: [{
-      path: '/statistics',
-      component: () => import('@/xt_pages/statistics/index'),
-      name: 'statistics',
-      meta: { title: 'statistics', icon: 'chart', noCache: true }
-    }]
-  },
-  {
-    path: '/sign',
-    component: Layout,
-    redirct: '/sign/index',
-    children: [{
-      path: '/sign',
-      component: () => import('@/xt_pages/sign/index'),
-      name: 'sign',
-      meta: { title: 'signWeight', icon: 'table', noCache: true }
-    }]
-  },
-  {
-    path: '/qcd',
-    component: Layout,
-    redirect: '/qcd/dialysistotal',
-    name: 'qcd',
-    alwaysShow: true,
-    meta: { title: '科室质控', icon: 'table' },
-    children: [
-      { path: '/qcd/dialysistotal', component: () => import('@/xt_pages/qcd/dialysisTotal'), name: 'dialysistotal', meta: { title: '透析总量' }},
-      { path: '/qcd/processindicators', component: () => import('@/xt_pages/qcd/processIndicators'), name: 'processIndicators', meta: { title: '过程指标' }},
-      {
-        path: '/qcd/outcomeIndicators',
-        name: 'outcomeIndicators',
-        meta: { title: '结果指标' },
-        redirect: '/qcd/outcomeIndicators/control',
-        component: () => import('@/xt_pages/qcd/outcomeIndicators/parent'), // Parent router-view
-        children: [
-          { path: '/qcd/outcomeIndicators/control', component: () => import('@/xt_pages/qcd/outcomeIndicators/control'), name: 'outcomeIndicatorsControl', meta: { title: '指标控制' }},
-          { path: '/qcd/outcomeIndicators/query', component: () => import('@/xt_pages/qcd/outcomeIndicators/query'), name: 'outcomeIndicatorsQuery', meta: { title: '指标查询' }}
-        ]
-      },
-      {
-        path: '/qcd/patientanalysis',
-        name: 'patientanalysis',
-        meta: { title: '患者分析' },
-        redirect: '/qcd/patientanalysis/total',
-        component: () => import('@/xt_pages/qcd/patientAnalysis/parent'), // Parent router-view
-        children: [
-          { path: '/qcd/patientanalysis/total', component: () => import('@/xt_pages/qcd/patientAnalysis/total'), name: 'patientAnalysisTotal', meta: { title: '总量分析' }},
-          { path: '/qcd/patientanalysis/weight', component: () => import('@/xt_pages/qcd/patientAnalysis/weight'), name: 'patientAnalysisWeight', meta: { title: '体重分析' }},
-          { path: '/qcd/patientanalysis/bloodpressure', component: () => import('@/xt_pages/qcd/patientAnalysis/bloodPressure'), name: 'patientAnalysisBloodPressure', meta: { title: '血压分析' }},
-          { path: '/qcd/patientanalysis/dialysisage', component: () => import('@/xt_pages/qcd/patientAnalysis/dialysisAge'), name: 'patientAnalysisDialysisAge', meta: { title: '透析龄分析' }},
-          { path: '/qcd/patientanalysis/lapseto', component: () => import('@/xt_pages/qcd/patientAnalysis/lapseto'), name: 'patientAnalysisLapseto', meta: { title: '转归分析' }}
-        ]
-      }
+      { path: '/qcd/pa/person/indicators', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/indicators'), name: 'paPersonIndicators', meta: { title: '指标控制' }},
+      { path: '/qcd/pa/person/oralmedicine', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/oralMedicine'), name: 'paPersonOralMedicine', meta: { title: '口服药' }}
     ]
   },
   {
-=======
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> .theirs
     path: '/patients',
     component: Layout,
     redirect: 'noredirect',
@@ -563,7 +443,7 @@ export const xt_constantRouterMap = [
         component: () => import('@/xt_pages/stock/stockQuery'),
         name: 'stockQuery',
         meta: { title: 'stockQuery' }
-      },{
+      }, {
         path: '/stock/detail',
         component: () => import('@/xt_pages/stock/stockDetailIndex'),
         name: 'stockDetail',
@@ -962,6 +842,11 @@ export const xt_asyncRouterMap = [
   //       name: 'stockQuery',
   //       meta: { title: 'stockQuery' }
   //     }, {
+  //       path: '/stock/detail',
+  //       component: () => import('@/xt_pages/stock/stockDetailIndex'),
+  //       name: 'stockDetail',
+  //       meta: { title: 'stockDetail' }
+  //     },{
   //       path: '/stock/in/add',
   //       component: () => import('@/xt_pages/stock/stockInOrderAdd'),
   //       name: 'stockInOrderAdd',
@@ -1052,7 +937,7 @@ export const xt_asyncRouterMap = [
   //   alwaysShow: true,
   //   meta: { title: '科室质控', icon: 'table' },
   //   children: [
-  //     { path: '/statistics/index', component: () => import('@/xt_pages/statistics/index'), name: 'dialysistotal', meta: { title: 'statistics' }},
+  //     { path: '/statistics/index', component: () => import('@/xt_pages/statistics/index'), name: 'statistics', meta: { title: 'statistics' }},
   //     { path: '/qcd/dialysistotal', component: () => import('@/xt_pages/qcd/dialysisTotal'), name: 'dialysistotal', meta: { title: '透析总量' }},
   //     { path: '/qcd/processindicators', component: () => import('@/xt_pages/qcd/processIndicators'), name: 'processIndicators', meta: { title: '过程指标' }},
   //     { path: '/qcd/outcomeIndicators/control', component: () => import('@/xt_pages/qcd/outcomeIndicators/control'), name: 'outcomeIndicatorsControl', meta: { title: '结果指标' }},
@@ -1065,6 +950,9 @@ export const xt_asyncRouterMap = [
   //     { path: '/qcd/patientanalysis/complication', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/complication'), name: 'patientAnalysisComplication', meta: { title: '并发症分析' }},
   //     { path: '/qcd/patientanalysis/infectiousdiseases', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/infectiousDiseases'), name: 'patientAnalysisInfectiousDiseases', meta: { title: '传染病分析' }},
   //     { path: '/qcd/pa/person/lapseto', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/lapseto'), name: 'paPersonLapseto', meta: { title: '转归' }},
+  //     { path: '/qcd/pa/person/weight', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/weight'), name: 'paPersonWeight', meta: { title: '体重' }},
+  //     { path: '/qcd/pa/person/bloodpressure', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/bloodPressure'), name: 'paPersonBloodPressure', meta: { title: '血压' }},
+  //     { path: '/qcd/pa/person/indicators', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/indicators'), name: 'paPersonIndicators', meta: { title: '指标控制' }},
   //   ]
   // },
   // /////////////////////////////////////线在end

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -77,21 +77,12 @@
         </div>
       </div>
 
-<<<<<<< .mine
     <el-table
       :data="SchedualPatientsTableData"
       style="width: 100%"
       v-loading="loading"
       @current-change="clickCurrent"
       :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
-=======
-      <el-table
-        :data="SchedualPatientsTableData"
-        style="width: 100%"
-        v-loading="loading"
-        @current-change="clickCurrent"
-        @selection-change="handleSelectionChange"
->>>>>>> .theirs
       >
         <el-table-column type="selection" width="45" align="center"></el-table-column>
         <el-table-column prop="number" label="机号" align="center"></el-table-column>