Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

package-lock.json

@@ -2014,6 +2014,12 @@
       "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
       "dev": true
     },
+    "ci-info": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+      "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
+      "dev": true
+    },
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -5931,6 +5937,17 @@
       "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
       "dev": true
     },
+    "husky": {
+      "version": "0.14.3",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-0.14.3.tgz",
+      "integrity": "sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==",
+      "dev": true,
+      "requires": {
+        "is-ci": "^1.0.10",
+        "normalize-path": "^1.0.0",
+        "strip-indent": "^2.0.0"
+      }
+    },
     "iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -6192,6 +6209,15 @@
       "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
       "dev": true
     },
+    "is-ci": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+      "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
+      "dev": true,
+      "requires": {
+        "ci-info": "^1.5.0"
+      }
+    },
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -7785,6 +7811,12 @@
         "validate-npm-package-license": "^3.0.1"
       }
     },
+    "normalize-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz",
+      "integrity": "sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=",
+      "dev": true
+    },
     "normalize-range": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
@@ -12992,6 +13024,12 @@
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
     },
+    "strip-indent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+      "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+      "dev": true
+    },
     "strip-json-comments": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",

package.json

@@ -94,6 +94,7 @@
     "file-loader": "1.1.5",
     "friendly-errors-webpack-plugin": "1.6.1",
     "html-webpack-plugin": "2.30.1",
+    "husky": "0.14.3",
     "lint-staged": "7.2.0",
     "node-notifier": "5.1.2",
     "node-sass": "^4.7.2",

src/api/patient.js

@@ -1,236 +1,246 @@
 import request from '@/utils/request'
 
-export function fetchList(params){
-    return request({
-        url:'/api/patients',
-        method:'get',
-        params:params
-    })
+export function fetchList(params) {
+  return request({
+    url: '/api/patients',
+    method: 'get',
+    params: params
+  })
 }
 
-export function fetchAllList(){
-    return request({
-        url:'/api/patients/all',
-        method:'get',
-    })
+export function fetchAllList() {
+  return request({
+    url: '/api/patients/all',
+    method: 'get'
+  })
 }
-export function GetPatientTotal(){
-    return request({
-        url:'/api/patients/total',
-        method:'get',
-    })
+export function GetPatientTotal() {
+  return request({
+    url: '/api/patients/total',
+    method: 'get'
+  })
 }
 
 export function generateDialysisNo() {
-    return request({
-        url:'/api/patients/generatedialysisno',
-        method:'get'
-    })
+  return request({
+    url: '/api/patients/generatedialysisno',
+    method: 'get'
+  })
 }
 
 export function createPatient(patient) {
-    return request({
-        url:'/api/patients/create',
-        method:'post',
-        data:patient,
-    })
-}
-export function editPatient(id,patient) {
-    return request({
-        url:'/api/patients/edit?id='+id,
-        method:'put',
-        data:patient,
-    })
+  return request({
+    url: '/api/patients/create',
+    method: 'post',
+    data: patient
+  })
+}
+export function editPatient(id, patient) {
+  return request({
+    url: '/api/patients/edit?id=' + id,
+    method: 'put',
+    data: patient
+  })
 }
 export function fetchPatient(id) {
-    return request({
-        url:'/api/patients/get?id='+id,
-        method:'get',
-    })
+  return request({
+    url: '/api/patients/get?id=' + id,
+    method: 'get'
+  })
 }
 
-
-export function fetchPatientDialysisSolutions(params){
-    return request({
-        url:'/api/patients/dialysissolutions',
-        method:'Get',
-        params:params,
-    })
+export function fetchPatientDialysisSolutions(params) {
+  return request({
+    url: '/api/patients/dialysissolutions',
+    method: 'Get',
+    params: params
+  })
 }
 
-export function createPatientDialysisSolution(id,solution){
-    return request({
-        url:'/api/patients/dialysissolution/create?patient='+id,
-        method:'post',
-        data:solution,
-    })
+export function createPatientDialysisSolution(id, solution) {
+  return request({
+    url: '/api/patients/dialysissolution/create?patient=' + id,
+    method: 'post',
+    data: solution
+  })
 }
 
-export function editPatientDialysisSolution(patient, id,solution){
-    return request({
-        url:'/api/patients/dialysissolution/edit?patient='+patient + '&id='+id,
-        method:'put',
-        data:solution,
-    })
+export function editPatientDialysisSolution(patient, id, solution) {
+  return request({
+    url: '/api/patients/dialysissolution/edit?patient=' + patient + '&id=' + id,
+    method: 'put',
+    data: solution
+  })
 }
 
-export function createChildPatientDialysisSolution(id,solution){
-    return request({
-        url:'/api/patients/dialysissolution/child/create?patient='+id,
-        method:'post',
-        data:solution,
-    })
+export function createChildPatientDialysisSolution(id, solution) {
+  return request({
+    url: '/api/patients/dialysissolution/child/create?patient=' + id,
+    method: 'post',
+    data: solution
+  })
 }
 
-
-export function editChildPatientDialysisSolution(patient, id, solution){
-    return request({
-        url:'/api/patients/dialysissolution/child/edit?patient='+patient + '&id='+id,
-        method:'put',
-        data:solution,
-    })
+export function editChildPatientDialysisSolution(patient, id, solution) {
+  return request({
+    url: '/api/patients/dialysissolution/child/edit?patient=' + patient + '&id=' + id,
+    method: 'put',
+    data: solution
+  })
 }
 
-export function editDialysisSolutionDetail(patient, id, solution){
-    return request({
-        url:'/api/patients/dialysissolution/detail/edit?patient='+patient + '&id='+id,
-        method:'put',
-        data:solution,
-    })
+export function editDialysisSolutionDetail(patient, id, solution) {
+  return request({
+    url: '/api/patients/dialysissolution/detail/edit?patient=' + patient + '&id=' + id,
+    method: 'put',
+    data: solution
+  })
 }
 
-
-export function deleteDialysisSolution(id){
-    return request({
-        url:'/api/patients/dialysissolution/delete?id='+id,
-        method:'delete',
-    })
+export function deleteDialysisSolution(id) {
+  return request({
+    url: '/api/patients/dialysissolution/delete?id=' + id,
+    method: 'delete'
+  })
 }
 
-export function createDryWeight(patient, weight){
-    return request({
-        url:'/api/patients/dryweight/create?id='+patient,
-        method:'post',
-        data:weight,
-    })
+export function createDryWeight(patient, weight) {
+  return request({
+    url: '/api/patients/dryweight/create?id=' + patient,
+    method: 'post',
+    data: weight
+  })
 }
 
-export function getDryWeights(params){
-    return request({
-        url:'/api/patients/dryweight/get',
-        method:'get',
-        params:params
-    })
+export function getDryWeights(params) {
+  return request({
+    url: '/api/patients/dryweight/get',
+    method: 'get',
+    params: params
+  })
 }
 
 export function getPatientDialysisRecords(params) {
-    return request({
-        url:'/api/patients/dialysisrecords',
-        method:'get',
-        params:params
-    })
+  return request({
+    url: '/api/patients/dialysisrecords',
+    method: 'get',
+    params: params
+  })
 }
 export function getPatientProEducation(params) {
-    return request({
-        url:'/api/patients/proeducation',
-        method:'get',
-        params:params
-    })
+  return request({
+    url: '/api/patients/proeducation',
+    method: 'get',
+    params: params
+  })
 }
 
 export function getCourseOfDiseaseRecords(patient_id, start_time_ymd, end_time_ymd) {
-    var params = {
-        patient_id: patient_id,
-        start_time: start_time_ymd,
-        end_time: end_time_ymd,
-    }
-    return request({
-        url: '/api/patient/courses',
-        method: 'get',
-        params: params,
-    })
+  var params = {
+    patient_id: patient_id,
+    start_time: start_time_ymd,
+    end_time: end_time_ymd
+  }
+  return request({
+    url: '/api/patient/courses',
+    method: 'get',
+    params: params
+  })
 }
 
 export function createCourseOfDiseaseRecord(patient_id, content) {
-    var params = {
-        patient_id: patient_id,
-        content: content,
-    }
-    return request({
-        url: '/api/patient/course/create',
-        method: 'post',
-        params: params,
-    })
+  var params = {
+    patient_id: patient_id,
+    content: content
+  }
+  return request({
+    url: '/api/patient/course/create',
+    method: 'post',
+    params: params
+  })
 }
 
 export function getRescueRecords(patient_id, start_time_ymd, end_time_ymd) {
-    var params = {
-        patient_id: patient_id,
-        start_time: start_time_ymd,
-        end_time: end_time_ymd,
-    }
-    return request({
-        url: '/api/patient/rescues',
-        method: 'get',
-        params: params,
-    })
+  var params = {
+    patient_id: patient_id,
+    start_time: start_time_ymd,
+    end_time: end_time_ymd
+  }
+  return request({
+    url: '/api/patient/rescues',
+    method: 'get',
+    params: params
+  })
 }
 
 export function createRescueRecord(patient_id, content) {
-    var params = {
-        patient_id: patient_id,
-        content: content,
-    }
-    return request({
-        url: '/api/patient/rescue/create',
-        method: 'post',
-        params: params,
-    })
+  var params = {
+    patient_id: patient_id,
+    content: content
+  }
+  return request({
+    url: '/api/patient/rescue/create',
+    method: 'post',
+    params: params
+  })
 }
 
 export function deleteCourseOfDiseaseRecords(patient_id, ids_str) {
-    var params = {
-        patient_id: patient_id,
-        ids: ids_str,
-    }
-    return request({
-        url: '/api/patient/course/delete',
-        method: 'post',
-        params: params,
-    })
+  var params = {
+    patient_id: patient_id,
+    ids: ids_str
+  }
+  return request({
+    url: '/api/patient/course/delete',
+    method: 'post',
+    params: params
+  })
 }
 
 export function deleteRescueRecords(patient_id, ids_str) {
-    var params = {
-        patient_id: patient_id,
-        ids: ids_str,
-    }
-    return request({
-        url: '/api/patient/rescue/delete',
-        method: 'post',
-        params: params,
-    })
+  var params = {
+    patient_id: patient_id,
+    ids: ids_str
+  }
+  return request({
+    url: '/api/patient/rescue/delete',
+    method: 'post',
+    params: params
+  })
 }
 
 export function EditLapseto(patient_id, data) {
-    return request({
-        url: '/api/patients/lapseto/edit?id='+patient_id,
-        method: 'post',
-        data: data,
-    })
-    
+  return request({
+    url: '/api/patients/lapseto/edit?id=' + patient_id,
+    method: 'post',
+    data: data
+  })
 }
 
-
-
-
-
 export function PostSearch(keyword) {
   return request({
-    url: '/api/patients/search?keyword='+keyword,
-    method: 'post',
+    url: '/api/patients/search?keyword=' + keyword,
+    method: 'post'
 
   })
+}
 
+export function OpenView(id) {
+  return request({
+    url: '/api/patients/querypatientbyId',
+    method: 'Get',
+    params: {
+      id: id
+    }
+  })
 }
 
+export function code(id) {
+  return request({
+    url: '/api/patients/codebyId',
+    method: 'Get',
+    params: {
+      id: id
+    }
+  })
+}

src/api/qcd.js

@@ -41,4 +41,4 @@ export function GetPADialysisAgeData(params) {
     method: 'get',
     params: params
   })
-}
+}

src/api/signandweigh.js

@@ -1,26 +1,62 @@
-import request from '@/utils/request';
+import request from '@/utils/request'
 
-export function fetchSignPatients(params){
-    return request({
-        url:'/api/sign/patients',
-        method:'get',
-        params:params,
-    })
+export function fetchSignPatients(params) {
+  return request({
+    url: '/api/sign/patients',
+    method: 'get',
+    params: params
+  })
 }
 
-export function getPatientSign(params){
-    return request({
-        url:'/api/sign/patientsign',
-        method:'get',
-        params:params,
-    })
+export function getPatientSign(params) {
+  return request({
+    url: '/api/sign/patientsign',
+    method: 'get',
+    params: params
+  })
 }
 
 export function SignWeigh(params, data) {
-    return request({
-        url:'/api/signweign',
-        params: params,
-        data: data,
-        method:"Post",
-    })
-}
+  return request({
+    url: '/api/signweign',
+    params: params,
+    data: data,
+    method: 'Post'
+  })
+}
+
+export function getDialysisInforInfomation(id) {
+  return request({
+    url: '/api/sign/getDialysisInforInfomation',
+    method: 'Get',
+    params: {
+      patient_id: id
+    }
+  })
+}
+
+export function getDialysisAfterInfomation(id) {
+  return request({
+    url: '/api/sign/getDialysisAfterInfomation',
+    method: 'Get',
+    params: {
+      patient_id: id
+    }
+  })
+}
+
+export function createdata(params) {
+  return request({
+    url: '/api/sign/savaData',
+    method: 'Post',
+    params: params
+  })
+}
+
+export function editdata(params) {
+  return request({
+    url: '/api/sign/editdata',
+    method: 'Post',
+    params: params
+  })
+}

src/main.js

@@ -13,7 +13,7 @@ import '@/assets/icon/iconfont.css'
 import App from './App'
 import router from './router'
 import store from './store'
-
+import { Base64 } from 'js-base64'
 import i18n from './lang' // Internationalization
 import './icons' // icon
 import './errorLog'// error log
@@ -42,3 +42,5 @@ new Vue({
   i18n,
   render: h => h(App)
 })
+
+Vue.prototype.Base64 = require('js-base64').Base64

src/router/index.js

@@ -769,94 +769,123 @@ export const xt_asyncRouterMap = [
   //     { path: '/device/numbers', component: () => import('@/xt_pages/device/number_main'), name: 'deviceNumberManage', meta: { title: 'deviceNumberManage' }},
   //     { path: '/device/main', component: () => import('@/xt_pages/device/main'), name: 'dialysisMachineManage', meta: { title: 'dialysisMachineManage' }}
   //   ]
-  // },{
+  // }, {
   //   path: '/stock/',
   //   component: Layout,
   //   redirect: 'noredirect',
   //   name: 'stockManage',
-  //   meta: {title: 'stockManage', icon: 'nested'},
+  //   meta: { title: 'stockManage', icon: 'excel' },
   //   children: [
   //     {
+  //       path: '/stock/config',
+  //       component: () => import('@/xt_pages/stock/index'),
+  //       name: 'config',
+  //       meta: { title: 'config' }
+  //     },
+  //     {
   //       path: '/stock/in',
-  //       component: () => import('@/xt_pages/stock/stockIn'),
-  //       name: 'stockIn',
-  //       meta: {title: 'stockIn',noCache: true }
-
+  //       component: () => import('@/xt_pages/stock/stockInOrder'),
+  //       name: 'stockInOrder',
+  //       meta: { title: 'stockInOrder', noCache: true }
+  //     }, {
+  //       path: '/stock/in/other',
+  //       component: () => import('@/xt_pages/stock/otherStockInOrder'),
+  //       name: 'otherStockInOrder',
+  //       meta: { title: 'otherStockInOrder', noCache: true }
+  //     }, {
+  //       path: '/stock/return',
+  //       component: () => import('@/xt_pages/stock/salesReturnOrder'),
+  //       name: 'salesReturnOrder',
+  //       meta: { title: 'salesReturnOrder', noCache: true }
+  //     }, {
+  //       path: '/stock/return/other',
+  //       component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
+  //       name: 'otherSalesReturnOrder',
+  //       meta: { title: 'otherSalesReturnOrder', noCache: true }
   //     },
-
-  //      {
+  //     {
   //       path: '/stock/out',
-  //       component: () => import('@/xt_pages/stock/stockOut'),
-  //       name: 'stockOut',
-  //       meta: {title: 'stockOut',noCache: true}
-  //     },{
+  //       component: () => import('@/xt_pages/stock/stockOutOrder'),
+  //       name: 'stockOutOrder',
+  //       meta: { title: 'stockOutOrder', noCache: true }
+  //     }, {
+  //       path: '/stock/out/other',
+  //       component: () => import('@/xt_pages/stock/otherStockOutOrder'),
+  //       name: 'otherStockOutOrder',
+  //       meta: { title: 'otherStockOutOrder', noCache: true }
+  //     }, {
+  //       path: '/stock/cancel',
+  //       component: () => import('@/xt_pages/stock/cancelStockOrder'),
+  //       name: 'cancelStockOrder',
+  //       meta: { title: 'cancelStockOrder', noCache: true }
+  //     }, {
+  //       path: '/stock/cancel/other',
+  //       component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
+  //       name: 'otherCancelStockOrder',
+  //       meta: { title: 'otherCancelStockOrder', noCache: true }
+  //     }, {
   //       path: '/stock/query',
   //       component: () => import('@/xt_pages/stock/stockQuery'),
   //       name: 'stockQuery',
-  //       meta: {title: 'stockQuery',noCache: true}
-  //     },
-  //     {
-  //       path: '/stock/config',
-  //       component: () => import('@/xt_pages/stock/index'),
-  //       name: 'config',
-  //       meta: {title: 'config'},
-  //     },{
+  //       meta: { title: 'stockQuery' }
+  //     }, {
   //       path: '/stock/in/add',
-  //       component: () => import('@/xt_pages/stock/addStockIn'),
-  //       name: 'addStockIn',
+  //       component: () => import('@/xt_pages/stock/stockInOrderAdd'),
+  //       name: 'stockInOrderAdd',
   //       hidden: true,
   //       is_menu: false,
-  //       meta: {title: 'addStockIn',noCache: true}
+  //       meta: { title: 'stockInOrderAdd' }
   //     }, {
-  //       path: '/stock/out/add',
-  //       component: () => import('@/xt_pages/stock/addStockOut'),
-  //       name: 'addStockOut',
+  //       path: '/stock/in/detail',
+  //       component: () => import('@/xt_pages/stock/stockInDetail'),
+  //       name: 'stockInDetail',
   //       hidden: true,
   //       is_menu: false,
-  //       meta: {title: 'addStockOut',noCache: true }
-  //     },{
-  //       path: '/stock/return',
-  //       component: () => import('@/xt_pages/stock/salesReturn'),
-  //       name: 'salesReturn',
+  //       meta: { title: 'stockInDetail' }
+  //     }, {
+  //       path: '/stock/return/detail',
+  //       component: () => import('@/xt_pages/stock/salesReturnDetail'),
+  //       name: 'salesReturnDetail',
   //       hidden: true,
   //       is_menu: false,
-  //       meta: {title: 'salesReturn'}
-  //     },{
-  //       path: '/stock/return/record',
-  //       component: () => import('@/xt_pages/stock/salesReutrnRecord'),
-  //       name: 'salesReutrnRecord',
+  //       meta: { title: 'salesReturnDetail' }
+  //     }, {
+  //       path: '/stock/return/add',
+  //       component: () => import('@/xt_pages/stock/salesReturnOrderAdd'),
+  //       name: 'salesReturnOrderAdd',
   //       hidden: true,
   //       is_menu: false,
-  //       meta: {title: 'salesReutrnRecord'}
-  //     },{
-  //       path: '/stock/warehouse/record',
-  //       component: () => import('@/xt_pages/stock/warehouseRecord'),
-  //       name: 'warehouseRecord',
+  //       meta: { title: 'salesReturnOrderAdd' }
+  //     }, {
+  //       path: '/stock/out/add',
+  //       component: () => import('@/xt_pages/stock/stockOutOrderAdd'),
+  //       name: 'stockOutOrderAdd',
   //       hidden: true,
   //       is_menu: false,
-  //       meta: {title: 'warehouseRecord'}
-  //     },{
-  //       path: '/stock/cancel/',
-  //       component: () => import('@/xt_pages/stock/cancelStock'),
-  //       name: 'cancelStock',
+  //       meta: { title: 'stockOutOrderAdd', noCache: true }
+  //     }, {
+  //       path: '/stock/out/detail',
+  //       component: () => import('@/xt_pages/stock/stockOutDetail'),
+  //       name: 'stockOutDetail',
   //       hidden: true,
   //       is_menu: false,
-  //       meta: {title: 'cancelStock'}
+  //       meta: { title: 'stockOutDetail', noCache: true }
   //     }, {
-  //       path: '/stock/cancel/record',
-  //       component: () => import('@/xt_pages/stock/cancelStockRecord'),
-  //       name: 'cancelStockRecord',
+  //       path: '/stock/cancel/add',
+  //       component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
+  //       name: 'cancelStockOrderAdd',
   //       hidden: true,
   //       is_menu: false,
-  //       meta: {title: 'cancelStockRecord'}
+  //       meta: { title: 'cancelStockOrderAdd', noCache: true }
   //     }, {
-  //       path: '/stock/out/record',
-  //       component: () => import('@/xt_pages/stock/stockOutRecord'),
-  //       name: 'stockOutRecord',
+  //       path: '/stock/cancel/detail',
+  //       component: () => import('@/xt_pages/stock/cancelStockDetail'),
+  //       name: 'cancelStockDetail',
   //       hidden: true,
   //       is_menu: false,
-  //       meta: {title: 'stockOutRecord'}
-  //     },
+  //       meta: { title: 'cancelStockDetail', noCache: true }
+  //     }
+
   //   ]
   // },
   // {

src/views/layout/components/Navbar.vue

@@ -41,7 +41,7 @@
           <span ><i class="icon iconfont icon-manbing-xuanzhong"></i> 慢病管理</span>
         </a>
       </div>
-      
+
       <div class="system-nav-menu">
         <a href="http://sso.kuyicloud.com/org/app/create">
         <!-- <a href="http://testsso.sgjyun.com/org/app/create"> -->
@@ -55,7 +55,7 @@
         <div class="avatar-wrapper">
           <img class="user-avatar" :src="avater">
           <span class="user-title">{{ this.$store.getters.xt_user.user.user_name }}</span>
-          <i class="el-icon-caret-bottom"></i>  
+          <i class="el-icon-caret-bottom"></i>
         </div>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item>
@@ -72,10 +72,10 @@
 
       <!-- <screenfull class="screenfull right-menu-item"></screenfull> -->
       <modify-user-info-dialog ref="modify_user_info_dialog"></modify-user-info-dialog>
-      
+
     </div>
   </el-menu>
-</div>  
+</div>
 </template>
 
 <script>

src/xt_pages/components/bread-crumb.vue

@@ -1,9 +1,13 @@
 <template>
     <el-breadcrumb separator="/">
     <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-    <el-breadcrumb-item><a href="/">活动管理</a></el-breadcrumb-item>
+    <template v-for="(crumb, index) in crumbsList" >
+      <el-breadcrumb-item v-if="crumb.path" :to="{ path: crumb.path }" :key="index">{{crumb.name}}</el-breadcrumb-item>
+      <el-breadcrumb-item v-else :key="index">{{crumb.name}}</el-breadcrumb-item>
+    </template>
+    <!-- <el-breadcrumb-item><a href="/">活动管理</a></el-breadcrumb-item>
     <el-breadcrumb-item>活动列表</el-breadcrumb-item>
-    <el-breadcrumb-item>活动详情</el-breadcrumb-item>
+    <el-breadcrumb-item>活动详情</el-breadcrumb-item> -->
     </el-breadcrumb>
 </template>
 
@@ -12,9 +16,25 @@
 
 export default {
   name: "BreadCrumb",
+  props:{
+    crumbs:{
+        type:Array,
+    }
+  },
+  data(){
+      return{
+          crumbsList:[
+            {path:'/', name:'首页'}
+          ],
+      }
+  }, 
   components: {
     // BreadCrumb
-  }
+  },
+  
+  created(){
+      this.crumbsList = this.crumbs;
+  },
 };
 </script>
 

src/xt_pages/dialysis/bulletinBoard.vue

@@ -1,26 +1,43 @@
 <template>
+ <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
     <div class="app-container" id="dialysis-board-box" >
         <el-row>
             <el-button type="primary" @click="fullscreenboard"> 全屏投影</el-button>
         </el-row>
         <bulletinboard></bulletinboard>
     </div>
+ </div>
 </template>
 
 <script>
 import { getBoards } from "@/api/board";
 import bulletinboard from "./components/bulletinboard";
 import { parseTime } from "@/utils";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
 export default {
-    components: { bulletinboard },
     name: 'bulletinBoard',
+    data() {
+        return {
+        crumbs:[
+            {path:false, name:'透析管理'},
+            {path:false, name:'数据看板'},
+        ],
+        }
+    },
     
     methods:{
         fullscreenboard:function(){
             let routeData = this.$router.resolve({ path: '/fullscreenboard'});
             window.open(routeData.href, '_blank');
         },
-    }
+    },
+  components: {
+      BreadCrumb,
+      bulletinboard
+  }
 }
 </script>

src/xt_pages/qcd/dialysisTotal.vue

@@ -1,223 +1,228 @@
 <template>
-  <div class="app-container">
-    <div class="cell">
-      <label class="title">
-        <span class="name">日期查询</span> :
-      </label>
-      <el-date-picker
-        v-model="listQuery.start_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
-      <span class>-</span>
-      <el-date-picker
-        v-model="listQuery.end_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
+ <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">统计方式</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.value==statisticalMethod?'active':''"
-            @click="selectStatisticalMethod(item.value)"
-            v-for="item in statisticalMethods"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+    <div class="app-container">
+      <div class="cell">
+        <label class="title">
+          <span class="name">日期查询</span> :
+        </label>
+        <el-date-picker
+          v-model="listQuery.start_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+        <span class>-</span>
+        <el-date-picker
+          v-model="listQuery.end_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
       </div>
-    </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">转归状态</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.lapseto==lapsetoType?'active':''"
-            @click="selectLapseTo( item.lapseto)"
-            v-for="item in lapsetoState"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">统计方式</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.value==statisticalMethod?'active':''"
+              @click="selectStatisticalMethod(item.value)"
+              v-for="item in statisticalMethods"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
+      </div>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">转归状态</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.lapseto==lapsetoType?'active':''"
+              @click="selectLapseTo( item.lapseto)"
+              v-for="item in lapsetoState"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
       </div>
-    </div>
 
-    <div class="cell">
-      <label class="title">
-        <span class="name">透析模式</span> :
-      </label>
-      <el-select v-model="listQuery.mode_id" placeholder="请选择" @change="changeModel()">
-        <el-option label="全部" value></el-option>
-        <el-option v-for="item in modeOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-      </el-select>
-    </div>
+      <div class="cell">
+        <label class="title">
+          <span class="name">透析模式</span> :
+        </label>
+        <el-select v-model="listQuery.mode_id" placeholder="请选择" @change="changeModel()">
+          <el-option label="全部" value></el-option>
+          <el-option v-for="item in modeOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select>
+      </div>
 
-    <h4 class="hui">统计图</h4>
-    <hr class="huixiao">
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="24">
-        <div class="chart-wrapper">
-            <bar-chart :title="totitle + batotal +'人次'" :options="modesData" />
-        </div>
-      </el-col>
-    </el-row>
+      <h4 class="hui">统计图</h4>
+      <hr class="huixiao">
+      <el-row :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="24">
+          <div class="chart-wrapper">
+              <bar-chart :title="totitle + batotal +'人次'" :options="modesData" />
+          </div>
+        </el-col>
+      </el-row>
 
-    <h4 class="hui">统计表</h4>
-    <hr class="huixiao">
-    <el-table
-      ref="multipleTable"
-      :data="tableData"
-      border
-      fit
-      highlight-current-row
-      style="width: 100%;margin-top: 10px;"
-    >
-      <el-table-column label="日期" min-width="80" property="date" align="center"></el-table-column>
-      <el-table-column
-        :label="modeOptions[1].name"
-        v-if="listQuery.mode_id==1||listQuery.mode_id==''"
-        property="data[1].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[2].name"
-        v-if="listQuery.mode_id==2||listQuery.mode_id==''"
-        property="data[2].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[3].name"
-        v-if="listQuery.mode_id==3||listQuery.mode_id==''"
-        property="data[3].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[4].name"
-        v-if="listQuery.mode_id==4||listQuery.mode_id==''"
-        property="data[4].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[5].name"
-        v-if="listQuery.mode_id==5||listQuery.mode_id==''"
-        property="data[5].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[6].name"
-        v-if="listQuery.mode_id==6||listQuery.mode_id==''"
-        property="data[6].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[7].name"
-        v-if="listQuery.mode_id==7||listQuery.mode_id==''"
-        property="data[7].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[8].name"
-        v-if="listQuery.mode_id==8||listQuery.mode_id==''"
-        property="data[8].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[9].name"
-        v-if="listQuery.mode_id==9||listQuery.mode_id==''"
-        property="data[9].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[10].name"
-        v-if="listQuery.mode_id==10||listQuery.mode_id==''"
-        property="data[10].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[11].name"
-        v-if="listQuery.mode_id==11||listQuery.mode_id==''"
-        property="data[11].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[12].name"
-        v-if="listQuery.mode_id==12||listQuery.mode_id==''"
-        property="data[12].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[13].name"
-        v-if="listQuery.mode_id==13||listQuery.mode_id==''"
-        property="data[13].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[14].name"
-        v-if="listQuery.mode_id==14||listQuery.mode_id==''"
-        property="data[14].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[15].name"
-        v-if="listQuery.mode_id==15||listQuery.mode_id==''"
-        property="data[15].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[16].name"
-        v-if="listQuery.mode_id==16||listQuery.mode_id==''"
-        property="data[16].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[17].name"
-        v-if="listQuery.mode_id==17||listQuery.mode_id==''"
-        property="data[17].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        :label="modeOptions[18].name"
-        v-if="listQuery.mode_id==18||listQuery.mode_id==''"
-        property="data[18].number"
-        align="center"
-      ></el-table-column>
-      <el-table-column label="总数" min-width="80" property="total" align="center"></el-table-column>
-    </el-table>
+      <h4 class="hui">统计表</h4>
+      <hr class="huixiao">
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;margin-top: 10px;"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+      >
+        <el-table-column label="日期" min-width="80" property="date" align="center"></el-table-column>
+        <el-table-column
+          :label="modeOptions[1].name"
+          v-if="listQuery.mode_id==1||listQuery.mode_id==''"
+          property="data[1].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[2].name"
+          v-if="listQuery.mode_id==2||listQuery.mode_id==''"
+          property="data[2].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[3].name"
+          v-if="listQuery.mode_id==3||listQuery.mode_id==''"
+          property="data[3].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[4].name"
+          v-if="listQuery.mode_id==4||listQuery.mode_id==''"
+          property="data[4].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[5].name"
+          v-if="listQuery.mode_id==5||listQuery.mode_id==''"
+          property="data[5].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[6].name"
+          v-if="listQuery.mode_id==6||listQuery.mode_id==''"
+          property="data[6].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[7].name"
+          v-if="listQuery.mode_id==7||listQuery.mode_id==''"
+          property="data[7].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[8].name"
+          v-if="listQuery.mode_id==8||listQuery.mode_id==''"
+          property="data[8].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[9].name"
+          v-if="listQuery.mode_id==9||listQuery.mode_id==''"
+          property="data[9].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[10].name"
+          v-if="listQuery.mode_id==10||listQuery.mode_id==''"
+          property="data[10].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[11].name"
+          v-if="listQuery.mode_id==11||listQuery.mode_id==''"
+          property="data[11].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[12].name"
+          v-if="listQuery.mode_id==12||listQuery.mode_id==''"
+          property="data[12].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[13].name"
+          v-if="listQuery.mode_id==13||listQuery.mode_id==''"
+          property="data[13].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[14].name"
+          v-if="listQuery.mode_id==14||listQuery.mode_id==''"
+          property="data[14].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[15].name"
+          v-if="listQuery.mode_id==15||listQuery.mode_id==''"
+          property="data[15].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[16].name"
+          v-if="listQuery.mode_id==16||listQuery.mode_id==''"
+          property="data[16].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[17].name"
+          v-if="listQuery.mode_id==17||listQuery.mode_id==''"
+          property="data[17].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="modeOptions[18].name"
+          v-if="listQuery.mode_id==18||listQuery.mode_id==''"
+          property="data[18].number"
+          align="center"
+        ></el-table-column>
+        <el-table-column label="总数" min-width="80" property="total" align="center"></el-table-column>
+      </el-table>
 
-    <!-- <pagi-nation title="分页"></pagi-nation> -->
+      <!-- <pagi-nation title="分页"></pagi-nation> -->
 
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="listQuery.pate"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="10"
-      background
-      style="margin-top:20px;"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="total"
-    ></el-pagination>
+      <el-pagination
+        align="right"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="listQuery.pate"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
   </div>
 </template>
 
@@ -225,10 +230,15 @@
 <script>
 import { getdialysistotaldata } from "@/api/qcd";
 import BarChart from "./components/BarChart";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 export default {
   name: "dialysisTotal",
   data() {
     return {
+      crumbs:[
+        {path:false, name:'科室质控'},
+        {path:'/qcd/dialysistotal', name:'透析总量'},
+      ],
       total: 0,
       totitle:'全部',
       batotal:0,
@@ -259,38 +269,6 @@ export default {
         { value: 1, label: "转出", source: 0, lapseto: 2 },
         { value: 2, label: "留治", source: 0, lapseto: 1 }
       ],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "今天",
-            onClick(picker) {
-              picker.$emit("pick", new Date());
-            }
-          },
-          {
-            text: "昨天",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "一周前",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "清空",
-            onClick(picker) {
-              picker.$emit("pick");
-            }
-          }
-        ]
-      }
     };
   },
   created() {
@@ -417,7 +395,8 @@ export default {
     }
   },
   components: {
-    BarChart
+    BarChart,
+    BreadCrumb
   }
 };
 </script>
@@ -425,7 +404,6 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 .app-container {
 //   margin: 20px;
-    margin-bottom: 50px;
   font-size: 15px;
   .filter-container {
     padding-bottom: 5px;
@@ -437,9 +415,6 @@ export default {
   .huixiao {
     border: solid 1px #ebeef5;
   }
-  .el-pagination {
-    float: right !important;
-  }
   .search-component {
     width: 500px;
     .searchBox {

src/xt_pages/qcd/outcomeIndicators/control.vue

@@ -1,141 +1,146 @@
 <template>
-  <div class="app-container">
-    <el-tabs v-model="tabActiveName" @tab-click="handleTabClick">
-        <el-tab-pane label="指标控制" name="control"></el-tab-pane>
-        <el-tab-pane label="指标查询" name="query"></el-tab-pane>
-    </el-tabs>
-
-    <div class="cell">
-      <label class="title">
-        <span class="name">日期查询</span> :
-      </label>
-      <el-date-picker
-        v-model="listQuery.start_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
-      <span class>-</span>
-      <el-date-picker
-        v-model="listQuery.end_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
+ <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">透析龄</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.value==dialysisAge?'active':''"
-            @click="selectdialysisAges(item.value)"
-            v-for="item in dialysisAgeOptions"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+    <div class="app-container">
+      <el-tabs v-model="tabActiveName" @tab-click="handleTabClick">
+          <el-tab-pane label="指标控制" name="control"></el-tab-pane>
+          <el-tab-pane label="指标查询" name="query"></el-tab-pane>
+      </el-tabs>
+
+      <div class="cell">
+        <label class="title">
+          <span class="name">日期查询</span> :
+        </label>
+        <el-date-picker
+          v-model="listQuery.start_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+        <span class>-</span>
+        <el-date-picker
+          v-model="listQuery.end_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
       </div>
-    </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">转归状态</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.lapseto==lapsetoType?'active':''"
-            @click="selectLapseTo( item.lapseto)"
-            v-for="item in lapsetoState"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">透析龄</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.value==dialysisAge?'active':''"
+              @click="selectdialysisAges(item.value)"
+              v-for="item in dialysisAgeOptions"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
+      </div>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">转归状态</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.lapseto==lapsetoType?'active':''"
+              @click="selectLapseTo( item.lapseto)"
+              v-for="item in lapsetoState"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
       </div>
-    </div>
 
-    <div class="cell">
-      <label class="title">
-        <span class="name">检验项目</span> :
-      </label>
-      <el-select v-model="listQuery.project_id" placeholder="请选择" @change="changeModel()">
-        <el-option label="全部" value=""></el-option>
-        <el-option v-for="item in projectOptions" :key="item.project_id" :label="item.project_name" :value="item.project_id"></el-option>
-      </el-select>
-      &nbsp;&nbsp;&nbsp;&nbsp;
-      <label class="title">
-        <span class="name">监测指标</span> :
-      </label>
-      <el-select v-model="listQuery.item_id" placeholder="请选择" @change="changeItem()">
-        <el-option label="全部" value=""></el-option>
-        <el-option v-for="item in itemOptions" :key="item.id" :label="item.item_name" :value="item.id"></el-option>
-      </el-select>
-    </div>
+      <div class="cell">
+        <label class="title">
+          <span class="name">检验项目</span> :
+        </label>
+        <el-select v-model="listQuery.project_id" placeholder="请选择" @change="changeModel()">
+          <el-option label="全部" value=""></el-option>
+          <el-option v-for="item in projectOptions" :key="item.project_id" :label="item.project_name" :value="item.project_id"></el-option>
+        </el-select>
+        &nbsp;&nbsp;&nbsp;&nbsp;
+        <label class="title">
+          <span class="name">监测指标</span> :
+        </label>
+        <el-select v-model="listQuery.item_id" placeholder="请选择" @change="changeItem()">
+          <el-option label="全部" value=""></el-option>
+          <el-option v-for="item in itemOptions" :key="item.id" :label="item.item_name" :value="item.id"></el-option>
+        </el-select>
+      </div>
 
-    <h4 class="hui">统计图</h4>
-    <hr class="huixiao">
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="24">
-        <div class="chart-wrapper">
-            <pie-chart title="" :options="CompletionOptions"/>
-        </div>
-      </el-col>
-    </el-row>
+      <h4 class="hui">统计图</h4>
+      <hr class="huixiao">
+      <el-row :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="24">
+          <div class="chart-wrapper">
+              <pie-chart title="" :options="CompletionOptions"/>
+          </div>
+        </el-col>
+      </el-row>
 
-    <h4 class="hui">统计表</h4>
-    <hr class="huixiao">
-    <el-table
-      ref="multipleTable"
-      :data="tableData"
-      id="oictable"
-      border
-      fit
-      highlight-current-row
-      style="width: 100%;margin-top: 10px;"
-    >
-      
-      <el-table-column fixed label="透析号" width="80" property="patient_id" align="center">
-        <template slot-scope="scope"><span>{{getPatientDialysisNo(scope.row.patient_id)}}</span></template>
-      </el-table-column>
-      <el-table-column fixed label="姓名" width="100" property="patient_id" align="center">
-        <template slot-scope="scope"><span>{{getPatientName(scope.row.patient_id)}}</span></template>
-      </el-table-column>
-      <el-table-column fixed label="检查日期" width="100" property="inspect_date" align="center">
-        <template slot-scope="scope"><span>{{getTime(scope.row.inspect_date, '{y}{m}{d}')}}</span></template>
-      </el-table-column>
-      
-      <el-table-column :label="reference.item_name+'//'+reference.unit" min-width="120" align="center" v-if="showTableColumn(reference)" v-for="(reference, index) in references" :key="index"  :render-header="renderheader">
-        <template slot-scope="scope"><span>{{getItemVulue(reference.project_id, reference.id, scope.row)}}</span></template>
-      </el-table-column>
-    </el-table>
+      <h4 class="hui">统计表</h4>
+      <hr class="huixiao">
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        id="oictable"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;margin-top: 10px;"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+      >
+        
+        <el-table-column fixed label="透析号" width="80" property="patient_id" align="center">
+          <template slot-scope="scope"><span>{{getPatientDialysisNo(scope.row.patient_id)}}</span></template>
+        </el-table-column>
+        <el-table-column fixed label="姓名" width="100" property="patient_id" align="center">
+          <template slot-scope="scope"><span>{{getPatientName(scope.row.patient_id)}}</span></template>
+        </el-table-column>
+        <el-table-column fixed label="检查日期" width="100" property="inspect_date" align="center">
+          <template slot-scope="scope"><span>{{getTime(scope.row.inspect_date, '{y}{m}{d}')}}</span></template>
+        </el-table-column>
+        
+        <el-table-column :label="reference.item_name+'//'+reference.unit" min-width="120" align="center" v-if="showTableColumn(reference)" v-for="(reference, index) in references" :key="index"  :render-header="renderheader">
+          <template slot-scope="scope"><span>{{getItemVulue(reference.project_id, reference.id, scope.row)}}</span></template>
+        </el-table-column>
+      </el-table>
 
-    <!-- <pagi-nation title="分页"></pagi-nation> -->
+      <!-- <pagi-nation title="分页"></pagi-nation> -->
 
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="listQuery.pate"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="10"
-      background
-      style="margin-top:20px;"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="total"
-    ></el-pagination>
+      <el-pagination
+        align="right"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="listQuery.pate"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
   </div>
 </template>
 
@@ -144,10 +149,16 @@
 import { GetOICData  } from "@/api/qcd";
 import PieChart from '../components/PieChart'
 import {uParseTime} from "@/utils/tools";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 export default {
   name: "dialysisTotal",
   data() {
     return {
+      crumbs:[
+        {path:false, name:'科室质控'},
+        {path:false, name:'结果指标'},
+        {path:false, name:'指标控制'},
+      ],
       tabActiveName:'control',
       total: 0,
       projectOptions:{},
@@ -181,38 +192,6 @@ export default {
         { value: 1, label: "大于三个月" },
         { value: 2, label: "小于三个月" }
       ],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "今天",
-            onClick(picker) {
-              picker.$emit("pick", new Date());
-            }
-          },
-          {
-            text: "昨天",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "一周前",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "清空",
-            onClick(picker) {
-              picker.$emit("pick");
-            }
-          }
-        ]
-      }
     };
   },
   created() {
@@ -390,7 +369,8 @@ export default {
     }
   },
   components: {
-      PieChart
+    PieChart,
+    BreadCrumb
   }
 };
 </script>
@@ -404,7 +384,6 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 .app-container {
 //   margin: 20px;
-    margin-bottom: 50px;
   font-size: 15px;
   .filter-container {
     padding-bottom: 5px;
@@ -416,9 +395,6 @@ export default {
   .huixiao {
     border: solid 1px #ebeef5;
   }
-  .el-pagination {
-    float: right !important;
-  }
   .search-component {
     width: 500px;
     .searchBox {

src/xt_pages/qcd/outcomeIndicators/query.vue

@@ -1,106 +1,111 @@
 <template>
-  <div class="app-container" id="outcome-indicators-query">
-    <el-tabs v-model="tabActiveName" @tab-click="handleTabClick">
-        <el-tab-pane label="指标控制" name="control"></el-tab-pane>
-        <el-tab-pane label="指标查询" name="query"></el-tab-pane>
-    </el-tabs>
-
-    <div class="cell">
-      <el-form :inline="true" :model="listQuery" >
-        <el-form-item label="">
-          <el-input v-model="listQuery.search" placeholder="姓名/透析号"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="onSearch">搜索</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="cell">
-      <label class="title">
-        <span class="name">日期查询</span> :
-      </label>
-      <el-date-picker
-        v-model="listQuery.start_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
-      <span class>-</span>
-      <el-date-picker
-        v-model="listQuery.end_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
+ <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
+    <div class="app-container" id="outcome-indicators-query">
+      <el-tabs v-model="tabActiveName" @tab-click="handleTabClick">
+          <el-tab-pane label="指标控制" name="control"></el-tab-pane>
+          <el-tab-pane label="指标查询" name="query"></el-tab-pane>
+      </el-tabs>
 
-    <div class="cell">
-      <label class="title">
-        <span class="name">检验项目</span> :
-      </label>
-      <el-select v-model="listQuery.project_id" placeholder="请选择" @change="changeModel()">
-        <el-option v-for="item in projectOptions" :key="item.project_id" :label="item.project_name" :value="item.project_id"></el-option>
-      </el-select>
-    </div>
+      <div class="cell">
+        <el-form :inline="true" :model="listQuery" >
+          <el-form-item label="">
+            <el-input v-model="listQuery.search" placeholder="姓名/透析号"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="onSearch">搜索</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="cell">
+        <label class="title">
+          <span class="name">日期查询</span> :
+        </label>
+        <el-date-picker
+          v-model="listQuery.start_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+        <span class>-</span>
+        <el-date-picker
+          v-model="listQuery.end_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+      </div>
 
-    <h4 class="hui">统计表</h4>
-    <hr class="huixiao">
-    <el-table
-      ref="multipleTable"
-      :data="tableData"
-      id="oictable"
-      border
-      fit
-      highlight-current-row
-      style="width: 100%;margin-top: 10px;"
-    >
-      
-      <el-table-column fixed label="透析号" width="80" property="patient_id" align="center">
-        <template slot-scope="scope"><span>{{getPatientDialysisNo(scope.row.patient_id)}}</span></template>
-      </el-table-column>
-      <el-table-column fixed label="姓名" width="100" property="patient_id" align="center">
-        <template slot-scope="scope"><span>{{getPatientName(scope.row.patient_id)}}</span></template>
-      </el-table-column>
-      <el-table-column fixed label="性别" width="100" property="patient_id" align="center">
-        <template slot-scope="scope"><span>{{getPatientGender(scope.row.patient_id)}}</span></template>
-      </el-table-column>
-      
-      <el-table-column fixed label="检查日期" width="100" property="inspect_date" align="center">
-        <template slot-scope="scope"><span>{{getTime(scope.row.inspect_date, '{y}{m}{d}')}}</span></template>
-      </el-table-column>
-      
-      <el-table-column :label="reference.item_name+'//'+reference.unit" min-width="120" align="center" v-if="showTableColumn(reference)" v-for="(reference, index) in references" :key="index"  :render-header="renderheader">
-        <template slot-scope="scope"><span>{{getItemVulue(reference.project_id, reference.id, scope.row)}}</span></template>
-      </el-table-column>
-    </el-table>
+      <div class="cell">
+        <label class="title">
+          <span class="name">检验项目</span> :
+        </label>
+        <el-select v-model="listQuery.project_id" placeholder="请选择" @change="changeModel()">
+          <el-option v-for="item in projectOptions" :key="item.project_id" :label="item.project_name" :value="item.project_id"></el-option>
+        </el-select>
+      </div>
 
-    <!-- <pagi-nation title="分页"></pagi-nation> -->
+      <h4 class="hui">统计表</h4>
+      <hr class="huixiao">
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        id="oictable"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;margin-top: 10px;"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+      >
+        
+        <el-table-column fixed label="透析号" width="80" property="patient_id" align="center">
+          <template slot-scope="scope"><span>{{getPatientDialysisNo(scope.row.patient_id)}}</span></template>
+        </el-table-column>
+        <el-table-column fixed label="姓名" width="100" property="patient_id" align="center">
+          <template slot-scope="scope"><span>{{getPatientName(scope.row.patient_id)}}</span></template>
+        </el-table-column>
+        <el-table-column fixed label="性别" width="100" property="patient_id" align="center">
+          <template slot-scope="scope"><span>{{getPatientGender(scope.row.patient_id)}}</span></template>
+        </el-table-column>
+        
+        <el-table-column fixed label="检查日期" width="100" property="inspect_date" align="center">
+          <template slot-scope="scope"><span>{{getTime(scope.row.inspect_date, '{y}{m}{d}')}}</span></template>
+        </el-table-column>
+        
+        <el-table-column :label="reference.item_name+'//'+reference.unit" min-width="120" align="center" v-if="showTableColumn(reference)" v-for="(reference, index) in references" :key="index"  :render-header="renderheader">
+          <template slot-scope="scope"><span>{{getItemVulue(reference.project_id, reference.id, scope.row)}}</span></template>
+        </el-table-column>
+      </el-table>
 
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="listQuery.pate"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="10"
-      background
-      style="margin-top:20px;"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="total"
-    ></el-pagination>
+      <!-- <pagi-nation title="分页"></pagi-nation> -->
+
+      <el-pagination
+        align="right"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="listQuery.pate"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
   </div>
 </template>
 
@@ -108,10 +113,16 @@
 <script>
 import { GetOIQData  } from "@/api/qcd";
 import {uParseTime} from "@/utils/tools";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 export default {
   name: "dialysisTotal",
   data() {
     return {
+      crumbs:[
+        {path:false, name:'科室质控'},
+        {path:false, name:'结果指标'},
+        {path:false, name:'指标查询'},
+      ],
       tabActiveName:'query',
       total: 0,
       projectOptions:{},
@@ -132,38 +143,6 @@ export default {
         { value: 1, label: "转出", source: 0, lapseto: 2 },
         { value: 2, label: "留治", source: 0, lapseto: 1 }
       ],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "今天",
-            onClick(picker) {
-              picker.$emit("pick", new Date());
-            }
-          },
-          {
-            text: "昨天",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "一周前",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "清空",
-            onClick(picker) {
-              picker.$emit("pick");
-            }
-          }
-        ]
-      }
     };
   },
   created() {
@@ -315,6 +294,7 @@ export default {
     }
   },
   components: {
+    BreadCrumb
   }
 };
 </script>
@@ -331,7 +311,6 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 .app-container {
 //   margin: 20px;
-    margin-bottom: 50px;
   font-size: 15px;
   .filter-container {
     padding-bottom: 5px;
@@ -343,9 +322,6 @@ export default {
   .huixiao {
     border: solid 1px #ebeef5;
   }
-  .el-pagination {
-    float: right !important;
-  }
   .search-component {
     width: 500px;
     .searchBox {

src/xt_pages/qcd/patientAnalysis/bloodPressure.vue

@@ -1,118 +1,123 @@
 <template>
-  <div class="app-container" id="outcome-indicators-query">
-    <analysis-nav activeName="bloodpressure"></analysis-nav>
-
-    <div class="cell">
-      <label class="title">
-        <span class="name">日期查询</span> :
-      </label>
-      <el-date-picker
-        v-model="listQuery.start_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
-      <span class>-</span>
-      <el-date-picker
-        v-model="listQuery.end_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
+ <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">转归状态</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.lapseto==lapsetoType?'active':''"
-            @click="selectLapseTo( item.lapseto)"
-            v-for="item in lapsetoState"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+    <div class="app-container" id="outcome-indicators-query">
+      <analysis-nav activeName="bloodpressure"></analysis-nav>
+
+      <div class="cell">
+        <label class="title">
+          <span class="name">日期查询</span> :
+        </label>
+        <el-date-picker
+          v-model="listQuery.start_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+        <span class>-</span>
+        <el-date-picker
+          v-model="listQuery.end_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
       </div>
-    </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">年龄</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.age==ageType?'active':''"
-            @click="selectAge( item.age)"
-            v-for="item in ageOptions"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">转归状态</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.lapseto==lapsetoType?'active':''"
+              @click="selectLapseTo( item.lapseto)"
+              v-for="item in lapsetoState"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
+      </div>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">年龄</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.age==ageType?'active':''"
+              @click="selectAge( item.age)"
+              v-for="item in ageOptions"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
       </div>
-    </div>
 
 
-    <h4 class="hui">统计图</h4>
-    <hr class="huixiao">
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="24">
-        <div class="chart-wrapper">
-            <pie-chart title="留治情况" :options="CompletionOptions"/>
-        </div>
-      </el-col>
-    </el-row>
+      <h4 class="hui">统计图</h4>
+      <hr class="huixiao">
+      <el-row :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="24">
+          <div class="chart-wrapper">
+              <pie-chart title="留治情况" :options="CompletionOptions"/>
+          </div>
+        </el-col>
+      </el-row>
 
-    <h4 class="hui">统计表</h4>
-    <hr class="huixiao">
-    <el-table
-      ref="multipleTable"
-      :data="tableData"
-      border
-      fit
-      highlight-current-row
-      style="width: 100%;margin-top: 10px;"
-    >
-      
-      <el-table-column  label="透析号" min-width="100" property="dialysis_no" align="center">
-      </el-table-column>
-      <el-table-column  label="患者姓名" min-width="100" property="name" align="center">
-      </el-table-column>
-      <el-table-column  label="性别" min-width="80" property="gender" align="center">
-        <template slot-scope="scope"><span>{{getPatientGender(scope.row.gender)}}</span></template>
-      </el-table-column>
-      <el-table-column  label="年龄" min-width="80" property="birthday" align="center">
-        <template slot-scope="scope"><span>{{tranAge(scope.row.birthday)}}</span></template>
-      </el-table-column>
-      
-    </el-table>
+      <h4 class="hui">统计表</h4>
+      <hr class="huixiao">
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;margin-top: 10px;"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+      >
+        
+        <el-table-column  label="透析号" min-width="100" property="dialysis_no" align="center">
+        </el-table-column>
+        <el-table-column  label="患者姓名" min-width="100" property="name" align="center">
+        </el-table-column>
+        <el-table-column  label="性别" min-width="80" property="gender" align="center">
+          <template slot-scope="scope"><span>{{getPatientGender(scope.row.gender)}}</span></template>
+        </el-table-column>
+        <el-table-column  label="年龄" min-width="80" property="birthday" align="center">
+          <template slot-scope="scope"><span>{{tranAge(scope.row.birthday)}}</span></template>
+        </el-table-column>
+        
+      </el-table>
 
-    <!-- <pagi-nation title="分页"></pagi-nation> -->
+      <!-- <pagi-nation title="分页"></pagi-nation> -->
 
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="listQuery.pate"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="10"
-      background
-      style="margin-top:20px;"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="total"
-    ></el-pagination>
+      <el-pagination
+      align='right'
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="listQuery.pate"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
   </div>
 </template>
 
@@ -122,10 +127,16 @@ import { GetPATotalData  } from "@/api/qcd";
 import PieChart from '../components/PieChart'
 import {jsGetAge, uParseTime} from "@/utils/tools";
 import analysisNav from './components/analysisNav'
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 export default {
   name: "totalAnalysis",
   data() {
     return {
+      crumbs:[
+        {path:false, name:'科室质控'},
+        {path:false, name:'患者分析'},
+        {path:false, name:'总量分析'},
+      ],
       total: 0,
       patientMap:{},
       listQuery: {
@@ -153,38 +164,6 @@ export default {
         { value: 3, label: "40～50", age: 3 },
         { value: 4, label: "其他", age: 4 },
       ],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "今天",
-            onClick(picker) {
-              picker.$emit("pick", new Date());
-            }
-          },
-          {
-            text: "昨天",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "一周前",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "清空",
-            onClick(picker) {
-              picker.$emit("pick");
-            }
-          }
-        ]
-      }
     };
   },
   created() {
@@ -307,7 +286,8 @@ export default {
   },
   components: {
       analysisNav,
-      PieChart
+      PieChart,
+      BreadCrumb
   }
 };
 </script>
@@ -324,7 +304,6 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 .app-container {
 //   margin: 20px;
-    margin-bottom: 50px;
   font-size: 15px;
   .filter-container {
     padding-bottom: 5px;
@@ -336,9 +315,6 @@ export default {
   .huixiao {
     border: solid 1px #ebeef5;
   }
-  .el-pagination {
-    float: right !important;
-  }
   .search-component {
     width: 500px;
     .searchBox {

src/xt_pages/qcd/patientAnalysis/dialysisAge.vue

@@ -1,142 +1,147 @@
 <template>
-  <div class="app-container" id="outcome-indicators-query">
-    <analysis-nav activeName="dialysisage"></analysis-nav>
-
-    <div class="cell">
-      <label class="title">
-        <span class="name">日期查询</span> :
-      </label>
-      <el-date-picker
-        v-model="listQuery.start_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
-      <span class>-</span>
-      <el-date-picker
-        v-model="listQuery.end_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
+ <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">转归状态</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.lapseto==lapsetoType?'active':''"
-            @click="selectLapseTo( item.lapseto)"
-            v-for="item in lapsetoState"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+    <div class="app-container" id="outcome-indicators-query">
+      <analysis-nav activeName="dialysisage"></analysis-nav>
+
+      <div class="cell">
+        <label class="title">
+          <span class="name">日期查询</span> :
+        </label>
+        <el-date-picker
+          v-model="listQuery.start_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+        <span class>-</span>
+        <el-date-picker
+          v-model="listQuery.end_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
       </div>
-    </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">年龄</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.age==ageType?'active':''"
-            @click="selectAge( item.age)"
-            v-for="item in ageOptions"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">转归状态</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.lapseto==lapsetoType?'active':''"
+              @click="selectLapseTo( item.lapseto)"
+              v-for="item in lapsetoState"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
       </div>
-    </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">透析龄</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.age==dialysisAgeType?'active':''"
-            @click="selectDialysisAge( item.age)"
-            v-for="item in dialysisAgeOptions"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">年龄</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.age==ageType?'active':''"
+              @click="selectAge( item.age)"
+              v-for="item in ageOptions"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
+      </div>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">透析龄</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.age==dialysisAgeType?'active':''"
+              @click="selectDialysisAge( item.age)"
+              v-for="item in dialysisAgeOptions"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
       </div>
-    </div>
 
 
-    <h4 class="hui">统计图</h4>
-    <hr class="huixiao">
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="24">
-        <div class="chart-wrapper">
-            <pie-chart title="透析龄分布情况（人）:" :options="CompletionOptions"/>
-        </div>
-      </el-col>
-    </el-row>
+      <h4 class="hui">统计图</h4>
+      <hr class="huixiao">
+      <el-row :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="24">
+          <div class="chart-wrapper">
+              <pie-chart title="透析龄分布情况（人）:" :options="CompletionOptions"/>
+          </div>
+        </el-col>
+      </el-row>
 
-    <h4 class="hui">统计表</h4>
-    <hr class="huixiao">
-    <el-table
-      ref="multipleTable"
-      :data="tableData"
-      border
-      fit
-      highlight-current-row
-      style="width: 100%;margin-top: 10px;"
-    >
-      
-      <el-table-column  label="透析号" min-width="100" property="dialysis_no" align="center">
-      </el-table-column>
-      <el-table-column  label="患者姓名" min-width="100" property="name" align="center">
-      </el-table-column>
-      <el-table-column  label="性别" min-width="80" property="gender" align="center">
-        <template slot-scope="scope"><span>{{getPatientGender(scope.row.gender)}}</span></template>
-      </el-table-column>
-      <el-table-column  label="年龄" min-width="80" property="birthday" align="center">
-        <template slot-scope="scope"><span>{{tranAge(scope.row.birthday)}}</span></template>
-      </el-table-column>
-      <el-table-column  label="归转状态" min-width="80" property="lapseto" align="center">
-        <template slot-scope="scope"><span>{{tranLapseto(scope.row.lapseto)}}</span></template>
-      </el-table-column>
-      <el-table-column  label="首次透析日期" min-width="80" property="first_dialysis_date" align="center">
-        <template slot-scope="scope"><span>{{getFirstDialysisDate(scope.row.first_dialysis_date)}}</span></template>
-      </el-table-column>
-      <el-table-column  label="透析龄" min-width="80" property="first_dialysis_date" align="center">
-        <template slot-scope="scope"><span>{{dialysisAge(scope.row.first_dialysis_date)}}</span></template>
-      </el-table-column>
-      
-    </el-table>
+      <h4 class="hui">统计表</h4>
+      <hr class="huixiao">
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;margin-top: 10px;"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+      >
+        
+        <el-table-column  label="透析号" min-width="100" property="dialysis_no" align="center">
+        </el-table-column>
+        <el-table-column  label="患者姓名" min-width="100" property="name" align="center">
+        </el-table-column>
+        <el-table-column  label="性别" min-width="80" property="gender" align="center">
+          <template slot-scope="scope"><span>{{getPatientGender(scope.row.gender)}}</span></template>
+        </el-table-column>
+        <el-table-column  label="年龄" min-width="80" property="birthday" align="center">
+          <template slot-scope="scope"><span>{{tranAge(scope.row.birthday)}}</span></template>
+        </el-table-column>
+        <el-table-column  label="归转状态" min-width="80" property="lapseto" align="center">
+          <template slot-scope="scope"><span>{{tranLapseto(scope.row.lapseto)}}</span></template>
+        </el-table-column>
+        <el-table-column  label="首次透析日期" min-width="80" property="first_dialysis_date" align="center">
+          <template slot-scope="scope"><span>{{getFirstDialysisDate(scope.row.first_dialysis_date)}}</span></template>
+        </el-table-column>
+        <el-table-column  label="透析龄" min-width="80" property="first_dialysis_date" align="center">
+          <template slot-scope="scope"><span>{{dialysisAge(scope.row.first_dialysis_date)}}</span></template>
+        </el-table-column>
+        
+      </el-table>
 
-    <!-- <pagi-nation title="分页"></pagi-nation> -->
+      <!-- <pagi-nation title="分页"></pagi-nation> -->
 
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="listQuery.pate"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="10"
-      background
-      style="margin-top:20px;"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="total"
-    ></el-pagination>
+      <el-pagination
+      align="right"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="listQuery.pate"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
   </div>
 </template>
 
@@ -146,10 +151,16 @@ import { GetPADialysisAgeData  } from "@/api/qcd";
 import PieChart from '../components/PieChart'
 import {jsGetAge, uParseTime, dialysisAge} from "@/utils/tools";
 import analysisNav from './components/analysisNav'
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 export default {
   name: "totalAnalysis",
   data() {
     return {
+      crumbs:[
+        {path:false, name:'科室质控'},
+        {path:false, name:'患者分析'},
+        {path:false, name:'透析龄分析'},
+      ],
       total: 0,
       patientMap:{},
       listQuery: {
@@ -194,38 +205,6 @@ export default {
         4: { value: 4, label: "大于10年", age: 4 },
         5: { value: 5, label: "大于20年", age: 5 },
       },
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "今天",
-            onClick(picker) {
-              picker.$emit("pick", new Date());
-            }
-          },
-          {
-            text: "昨天",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "一周前",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "清空",
-            onClick(picker) {
-              picker.$emit("pick");
-            }
-          }
-        ]
-      }
     };
   },
   created() {
@@ -375,7 +354,8 @@ export default {
   },
   components: {
       analysisNav,
-      PieChart
+      PieChart,
+      BreadCrumb
   }
 };
 </script>
@@ -392,7 +372,6 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 .app-container {
 //   margin: 20px;
-    margin-bottom: 50px;
   font-size: 15px;
   .filter-container {
     padding-bottom: 5px;
@@ -404,9 +383,6 @@ export default {
   .huixiao {
     border: solid 1px #ebeef5;
   }
-  .el-pagination {
-    float: right !important;
-  }
   .search-component {
     width: 500px;
     .searchBox {

src/xt_pages/qcd/patientAnalysis/lapseto.vue

@@ -1,136 +1,141 @@
 <template>
-  <div class="app-container" id="outcome-indicators-query">
-    <analysis-nav activeName="lapseto"></analysis-nav>
-
-    <div class="cell">
-      <label class="title">
-        <span class="name">日期查询</span> :
-      </label>
-      <el-date-picker
-        v-model="listQuery.start_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
-      <span class>-</span>
-      <el-date-picker
-        v-model="listQuery.end_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
+ <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">转归状态</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.lapseto==lapsetoType?'active':''"
-            @click="selectLapseTo( item.lapseto)"
-            v-for="item in lapsetoState"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+    <div class="app-container" id="outcome-indicators-query">
+      <analysis-nav activeName="lapseto"></analysis-nav>
+
+      <div class="cell">
+        <label class="title">
+          <span class="name">日期查询</span> :
+        </label>
+        <el-date-picker
+          v-model="listQuery.start_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+        <span class>-</span>
+        <el-date-picker
+          v-model="listQuery.end_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
       </div>
-    </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">患者来源</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.source==sourceType?'active':''"
-            @click="selectSource( item.source)"
-            v-for="item in sourceOptions"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">转归状态</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.lapseto==lapsetoType?'active':''"
+              @click="selectLapseTo( item.lapseto)"
+              v-for="item in lapsetoState"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
       </div>
-    </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">年龄</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.age==ageType?'active':''"
-            @click="selectAge( item.age)"
-            v-for="item in ageOptions"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">患者来源</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.source==sourceType?'active':''"
+              @click="selectSource( item.source)"
+              v-for="item in sourceOptions"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
+      </div>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">年龄</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.age==ageType?'active':''"
+              @click="selectAge( item.age)"
+              v-for="item in ageOptions"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
       </div>
-    </div>
 
 
-    <h4 class="hui">统计图</h4>
-    <hr class="huixiao">
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="24">
-        <div class="chart-wrapper">
-            <pie-chart title="" :options="CompletionOptions"/>
-        </div>
-      </el-col>
-    </el-row>
+      <h4 class="hui">统计图</h4>
+      <hr class="huixiao">
+      <el-row :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="24">
+          <div class="chart-wrapper">
+              <pie-chart title="" :options="CompletionOptions"/>
+          </div>
+        </el-col>
+      </el-row>
 
-    <h4 class="hui">统计表</h4>
-    <hr class="huixiao">
-    <el-table
-      ref="multipleTable"
-      :data="tableData"
-      border
-      fit
-      highlight-current-row
-      style="width: 100%;margin-top: 10px;"
-    >
-      
-      <el-table-column  label="日期" min-width="80" property="created_time" align="center">
-        <template slot-scope="scope"><span>{{getTime(scope.row.created_time,'{y}-{m}-{d}')}}</span></template>
-      </el-table-column>
-      <el-table-column  label="透析号" min-width="100" property="dialysis_no" align="center">
-      </el-table-column>
-      <el-table-column  label="姓名" min-width="100" property="name" align="center">
-      </el-table-column>
-      <el-table-column  label="患者来源" min-width="80" property="source" align="center">
-        <template slot-scope="scope"><span>{{getPatientSource(scope.row.source)}}</span></template>
-      </el-table-column>
-      <el-table-column  label="归转状态" min-width="80" property="lapseto" align="center">
-        <template slot-scope="scope"><span>{{getPatientLapseto(scope.row.lapseto)}}</span></template>
-      </el-table-column>
-      
-    </el-table>
+      <h4 class="hui">统计表</h4>
+      <hr class="huixiao">
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;margin-top: 10px;"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+      >
+        
+        <el-table-column  label="日期" min-width="80" property="created_time" align="center">
+          <template slot-scope="scope"><span>{{getTime(scope.row.created_time,'{y}-{m}-{d}')}}</span></template>
+        </el-table-column>
+        <el-table-column  label="透析号" min-width="100" property="dialysis_no" align="center">
+        </el-table-column>
+        <el-table-column  label="姓名" min-width="100" property="name" align="center">
+        </el-table-column>
+        <el-table-column  label="患者来源" min-width="80" property="source" align="center">
+          <template slot-scope="scope"><span>{{getPatientSource(scope.row.source)}}</span></template>
+        </el-table-column>
+        <el-table-column  label="归转状态" min-width="80" property="lapseto" align="center">
+          <template slot-scope="scope"><span>{{getPatientLapseto(scope.row.lapseto)}}</span></template>
+        </el-table-column>
+        
+      </el-table>
 
-    <!-- <pagi-nation title="分页"></pagi-nation> -->
+      <!-- <pagi-nation title="分页"></pagi-nation> -->
 
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="listQuery.pate"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="10"
-      background
-      style="margin-top:20px;"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="total"
-    ></el-pagination>
+      <el-pagination
+      align="right"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="listQuery.pate"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
   </div>
 </template>
 
@@ -140,10 +145,16 @@ import { GetPATotalData  } from "@/api/qcd";
 import PieChart from '../components/PieChart'
 import {jsGetAge, uParseTime} from "@/utils/tools";
 import analysisNav from './components/analysisNav'
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 export default {
   name: "totalAnalysis",
   data() {
     return {
+      crumbs:[
+        {path:false, name:'科室质控'},
+        {path:false, name:'患者分析'},
+        {path:false, name:'转归分析'},
+      ],
       total: 0,
       patientMap:{},
       listQuery: {
@@ -178,38 +189,6 @@ export default {
         { value: 3, label: "40～50", age: 3 },
         { value: 4, label: "其他", age: 4 },
       ],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "今天",
-            onClick(picker) {
-              picker.$emit("pick", new Date());
-            }
-          },
-          {
-            text: "昨天",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "一周前",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "清空",
-            onClick(picker) {
-              picker.$emit("pick");
-            }
-          }
-        ]
-      }
     };
   },
   created() {
@@ -357,7 +336,8 @@ export default {
   },
   components: {
       analysisNav,
-      PieChart
+      PieChart,
+      BreadCrumb
   }
 };
 </script>
@@ -374,7 +354,6 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 .app-container {
 //   margin: 20px;
-    margin-bottom: 50px;
   font-size: 15px;
   .filter-container {
     padding-bottom: 5px;
@@ -386,9 +365,6 @@ export default {
   .huixiao {
     border: solid 1px #ebeef5;
   }
-  .el-pagination {
-    float: right !important;
-  }
   .search-component {
     width: 500px;
     .searchBox {

src/xt_pages/qcd/patientAnalysis/total.vue

@@ -1,128 +1,133 @@
 <template>
-  <div class="app-container" id="outcome-indicators-query">
-    <analysis-nav activeName="total"></analysis-nav>
-
-    <div class="cell">
-      <el-form :inline="true" :model="listQuery" >
-        <el-form-item label="">
-          <el-input v-model="listQuery.search" placeholder="姓名/透析号"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="onSearch">搜索</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="cell">
-      <label class="title">
-        <span class="name">日期查询</span> :
-      </label>
-      <el-date-picker
-        v-model="listQuery.start_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
-      <span class>-</span>
-      <el-date-picker
-        v-model="listQuery.end_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
+ <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">转归状态</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.lapseto==lapsetoType?'active':''"
-            @click="selectLapseTo( item.lapseto)"
-            v-for="item in lapsetoState"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+    <div class="app-container" id="outcome-indicators-query">
+      <analysis-nav activeName="total"></analysis-nav>
+
+      <div class="cell">
+        <el-form :inline="true" :model="listQuery" >
+          <el-form-item label="">
+            <el-input v-model="listQuery.search" placeholder="姓名/透析号"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="onSearch">搜索</el-button>
+          </el-form-item>
+        </el-form>
       </div>
-    </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">年龄</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.age==ageType?'active':''"
-            @click="selectAge( item.age)"
-            v-for="item in ageOptions"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+      <div class="cell">
+        <label class="title">
+          <span class="name">日期查询</span> :
+        </label>
+        <el-date-picker
+          v-model="listQuery.start_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+        <span class>-</span>
+        <el-date-picker
+          v-model="listQuery.end_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+      </div>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">转归状态</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.lapseto==lapsetoType?'active':''"
+              @click="selectLapseTo( item.lapseto)"
+              v-for="item in lapsetoState"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
+      </div>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">年龄</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.age==ageType?'active':''"
+              @click="selectAge( item.age)"
+              v-for="item in ageOptions"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
       </div>
-    </div>
 
 
-    <h4 class="hui">统计图</h4>
-    <hr class="huixiao">
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="24">
-        <div class="chart-wrapper">
-            <pie-chart title="" :options="CompletionOptions"/>
-        </div>
-      </el-col>
-    </el-row>
+      <h4 class="hui">统计图</h4>
+      <hr class="huixiao">
+      <el-row :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="24">
+          <div class="chart-wrapper">
+              <pie-chart title="" :options="CompletionOptions"/>
+          </div>
+        </el-col>
+      </el-row>
 
-    <h4 class="hui">统计表</h4>
-    <hr class="huixiao">
-    <el-table
-      ref="multipleTable"
-      :data="tableData"
-      border
-      fit
-      highlight-current-row
-      style="width: 100%;margin-top: 10px;"
-    >
-      
-      <el-table-column  label="透析号" min-width="100" property="dialysis_no" align="center">
-      </el-table-column>
-      <el-table-column  label="患者姓名" min-width="100" property="name" align="center">
-      </el-table-column>
-      <el-table-column  label="性别" min-width="80" property="gender" align="center">
-        <template slot-scope="scope"><span>{{getPatientGender(scope.row.gender)}}</span></template>
-      </el-table-column>
-      <el-table-column  label="年龄" min-width="80" property="birthday" align="center">
-        <template slot-scope="scope"><span>{{tranAge(scope.row.birthday)}}</span></template>
-      </el-table-column>
-      
-    </el-table>
+      <h4 class="hui">统计表</h4>
+      <hr class="huixiao">
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;margin-top: 10px;"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+      >
+        
+        <el-table-column  label="透析号" min-width="100" property="dialysis_no" align="center">
+        </el-table-column>
+        <el-table-column  label="患者姓名" min-width="100" property="name" align="center">
+        </el-table-column>
+        <el-table-column  label="性别" min-width="80" property="gender" align="center">
+          <template slot-scope="scope"><span>{{getPatientGender(scope.row.gender)}}</span></template>
+        </el-table-column>
+        <el-table-column  label="年龄" min-width="80" property="birthday" align="center">
+          <template slot-scope="scope"><span>{{tranAge(scope.row.birthday)}}</span></template>
+        </el-table-column>
+        
+      </el-table>
 
-    <!-- <pagi-nation title="分页"></pagi-nation> -->
+      <!-- <pagi-nation title="分页"></pagi-nation> -->
 
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="listQuery.pate"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="10"
-      background
-      style="margin-top:20px;"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="total"
-    ></el-pagination>
+      <el-pagination
+      align='right'
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="listQuery.pate"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
   </div>
 </template>
 
@@ -132,10 +137,16 @@ import { GetPATotalData  } from "@/api/qcd";
 import PieChart from '../components/PieChart'
 import {jsGetAge, uParseTime} from "@/utils/tools";
 import analysisNav from './components/analysisNav'
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 export default {
   name: "totalAnalysis",
   data() {
     return {
+      crumbs:[
+        {path:false, name:'科室质控'},
+        {path:false, name:'患者分析'},
+        {path:false, name:'总量分析'},
+      ],
       total: 0,
       patientMap:{},
       listQuery: {
@@ -163,38 +174,6 @@ export default {
         { value: 3, label: "40～50", age: 3 },
         { value: 4, label: "其他", age: 4 },
       ],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "今天",
-            onClick(picker) {
-              picker.$emit("pick", new Date());
-            }
-          },
-          {
-            text: "昨天",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "一周前",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "清空",
-            onClick(picker) {
-              picker.$emit("pick");
-            }
-          }
-        ]
-      }
     };
   },
   created() {
@@ -320,7 +299,8 @@ export default {
   },
   components: {
       analysisNav,
-      PieChart
+      PieChart,
+      BreadCrumb
   }
 };
 </script>
@@ -337,7 +317,6 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 .app-container {
 //   margin: 20px;
-    margin-bottom: 50px;
   font-size: 15px;
   .filter-container {
     padding-bottom: 5px;
@@ -349,9 +328,6 @@ export default {
   .huixiao {
     border: solid 1px #ebeef5;
   }
-  .el-pagination {
-    float: right !important;
-  }
   .search-component {
     width: 500px;
     .searchBox {

src/xt_pages/qcd/patientAnalysis/weight.vue

@@ -1,118 +1,123 @@
 <template>
-  <div class="app-container" id="outcome-indicators-query">
-    <analysis-nav activeName="weight"></analysis-nav>
-
-    <div class="cell">
-      <label class="title">
-        <span class="name">日期查询</span> :
-      </label>
-      <el-date-picker
-        v-model="listQuery.start_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
-      <span class>-</span>
-      <el-date-picker
-        v-model="listQuery.end_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
+ <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">转归状态</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.lapseto==lapsetoType?'active':''"
-            @click="selectLapseTo( item.lapseto)"
-            v-for="item in lapsetoState"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+    <div class="app-container" id="outcome-indicators-query">
+      <analysis-nav activeName="weight"></analysis-nav>
+
+      <div class="cell">
+        <label class="title">
+          <span class="name">日期查询</span> :
+        </label>
+        <el-date-picker
+          v-model="listQuery.start_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+        <span class>-</span>
+        <el-date-picker
+          v-model="listQuery.end_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
       </div>
-    </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">年龄</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.age==ageType?'active':''"
-            @click="selectAge( item.age)"
-            v-for="item in ageOptions"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">转归状态</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.lapseto==lapsetoType?'active':''"
+              @click="selectLapseTo( item.lapseto)"
+              v-for="item in lapsetoState"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
+      </div>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">年龄</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.age==ageType?'active':''"
+              @click="selectAge( item.age)"
+              v-for="item in ageOptions"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
       </div>
-    </div>
 
 
-    <h4 class="hui">统计图</h4>
-    <hr class="huixiao">
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="24">
-        <div class="chart-wrapper">
-            <pie-chart title="留治情况" :options="CompletionOptions"/>
-        </div>
-      </el-col>
-    </el-row>
+      <h4 class="hui">统计图</h4>
+      <hr class="huixiao">
+      <el-row :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="24">
+          <div class="chart-wrapper">
+              <pie-chart title="留治情况" :options="CompletionOptions"/>
+          </div>
+        </el-col>
+      </el-row>
 
-    <h4 class="hui">统计表</h4>
-    <hr class="huixiao">
-    <el-table
-      ref="multipleTable"
-      :data="tableData"
-      border
-      fit
-      highlight-current-row
-      style="width: 100%;margin-top: 10px;"
-    >
-      
-      <el-table-column  label="透析号" min-width="100" property="dialysis_no" align="center">
-      </el-table-column>
-      <el-table-column  label="患者姓名" min-width="100" property="name" align="center">
-      </el-table-column>
-      <el-table-column  label="性别" min-width="80" property="gender" align="center">
-        <template slot-scope="scope"><span>{{getPatientGender(scope.row.gender)}}</span></template>
-      </el-table-column>
-      <el-table-column  label="年龄" min-width="80" property="birthday" align="center">
-        <template slot-scope="scope"><span>{{tranAge(scope.row.birthday)}}</span></template>
-      </el-table-column>
-      
-    </el-table>
+      <h4 class="hui">统计表</h4>
+      <hr class="huixiao">
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;margin-top: 10px;"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+      >
+        
+        <el-table-column  label="透析号" min-width="100" property="dialysis_no" align="center">
+        </el-table-column>
+        <el-table-column  label="患者姓名" min-width="100" property="name" align="center">
+        </el-table-column>
+        <el-table-column  label="性别" min-width="80" property="gender" align="center">
+          <template slot-scope="scope"><span>{{getPatientGender(scope.row.gender)}}</span></template>
+        </el-table-column>
+        <el-table-column  label="年龄" min-width="80" property="birthday" align="center">
+          <template slot-scope="scope"><span>{{tranAge(scope.row.birthday)}}</span></template>
+        </el-table-column>
+        
+      </el-table>
 
-    <!-- <pagi-nation title="分页"></pagi-nation> -->
+      <!-- <pagi-nation title="分页"></pagi-nation> -->
 
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="listQuery.pate"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="10"
-      background
-      style="margin-top:20px;"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="total"
-    ></el-pagination>
+      <el-pagination
+      align="right"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="listQuery.pate"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
   </div>
 </template>
 
@@ -122,10 +127,16 @@ import { GetPATotalData  } from "@/api/qcd";
 import PieChart from '../components/PieChart'
 import {jsGetAge, uParseTime} from "@/utils/tools";
 import analysisNav from './components/analysisNav'
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 export default {
   name: "totalAnalysis",
   data() {
     return {
+      crumbs:[
+        {path:false, name:'科室质控'},
+        {path:false, name:'患者分析'},
+        {path:false, name:'体重分析'},
+      ],
       total: 0,
       patientMap:{},
       listQuery: {
@@ -153,38 +164,6 @@ export default {
         { value: 3, label: "40～50", age: 3 },
         { value: 4, label: "其他", age: 4 },
       ],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "今天",
-            onClick(picker) {
-              picker.$emit("pick", new Date());
-            }
-          },
-          {
-            text: "昨天",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "一周前",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "清空",
-            onClick(picker) {
-              picker.$emit("pick");
-            }
-          }
-        ]
-      }
     };
   },
   created() {
@@ -307,7 +286,8 @@ export default {
   },
   components: {
       analysisNav,
-      PieChart
+      PieChart,
+      BreadCrumb
   }
 };
 </script>
@@ -324,7 +304,6 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 .app-container {
 //   margin: 20px;
-    margin-bottom: 50px;
   font-size: 15px;
   .filter-container {
     padding-bottom: 5px;
@@ -336,9 +315,6 @@ export default {
   .huixiao {
     border: solid 1px #ebeef5;
   }
-  .el-pagination {
-    float: right !important;
-  }
   .search-component {
     width: 500px;
     .searchBox {

src/xt_pages/qcd/processIndicators.vue

@@ -1,127 +1,132 @@
 <template>
-  <div class="app-container">
-    <div class="cell">
-      <label class="title">
-        <span class="name">日期查询</span> :
-      </label>
-      <el-date-picker
-        v-model="listQuery.start_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
-      <span class>-</span>
-      <el-date-picker
-        v-model="listQuery.end_time"
-        prefix-icon="el-icon-date"
-        @change="changeTime"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        :picker-options="pickerOptions"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-      ></el-date-picker>
+ <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">透析龄</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.value==dialysisAge?'active':''"
-            @click="selectdialysisAges(item.value)"
-            v-for="item in dialysisAgeOptions"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+    <div class="app-container">
+      <div class="cell">
+        <label class="title">
+          <span class="name">日期查询</span> :
+        </label>
+        <el-date-picker
+          v-model="listQuery.start_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+        <span class>-</span>
+        <el-date-picker
+          v-model="listQuery.end_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
       </div>
-    </div>
-    <div class="cell clearfix">
-      <label class="title">
-        <span class="name">转归状态</span> :
-      </label>
-      <div class="time">
-        <ul class>
-          <li
-            :class="item.lapseto==lapsetoType?'active':''"
-            @click="selectLapseTo( item.lapseto)"
-            v-for="item in lapsetoState"
-            :key="item.value"
-          >{{item.label}}</li>
-        </ul>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">透析龄</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.value==dialysisAge?'active':''"
+              @click="selectdialysisAges(item.value)"
+              v-for="item in dialysisAgeOptions"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
+      </div>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">转归状态</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.lapseto==lapsetoType?'active':''"
+              @click="selectLapseTo( item.lapseto)"
+              v-for="item in lapsetoState"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
       </div>
-    </div>
 
-    <div class="cell">
-      <label class="title">
-        <span class="name">检验项目</span> :
-      </label>
-      <el-select v-model="listQuery.project_id" placeholder="请选择" @change="changeModel()">
-        <el-option label="全部" value=""></el-option>
-        <el-option v-for="item in projectOptions" :key="item.project_id" :label="item.project_name" :value="item.project_id"></el-option>
-      </el-select>
-    </div>
+      <div class="cell">
+        <label class="title">
+          <span class="name">检验项目</span> :
+        </label>
+        <el-select v-model="listQuery.project_id" placeholder="请选择" @change="changeModel()">
+          <el-option label="全部" value=""></el-option>
+          <el-option v-for="item in projectOptions" :key="item.project_id" :label="item.project_name" :value="item.project_id"></el-option>
+        </el-select>
+      </div>
 
-    <h4 class="hui">统计图</h4>
-    <hr class="huixiao">
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="24">
-        <div class="chart-wrapper">
-            <pie-chart title="" :options="CompletionOptions"/>
-        </div>
-      </el-col>
-    </el-row>
+      <h4 class="hui">统计图</h4>
+      <hr class="huixiao">
+      <el-row :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="24">
+          <div class="chart-wrapper">
+              <pie-chart title="" :options="CompletionOptions"/>
+          </div>
+        </el-col>
+      </el-row>
 
-    <h4 class="hui">统计表</h4>
-    <hr class="huixiao">
-    <el-table
-      ref="multipleTable"
-      :data="tableData"
-      :span-method="mergeSpan"
-      border
-      fit
-      highlight-current-row
-      style="width: 100%;margin-top: 10px;"
-    >
-      
-      <el-table-column label="透析号" min-width="80" property="patient_id" align="center">
-        <template slot-scope="scope"><span>{{getPatientDialysisNo(scope.row.patient_id)}}</span></template>
-      </el-table-column>
-      <el-table-column label="姓名" min-width="80" property="patient_id" align="center">
-        <template slot-scope="scope"><span>{{getPatientName(scope.row.patient_id)}}</span></template>
-      </el-table-column>
-      <el-table-column label="检查项目" min-width="80" property="project_id" align="center">
-        <template slot-scope="scope"><span>{{getProjectName(scope.row.project_id)}}</span></template>
-      </el-table-column>
-      <el-table-column label="检查日期" min-width="80" property="inspect_date" align="center">
-        <template slot-scope="scope"><span>{{getTime(scope.row.inspect_date, '{y}{m}{d}')}}</span></template>
-      </el-table-column>
-    </el-table>
+      <h4 class="hui">统计表</h4>
+      <hr class="huixiao">
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        :span-method="mergeSpan"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;margin-top: 10px;"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+      >
+        
+        <el-table-column label="透析号" min-width="80" property="patient_id" align="center">
+          <template slot-scope="scope"><span>{{getPatientDialysisNo(scope.row.patient_id)}}</span></template>
+        </el-table-column>
+        <el-table-column label="姓名" min-width="80" property="patient_id" align="center">
+          <template slot-scope="scope"><span>{{getPatientName(scope.row.patient_id)}}</span></template>
+        </el-table-column>
+        <el-table-column label="检查项目" min-width="80" property="project_id" align="center">
+          <template slot-scope="scope"><span>{{getProjectName(scope.row.project_id)}}</span></template>
+        </el-table-column>
+        <el-table-column label="检查日期" min-width="80" property="inspect_date" align="center">
+          <template slot-scope="scope"><span>{{getTime(scope.row.inspect_date, '{y}{m}{d}')}}</span></template>
+        </el-table-column>
+      </el-table>
 
-    <!-- <pagi-nation title="分页"></pagi-nation> -->
+      <!-- <pagi-nation title="分页"></pagi-nation> -->
 
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="listQuery.pate"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="10"
-      background
-      style="margin-top:20px;"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="total"
-    ></el-pagination>
+      <el-pagination
+        align="right"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="listQuery.pate"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
   </div>
 </template>
 
@@ -130,10 +135,15 @@
 import { GetProcessIndicatorsData  } from "@/api/qcd";
 import PieChart from './components/PieChart'
 import {uParseTime} from "@/utils/tools";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 export default {
   name: "dialysisTotal",
   data() {
     return {
+      crumbs:[
+        {path:false, name:'科室质控'},
+        {path:'/qcd/processindicators', name:'过程指标'},
+      ],
       total: 0,
       projectOptions:{},
       patientMap:{},
@@ -164,38 +174,6 @@ export default {
         { value: 1, label: "大于三个月" },
         { value: 2, label: "小于三个月" }
       ],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "今天",
-            onClick(picker) {
-              picker.$emit("pick", new Date());
-            }
-          },
-          {
-            text: "昨天",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "一周前",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", date);
-            }
-          },
-          {
-            text: "清空",
-            onClick(picker) {
-              picker.$emit("pick");
-            }
-          }
-        ]
-      }
     };
   },
   created() {
@@ -347,7 +325,8 @@ export default {
     },
   },
   components: {
-      PieChart
+      PieChart,
+      BreadCrumb
   }
 };
 </script>
@@ -355,7 +334,6 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 .app-container {
 //   margin: 20px;
-    margin-bottom: 50px;
   font-size: 15px;
   .filter-container {
     padding-bottom: 5px;
@@ -367,9 +345,6 @@ export default {
   .huixiao {
     border: solid 1px #ebeef5;
   }
-  .el-pagination {
-    float: right !important;
-  }
   .search-component {
     width: 500px;
     .searchBox {

src/xt_pages/sign/index.vue

@@ -1,8 +1,4 @@
 <template>
-<div class="main-contain">
-    <div class="position">
-        <bread-crumb></bread-crumb>
-    </div>
     <div class="app-container sign-and-weigh-box">
         <el-row :gutter="20">
             <el-col :span="7">
@@ -10,16 +6,17 @@
                 <div style="margin-bottom: 10px;">
                     <el-input v-model="queryParams.keywords" placeholder="姓名/透析号" style="width: 180px;" @change="changeSearch"></el-input>
                     <el-select v-model="queryParams.schedule_type" style="width: 100px;" @change="changeSearch">
-                        <el-option v-for="item in shiftOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                    <el-option v-for="item in shiftOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
                     </el-select>
                 </div>
-                <el-table :data="patients" :class="signAndWeighBoxPatients" style="width: 100%" border highlight-current-row :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" max-height="300"  @current-change="handleCurrentChange"> 
+                <el-table  :data="patients" :class="signAndWeighBoxPatients" style="width: 100%" border highlight-current-row :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" max-height="300" @current-change="handleCurrentChange">  
                     <el-table-column type="index" label="序号" min-width="20" align="center"></el-table-column>
-                    <el-table-column prop="name" label="姓名" min-width="50" align="center" >
-                        <template slot-scope="scope">
+                   <el-table-column prop="name" label="姓名" min-width="50" align="center">
+                       <template slot-scope="scope">
                             {{scope.row.name}}({{scope.row.dialysis_no}})
-                        </template>
-                    </el-table-column>
+                        </template> 
+                    </el-table-column> 
+
                     <el-table-column prop="state" label="状态" min-width="30" align="center" >
                         <template slot-scope="scope">
                             <span v-if="scope.row.signin.id==0">未签到</span>
@@ -29,11 +26,11 @@
                     </el-table-column>
                 </el-table>
             
-                <el-table :data="schedules" style="width: 100%; margin:15px 0 0 0;" border highlight-current-row :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
+                <el-table  :data="schedules" style="width: 100%; margin:15px 0 0 0;" border highlight-current-row :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
                     <el-table-column prop="shift" label="班次" min-width="30" align="center"></el-table-column>
                     <el-table-column prop="arrange" label="排班" min-width="30" align="center" ></el-table-column>
                     <el-table-column prop="sign" label="签到" min-width="30" align="center" ></el-table-column>
-                    <el-table-column prop="weight" label="称重" min-width="50" align="center" >
+                    <el-table-column prop="weight" label="称重(透前/透后)" min-width="50" align="center" >
                         <template slot-scope="scope">
                             {{scope.row.before}} / {{scope.row.after}}
                         </template>
@@ -43,75 +40,45 @@
 
             <el-col :span="17">
                 <div class="title">患者信息</div>
-
                 <el-form class="information" label-position="left">
-                    <el-row :gutter="20">
-                        <el-col :span="8">
-                            <el-form-item label="姓 名:" label-width="50px">
-                                <el-input v-model="weigh_form.name" disabled></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="干体重(kg):" label-width="85px">
-                                <el-input v-model="weigh_form.dry_weight" ></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="衣物重(kg):" label-width="85px">
-                                <el-input v-model="weigh_form.clothes_weight"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-
+                   <div class="patient-app-container">
+                     <span>姓名:{{weigh_form.name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;透析号:{{weigh_form.dialysis_no}} &nbsp;&nbsp;</span> <span class="button"><el-button  @click="change()">修改</el-button></span>
+                    </div>
                     <div class="border"></div>
 
                     <el-row :gutter="20">
                         <el-col :span="8">
                             <el-form-item label="透前称重(kg):" label-width="100px">
-                                <el-input v-model="weigh_form.weigh_before"></el-input>
+                                <el-input v-model="weigh_list.weight_before"></el-input>
                             </el-form-item>
                         </el-col> 
                         <el-col :span="8">
-                            <el-form-item label="目标脱水(kg):" label-width="100px">
-                                <el-input v-model="weigh_form.dehydrated_weight" disabled></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="脱水百分比:" label-width="90px">
-                                <el-input v-model="weigh_form.dehydrated_percent" disabled></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-
-                    <el-row :gutter="20">
-                        <el-col :span="8">
-                            <el-form-item label="透前体重(kg):" label-width="100px">
-                                <el-input v-model="weigh_form.weight_before" disabled></el-input>
+                            <el-form-item label="干体重(kg):" label-width="100px">
+                                <el-input v-model="weigh_list.dry_weight"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
-
                     <el-row :gutter="20">
                         <el-col :span="4">
-                            <el-form-item label="T(℃):" label-width="45px">
-                                <el-input v-model="weigh_form.temperature_before"></el-input>
+                            <el-form-item label="体温(℃):" label-width="80px">
+                               <el-input v-model="weigh_list.temperature"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
-                            <el-form-item label="P(次/分):" label-width="70px">
-                                <el-input v-model="weigh_form.pulse_rate_before"></el-input>
+                            <el-form-item label="脉搏(次/分):" label-width="90px">
+                                <el-input v-model="weigh_list.pulse_frequency"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
-                            <el-form-item label="R(次/分):" label-width="70px">
-                                <el-input v-model="weigh_form.respiratory_rate_before"></el-input>
+                            <el-form-item label="呼吸(次/分):" label-width="100px">
+                                <el-input v-model="weigh_list.breathing_rate"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="9">
-                            <el-form-item label="BP(mmHg):" label-width="80px">
-                                <el-input v-model="weigh_form.DBP_before" style="width: 70px"></el-input>
+                            <el-form-item label="血压(mmHg):" label-width="100px">
+                                <el-input v-model="weigh_list.systolic_blood_pressure" style="width: 70px"></el-input>
                                 <span> / </span>
-                                <el-input v-model="weigh_form.SBP_before" style="width: 70px"></el-input>
+                                <el-input v-model="weigh_list.diastolic_blood_pressure" style="width: 70px"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -121,381 +88,465 @@
                     <el-row :gutter="20">
                         <el-col :span="8">
                             <el-form-item label="透后称重(kg):" label-width="100px">
-                                <el-input v-model="weigh_form.weigh_after" :disabled="dialysis_stege==2?false:true"></el-input> 
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="体重减少(kg):" label-width="100px">
-                                <el-input v-model="weigh_form.weight_reduce_after"  :disabled="dialysis_stege==2?false:true"></el-input>
+                                <el-input v-model="weigh_infor.weight_after"></el-input>
                             </el-form-item>
                         </el-col>
-                    </el-row>
-
-                    <el-row :gutter="20">
                         <el-col :span="8">
-                            <el-form-item label="透后体重(kg):" label-width="100px">
-                                <el-input v-model="weigh_form.weight_after"  :disabled="dialysis_stege==2?false:true"></el-input>
+                            <el-form-item label="干体重(kg):" label-width="100px">
+                                <el-input v-model="weigh_list.dry_weight"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
-
                     <el-row :gutter="20">
                         <el-col :span="4">
-                            <el-form-item label="T(℃):" label-width="45px">
-                                <el-input v-model="weigh_form.temperature_after"  :disabled="dialysis_stege==2?false:true"></el-input>
+                            <el-form-item label="体温(℃):" label-width="80px">
+                                <el-input v-model="weigh_infor.temperature"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
-                            <el-form-item label="P(次/分):" label-width="70px">
-                                <el-input v-model="weigh_form.pulse_rate_after"  :disabled="dialysis_stege==2?false:true"></el-input>
+                            <el-form-item label="脉搏(次/分):" label-width="90px">
+                                <el-input v-model="weigh_infor.pulse_frequency"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
-                            <el-form-item label="R(次/分):" label-width="70px">
-                                <el-input v-model="weigh_form.respiratory_rate_after"  :disabled="dialysis_stege==2?false:true"></el-input>
+                            <el-form-item label="呼吸(次/分):" label-width="100px">
+                                <el-input v-model="weigh_infor.breathing_rate"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="9">
-                            <el-form-item label="BP(mmHg):" label-width="80px">
-                                <el-input v-model="weigh_form.DBP_after" style="width: 70px"  :disabled="dialysis_stege==2?false:true"></el-input>
+                            <el-form-item label="血压(mmHg):" label-width="100px">
+                                <el-input v-model="weigh_infor.systolic_blood_pressure" style="width: 70px" ></el-input>
                                 <span> / </span>
-                                <el-input v-model="weigh_form.SBP_after" style="width: 70px"  :disabled="dialysis_stege==2?false:true"></el-input>
+                                <el-input v-model="weigh_infor.diastolic_blood_pressure" style="width: 70px" ></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
                     
                     <div class="border"></div>
-                    
+                    <div v-if="show">
                     <el-row :gutter="20">
                         <el-col :span="23" align="right">
-                            <el-button @click="submitSign" :disabled="weigh_form.choose?false:true" type="primary">保 存</el-button>
+                            <el-button  @click="hide()">取消</el-button>
+                            <el-button @click="savedata();updatedata()" type="primary">保存</el-button>
                         </el-col>
                     </el-row>
+                   </div>
                 </el-form>
             </el-col>
         </el-row>
     </div>
- </div>
 </template>
 
 <script>
-import {fetchSignPatients,getPatientSign,SignWeigh} from '@/api/signandweigh';
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
-
+import { fetchSignPatients, getPatientSign, SignWeigh, getDialysisInforInfomation, getDialysisAfterInfomation, createdata, editdata } from '@/api/signandweigh'
 export default {
-  name: "sign",
+  name: 'sign',
   data() {
     return {
-        signAndWeighBoxPatients:'sign-and-weigh-box-patients',
-        queryParams:{
-            keywords: '',
-            schedule_type: '',
-            need_schedule_type:0,
-        },
-        querySignParams:{
-            patient_id:0,
-            date_time:'',
-        },
-        weigh_form: {
-            choose:false,
-            name: '',
-            dry_weight: '',
-            clothes_weight: '',
-            // 透前
-            weigh_before: '',
-            dehydrated_weight: '',
-            dehydrated_percent: '',
-            weight_before: '',
-            temperature_before: '',
-            pulse_rate_before: '',  // P 脉率
-            respiratory_rate_before: '', // R 呼吸频率
-            DBP_before: '', // 舒张压
-            SBP_before: '', // 收缩压
-            // 透后
-            weigh_after: '',
-            weight_reduce_after: '',
-            weight_after: '',
-            temperature_after: '',
-            pulse_rate_after: '', // P 脉率
-            respiratory_rate_after: '', // R 呼吸频率
-            DBP_after: '', // 舒张压
-            SBP_after: '', // 收缩压
-        },
-        shiftOptions:[
-            { value:0, label:'全部' },
-            { value:1, label:'上午' },
-            { value:2, label:'下午' },
-            { value:3, label:'晚上' },
-        ],
-        schedules: [{
-            type:1,
-            shift: "上午",
-            arrange: 0,
-            sign: 0,
-            before:0,
-            after:0,
-        }, {
-            type:2,
-            shift: "下午",
-            arrange: 0,
-            sign: 0,
-            before:0,
-            after:0,
-        }, {
-            type:3,
-            shift: "晚上",
-            arrange: 0,
-            sign: 0,
-            before:0,
-            after:0,
-        }],
-        patients: [],
-        dialysis_stege:0,
-    };
-  },
-  components:{
-    BreadCrumb
-  },
-  methods:{
-      fetchSignPatients(){
-          fetchSignPatients(this.queryParams).then(response=>{
-              this.patients = [];
-              if (response.data.state==1) {
-                  this.patients = response.data.data.patients;
-                  this.queryParams.schedule_type = response.data.data.schedule_type;
-                  this.querySignParams.date_time = response.data.data.today;
-
-                  if(this.queryParams.need_schedule_type == 1) {
-                      var sl = this.schedules.length;
-                      for (let index = 0; index < sl; index++) {
-                          if(this.schedules[index].type in response.data.data.panel) {
-                                this.schedules[index].arrange = response.data.data.panel[this.schedules[index].type].schedule;
-                                this.schedules[index].sign = response.data.data.panel[this.schedules[index].type].sign;
-                                this.schedules[index].before = response.data.data.panel[this.schedules[index].type].before;
-                                this.schedules[index].after = response.data.data.panel[this.schedules[index].type].after;
-                          }
-                      }
-                  }
-
-              }
-          });
+      patientlist: [],
+      signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+      queryParams: {
+        keywords: '',
+        schedule_type: '',
+        need_schedule_type: 0
       },
-      getPatientSign(){
-          getPatientSign(this.querySignParams).then(response=>{
-              if (response.data.state==1) {
-                  if (response.data.data.sign != null) {
-                      var sign = response.data.data.sign;
-                      this.weigh_form.dry_weight = sign.dry_weight;
-                      this.weigh_form.clothes_weight = sign.clothes_weight;
-                        // 透前
-                      this.weigh_form.weigh_before = sign.weigh_before;
-                      this.weigh_form.dehydrated_weight = sign.dehydrated_weight;
-                      this.weigh_form.dehydrated_percent = sign.dehydrated_percent;
-                      this.weigh_form.weight_before = sign.weight_before;
-                      this.weigh_form.temperature_before = sign.temperature_before;
-                      this.weigh_form.pulse_rate_before = sign.pulse_rate_before;  // P 脉率
-                      this.weigh_form.respiratory_rate_before = sign.respiratory_rate_before; // R 呼吸频率
-                      this.weigh_form.DBP_before = sign.DBP_before; // 舒张压
-                      this.weigh_form.SBP_before = sign.SBP_before // 收缩压
-                        // 透后
-                      this.weigh_form.weigh_after = sign.weigh_after;
-                      this.weigh_form.weight_reduce_after = sign.weight_reduce_after;
-                      this.weigh_form.weight_after = sign.weight_after
-                      this.weigh_form.temperature_after = sign.temperature_after;
-                      this.weigh_form.pulse_rate_after = sign.pulse_rate_after; // P 脉率
-                      this.weigh_form.respiratory_rate_after = sign.respiratory_rate_after; // R 呼吸频率
-                      this.weigh_form.DBP_after = sign.DBP_after; // 舒张压
-                      this.weigh_form.SBP_after = sign.SBP_after; // 收缩压
-                      this.weigh_form.id=sign.id;
-                  }
-              }
-          });
+      querySignParams: {
+        patient_id: 0,
+        date_time: ''
       },
-      changeSearch(){
-            this.queryParams.need_schedule_type = 0;
-            this.fetchSignPatients();
+      weigh_form: {
+        choose: false,
+        name: '',
+        dry_weight: '',
+        clothes_weight: '',
+        // 透前
+        weigh_before: '',
+        dehydrated_weight: '',
+        dehydrated_percent: '',
+        weight_before: '',
+        temperature_before: '',
+        pulse_rate_before: '', // P 脉率
+        respiratory_rate_before: '', // R 呼吸频率
+        DBP_before: '', // 舒张压
+        SBP_before: '', // 收缩压
+        // 透后
+        weigh_after: '',
+        weight_reduce_after: '',
+        weight_after: '',
+        temperature_after: '',
+        pulse_rate_after: '', // P 脉率
+        respiratory_rate_after: '', // R 呼吸频率
+        DBP_after: '', // 舒张压
+        SBP_after: '', // 收缩压
+        dialysis_no: ''
       },
-      handleCurrentChange(row, old){
-            this.weigh_form = {
-            id:0,
-            choose:false,
-            name: '',
-            dry_weight: '',
-            clothes_weight: '',
-            // 透前
-            weigh_before: '',
-            dehydrated_weight: '',
-            dehydrated_percent: '',
-            weight_before: '',
-            temperature_before: '',
-            pulse_rate_before: '',  // P 脉率
-            respiratory_rate_before: '', // R 呼吸频率
-            DBP_before: '', // 舒张压
-            SBP_before: '', // 收缩压
-            // 透后
-            weigh_after: '',
-            weight_reduce_after: '',
-            weight_after: '',
-            temperature_after: '',
-            pulse_rate_after: '', // P 脉率
-            respiratory_rate_after: '', // R 呼吸频率
-            DBP_after: '', // 舒张压
-            SBP_after: '', // 收缩压
-            patient_id: 0,
-        };
-
-          this.weigh_form.choose = true;
-          this.weigh_form.name = row.name;
-          if (row.alias.length>0) {
-              this.weigh_form.name += "("+row.alias+")";
+      weigh_list: {
+        weight_before: '', // 透前体重
+        temperature: '', // 体温
+        pulse_frequency: '', // 脉搏
+        breathing_rate: '', // 呼吸频率
+        dry_weight: '', // 干体重
+        systolic_blood_pressure: '', // 收缩压
+        diastolic_blood_pressure: ''// 舒张压
+      },
+      weigh_infor: {
+        weight_after: '', // 透后体重
+        temperature: '',
+        pulse_frequency: '',
+        breathing_rate: '',
+        dry_weight: '',
+        systolic_blood_pressure: '',
+        diastolic_blood_pressure: ''
+      },
+      shiftOptions: [
+        { value: 0, label: '班次' },
+        { value: 1, label: '上午' },
+        { value: 2, label: '下午' },
+        { value: 3, label: '晚上' }
+      ],
+      schedules: [{
+        type: 1,
+        shift: '上午',
+        arrange: 0,
+        sign: 0,
+        before: 0,
+        after: 0
+      }, {
+        type: 2,
+        shift: '下午',
+        arrange: 0,
+        sign: 0,
+        before: 0,
+        after: 0
+      }, {
+        type: 3,
+        shift: '晚上',
+        arrange: 0,
+        sign: 0,
+        before: 0,
+        after: 0
+      }],
+      patients: [],
+      dialysis_stege: 0,
+      show: false
+    }
+  },
+  methods: {
+    fetchSignPatients() {
+      fetchSignPatients(this.queryParams).then(response => {
+        this.patients = []
+        if (response.data.state === 1) {
+          this.patients = response.data.data.patients
+          this.queryParams.schedule_type = response.data.data.schedule_type
+          this.querySignParams.date_time = response.data.data.today
+
+          if (this.queryParams.need_schedule_type === 1) {
+            var sl = this.schedules.length
+            for (let index = 0; index < sl; index++) {
+              if (this.schedules[index].type in response.data.data.panel) {
+                this.schedules[index].arrange = response.data.data.panel[this.schedules[index].type].schedule
+                this.schedules[index].sign = response.data.data.panel[this.schedules[index].type].sign
+                this.schedules[index].before = response.data.data.panel[this.schedules[index].type].before
+                this.schedules[index].after = response.data.data.panel[this.schedules[index].type].after
+              }
+            }
           }
-          this.weigh_form.patient_id = row.id;
-          this.querySignParams.patient_id = row.id;
-          this.dialysis_stege = row.dialysis_order.stage;
-
-          if (row.signin != null) {
-               this.weigh_form.dry_weight = '' + row.signin.dry_weight;
-               this.weigh_form.clothes_weight = '' + row.signin.clothing_weight;
-                // 透前
-                this.weigh_form.weigh_before = '' + row.signin.weighing_before;
-                this.weigh_form.dehydrated_weight = '' + row.signin.target_dewatering;
-            
-                if (this.weigh_form.dry_weight == 0) {
-                    this.weigh_form.dehydrated_percent  = '';
-                }else {
-                    var dehydrated_percent = ((this.weigh_form.dehydrated_weight/this.weigh_form.dry_weight) * 100).toFixed(2);
-                    if (isNaN(dehydrated_percent)) {
-                        this.weigh_form.dehydrated_percent  = '';
-                    }else {
-                        this.weigh_form.dehydrated_percent  = dehydrated_percent + "%";
+        }
+      })
+    },
+    //   getPatientSign(){
+    //       getPatientSign(this.querySignParams).then(response=>{
+    //           if (response.data.state==1) {
+    //               if (response.data.data.sign != null) {
+    //                   var sign = response.data.data.sign;
+    //                   this.weigh_form.dry_weight = sign.dry_weight;
+    //                   this.weigh_form.clothes_weight = sign.clothes_weight;
+    //                     // 透前
+    //                   this.weigh_form.weigh_before = sign.weigh_before;
+    //                   this.weigh_form.dehydrated_weight = sign.dehydrated_weight;
+    //                   this.weigh_form.dehydrated_percent = sign.dehydrated_percent;
+    //                   this.weigh_form.weight_before = sign.weight_before;
+    //                   this.weigh_form.temperature_before = sign.temperature_before;
+    //                   this.weigh_form.pulse_rate_before = sign.pulse_rate_before;  // P 脉率
+    //                   this.weigh_form.respiratory_rate_before = sign.respiratory_rate_before; // R 呼吸频率
+    //                   this.weigh_form.DBP_before = sign.DBP_before; // 舒张压
+    //                   this.weigh_form.SBP_before = sign.SBP_before // 收缩压
+    //                     // 透后
+    //                   this.weigh_form.weigh_after = sign.weigh_after;
+    //                   this.weigh_form.weight_reduce_after = sign.weight_reduce_after;
+    //                   this.weigh_form.weight_after = sign.weight_after
+    //                   this.weigh_form.temperature_after = sign.temperature_after;
+    //                   this.weigh_form.pulse_rate_after = sign.pulse_rate_after; // P 脉率
+    //                   this.weigh_form.respiratory_rate_after = sign.respiratory_rate_after; // R 呼吸频率
+    //                   this.weigh_form.DBP_after = sign.DBP_after; // 舒张压
+    //                   this.weigh_form.SBP_after = sign.SBP_after; // 收缩压
+    //                   this.weigh_form.id=sign.id;
+    //               }
+    //           }
+    //       });
+    //   },
+    changeSearch() {
+      this.queryParams.need_schedule_type = 0
+      this.fetchSignPatients()
+    },
+    handleCurrentChange(row, old) {
+      //     this.weigh_form = {
+      //     id:0,
+      //     choose:false,
+      //     name: '',
+      //     dry_weight: '',
+      //     clothes_weight: '',
+      //     // 透前
+      //     weigh_before: '',
+      //     dehydrated_weight: '',
+      //     dehydrated_percent: '',
+      //     weight_before: '',
+      //     temperature_before: '',
+      //     pulse_rate_before: '',  // P 脉率
+      //     respiratory_rate_before: '', // R 呼吸频率
+      //     DBP_before: '', // 舒张压
+      //     SBP_before: '', // 收缩压
+      //     // 透后
+      //     weigh_after: '',
+      //     weight_reduce_after: '',
+      //     weight_after: '',
+      //     temperature_after: '',
+      //     pulse_rate_after: '', // P 脉率
+      //     respiratory_rate_after: '', // R 呼吸频率
+      //     DBP_after: '', // 舒张压
+      //     SBP_after: '', // 收缩压
+      //     patient_id: 0,
+      //     dialysis_no:'',
+      // };
+
+      this.weigh_form.choose = true
+      this.weigh_form.name = row.name
+      this.weigh_form.dialysis_no = row.dialysis_no
+      //   if (row.alias.length>0) {
+      //       this.weigh_form.name += "("+row.alias+")";
+      //   }
+      this.weigh_form.patient_id = row.id
+      this.querySignParams.patient_id = row.id
+      this.dialysis_stege = row.dialysis_order.stage
+      this.getDialysisInforInfomation(row.id)
+      this.getDialysisAfterInfomation(row.id)
+      //   if (row.signin != null) {
+      //        this.weigh_form.dry_weight = '' + row.signin.dry_weight;
+      //        this.weigh_form.clothes_weight = '' + row.signin.clothing_weight;
+      //         // 透前
+      //         this.weigh_form.weigh_before = '' + row.signin.weighing_before;
+      //         this.weigh_form.dehydrated_weight = '' + row.signin.target_dewatering;
+
+      //         if (this.weigh_form.dry_weight == 0) {
+      //             this.weigh_form.dehydrated_percent  = '';
+      //         }else {
+      //             var dehydrated_percent = ((this.weigh_form.dehydrated_weight/this.weigh_form.dry_weight) * 100).toFixed(2);
+      //             if (isNaN(dehydrated_percent)) {
+      //                 this.weigh_form.dehydrated_percent  = '';
+      //             }else {
+      //                 this.weigh_form.dehydrated_percent  = dehydrated_percent + "%";
+      //             }
+      //         }
+
+      //         this.weigh_form.weight_before = '' + row.signin.weight_before;
+      //         this.weigh_form.temperature_before = '' + row.signin.temperature_before;
+      //         this.weigh_form.pulse_rate_before = '' + row.signin.pulse_frequency_before;
+      //         this.weigh_form.respiratory_rate_before = '' + row.signin.breathing_rate_before;
+      //         this.weigh_form.DBP_before = '' + row.signin.diastolic_blood_pressure_before;
+      //         this.weigh_form.SBP_before = '' + row.signin.systolic_blood_pressure_before;
+
+      //         this.weigh_form.weigh_after = '' + row.signin.weighing_after;
+      //         this.weigh_form.weight_reduce_after = '' + row.signin.weight_loss;
+      //         this.weigh_form.weight_after = '' + row.signin.weight_after;
+      //         this.weigh_form.temperature_after = '' + row.signin.temperature_after;
+      //         this.weigh_form.pulse_rate_after = '' + row.signin.pulse_frequency_after;
+      //         this.weigh_form.respiratory_rate_after = '' + row.signin.breathing_rate_after;
+      //         this.weigh_form.DBP_after = '' + row.signin.diastolic_blood_pressure_after;
+      //         this.weigh_form.SBP_after = '' + row.signin.systolic_blood_pressure_after;
+      //         this.weigh_form.id = row.signin.id;
+      //   }
+    },
+    submitSign() {
+      SignWeigh(this.querySignParams, this.weigh_form).then(response => {
+        if (response.data.state === 1) {
+          this.$message({
+            type: 'success',
+            message: '成功!'
+          })
+
+          var tlen = this.patients.length
+          for (let index = 0; index < tlen; index++) {
+            if (this.patients[index].id === this.querySignParams.patient_id) {
+              var signin = this.patients[index].signin
+              this.patients[index].signin = response.data.data.sign
+
+              if (this.patients[index].schedule.id > 0 && (this.patients[index].schedule.schedule_type >= 1 || this.patients[index].schedule.schedule_type <= 3)) {
+                var sl = this.schedules.length
+                for (let j = 0; j < sl; j++) {
+                  if (this.schedules[j].type === this.patients[index].schedule.schedule_type) {
+                    if (this.weigh_form.id <= 0) {
+                      this.schedules[j].sign++
+                    }
+                    if (signin.weigh_before_time === 0 && response.data.data.sign.weigh_before_time > 0) {
+                      this.schedules[j].before++
                     }
-                }
-
-                this.weigh_form.weight_before = '' + row.signin.weight_before;
-                this.weigh_form.temperature_before = '' + row.signin.temperature_before;
-                this.weigh_form.pulse_rate_before = '' + row.signin.pulse_frequency_before;
-                this.weigh_form.respiratory_rate_before = '' + row.signin.breathing_rate_before;
-                this.weigh_form.DBP_before = '' + row.signin.diastolic_blood_pressure_before;
-                this.weigh_form.SBP_before = '' + row.signin.systolic_blood_pressure_before;
-
-                this.weigh_form.weigh_after = '' + row.signin.weighing_after;
-                this.weigh_form.weight_reduce_after = '' + row.signin.weight_loss;
-                this.weigh_form.weight_after = '' + row.signin.weight_after;
-                this.weigh_form.temperature_after = '' + row.signin.temperature_after;
-                this.weigh_form.pulse_rate_after = '' + row.signin.pulse_frequency_after;
-                this.weigh_form.respiratory_rate_after = '' + row.signin.breathing_rate_after;
-                this.weigh_form.DBP_after = '' + row.signin.diastolic_blood_pressure_after;
-                this.weigh_form.SBP_after = '' + row.signin.systolic_blood_pressure_after;
-                this.weigh_form.id = row.signin.id;
-          }
-
-      },
-      submitSign(){
-          SignWeigh(this.querySignParams, this.weigh_form).then(response=>{
-              if(response.data.state==1){
-                this.$message({
-                    type: 'success',
-                    message: '成功!'
-                });
-
-
-                var tlen = this.patients.length;
-                for (let index = 0; index < tlen; index++) {
-                    if (this.patients[index].id == this.querySignParams.patient_id) {
-                        var signin = this.patients[index].signin;
-                        this.patients[index].signin = response.data.data.sign;
-
-                        if (this.patients[index].schedule.id>0 && (this.patients[index].schedule.schedule_type>=1 || this.patients[index].schedule.schedule_type <= 3)) {
-                            var sl = this.schedules.length;
-                            for (let j = 0; j < sl; j++) {
-                                if(this.schedules[j].type == this.patients[index].schedule.schedule_type) {
-                                    if(this.weigh_form.id <= 0) {
-                                        this.schedules[j].sign ++;
-                                    }
-                                    if (signin.weigh_before_time==0 && response.data.data.sign.weigh_before_time>0) {
-                                        this.schedules[j].before ++;
-                                    }
-
-                                    if(signin.weigh_time==0 && response.data.data.sign.weigh_time>0) {
-                                        this.schedules[j].after ++;
-                                    }
 
-                                }
-                            }
-                        }
-                        break;
+                    if (signin.weigh_time === 0 && response.data.data.sign.weigh_time > 0) {
+                      this.schedules[j].after++
                     }
-                    
+                  }
                 }
-                this.weigh_form.id = response.data.data.sign.id;
-
-              }else {
-                this.$message.error(response.data.msg);
-                return false;
               }
-          });
-      }
-
-  },
-  watch:{
-      "weigh_form.weigh_before":function () {
-          this.weigh_form.weight_before = this.weigh_form.weigh_before - this.weigh_form.clothes_weight;
-          this.weigh_form.dehydrated_weight = this.weigh_form.weigh_before - this.weigh_form.dry_weight  - this.weigh_form.clothes_weight;
-          this.weigh_form.weight_before += '';
-          this.weigh_form.dehydrated_weight += '';
-
-          if (this.dialysis_stege == 2) {
-              this.weigh_form.weight_reduce_after = this.weigh_form.weigh_before - this.weigh_form.weigh_after;
-              this.weigh_form.weight_reduce_after += '';
-          }
-      },
-      "weigh_form.weigh_after":function () {
-          if (this.dialysis_stege == 2) {
-              this.weigh_form.weight_reduce_after = this.weigh_form.weigh_before - this.weigh_form.weigh_after; 
-              this.weigh_form.weight_reduce_after += '';
-              
-              this.weigh_form.weight_after = this.weigh_form.weigh_after - this.weigh_form.clothes_weight; 
-              this.weigh_form.weight_after += '';
+              break
+            }
           }
-      },
-      "weigh_form.clothes_weight":function () {
-          this.weigh_form.weight_before = this.weigh_form.weigh_before - this.weigh_form.clothes_weight;
-          this.weigh_form.dehydrated_weight = this.weigh_form.weigh_before - this.weigh_form.dry_weight  - this.weigh_form.clothes_weight;
-          this.weigh_form.weight_before += '';
-          this.weigh_form.dehydrated_weight += '';
+          this.weigh_form.id = response.data.data.sign.id
+        } else {
+          this.$message.error(response.data.msg)
+          return false
+        }
+      })
+    },
+
+    getDialysisInforInfomation(id) {
+      getDialysisInforInfomation(id).then(response => {
+        if (response.data.data.patientlist != null) {
+          var patientlist = response.data.data.patientlist
+          this.weigh_list.dry_weight = patientlist.dry_weight
+          this.weigh_list.weight_before = patientlist.weight_before
+          this.weigh_list.temperature = patientlist.temperature
+          this.weigh_list.pulse_frequency = patientlist.pulse_frequency
+          this.weigh_list.breathing_rate = patientlist.breathing_rate
+          this.weigh_list.systolic_blood_pressure = patientlist.systolic_blood_pressure
+          this.weigh_list.diastolic_blood_pressure = patientlist.diastolic_blood_pressure
+          console.log('報恩 ')
+          console.log(patientlist)
+        }
+      })
+    },
+
+    getDialysisAfterInfomation(id) {
+      getDialysisAfterInfomation(id).then(response => {
+        if (response.data.data.patientinfor != null) {
+          var patientinfor = response.data.data.patientinfor
+          console.log(patientinfor)
+          this.weigh_infor.dry_weight = patientinfor.dry_weight
+          this.weigh_infor.weight_after = patientinfor.weight_after
+          console.log(patientinfor.weight_after)
+          this.weigh_infor.temperature = patientinfor.temperature
+          this.weigh_infor.pulse_frequency = patientinfor.pulse_frequency
+          this.weigh_infor.breathing_rate = patientinfor.breathing_rate
+          this.weigh_infor.systolic_blood_pressure = patientinfor.systolic_blood_pressure
+          this.weigh_infor.diastolic_blood_pressure = patientinfor.diastolic_blood_pressure
+        }
+      })
+    },
+    change() {
+      this.show = true
+    },
+    savedata() {
+      var params = new Object()
+      params.patient_id = this.weigh_form.patient_id
+      params.dry_weight = this.weigh_list.dry_weight
+      params.weight_before = this.weigh_list.weight_before
+      params.temperature = this.weigh_list.temperature
+      params.pulse_frequency = this.weigh_list.pulse_frequency
+      params.breathing_rate = this.weigh_list.breathing_rate
+      params.systolic_blood_pressure = this.weigh_list.systolic_blood_pressure
+      params.diastolic_blood_pressure = this.weigh_list.diastolic_blood_pressure
+      createdata(params).then(response => {
+        if (response.data.state === 1) {
+          this.$message({
+            type: 'success',
+            message: '成功!'
+          })
+        }
+      })
+      console.log('aaaaaaaaaaaaaaaaaa')
+      console.log(params)
+    },
+    hide() {
+      this.show = false
+    },
+    updatedata() {
+      var params = new Object()
+      params.patient_id = this.weigh_form.patient_id
+      params.dry_weight = this.weigh_infor.dry_weight
+      params.weight_after = this.weigh_infor.weight_after
+      params.temperature = this.weigh_infor.temperature
+      params.pulse_frequency = this.weigh_infor.pulse_frequency
+      params.breathing_rate = this.weigh_infor.breathing_rate
+      params.systolic_blood_pressure = this.weigh_infor.systolic_blood_pressure
+      params.diastolic_blood_pressure = this.weigh_infor.diastolic_blood_pressure
+      editdata(params).then(response => {
+        if (response.data.state === 1) {
+          this.$message({
+            type: 'success',
+            message: '成功!'
+          })
+        }
+      })
+      console.log('hahahahah')
+      console.log(params)
+    }
+  },
+  watch: {
+    'weigh_form.weigh_before': function() {
+      this.weigh_form.weight_before = this.weigh_form.weigh_before - this.weigh_form.clothes_weight
+      this.weigh_form.dehydrated_weight = this.weigh_form.weigh_before - this.weigh_form.dry_weight - this.weigh_form.clothes_weight
+      this.weigh_form.weight_before += ''
+      this.weigh_form.dehydrated_weight += ''
+
+      if (this.dialysis_stege === 2) {
+        this.weigh_form.weight_reduce_after = this.weigh_form.weigh_before - this.weigh_form.weigh_after
+        this.weigh_form.weight_reduce_after += ''
+      }
+    },
+    'weigh_form.weigh_after': function() {
+      if (this.dialysis_stege === 2) {
+        this.weigh_form.weight_reduce_after = this.weigh_form.weigh_before - this.weigh_form.weigh_after
+        this.weigh_form.weight_reduce_after += ''
+
+        this.weigh_form.weight_after = this.weigh_form.weigh_after - this.weigh_form.clothes_weight
+        this.weigh_form.weight_after += ''
+      }
+    },
+    'weigh_form.clothes_weight': function() {
+      this.weigh_form.weight_before = this.weigh_form.weigh_before - this.weigh_form.clothes_weight
+      this.weigh_form.dehydrated_weight = this.weigh_form.weigh_before - this.weigh_form.dry_weight - this.weigh_form.clothes_weight
+      this.weigh_form.weight_before += ''
+      this.weigh_form.dehydrated_weight += ''
+
+      if (this.dialysis_stege === 2) {
+        this.weigh_form.weight_after = this.weigh_form.weigh_after - this.weigh_form.clothes_weight
+        this.weigh_form.weight_after += ''
+      }
+    },
+    'weigh_form.dry_weight': function() {
+      this.weigh_form.dehydrated_weight = this.weigh_form.weigh_before - this.weigh_form.dry_weight - this.weigh_form.clothes_weight
+
+      this.weigh_form.dehydrated_weight += ''
+    },
+    'weigh_form.dehydrated_weight': function() {
+      if (this.weigh_form.dry_weight === 0) {
+        this.weigh_form.dehydrated_percent = ''
+      } else {
+        var dehydrated_percent = ((this.weigh_form.dehydrated_weight / this.weigh_form.dry_weight) * 100).toFixed(2)
+        if (isNaN(dehydrated_percent)) {
+          this.weigh_form.dehydrated_percent = ''
+        } else {
+          this.weigh_form.dehydrated_percent = dehydrated_percent + '%'
+        }
+      }
+    }
 
-          if (this.dialysis_stege == 2) {
-              
-              this.weigh_form.weight_after = this.weigh_form.weigh_after - this.weigh_form.clothes_weight; 
-              this.weigh_form.weight_after += '';
-          }
-      },
-      "weigh_form.dry_weight":function () {
-          this.weigh_form.dehydrated_weight = this.weigh_form.weigh_before - this.weigh_form.dry_weight  - this.weigh_form.clothes_weight;
-          
-          this.weigh_form.dehydrated_weight += '';
-      },
-      "weigh_form.dehydrated_weight":function () {
-          if (this.weigh_form.dry_weight == 0) {
-              this.weigh_form.dehydrated_percent  = '';
-          }else {
-                var dehydrated_percent = ((this.weigh_form.dehydrated_weight/this.weigh_form.dry_weight) * 100).toFixed(2);
-                if (isNaN(dehydrated_percent)) {
-                    this.weigh_form.dehydrated_percent  = '';
-                }else {
-                    this.weigh_form.dehydrated_percent  = dehydrated_percent + "%";
-                }
-          }
-          
-      },
-      
   },
-  created(){
-      this.queryParams.schedule_type = -1;
-      this.queryParams.need_schedule_type = 1;
-      this.fetchSignPatients();
+  created() {
+    this.queryParams.schedule_type = -1
+    this.queryParams.need_schedule_type = 1
+    this.fetchSignPatients()
   }
-};
+}
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
@@ -535,4 +586,16 @@ export default {
     background: #6fb5fa;
 }
 
+ .patient-app-container {
+    margin-left: 10px;
+    padding-left: 20px;
+    margin-bottom: 4px;
+    height: 36px;
+    line-height: 36px;
+  }
+
+  .button{
+      float: right;
+      margin-bottom:0px
+  }
 </style>

src/xt_pages/user/courseOfDisease.vue

@@ -1,8 +1,8 @@
 <template>
-<div class="main-contain">
+<!-- <div class="main-contain">
     <div class="position">
        <bread-crumb></bread-crumb>
-    </div>
+    </div> -->
     <div class="patient-container ">
         <patient-sidebar :id="patient_id" defaultActive="1-2"></patient-sidebar>
         <div class="container" v-loading="loading">
@@ -64,7 +64,7 @@
             </div>
         </el-dialog>
     </div>
-</div>
+<!-- </div> -->
 </template>
 
 <script>

src/xt_pages/user/dialysisRecord.vue

@@ -79,6 +79,7 @@
               </el-table-column>
           </el-table>
           <el-pagination
+          align="right"
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
             :current-page="queryParams.page"

src/xt_pages/user/dialysisSolution.vue

@@ -111,6 +111,7 @@
     </el-table-column>
    </el-table>
   <el-pagination
+  align="right"
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="queryParams.page"

src/xt_pages/user/inspection.vue

@@ -65,6 +65,7 @@
             </el-table-column>
           </el-table>
           <el-pagination
+          align="right"
             @current-change="handleCurrentChangePage"
             :current-page="queryParams.page"
             :page-size="1"

src/xt_pages/user/proeducation.vue

@@ -19,6 +19,7 @@
             </el-table>
             
             <el-pagination
+          align="right"
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
                 :current-page="listQuery.page"