修改

src/views/layout/components/Navbar.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="top-nav">
-    <!-- <div class="nav-logo">
+    <div class="nav-logo">
       <img :src="require(`../../../assets/logo/logo.png`)" alt="">
     </div>
-    <el-menu class="navbar" mode="horizontal">
+    <!-- <el-menu class="navbar" mode="horizontal">
       <div>
         <span> {{this.$store.getters.xt_user.org.org_name}}
         </span>
@@ -62,62 +62,64 @@
         <modify-org-info-dialog ref="modify_org_info_dialog"></modify-org-info-dialog>
 
       </div>
-    </el-menu>-->
-    <div class="dropdownBox">
-      <el-dropdown trigger="click" @command="handleOrgCommand">
-        <span class="el-dropdown-link">
-          {{ org_name }}
-          <i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item
-            v-for="(item, index) in orgs"
-            :key="index"
-            :command="item.id"
-            >{{ item.org_name }}</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown>
-    </div>
-    <div class="navRight">
-      <!-- <el-input placeholder="搜索患者透析号/姓名/首拼" prefix-icon="el-icon-search" v-model="input2"></el-input>
-      <div style="color: #b2b2b3;">通知中心</div> -->
-      <div class="right-menu">
-        <el-dropdown
-          class="avatar-container right-menu-item"
-          trigger="click"
-          @command="handleCommand"
-        >
-          <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>
-          </div>
+    </el-menu> -->
+    <div style="display:flex;align-items: center;justify-content: space-between; width:96%">
+      <div class="dropdownBox">
+        <el-dropdown trigger="click" @command="handleOrgCommand">
+          <span class="el-dropdown-link">
+            {{ org_name }}
+            <i class="el-icon-arrow-down el-icon--right"></i>
+          </span>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="modifyUserInfoAction"
-              >个人信息</el-dropdown-item
+            <el-dropdown-item
+              v-for="(item, index) in orgs"
+              :key="index"
+              :command="item.id"
+              >{{ item.org_name }}</el-dropdown-item
             >
-            <el-dropdown-item command="modifyOrgInfoAction"
-              >机构信息</el-dropdown-item
-            >
-            <el-dropdown-item divided command="logout">{{
-              $t("navbar.logOut")
-            }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-
-        <modify-user-info-dialog
-          ref="modify_user_info_dialog"
-        ></modify-user-info-dialog>
-        <modify-org-info-dialog
-          ref="modify_org_info_dialog"
-        ></modify-org-info-dialog>
       </div>
-      <div>
-        <i class="el-icon-question"></i>
-        <a href="https://sso.kuyicloud.com/help" target="_blank">帮助中心</a>
+      <div class="navRight">
+        <!-- <el-input placeholder="搜索患者透析号/姓名/首拼" prefix-icon="el-icon-search" v-model="input2"></el-input>
+        <div style="color: #b2b2b3;">通知中心</div> -->
+        <div class="right-menu">
+          <el-dropdown
+            class="avatar-container right-menu-item"
+            trigger="click"
+            @command="handleCommand"
+          >
+            <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>
+            </div>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="modifyUserInfoAction"
+                >个人信息</el-dropdown-item
+              >
+              <el-dropdown-item command="modifyOrgInfoAction"
+                >机构信息</el-dropdown-item
+              >
+              <el-dropdown-item divided command="logout">{{
+                $t("navbar.logOut")
+              }}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+
+          <modify-user-info-dialog
+            ref="modify_user_info_dialog"
+          ></modify-user-info-dialog>
+          <modify-org-info-dialog
+            ref="modify_org_info_dialog"
+          ></modify-org-info-dialog>
+        </div>
+        <div>
+          <i class="el-icon-question"></i>
+          <a href="https://sso.kuyicloud.com/help" target="_blank">帮助中心</a>
+        </div>
       </div>
     </div>
   </div>
@@ -295,16 +297,17 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 .top-nav {
+  width: 100%;
   background: #409eff;
   position: fixed;
   top: 0;
-  left: 150px;
+  // left: 150px;
   right: 0;
   z-index: 1000;
   height: 50px;
   display: flex;
   align-items: center;
-  justify-content: space-between;
+  // justify-content: space-between;
   color: #fff;
   .dropdownBox {
     margin-left: 10px;

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -111,7 +111,7 @@
               诊断：
               <div
                 class="under_line"
-                style="width: 640px;text-align: left;word-break: break-all;word-wrap: break-word;display: inline-block;white-space: pre-wrap;"
+                style="width: 740px;text-align: left;word-break: break-all;word-wrap: break-word;display: inline-block;white-space: unset;"
               >
                 {{ record.patient.diagnose }}
               </div>
@@ -1318,7 +1318,7 @@
                       class="row"
                       style="padding: 2px 0;line-height:23px;display:flex;"
                     >
-                      <div class="inline_block" style="flex:1;">
+                      <!-- <div class="inline_block" style="flex:1;">
                         透析器凝血：
                         <div
                           class="under_line"
@@ -1331,7 +1331,7 @@
                               : "/"
                           }}
                         </div>
-                      </div>
+                      </div> -->
                       <div class="inline_block" style="flex:1;">
                         内瘘：
                         <div
@@ -1392,6 +1392,21 @@
                         </div>
                         min
                       </div>
+                      <!-- 只是占位 -->
+                      <div class="inline_block" style="flex:1;visibility: hidden;">
+                        透析器凝血：
+                        <div
+                          class="under_line"
+                          style="width: 70px;text-align: center"
+                        >
+                          {{
+                            record.assessment_after_dislysis &&
+                            record.assessment_after_dislysis.cruor
+                              ? record.assessment_after_dislysis.cruor
+                              : "/"
+                          }}
+                        </div>
+                      </div>
                     </div>
 
                     <div
@@ -1470,7 +1485,24 @@
                         ml
                       </div>
                     </div>
-
+                    <div
+                      class="row"
+                      style="padding: 2px 0;line-height:23px;display:flex;"
+                    >
+                      <div class="inline_block" style="flex:1;">
+                        透析器凝血：
+                        <span
+                          style="width: 95%;line-height: 25px;text-align: left;margin-left: 2px;text-underline-position: under; text-decoration: underline;"
+                        >
+                          {{
+                            record.assessment_after_dislysis &&
+                            record.assessment_after_dislysis.cruor
+                              ? record.assessment_after_dislysis.cruor
+                              : "/"
+                          }}
+                        </span>
+                      </div>
+                    </div>
                     <div
                       class="row"
                       style="padding: 2px 0;line-height:23px;display:flex;"
@@ -1580,10 +1612,9 @@
                           style="width: 80px;text-align: left"
                           v-if="record.dialysis_order == null"
                         ></div>
-                        <div v-if="record.check">
+                        <div v-if="record.check" class="under_line" style="width: 80px;text-align: left">
                           <div
-                            class="under_line"
-                            style="width: 80px;text-align: left"
+                            style="width: 80px;text-align: left;display: inline-block;white-space: nowrap;"
                             v-if="
                               record.dialysis_order != null &&
                                 record.dialysis_order.start_nurse ==

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

@@ -1244,16 +1244,27 @@ export default {
 <style style="stylesheet/scss" lang="scss">
 .dialog_box .current-box-class .current-row > td {
   background: #6fb5fa;
-  color: white;
+  // color: #000;
   /* font-size: 12px; */
 }
 
 .dialog_box .current-box-class .current-row:hover > td {
   background: #6fb5fa;
-  color: white;
+  // color: white;
   /* font-size: 12px; */
 }
 .el-table__body-wrapper::-webkit-scrollbar {
   height: 20px;
 }
+.dialog_box .current-box-class .current-row{
+  background: #87ceff;
+}
+.dialog_box tr:hover > td {
+  background-color: #ecf5ff !important;
+  color: #3a8ee6;
+}
+.dialog_box tr > td:hover {
+  background-color: #409eff !important;
+  color: #fff !important;
+}
 </style>