表格渲染

src/pages/layout/SideBar.vue

   // position: fixed;
   height: 50px;
   z-index: 999;
+  @media only screen and (min-width: 768px) {
+    height: 70px;
+  }
   .column {
     .head {
       @include display-flex;
           @media only screen and (min-width: 768px) {
             display: flex;
             align-items: center;
-            margin-bottom: 20px;
+            // margin-bottom: 20px;
           }
           p {
             font-size: 0.32rem;

src/pages/main/PatientBox.vue

         .iconfont {
           margin: 0 0.1rem 0 0;
           font-size: 0.4rem;
+          display: none;
         }
       }
     }

src/pages/main/RecordPage.vue

           >搜索</van-button>
         </van-field>-->
         <el-input
-          class="newInput"
+          class="newinput"
           prefix-icon="el-icon-search"
           v-model="search_input"
           ref="search_field"
 }
 </style>
 <style lang="scss">
-.newInput {
+.newinput {
   height: 100%;
   width: 85% !important;
   float: left;
   .el-input__inner {
-    height: 100%;
+    height: 1rem;
     line-height: 1rem;
     width: 100%;
     border-radius: 30px;
     border: none;
     font-size: 0.45rem;
+    box-sizing: border-box;
+    padding-bottom: 0.05rem;
     @media only screen and (min-width: 768px) {
       padding-left: 0.9rem !important;
     }
   }
   .el-input__icon {
-    line-height: 1rem;
+    line-height: 0.95rem;
     font-size: 0.45rem;
     margin-top: 0.02rem;
     padding-left: 0.1rem;

src/pages/main/add_urgent_schedule.vue

       }
 
       .danger_hint {
-        font-size: 0.34rem;
+        font-size: 0.4rem;
         line-height: 40px;
         text-align: center;
         color: red;
     }
   }
 }
+.van-ellipsis {
+  font-size: 0.45rem;
+}
 </style>

src/pages/main/dialysis/AdviceTable.vue

     padding: 0.24rem 0;
     background: #f6f8f9;
     ul {
-      width: 50%;
+      width: 92%;
       background: #fff;
       margin: 0 auto;
       border-radius: 30px;
         @include text-align;
         padding-left: 15px;
         .iconfont {
-          font-size: 0.42rem;
+          font-size: 0.6rem;
         }
         input {
           border: none;
           border-radius: 30px;
-          padding: 0.15rem;
+          padding: 0.2rem;
           width: 100%;
           color: $pgh-color;
         }

src/pages/main/dialysis/CheckTab.vue

 }
 .nav {
   .van-tabs {
-    height: 1rem !important;
+    height: 1.2rem !important;
   }
   .van-tabs--line .van-tabs__wrap {
-    height: 1rem !important;
+    height: 1.2rem !important;
   }
   .van-tabs--line {
-    padding-top: 1rem !important;
+    padding-top: 1.2rem !important;
   }
   .van-tab {
-    line-height: 1rem !important;
+    line-height: 1.2rem !important;
   }
 }
 </style>

src/pages/main/dialysis/InspectionItemTable.vue

 .van-list {
   background: #fff;
   min-height: calc(100vh - 178px);
-  margin-top: 62px;
+  margin-top: 68px;
   // @media only screen and (min-width: 376px) and (max-width: 668px) {
   //   margin-top: 84px;
   // }
 </style>
 
 <style lang="scss">
-.van-ellipsis {
-  font-size: 0.34rem;
+.nav {
+  .van-ellipsis {
+    font-size: 0.4rem;
+  }
 }
 
 .van-tabs__line {

src/pages/main/records/RecordsTab.vue

       padding: 0.25rem 0;
       margin: 0 0.2rem 0 0;
       .name {
-        font-size: 0.32rem;
+        font-size: 0.45rem;
         color: $pgh-color;
       }
       .text {
-        font-size: 0.3rem;
+        font-size: 0.45rem;
         color: $pgh-color;
       }
     }

src/pages/main/today/TodayTab.vue

           p {
             line-height: 0.6rem;
             color: #34495e;
-            font-size: 0.3rem;
+            font-size: 0.4rem;
           }
           img {
-            width: 1rem;
-            height: 1rem;
+            width: 1.2rem;
+            height: 1.2rem;
           }
         }
       }
   border: 1px solid #fff;
   top: -8px;
   right: -8px;
+  @media only screen and (min-width: 768px) {
+    height: 30px;
+    width: 30px;
+    line-height: 28px;
+  }
 }
 .goTop {
   z-index: 999;

src/pages/main/today/statOrder.vue

       <span class="line"></span>
     </h2>
 
-      <!-- <div class="newDiv">
+    <!-- <div class="newDiv">
       <table class="table">
         <tr>
           <th width="12%">开嘱医生</th>
     </div>
     <div class="NoData" v-show="advice_groups.length == 0">
       <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
+<<<<<<< .mine
     </div> -->
     <el-table :data="tableDate" border style="width: 100%">
       <el-table-column fixed  label="开嘱医生" width="100">
         <template slot-scope="scope">
            {{doctor_map[scope.row.advice_doctor] != undefined ? doctor_map[scope.row.advice_doctor].name : ""}}
         </template>
+=======
+    </div>-->
+    <el-table :data="tableDate" border style="width: 100%">
+      <el-table-column fixed label="开嘱医生" width="100">
+        <template
+          slot-scope="scope"
+        >{{doctor_map[scope.row.advice_doctor] != undefined ? doctor_map[scope.row.advice_doctor].name : ""}}</template>
+>>>>>>> .theirs
       </el-table-column>
-      <el-table-column label="开始时间" width="100" type="index"
-     >
-          <template slot-scope="scope">
-                {{parseTime(scope.row.start_time, "{m}-{d} {h}:{i}")}}
-          </template>
+      <el-table-column label="开始时间" width="100" type="index">
+        <template slot-scope="scope">{{parseTime(scope.row.start_time, "{m}-{d} {h}:{i}")}}</template>
       </el-table-column>
-      <el-table-column  label="医嘱内容" width="100">
+      <el-table-column label="医嘱内容" width="100">
         <template slot-scope="scope">
-               <span>{{scope.row.advice_name }}</span>
+          <span>{{scope.row.advice_name }}</span>
 
-              <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
-              <span
-                v-if="scope.row.prescribing_number"
-              >{{scope.row.prescribing_number}}{{scope.row.prescribing_number_unit}}</span>
-              <span v-if="scope.row.single_dose">单次用量{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</span>
-              <span v-if="scope.row.parent_id == 0">{{scope.row.delivery_way}}</span>
-              <span v-if="scope.row.parent_id == 0">{{scope.row.execution_frequency}}</span>
+          <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+          <span
+            v-if="scope.row.prescribing_number"
+          >{{scope.row.prescribing_number}}{{scope.row.prescribing_number_unit}}</span>
+          <span
+            v-if="scope.row.single_dose"
+          >单次用量{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</span>
+          <span v-if="scope.row.parent_id == 0">{{scope.row.delivery_way}}</span>
+          <span v-if="scope.row.parent_id == 0">{{scope.row.execution_frequency}}</span>
         </template>
       </el-table-column>
-      <el-table-column  label="执行时间" width="100">
-         <template slot-scope="scope">
-              {{parseTime(scope.row.execution_time, "{m}-{d} {h}:{i}")}}
-         </template>
+      <el-table-column label="执行时间" width="100">
+        <template slot-scope="scope">{{parseTime(scope.row.execution_time, "{m}-{d} {h}:{i}")}}</template>
       </el-table-column>
       <el-table-column label="执行护士" width="200">
-         <template slot-scope="scope">
-          {{scope.row.checker != 0 ? (doctor_map[scope.row.checker] != undefined ? doctor_map[scope.row.checker].name : "") : ""}}
-         </template>
+        <template
+          slot-scope="scope"
+        >{{scope.row.checker != 0 ? (doctor_map[scope.row.checker] != undefined ? doctor_map[scope.row.checker].name : "") : ""}}</template>
       </el-table-column>
     </el-table>
   </div>
 </template>
 
 <script>
-import { parseTime } from '@/utils'
+import { parseTime } from "@/utils";
 
 export default {
-  name: 'statOrder',
-  data () {
+  name: "statOrder",
+  data() {
     return {
-      title: '临时医嘱 ',
+      title: "临时医嘱 ",
       template_id: 0,
       tableDate: []
-    }
+    };
   },
   props: {
     doctor_map: {
     advice_groups: {
       type: Array,
       default: () => {
-        return []
+        return [];
       }
     },
   },
 
   methods: {
-    setAdvices (advices) {
+    setAdvices(advices) {
       if (advices == null) {
-        advices = []
+        advices = [];
       }
-      this.tableDate.splice(0, this.tableDate.length)
-      this.tableDate.push(...advices)
+      this.tableDate.splice(0, this.tableDate.length);
+      this.tableDate.push(...advices);
     },
-    parseTime (time, layout) {
+    parseTime(time, layout) {
       if (time == 0) {
-        return ''
+        return "";
       }
-      return parseTime(time, layout)
+      return parseTime(time, layout);
     },
-    createMedicalOrder (row) {
+    createMedicalOrder(row) {
       if (row.parent_id > 0) {
-        var spliceIndex = -1
+        var spliceIndex = -1;
         for (let index = this.tableDate.length - 1; ; index--) {
           if (this.tableDate[index].parent_id === row.parent_id) {
-            spliceIndex = index
-            break
+            spliceIndex = index;
+            break;
           } else if (this.tableDate[index].id === row.parent_id) {
-            spliceIndex = index
-            break
+            spliceIndex = index;
+            break;
           }
         }
         if (spliceIndex > -1) {
-          spliceIndex += 1
+          spliceIndex += 1;
           if (spliceIndex === this.tableDate.length) {
-            this.tableDate.push(row)
+            this.tableDate.push(row);
           } else {
-            var swapData = this.tableDate.splice(spliceIndex)
-            this.tableDate.push(row)
-            this.tableDate = this.tableDate.concat(swapData)
+            var swapData = this.tableDate.splice(spliceIndex);
+            this.tableDate.push(row);
+            this.tableDate = this.tableDate.concat(swapData);
           }
         }
       } else {
-        this.tableDate.unshift(row)
+        this.tableDate.unshift(row);
       }
     },
-    delMedicalOrder (row) {
+    delMedicalOrder(row) {
       if (row.parent_id > 0) {
-        var rslen = this.tableDate.length
+        var rslen = this.tableDate.length;
         for (let i = 0; i < rslen; i++) {
           if (this.tableDate[i].id == row.id) {
-            this.tableDate.splice(i, 1)
-            break
+            this.tableDate.splice(i, 1);
+            break;
           }
         }
       } else {
-        var resetTableData = this.tableDate
-        this.tableDate = []
-        var that = this
-        var rslen = resetTableData.length
+        var resetTableData = this.tableDate;
+        this.tableDate = [];
+        var that = this;
+        var rslen = resetTableData.length;
         for (let i = 0; i < rslen; i++) {
           if (
             resetTableData[i].id != row.id &&
             resetTableData[i].parent_id != row.id
           ) {
-            that.tableDate.push(resetTableData[i])
+            that.tableDate.push(resetTableData[i]);
           }
         }
       }
     },
-    executionMedicalOrder (row) {
-      var alen = this.tableDate.length
+    executionMedicalOrder(row) {
+      var alen = this.tableDate.length;
       for (let index = 0; index < alen; index++) {
         if (this.tableDate[index].id == row.id) {
-          this.tableDate[index].execution_state = 1
-          this.tableDate[index].execution_staff = row.execution_staff
-          this.tableDate[index].execution_time = row.execution_time
-          this.tableDate[index].checker = row.checker
-          break
+          this.tableDate[index].execution_state = 1;
+          this.tableDate[index].execution_staff = row.execution_staff;
+          this.tableDate[index].execution_time = row.execution_time;
+          this.tableDate[index].checker = row.checker;
+          break;
         }
       }
     }
   },
+<<<<<<< .mine
   created () {
     this.template_id = this.$store.getters.user.template_info.template_id
     console.log('this是什么东西', this.advice_groups)
+=======
+  created() {
+    this.template_id = this.$store.getters.user.template_info.template_id;
+    console.log("this是什么东西", this.advice_groups);
+>>>>>>> .theirs
   }
+<<<<<<< .mine
 
 }
+=======
+};
+
+>>>>>>> .theirs
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

src/styles/style.scss

 }
 
 .el-collapse-item__header {
-  font-size: 0.35rem !important;
+  font-size: 0.45rem !important;
   color: $pgh-color !important;
   height: 64px !important;
   line-height: 64px !important;
-  @media only screen and (max-width: 812px) {
-    font-size: 0.35rem !important;
-    color: $pgh-color !important;
+  @media only screen and (max-width: 767px) {
+    font-size: 0.45rem !important;
     height: 48px !important;
     line-height: 48px !important;
   }
   color: #a8b3ba;
   width: 6.2rem;
   float: right;
-  font-size: 0.34rem;
+  font-size: 0.45rem;
   .field {
     // @media only screen and (max-width: 812px) {
     //   margin-top: 6px;
   min-height: calc(100vh - 2px);
   padding-left: 0.45rem;
   @media only screen and (min-width: 768px) {
-    padding-top: 216px;
+    padding-top: 232px;
   }
 }
 #app {