소스 검색

Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

28169 1 주 전
부모
커밋
3fa4fd30a6

+ 10 - 3
src/pages/control/index.vue 파일 보기

@@ -1068,9 +1068,18 @@
1068 1068
       background:#f7f7fa;
1069 1069
       color:#000;
1070 1070
       font-weight:bold;
1071
+      td span{
1072
+        display: inline-block;
1073
+      }
1071 1074
     }
1072 1075
     .table tr td{
1073 1076
       background:#f7f7fa;
1077
+      td span{
1078
+        display: inline-block;
1079
+      }
1080
+    }
1081
+    td span{
1082
+      display: inline-block;
1074 1083
     }
1075 1084
   }
1076 1085
   .modeRed{
@@ -1089,8 +1098,6 @@
1089 1098
   .redFont{
1090 1099
     color: red;
1091 1100
   }
1092
-  td span{
1093
-    display: inline-block;
1094
-  }
1101
+  
1095 1102
   </style>
1096 1103
   

+ 4 - 3
src/pages/monitoring/index.vue 파일 보기

@@ -1006,6 +1006,9 @@ export default {
1006 1006
   .table tr td{
1007 1007
     background:#f7f7fa;
1008 1008
   }
1009
+  td span{
1010
+    display: inline-block;
1011
+  }
1009 1012
 }
1010 1013
 .modeRed{
1011 1014
   color:#ed5555;
@@ -1023,7 +1026,5 @@ export default {
1023 1026
 .redFont{
1024 1027
   color: red;
1025 1028
 }
1026
-td span{
1027
-  display: inline-block;
1028
-}
1029
+
1029 1030
 </style>

+ 4 - 2
src/pages/new_Patientscheduling/ScheduleItem.vue 파일 보기

@@ -1,9 +1,11 @@
1 1
 <template>
2 2
   <!-- 排班表填充内容 -->
3
-    <div >
3
+    <div>
4 4
       <div style="min-width: 60px;min-height: 20px;">
5 5
           <span :class='modeColor(scheduleDetail.mode_id)'>{{scheduleDetail.patient}}</span>
6
-          <br/>
6
+          <span v-if="scheduleDetail.mode_id>2 && scheduleDetail.mode_id !=0">
7
+            <br/>
8
+          </span>
7 9
           <template v-if="schedulMode">
8 10
             <span v-if="scheduleDetail.mode_id>0"  :class='modeColor(scheduleDetail.mode_id)' >{{'('+modename(scheduleDetail.mode_id)+')'}}</span>
9 11
           </template>

+ 9 - 7
src/pages/new_Patientscheduling/new_content.vue 파일 보기

@@ -56,7 +56,6 @@
56 56
         ></el-table-column>
57 57
         <el-table-column prop="Mon_M" label="上午" min-width="60" align="center">
58 58
           <template slot-scope="scope">
59
-            <div>
60 59
               <el-popover ref="popover" placement="top"
61 60
                 title=""width=""
62 61
                 trigger="click"content=""
@@ -72,8 +71,6 @@
72 71
                 <!-- <schedule-item slot="reference" :schedule-detail="scope.row.Mon_M"></schedule-item> -->
73 72
               </el-popover>
74 73
               <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_M"></schedule-item>
75
-
76
-            </div>
77 74
           </template>
78 75
         </el-table-column>
79 76
         <el-table-column prop="Mon_A" label="下午" min-width="60" align="center">
@@ -123,9 +120,6 @@
123 120
           </template>
124 121
         </el-table-column>
125 122
       </el-table>
126
-      <!-- <div style="position: fixed;top: 50vh;left: 50vw;">
127
-        <van-loading type="spinner" v-show="loading" color="#1989fa"/>
128
-      </div> -->
129 123
     </div>
130 124
     <!-- 日期 -->
131 125
     <van-popup v-model="dateShow" position="bottom" :style="{ height: '40%' }">
@@ -1621,6 +1615,8 @@ export default{
1621 1615
     .el-input__inner{
1622 1616
       font-size: 14px;
1623 1617
       padding: 0 5px;
1618
+      padding-right: 0px !important;
1619
+      padding-left: 0px !important;
1624 1620
     }
1625 1621
     .el-input__prefix{
1626 1622
       font-size: 14px;
@@ -1630,7 +1626,7 @@ export default{
1630 1626
     }
1631 1627
   }
1632 1628
   .ellipsis-pop{
1633
-    min-width: 83px;
1629
+    min-width: 83px !important;
1634 1630
   }
1635 1631
   .el-table .el-table__cell {
1636 1632
     padding: 5px 0 !important;
@@ -1642,4 +1638,10 @@ export default{
1642 1638
     position: relative;
1643 1639
     text-align: left;
1644 1640
   }
1641
+  .eltable{
1642
+    .cell{
1643
+      padding-left: 0px !important;
1644
+      padding-right: 0px !important;
1645
+    }
1646
+  }
1645 1647
 </style>