Merge remote-tracking branch 'origin/superman' 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",
@@ -5210,9 +5216,9 @@
       }
     },
     "fstream": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
@@ -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",
@@ -6512,7 +6538,8 @@
     },
     "js-yaml": {
       "version": "3.7.0",
-      "resolved": "",
+      "resolved": "https://registry.npm.taobao.org/js-yaml/download/js-yaml-3.7.0.tgz",
+      "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -7785,6 +7812,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 +13025,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",
@@ -13306,13 +13345,13 @@
       "dev": true
     },
     "tar": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
-      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
       "dev": true,
       "requires": {
         "block-stream": "*",
-        "fstream": "^1.0.12",
+        "fstream": "^1.0.2",
         "inherits": "2"
       }
     },

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/qcd.js

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

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/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/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"