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

config/dev.env.js

@@ -6,5 +6,5 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API: '"http://112.74.16.180:9527"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com http://112.74.16.180:9527
+  BASE_API: '"http://localhost:9529"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com http://112.74.16.180:9527
 }

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -241,7 +241,7 @@
           </el-row>
         </el-form>
 
-        <div slot="footer" class="dialog-footer">
+        <div slot="footer" class="dialog-footer" v-show="edit" >
               <el-button @click="cancelEditAction">取 消</el-button>
               <el-button type="primary" @click="submitAction">保 存</el-button>
         </div>

src/xt_pages/qcd/components/BarChart.vue

@@ -21,7 +21,7 @@ export default {
     },
     height: {
       type: String,
-      default: '350px'
+      default: '380px'
     },
     title:{
       type: String,

src/xt_pages/qcd/components/LineChart.vue

@@ -19,7 +19,7 @@ export default {
     },
     height: {
       type: String,
-      default: '350px'
+      default: '380px'
     },
     autoResize: {
       type: Boolean,

src/xt_pages/qcd/components/PieChart.vue

@@ -19,7 +19,7 @@ export default {
     },
     height: {
       type: String,
-      default: '350px'
+      default: '380px'
     },
     title:{
       type: String,

src/xt_pages/qcd/outcomeIndicators/control.vue

@@ -4,7 +4,7 @@
       <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
     <div class="app-container">
-      <el-tabs v-model="tabActiveName" @tab-click="handleTabClick">
+      <el-tabs v-model="tabActiveName" @tab-click="handleTabClick" style="margin-bottom:10px">
           <el-tab-pane label="指标控制" name="control"></el-tab-pane>
           <el-tab-pane label="指标查询" name="query"></el-tab-pane>
       </el-tabs>

src/xt_pages/qcd/outcomeIndicators/query.vue

@@ -4,7 +4,7 @@
       <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
     <div class="app-container" id="outcome-indicators-query">
-      <el-tabs v-model="tabActiveName" @tab-click="handleTabClick">
+      <el-tabs v-model="tabActiveName" @tab-click="handleTabClick" style="margin-bottom:10px">
           <el-tab-pane label="指标控制" name="control"></el-tab-pane>
           <el-tab-pane label="指标查询" name="query"></el-tab-pane>
       </el-tabs>

src/xt_pages/qcd/patientAnalysis/components/analysisNav.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-tabs v-model="tabActiveName" @tab-click="handleTabClick">
+    <el-tabs v-model="tabActiveName" @tab-click="handleTabClick" style="margin-bottom:10px">
         <el-tab-pane label="总量分析" name="total"></el-tab-pane>
         <el-tab-pane label="体重分析" name="weight"></el-tab-pane>
         <el-tab-pane label="血压分析" name="bloodpressure"></el-tab-pane>

src/xt_pages/qcd/patientAnalysis/person/indicators.vue

@@ -213,7 +213,7 @@ export default {
   },
   computed:{
     activeReferences:function(){
-      var routineBloodShowItem = {17:17,35:35,36:36,37:37,51:51,46:46};
+      var routineBloodShowItem = {17:1,35:1,36:1,37:1,49:1,46:1,48:1};
       var references = [];
       for (const index in this.references) {
         if (this.references[index].id in routineBloodShowItem) {

src/xt_pages/qcd/patientAnalysis/total.vue

@@ -9,9 +9,7 @@
       <div class="cell clearfix">
         <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-input v-model="listQuery.search" placeholder="姓名/透析号" style="width: 377px;"></el-input>
             <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
           </el-form-item>
         </el-form>

src/xt_pages/workforce/components/tableData.vue

@@ -141,7 +141,7 @@
             </div>
           </div>
         </div>
-        <el-table ref="singleTable" :data="patients" border height="250" highlight-current-row @current-change="handleCurrentChange" :header-cell-style="{ backgroundColor: 'rgb(236, 245, 255)'}" >
+        <el-table ref="singleTable" :data="patients" border  highlight-current-row @current-change="handleCurrentChange" :header-cell-style="{ backgroundColor: 'rgb(236, 245, 255)'}" >
           <el-table-column type="index" label="序号" width="89" align="center"> </el-table-column>
           <el-table-column property="dialysis_no" label="透析号" min-width="110" align="center" ></el-table-column>
           <el-table-column property="name" label="姓名" min-width="110" align="center" ></el-table-column>

src/xt_pages/workforce/components/template_schedule_selector_dialog.vue

@@ -13,11 +13,11 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item>
-                <el-button type="danger" @click="cancelScheduleAction">取消排班</el-button>
-                <el-button type="primary" @click="saveAction">保存</el-button>
-            </el-form-item>
         </el-form>
+        <div slot="footer" class="dialog-footer">
+            <el-button  @click="cancelScheduleAction">取消排班</el-button>
+            <el-button type="primary" @click="saveAction">保 存</el-button>
+        </div>
     </el-dialog>
 </template>
 

src/xt_pages/workforce/schedule_print.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="main-contain">
     <div class="position">
-       <bread-crumb></bread-crumb>
+       <bread-crumb :crumbs="crumbs"></bread-crumb>
         <el-row style="float:right;">
             <el-col :span="24">
                 <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
@@ -88,6 +88,10 @@ export default {
     name: "SchedulePrint",
     data() {
         return {
+            crumbs: [
+                { path: false, name: '排班管理' },
+                { path: false, name: '排班打印' },
+            ],
             td_1_width: "8%",
             td_2_width: "8%",
             td_3_width: "64%",

src/xt_permission.js

@@ -10,19 +10,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
 
   NProgress.start()