See999 5 years ago
parent
commit
9a0661d7c2

+ 58 - 55
src/views/layout/components/Navbar.vue View File

1
 <template>
1
 <template>
2
   <div class="top-nav">
2
   <div class="top-nav">
3
-    <!-- <div class="nav-logo">
3
+    <div class="nav-logo">
4
       <img :src="require(`../../../assets/logo/logo.png`)" alt="">
4
       <img :src="require(`../../../assets/logo/logo.png`)" alt="">
5
     </div>
5
     </div>
6
-    <el-menu class="navbar" mode="horizontal">
6
+    <!-- <el-menu class="navbar" mode="horizontal">
7
       <div>
7
       <div>
8
         <span> {{this.$store.getters.xt_user.org.org_name}}
8
         <span> {{this.$store.getters.xt_user.org.org_name}}
9
         </span>
9
         </span>
62
         <modify-org-info-dialog ref="modify_org_info_dialog"></modify-org-info-dialog>
62
         <modify-org-info-dialog ref="modify_org_info_dialog"></modify-org-info-dialog>
63
 
63
 
64
       </div>
64
       </div>
65
-    </el-menu>-->
66
-    <div class="dropdownBox">
67
-      <el-dropdown trigger="click" @command="handleOrgCommand">
68
-        <span class="el-dropdown-link">
69
-          {{ org_name }}
70
-          <i class="el-icon-arrow-down el-icon--right"></i>
71
-        </span>
72
-        <el-dropdown-menu slot="dropdown">
73
-          <el-dropdown-item
74
-            v-for="(item, index) in orgs"
75
-            :key="index"
76
-            :command="item.id"
77
-            >{{ item.org_name }}</el-dropdown-item
78
-          >
79
-        </el-dropdown-menu>
80
-      </el-dropdown>
81
-    </div>
82
-    <div class="navRight">
83
-      <!-- <el-input placeholder="搜索患者透析号/姓名/首拼" prefix-icon="el-icon-search" v-model="input2"></el-input>
84
-      <div style="color: #b2b2b3;">通知中心</div> -->
85
-      <div class="right-menu">
86
-        <el-dropdown
87
-          class="avatar-container right-menu-item"
88
-          trigger="click"
89
-          @command="handleCommand"
90
-        >
91
-          <div class="avatar-wrapper">
92
-            <img class="user-avatar" :src="avater" />
93
-            <span class="user-title">{{
94
-              this.$store.getters.xt_user.user.user_name
95
-            }}</span>
96
-            <i class="el-icon-caret-bottom"></i>
97
-          </div>
65
+    </el-menu> -->
66
+    <div style="display:flex;align-items: center;justify-content: space-between; width:96%">
67
+      <div class="dropdownBox">
68
+        <el-dropdown trigger="click" @command="handleOrgCommand">
69
+          <span class="el-dropdown-link">
70
+            {{ org_name }}
71
+            <i class="el-icon-arrow-down el-icon--right"></i>
72
+          </span>
98
           <el-dropdown-menu slot="dropdown">
73
           <el-dropdown-menu slot="dropdown">
99
-            <el-dropdown-item command="modifyUserInfoAction"
100
-              >个人信息</el-dropdown-item
74
+            <el-dropdown-item
75
+              v-for="(item, index) in orgs"
76
+              :key="index"
77
+              :command="item.id"
78
+              >{{ item.org_name }}</el-dropdown-item
101
             >
79
             >
102
-            <el-dropdown-item command="modifyOrgInfoAction"
103
-              >机构信息</el-dropdown-item
104
-            >
105
-            <el-dropdown-item divided command="logout">{{
106
-              $t("navbar.logOut")
107
-            }}</el-dropdown-item>
108
           </el-dropdown-menu>
80
           </el-dropdown-menu>
109
         </el-dropdown>
81
         </el-dropdown>
110
-
111
-        <modify-user-info-dialog
112
-          ref="modify_user_info_dialog"
113
-        ></modify-user-info-dialog>
114
-        <modify-org-info-dialog
115
-          ref="modify_org_info_dialog"
116
-        ></modify-org-info-dialog>
117
       </div>
82
       </div>
118
-      <div>
119
-        <i class="el-icon-question"></i>
120
-        <a href="https://sso.kuyicloud.com/help" target="_blank">帮助中心</a>
83
+      <div class="navRight">
84
+        <!-- <el-input placeholder="搜索患者透析号/姓名/首拼" prefix-icon="el-icon-search" v-model="input2"></el-input>
85
+        <div style="color: #b2b2b3;">通知中心</div> -->
86
+        <div class="right-menu">
87
+          <el-dropdown
88
+            class="avatar-container right-menu-item"
89
+            trigger="click"
90
+            @command="handleCommand"
91
+          >
92
+            <div class="avatar-wrapper">
93
+              <img class="user-avatar" :src="avater" />
94
+              <span class="user-title">{{
95
+                this.$store.getters.xt_user.user.user_name
96
+              }}</span>
97
+              <i class="el-icon-caret-bottom"></i>
98
+            </div>
99
+            <el-dropdown-menu slot="dropdown">
100
+              <el-dropdown-item command="modifyUserInfoAction"
101
+                >个人信息</el-dropdown-item
102
+              >
103
+              <el-dropdown-item command="modifyOrgInfoAction"
104
+                >机构信息</el-dropdown-item
105
+              >
106
+              <el-dropdown-item divided command="logout">{{
107
+                $t("navbar.logOut")
108
+              }}</el-dropdown-item>
109
+            </el-dropdown-menu>
110
+          </el-dropdown>
111
+
112
+          <modify-user-info-dialog
113
+            ref="modify_user_info_dialog"
114
+          ></modify-user-info-dialog>
115
+          <modify-org-info-dialog
116
+            ref="modify_org_info_dialog"
117
+          ></modify-org-info-dialog>
118
+        </div>
119
+        <div>
120
+          <i class="el-icon-question"></i>
121
+          <a href="https://sso.kuyicloud.com/help" target="_blank">帮助中心</a>
122
+        </div>
121
       </div>
123
       </div>
122
     </div>
124
     </div>
123
   </div>
125
   </div>
295
 
297
 
296
 <style rel="stylesheet/scss" lang="scss" scoped>
298
 <style rel="stylesheet/scss" lang="scss" scoped>
297
 .top-nav {
299
 .top-nav {
300
+  width: 100%;
298
   background: #409eff;
301
   background: #409eff;
299
   position: fixed;
302
   position: fixed;
300
   top: 0;
303
   top: 0;
301
-  left: 150px;
304
+  // left: 150px;
302
   right: 0;
305
   right: 0;
303
   z-index: 1000;
306
   z-index: 1000;
304
   height: 50px;
307
   height: 50px;
305
   display: flex;
308
   display: flex;
306
   align-items: center;
309
   align-items: center;
307
-  justify-content: space-between;
310
+  // justify-content: space-between;
308
   color: #fff;
311
   color: #fff;
309
   .dropdownBox {
312
   .dropdownBox {
310
     margin-left: 10px;
313
     margin-left: 10px;

+ 38 - 7
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue View File

111
               诊断:
111
               诊断:
112
               <div
112
               <div
113
                 class="under_line"
113
                 class="under_line"
114
-                style="width: 640px;text-align: left;word-break: break-all;word-wrap: break-word;display: inline-block;white-space: pre-wrap;"
114
+                style="width: 740px;text-align: left;word-break: break-all;word-wrap: break-word;display: inline-block;white-space: unset;"
115
               >
115
               >
116
                 {{ record.patient.diagnose }}
116
                 {{ record.patient.diagnose }}
117
               </div>
117
               </div>
1318
                       class="row"
1318
                       class="row"
1319
                       style="padding: 2px 0;line-height:23px;display:flex;"
1319
                       style="padding: 2px 0;line-height:23px;display:flex;"
1320
                     >
1320
                     >
1321
-                      <div class="inline_block" style="flex:1;">
1321
+                      <!-- <div class="inline_block" style="flex:1;">
1322
                         透析器凝血:
1322
                         透析器凝血:
1323
                         <div
1323
                         <div
1324
                           class="under_line"
1324
                           class="under_line"
1331
                               : "/"
1331
                               : "/"
1332
                           }}
1332
                           }}
1333
                         </div>
1333
                         </div>
1334
-                      </div>
1334
+                      </div> -->
1335
                       <div class="inline_block" style="flex:1;">
1335
                       <div class="inline_block" style="flex:1;">
1336
                         内瘘:
1336
                         内瘘:
1337
                         <div
1337
                         <div
1392
                         </div>
1392
                         </div>
1393
                         min
1393
                         min
1394
                       </div>
1394
                       </div>
1395
+                      <!-- 只是占位 -->
1396
+                      <div class="inline_block" style="flex:1;visibility: hidden;">
1397
+                        透析器凝血:
1398
+                        <div
1399
+                          class="under_line"
1400
+                          style="width: 70px;text-align: center"
1401
+                        >
1402
+                          {{
1403
+                            record.assessment_after_dislysis &&
1404
+                            record.assessment_after_dislysis.cruor
1405
+                              ? record.assessment_after_dislysis.cruor
1406
+                              : "/"
1407
+                          }}
1408
+                        </div>
1409
+                      </div>
1395
                     </div>
1410
                     </div>
1396
 
1411
 
1397
                     <div
1412
                     <div
1470
                         ml
1485
                         ml
1471
                       </div>
1486
                       </div>
1472
                     </div>
1487
                     </div>
1473
-
1488
+                    <div
1489
+                      class="row"
1490
+                      style="padding: 2px 0;line-height:23px;display:flex;"
1491
+                    >
1492
+                      <div class="inline_block" style="flex:1;">
1493
+                        透析器凝血:
1494
+                        <span
1495
+                          style="width: 95%;line-height: 25px;text-align: left;margin-left: 2px;text-underline-position: under; text-decoration: underline;"
1496
+                        >
1497
+                          {{
1498
+                            record.assessment_after_dislysis &&
1499
+                            record.assessment_after_dislysis.cruor
1500
+                              ? record.assessment_after_dislysis.cruor
1501
+                              : "/"
1502
+                          }}
1503
+                        </span>
1504
+                      </div>
1505
+                    </div>
1474
                     <div
1506
                     <div
1475
                       class="row"
1507
                       class="row"
1476
                       style="padding: 2px 0;line-height:23px;display:flex;"
1508
                       style="padding: 2px 0;line-height:23px;display:flex;"
1580
                           style="width: 80px;text-align: left"
1612
                           style="width: 80px;text-align: left"
1581
                           v-if="record.dialysis_order == null"
1613
                           v-if="record.dialysis_order == null"
1582
                         ></div>
1614
                         ></div>
1583
-                        <div v-if="record.check">
1615
+                        <div v-if="record.check" class="under_line" style="width: 80px;text-align: left">
1584
                           <div
1616
                           <div
1585
-                            class="under_line"
1586
-                            style="width: 80px;text-align: left"
1617
+                            style="width: 80px;text-align: left;display: inline-block;white-space: nowrap;"
1587
                             v-if="
1618
                             v-if="
1588
                               record.dialysis_order != null &&
1619
                               record.dialysis_order != null &&
1589
                                 record.dialysis_order.start_nurse ==
1620
                                 record.dialysis_order.start_nurse ==

+ 13 - 2
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue View File

1244
 <style style="stylesheet/scss" lang="scss">
1244
 <style style="stylesheet/scss" lang="scss">
1245
 .dialog_box .current-box-class .current-row > td {
1245
 .dialog_box .current-box-class .current-row > td {
1246
   background: #6fb5fa;
1246
   background: #6fb5fa;
1247
-  color: white;
1247
+  // color: #000;
1248
   /* font-size: 12px; */
1248
   /* font-size: 12px; */
1249
 }
1249
 }
1250
 
1250
 
1251
 .dialog_box .current-box-class .current-row:hover > td {
1251
 .dialog_box .current-box-class .current-row:hover > td {
1252
   background: #6fb5fa;
1252
   background: #6fb5fa;
1253
-  color: white;
1253
+  // color: white;
1254
   /* font-size: 12px; */
1254
   /* font-size: 12px; */
1255
 }
1255
 }
1256
 .el-table__body-wrapper::-webkit-scrollbar {
1256
 .el-table__body-wrapper::-webkit-scrollbar {
1257
   height: 20px;
1257
   height: 20px;
1258
 }
1258
 }
1259
+.dialog_box .current-box-class .current-row{
1260
+  background: #87ceff;
1261
+}
1262
+.dialog_box tr:hover > td {
1263
+  background-color: #ecf5ff !important;
1264
+  color: #3a8ee6;
1265
+}
1266
+.dialog_box tr > td:hover {
1267
+  background-color: #409eff !important;
1268
+  color: #fff !important;
1269
+}
1259
 </style>
1270
 </style>