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

config/dev.env.js

@@ -6,11 +6,5 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-<<<<<<< .mine
-  BASE_API: '"http://localhost:9529"',//'"http://112.74.16.180:9527"', //http://api.xt.test.sgjyun.com
-=======
-  BASE_API: '"http://localhost:9529"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com http://112.74.16.180:9527
->>>>>>> .theirs
-  // PATIENT_SIT: '"http://test1.sgjyun.com"',
-  // MIRCOMALL_SIT: '"http://mall.test.sgjyun.com"'
+  BASE_API: '"http://112.74.16.180:9527"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com http://112.74.16.180:9527
 }

src/router/index.js

@@ -125,17 +125,6 @@ export const xt_constantRouterMap = [
   // ////////////////////////////
   // 本地开始
   // /////////////////////////////
-  {
-    path: '/sign',
-    component: Layout,
-    redirect: '/sign/index',
-    name: 'sign',
-    alwaysShow: true,
-    meta: { title: 'signWeight', icon: 'table' },
-    children: [
-      { path: '/sign/index', component: () => import('@/xt_pages/sign/index'), name: 'signWeight', meta: { title: 'signWeight' }}
-    ]
-  },
   {
     path: '/qcd',
     component: Layout,
@@ -162,6 +151,65 @@ export const xt_constantRouterMap = [
       { path: '/qcd/pa/person/indicators', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/indicators'), name: 'paPersonIndicators', meta: { title: '指标控制' }}
     ]
   },
+  {
+    path: 'statistics',
+    component: Layout,
+    redirect: '/statistics/index',
+    children: [{
+      path: '/statistics',
+      component: () => import('@/xt_pages/statistics/index'),
+      name: 'statistics',
+      meta: { title: 'statistics', icon: 'chart', noCache: true }
+    }]
+  },
+  {
+    path: '/sign',
+    component: Layout,
+    redirct: '/sign/index',
+    children: [{
+      path: '/sign',
+      component: () => import('@/xt_pages/sign/index'),
+      name: 'sign',
+      meta: { title: 'signWeight', icon: 'table', noCache: true }
+    }]
+  },
+  {
+    path: '/qcd',
+    component: Layout,
+    redirect: '/qcd/dialysistotal',
+    name: 'qcd',
+    alwaysShow: true,
+    meta: { title: '科室质控', icon: 'table' },
+    children: [
+      { path: '/qcd/dialysistotal', component: () => import('@/xt_pages/qcd/dialysisTotal'), name: 'dialysistotal', meta: { title: '透析总量' }},
+      { path: '/qcd/processindicators', component: () => import('@/xt_pages/qcd/processIndicators'), name: 'processIndicators', meta: { title: '过程指标' }},
+      {
+        path: '/qcd/outcomeIndicators',
+        name: 'outcomeIndicators',
+        meta: { title: '结果指标' },
+        redirect: '/qcd/outcomeIndicators/control',
+        component: () => import('@/xt_pages/qcd/outcomeIndicators/parent'), // Parent router-view
+        children: [
+          { path: '/qcd/outcomeIndicators/control', component: () => import('@/xt_pages/qcd/outcomeIndicators/control'), name: 'outcomeIndicatorsControl', meta: { title: '指标控制' }},
+          { path: '/qcd/outcomeIndicators/query', component: () => import('@/xt_pages/qcd/outcomeIndicators/query'), name: 'outcomeIndicatorsQuery', meta: { title: '指标查询' }}
+        ]
+      },
+      {
+        path: '/qcd/patientanalysis',
+        name: 'patientanalysis',
+        meta: { title: '患者分析' },
+        redirect: '/qcd/patientanalysis/total',
+        component: () => import('@/xt_pages/qcd/patientAnalysis/parent'), // Parent router-view
+        children: [
+          { path: '/qcd/patientanalysis/total', component: () => import('@/xt_pages/qcd/patientAnalysis/total'), name: 'patientAnalysisTotal', meta: { title: '总量分析' }},
+          { path: '/qcd/patientanalysis/weight', component: () => import('@/xt_pages/qcd/patientAnalysis/weight'), name: 'patientAnalysisWeight', meta: { title: '体重分析' }},
+          { path: '/qcd/patientanalysis/bloodpressure', component: () => import('@/xt_pages/qcd/patientAnalysis/bloodPressure'), name: 'patientAnalysisBloodPressure', meta: { title: '血压分析' }},
+          { path: '/qcd/patientanalysis/dialysisage', component: () => import('@/xt_pages/qcd/patientAnalysis/dialysisAge'), name: 'patientAnalysisDialysisAge', meta: { title: '透析龄分析' }},
+          { path: '/qcd/patientanalysis/lapseto', component: () => import('@/xt_pages/qcd/patientAnalysis/lapseto'), name: 'patientAnalysisLapseto', meta: { title: '转归分析' }}
+        ]
+      }
+    ]
+  },
   {
     path: '/patients',
     component: Layout,

src/views/layout/components/Navbar.vue

@@ -80,45 +80,45 @@
 </template>
 
 <script>
-  import { mapGetters } from 'vuex'
-  // import Breadcrumb from "@/components/Breadcrumb";
-  // import Hamburger from "@/components/Hamburger";
-  import Screenfull from '@/components/Screenfull'
-  import ModifyUserInfoDialog from '@/xt_pages/home/modify_user_info_dialog'
+import { mapGetters } from "vuex";
+// import Breadcrumb from "@/components/Breadcrumb";
+// import Hamburger from "@/components/Hamburger";
+import Screenfull from "@/components/Screenfull";
+import ModifyUserInfoDialog from "@/xt_pages/home/modify_user_info_dialog";
 
-  export default {
-    components: {
-      // Breadcrumb,
-      // Hamburger,
-      Screenfull,
-      ModifyUserInfoDialog
+export default {
+  components: {
+    // Breadcrumb,
+    // Hamburger,
+    Screenfull,
+    ModifyUserInfoDialog
+  },
+  computed: {
+    ...mapGetters(["sidebar"]),
+    avater: function() {
+      var avatar = this.$store.getters.xt_user.user.avatar;
+      return avatar.length > 0
+        ? avatar
+        : require("../../../assets/home/userData.png");
+    }
+  },
+  methods: {
+    // toggleSideBar() {
+    //   this.$store.dispatch("toggleSideBar");
+    // },
+    logout() {
+      this.$store.dispatch("FrontendLogout");
+      window.location.href = process.env.BASE_API + "/logout";
     },
-    computed: {
-      ...mapGetters(['sidebar']),
-      avater: function() {
-        var avatar = this.$store.getters.xt_user.user.avatar
-        return avatar.length > 0
-          ? avatar
-          : require('../../../assets/home/userData.png')
-      }
+    modifyUserInfoAction() {
+      this.$refs.modify_user_info_dialog.show();
     },
-    methods: {
-      // toggleSideBar() {
-      //   this.$store.dispatch("toggleSideBar");
-      // },
-      logout() {
-        this.$store.dispatch('FrontendLogout')
-        window.location.href = process.env.BASE_API + '/logout'
-      },
-      modifyUserInfoAction() {
-        this.$refs.modify_user_info_dialog.show()
-      },
-      myServe() {
-        this.$router.push('/service')
-        return false
-      }
+    myServe() {
+      this.$router.push("/service");
+      return false;
     }
   }
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
@@ -140,11 +140,10 @@
     box-sizing: border-box;
     float: left;
 
-  img {
-    display: inline-block;
-    width: 100px;
-  }
-
+    img {
+      display: inline-block;
+      width: 100px;
+    }
   }
   .navbar {
     border-radius: 0px !important;
@@ -157,101 +156,95 @@
     background: #409eff;
     float: left;
 
-  .breadcrumb-container {
-    float: left;
-  }
-
-  .errLog-container {
-    display: inline-block;
-    vertical-align: top;
-  }
-
-  .right-menu {
-    float: right;
-    height: 100%;
-
-  &
-  :focus {
-    outline: none;
-  }
+    .breadcrumb-container {
+      float: left;
+    }
 
-  .right-menu-item {
-    display: inline-block;
-    margin: 0 8px;
+    .errLog-container {
+      display: inline-block;
+      vertical-align: top;
+    }
 
-  .iconfont {
-    font-size: 18px;
-  }
+    .right-menu {
+      float: right;
+      height: 100%;
+      z-index: 99999;
+      &:focus {
+        outline: none;
+      }
 
-  }
-  .screenfull {
-    height: 20px;
-  }
+      .right-menu-item {
+        display: inline-block;
+        margin: 0 8px;
 
-  .international {
-    vertical-align: top;
-  }
+        .iconfont {
+          font-size: 18px;
+        }
+      }
+      .screenfull {
+        height: 20px;
+      }
 
-  .theme-switch {
-    vertical-align: 15px;
-  }
+      .international {
+        vertical-align: top;
+      }
 
-  .avatar-container {
-    margin-right: 10px;
+      .theme-switch {
+        vertical-align: 15px;
+      }
 
-  .avatar-wrapper {
-    cursor: pointer;
-    margin-top: 3px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
+      .avatar-container {
+        margin-right: 10px;
 
-  .user-avatar {
-    width: 40px;
-    height: 40px;
-    border-radius: 50%;
-    object-fit: cover;
-    object-position: center;
-  }
+        .avatar-wrapper {
+          cursor: pointer;
+          margin-top: 3px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
 
-  .user-title {
-    margin: 0 8px;
-    font-size: 14px;
-    color: #fff;
-  }
+          .user-avatar {
+            width: 40px;
+            height: 40px;
+            border-radius: 50%;
+            object-fit: cover;
+            object-position: center;
+          }
 
-  .el-icon-caret-bottom {
-    font-size: 12px;
-    color: #fff;
-  }
+          .user-title {
+            margin: 0 8px;
+            font-size: 14px;
+            color: #fff;
+          }
 
-  }
-  }
-  }
+          .el-icon-caret-bottom {
+            font-size: 12px;
+            color: #fff;
+          }
+        }
+      }
+    }
   }
   .system-nav {
+    .system-nav-menu {
+      float: left;
+      height: 60px;
+      line-height: 60px;
+      padding: 0 25px;
 
-  .system-nav-menu {
-    float: left;
-    height: 60px;
-    line-height: 60px;
-    padding: 0 25px;
-
-  a {
-    font-size: 15px;
-
-  .iconfont {
-    font-size: 18px;
-  }
-
-  }
-  }
-  .active {
-    background: #3090eb;
-    border-left: 1px #5fabf7 solid;
-    border-right: 1px #5fabf7 solid;
-  }
+      a {
+        font-size: 15px;
 
+        .iconfont {
+          font-size: 18px;
+        }
+      }
+    }
+    .active {
+      background: #3090eb;
+      border-left: 1px #5fabf7 solid;
+      border-right: 1px #5fabf7 solid;
+    }
   }
   .el-menu::after,
   .el-menu::before {
@@ -261,6 +254,5 @@
     top: 0;
     left: 0;
   }
-
-  }
+}
 </style>

src/xt_pages/role/admin.vue

@@ -1,24 +1,23 @@
 <template>
-  <div class="app-container">
-    <el-row style="margin-bottom: 10px;">
-      <el-col :span="24">
+<div class="main-contain">
+  <div class="position">
+    <bread-crumb></bread-crumb>
         <router-link to="/role/admin/create">
-          <el-button type="primary" icon="el-icon-circle-plus">新增用户</el-button>
+          <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="float:right;">新增</el-button>
         </router-link>
-      </el-col>
-    </el-row>
-
-    <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="table" :data="admins" v-loading="is_loading_admins">
-      <el-table-column label="用户名" prop="user_name" width="160px"></el-table-column>
-      <el-table-column label="最后登录IP" prop="ip" width="100px"></el-table-column>
-      <el-table-column label="最后登录时间" prop="last_login_time" width="160px">
+  </div>
+  <div class="app-container">
+    <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" style="width:100%;" ref="table" :data="admins" v-loading="is_loading_admins">
+      <el-table-column label="用户名" prop="user_name" width="160"></el-table-column>
+      <el-table-column label="最后登录IP" prop="ip" width="150"></el-table-column>
+      <el-table-column label="最后登录时间" prop="last_login_time" width="170">
         <template slot-scope="scope">
           <span>{{ scope.row.last_login_time == 0 ? '' : (_parseTime(scope.row.last_login_time, '{y}-{m}-{d} {h}:{i}'))}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="角色" prop="role_name" width="160px"></el-table-column>
-      <el-table-column label="职称" prop="title_name" width="160px"></el-table-column>
-      <el-table-column label="状态" width="100px">
+      <el-table-column label="角色" prop="role_name" width="160"></el-table-column>
+      <el-table-column label="职称" prop="title_name" width="160"></el-table-column>
+      <el-table-column label="状态" width="100">
         <template slot-scope="scope">
           <div v-if="scope.row.status == 1" style="color: #67C23A; font-size:20px;">
             <li class="el-icon-success"></li>
@@ -28,7 +27,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="210px">
+      <el-table-column label="操作" >
         <template slot-scope="scope">
           <router-link :to="{ path:'/role/admin/edit', query:{ id:scope.row.user_id }}">
             <el-tooltip class="item" effect="dark" content="编辑" placement="top">
@@ -51,16 +50,19 @@
       </el-col>
     </el-row>
   </div>
+</div>
+
 </template>
 
 <script>
 import {adminMainView, getAdmins, setAdminStatus} from '@/api/role/admin'
 import { parseTime } from '@/utils'
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
 export default {
   name: 'adminManage',
   data() {
-    return {
+    return {  
       is_loading_admins: true,
       admins: [], // [{user_id, user_name, role_name, title_name, ip, last_login_time, status}]
       admin_total_count: 0,
@@ -68,6 +70,10 @@ export default {
       is_exist_role: false
     }
   },
+  components:{
+    BreadCrumb
+    
+  },
   created: function() {
     adminMainView().then(rs => {
       this.is_loading_admins = false
@@ -191,3 +197,12 @@ export default {
   }
 }
 </script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+.el-button+.el-button{
+  margin-left:0!important;
+}
+
+</style>

src/xt_pages/role/role.vue

@@ -1,11 +1,10 @@
 <template>
+<div class="main-contain">
+  <div class="position">
+    <bread-crumb></bread-crumb>
+    <el-button type="primary" size="small" icon="el-icon-circle-plus" style="float:right;" @click="addRoleAction">新增</el-button>
+  </div>
   <div class="app-container">
-    <el-row style="margin-bottom: 10px;">
-      <el-col :span="24">
-        <el-button type="primary" icon="el-icon-circle-plus" @click="addRoleAction">新增角色</el-button>
-      </el-col>
-    </el-row>
-
     <el-table :data="roles" v-loading="loading_roles" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
       <el-table-column label="角色名称" prop="name" min-width="20%"></el-table-column>
       <el-table-column label="角色描述" prop="intro" min-width="25%"></el-table-column>
@@ -50,15 +49,18 @@
 
     <edit-role ref="edit_role" @did-add-role="didAddRole" @did-edit-role="didModifyRole"></edit-role>
   </div>
+</div>
 </template>
 
 <script>
 import EditRole from './components/EditRole.vue'
 import {getRoles, setRoleStatus} from '@/api/role/role'
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
 export default {
   components: {
-    EditRole
+    EditRole,
+    BreadCrumb
   },
   data: function() {
     return {
@@ -174,4 +176,13 @@ export default {
   }
 }
 </script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+.el-button+.el-button{
+  margin-left:0!important;
+}
+
+</style>
+
+
 

src/xt_pages/role/special_permission.vue

@@ -1,4 +1,9 @@
 <template>
+<div class="main-contain">
+  <div class="position">
+    <bread-crumb></bread-crumb>
+    
+  </div>
     <div class="app-container">
         <el-row>
             <el-col :span="24">
@@ -21,10 +26,13 @@
             </el-col>
         </el-row>
     </div>
+</div>
+
 </template>
 
 <script>
 import { getSpecialPermissionInitData, submitDialysisRecordPermissionUsers } from '@/api/role/admin'
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
 export default {
     name: "SpecialPermissionManage",
@@ -36,6 +44,9 @@ export default {
             selecting_users: [],
         }
     },
+    components:{
+     BreadCrumb
+    },
     mounted() {
         getSpecialPermissionInitData().then(rs => {
             var resp = rs.data

src/xt_pages/user/components/PatientForm.vue

@@ -60,11 +60,7 @@
               <el-col :span="8" >
                 <el-form-item label="透析号 : " class="is-required" prop="dialysisNo" >
                     <el-input v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 2%;" ></el-input> 
-<<<<<<< .mine
-                    <el-button style="width:36%;padding:10px 0;" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" @click="generatedialysisno">自动生成</el-button>   
-=======
                     <el-button style="width:36%;padding:10px 0;" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" @click="generatedialysisno">自动生成</el-button>
->>>>>>> .theirs
                 </el-form-item>
               </el-col>
             </template>