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

package-lock.json

@@ -5216,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",
@@ -6538,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",
@@ -13344,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"
       }
     },

src/components/Hamburger/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <svg t="1492500959545" @click="toggleClick" class="hamburger" :class="{'is-active':isActive}" style="fill:#bfcbd9" viewBox="0 0 1024 1024"
+    <svg t="1492500959545" @click="toggleClick" class="hamburger" :class="{'is-active':isActive}" style="" viewBox="0 0 1024 1024"
       version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1691" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64">
       <path d="M966.8023 568.849776 57.196677 568.849776c-31.397081 0-56.850799-25.452695-56.850799-56.850799l0 0c0-31.397081 25.452695-56.849776 56.850799-56.849776l909.605623 0c31.397081 0 56.849776 25.452695 56.849776 56.849776l0 0C1023.653099 543.397081 998.200404 568.849776 966.8023 568.849776z"
         p-id="1692"></path>
@@ -32,8 +32,8 @@ export default {
 .hamburger {
   display: inline-block;
   cursor: pointer;
-  width: 16px;
-  height: 16px;
+  width: 20px;
+  height: 20px;
   transform: rotate(90deg);
   transition: .38s;
   transform-origin: 50% 50%;

src/styles/index.scss

@@ -139,7 +139,7 @@ code {
   padding: 20px;
   background: #fff;
   margin: 0 15px 15px 15px;
-  min-height: calc(100vh - 178px);
+  min-height: calc(100vh - 185px);
 }
 
 .components-container {
@@ -385,12 +385,12 @@ code {
           float: left;
           list-style: none;
           cursor: pointer;
-          padding: 6px 10px;
+          padding: 6px 0;
           color: #606266;
           border-radius: 4px;
           margin: 0 8px 0 0;
           font-size: 14px;
-          // width: 70px;
+          width: 70px;
           text-align: center;
           &:hover {
             background: #f5f7fa;
@@ -412,19 +412,11 @@ code {
     .cell {
       margin: 0;
       padding: 0 12px;
-      display: inline-block;
-    }
-  }
-  th{
-    .cell{
-      color: #999!important;
-      
     }
   }
   td {
     .cell {
       padding: 0 12px;
-      color: #606266;
     }
   }
 }

src/styles/sidebar.scss

@@ -47,7 +47,7 @@
     }
     .el-menu {
       border: none;
-      height: 100%;
+      min-height: 100%;
       width: 100% !important;
     }
   }

src/views/layout/components/Navbar.vue

@@ -127,7 +127,7 @@ export default {
   top: 0;
   left: 0;
   right: 0;
-  z-index: 2052;
+  // z-index: 2052;
   .nav-logo {
     width: 162px;
     display: flex;

src/views/layout/components/TagsView.vue

@@ -124,7 +124,7 @@ export default {
     border-bottom: 1px solid #d8dce5;
     box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
     position: fixed;
-    z-index: 2052;
+    // z-index: 2052;
     top: 60px;
     .tags-view-item {
       display: inline-block;

src/xt_pages/dialysis/bulletinBoard.vue

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

src/xt_pages/user/components/PatientSidebar.vue

@@ -202,7 +202,7 @@
     float: left;
     bottom: 0;
     left: 0;
-    z-index: 99;
+    z-index: 1001;
     overflow: hidden;
   }
 

src/xt_pages/user/doctorAdvice.vue

@@ -3,10 +3,10 @@
         <patient-sidebar :id="patientID" defaultActive="1-4" v-on:tran-patient="onTranPatient"></patient-sidebar>
         <div class="patient-app-container advice-container app-container">
             <div class="filter-container">
-                <el-input  size="small" style="width: 400px;" v-model="listQuery.keywords" class="filter-item" />
-                <el-button size="small"  class="filter-item" type="primary" icon="el-icon-search" @click="changeKey" >搜索</el-button>
-                <el-button size="small" class="filter-item" style="float:right;" @click="printThisInfo()" :type="adviceType==1 || adviceType == 3?'primary':'warning'" icon="el-icon-printer" >打印医嘱</el-button>
-                <el-button size="small" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" class="filter-item" style="float:right;" @click="openNew" type="primary" icon="el-icon-plus" >新增医嘱</el-button>
+                <el-input   style="width: 400px;" v-model="listQuery.keywords" class="filter-item" />
+                <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="changeKey" >搜索</el-button>
+                <el-button  class="filter-item" style="float:right;" @click="printThisInfo()" :type="adviceType==1 || adviceType == 3?'primary':'warning'" icon="el-icon-printer" >打印医嘱</el-button>
+                <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" class="filter-item" style="float:right;" @click="openNew" type="primary" icon="el-icon-plus" >新增医嘱</el-button>
             </div>
             <div class="cell clearfix">
                 <label class="title"><span class="name">医嘱类型</span> : </label>
@@ -2839,7 +2839,66 @@ export default {
       cursor: pointer;
     }
   }
-
+  .cell {
+    margin: 0px 0 15px 0;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    -o-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    // display: flex;
+    -webkit-box-align: flex-start;
+    -ms-flex-align: flex-start;
+    align-items: flex-start;
+    text-align: left;
+    justify-content: flex-start;
+    color: #333;
+    .title {
+      width: 80px;
+      display: inline-block;
+      font-weight: normal;
+      color: #909399;
+      padding: 6px 0;
+      font-weight: 700;
+      .name {
+        width: 60px;
+        text-align: justify;
+        text-justify: distribute-all-lines;
+        text-align-last: justify;
+        -moz-text-align-last: justify;
+        -webkit-text-align-last: justify;
+        display: inline-block;
+      }
+    }
+    .time {
+      -webkit-box-flex: 1;
+      -ms-flex: 1;
+      flex: 1;
+      ul {
+        padding: 0;
+        margin: 0;
+        li {
+          float: left;
+          list-style: none;
+          cursor: pointer;
+          padding: 6px 10px;
+          color: #606266;
+          border-radius: 4px;
+          margin: 0 4px 0 0;
+          &:hover {
+            background: #409eff;
+            color: #fff;
+          }
+        }
+        .active {
+          background: #409eff;
+          color: #fff;
+        }
+      }
+    }
+  }
   .amount {
     font-weight: normal;
     padding: 10px 0 0 0;

src/xt_pages/user/patientInfo.vue

@@ -11,9 +11,8 @@
 import PatientSidebar from './components/PatientSidebar'
 
 export default {
-  name: 'editForm',
+   name: 'editForm',
   components: { PatientDetail, PatientSidebar },
-
   data() {
     return {
       patientID: 0,