Merge branch 'wzf' of http://git.shengws.com/zhangbj/xt_pad into wzf

src/pages/advice/AdvicePage.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <van-row class="top_row">
-      <van-col :span="9">
+      <!-- <van-col :span="9">
         <div style="visibility: hidden">
           <span class="title"></span>
         </div>
@@ -33,7 +33,16 @@
             >搜索</van-button>
           </van-field>
         </div>
-      </van-col>
+      </van-col>-->
+      <div class="newSearch">
+        <el-input
+          prefix-icon="el-icon-search"
+          v-model="advice_keyword"
+          ref="search_field"
+          placeholder="透析号/姓名"
+        ></el-input>
+        <p class="searchBtn" @click="searchWithKeyword(1)">搜索</p>
+      </div>
     </van-row>
 
     <div class="area">
@@ -52,7 +61,8 @@ export default {
     return {
       index: 0,
       search_input: "",
-      search_keyword: ""
+      search_keyword: "",
+      advice_keyword: ""
     };
   },
   components: {
@@ -79,7 +89,7 @@ export default {
 .top_row {
   font-size: 0.3rem;
   padding: 0.3rem 0.3rem;
-  border-bottom: 1px #e5e5e5 solid;
+  // border-bottom: 1px #e5e5e5 solid;
   display: flex;
   align-items: center;
 }
@@ -134,5 +144,39 @@ export default {
     min-width: 60px !important;
   }
 }
+.newSearch {
+  height: 1rem;
+  width: 100%;
+  background: #fff;
+  border-radius: 30px;
+  .searchBtn {
+    width: 15%;
+    float: left;
+    height: 1rem;
+    line-height: 1rem;
+    text-align: center;
+    font-size: 0.45rem;
+    color: #258ffc;
+  }
+}
 </style>
 
+<style lang="scss">
+.el-input {
+  height: 100%;
+  width: 85%;
+  float: left;
+}
+.el-input__inner {
+  height: 100%;
+  line-height: 1rem;
+  width: 100%;
+  border-radius: 30px;
+  border: none;
+  font-size: 0.45rem;
+}
+.el-input__icon {
+  line-height: 1rem;
+  font-size: 0.45rem;
+}
+</style>

src/pages/advice/DialysisAdviceTable.vue

@@ -2,11 +2,7 @@
   <div class="mainBox">
     <div class="choice">
       <ul>
-        <el-popover
-          placement="bottom"
-          trigger="click"
-          v-model="show_patient_type_selector"
-        >
+        <el-popover placement="bottom" trigger="click" v-model="show_patient_type_selector">
           <li slot="reference">
             {{ patient_types[patient_selected].text }}
             <span class="iconfont">&#xe74a;</span>
@@ -18,18 +14,12 @@
                 :key="type.value"
                 @click="handlePaitentType(type.value)"
                 :class="advice_type_selected == type.value ? 'tick' : ''"
-              >
-                {{ type.text }}
-              </li>
+              >{{ type.text }}</li>
             </ul>
           </div>
         </el-popover>
 
-        <el-popover
-          placement="bottom"
-          trigger="click"
-          v-model="show_zone_selector"
-        >
+        <el-popover placement="bottom" trigger="click" v-model="show_zone_selector">
           <li slot="reference">
             {{ zones[zone_selected].text }}
             <span class="iconfont">&#xe74a;</span>
@@ -41,17 +31,11 @@
                 :key="zone.value"
                 @click="handleZoneChange(index)"
                 :class="zone_selected == index ? 'tick' : ''"
-              >
-                {{ zone.text }}
-              </li>
+              >{{ zone.text }}</li>
             </ul>
           </div>
         </el-popover>
-        <el-popover
-          placement="bottom"
-          trigger="click"
-          v-model="show_sch_type_selector"
-        >
+        <el-popover placement="bottom" trigger="click" v-model="show_sch_type_selector">
           <li slot="reference">
             {{ schedule_types[schedule_type_selected].text }}
             <span class="iconfont">&#xe74a;</span>
@@ -65,9 +49,7 @@
                 :class="
                   schedule_type_selected == scheduleType.value ? 'tick' : ''
                 "
-              >
-                {{ scheduleType.text }}
-              </li>
+              >{{ scheduleType.text }}</li>
             </ul>
           </div>
         </el-popover>
@@ -87,123 +69,110 @@
       </ul>
     </div>
 
-    <div
-      style="width:100%;overflow:hildden;overflow-x:auto;"
-      class="DialysisAdvice"
-    >
+    <div style="width:100%;overflow:hildden;overflow-x:auto;" class="DialysisAdvice">
       <div class="blueBorder"></div>
-      <table class="table">
-        <tr>
-          <!--<th width="50px">机号</th>-->
-          <th width="50px">姓名</th>
-          <th width="50px">透析号</th>
-          <th width="50px">期效</th>
-          <th width="100px">开始时间</th>
-          <th width="200px">医嘱内容</th>
-          <th width="50px">执行时间</th>
-          <th width="50px">执行护士</th>
-          <th width="50px">校对护士</th>
-          <th width="100px">校对时间</th>
-          <th width="50px">开嘱医生</th>
-          <th width="100px">开嘱时间</th>
+      <!-- <table class="table">
+      <tr>
+        <th width="50px">姓名</th>
+        <th width="50px">透析号</th>
+        <th width="50px">期效</th>
+        <th width="100px">开始时间</th>
+        <th width="200px">医嘱内容</th>
+        <th width="50px">执行时间</th>
+        <th width="50px">执行护士</th>
+        <th width="50px">校对护士</th>
+        <th width="100px">校对时间</th>
+        <th width="50px">开嘱医生</th>
+        <th width="100px">开嘱时间</th>
+      </tr>
+      <template v-for="(schedules, zone_name, index) in filtedScheduals">
+        <tr :key="index">
+          <td>{{ zone_name }}</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
         </tr>
-        <template v-for="(schedules, zone_name, index) in filtedScheduals">
-          <tr :key="index">
-            <td>{{ zone_name }}</td>
-            <!--<td></td>-->
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-          </tr>
-          <template v-for="schedule in schedules">
-            <template v-for="(group, group_index) in schedule.new_advice">
-              <tr
-                v-for="(advice, advice_index) in group.advices"
-                @click="clickfunction(schedule)"
-              >
-                <!--<td  v-if="advice_index == 0"-->
-                <!--:rowspan="group.advices.length">{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>-->
-
-                <!--<td  v-if="advice_index == 0" :rowspan="group.advices.length">{{ advice.parent_id == 0 && advice.dialysis_order&&advice.dialysis_order.device_number&& advice.dialysis_order.device_number.number.length > 0 ? advice.dialysis_order.device_number.number : schedule.device_number.number }}</td>-->
-                <!--<td v-if="advice_index == 0" :rowspan="group.advices.length">-->
-                <!--{{getNumber(advice,schedule)}}-->
-                <!--</td>-->
+        <template v-for="schedule in schedules">
+          <template v-for="(group, group_index) in schedule.new_advice">
+            <tr v-for="(advice, advice_index) in group.advices" @click="clickfunction(schedule)">
 
-                <td
-                  v-if="advice_index == 0"
-                  :rowspan="group.advices.length"
-                  style="color:#409eff;"
-                >
-                  {{ advice.parent_id == 0 ? schedule.patient.name : "" }}
-                </td>
-                <td v-if="advice_index == 0" :rowspan="group.advices.length">
-                  {{
-                    advice.parent_id == 0 ? schedule.patient.dialysis_no : ""
-                  }}
-                </td>
-                <td v-if="advice_index == 0" :rowspan="group.advices.length">
-                  {{ getAdaviceType(advice.advice_type, advice.parent_id) }}
-                </td>
-                <td v-if="advice_index == 0" :rowspan="group.advices.length">
-                  {{
-                    advice.parent_id == 0
-                      ? parseTime(advice.start_time, "{m}-{d} {h}:{i}")
-                      : ""
-                  }}
-                </td>
-                <td
-                  :class="
+              <td
+                v-if="advice_index == 0"
+                :rowspan="group.advices.length"
+                style="color:#409eff;"
+              >{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
+              <td v-if="advice_index == 0" :rowspan="group.advices.length">
+                {{
+                advice.parent_id == 0 ? schedule.patient.dialysis_no : ""
+                }}
+              </td>
+              <td
+                v-if="advice_index == 0"
+                :rowspan="group.advices.length"
+              >{{ getAdaviceType(advice.advice_type, advice.parent_id) }}</td>
+              <td v-if="advice_index == 0" :rowspan="group.advices.length">
+                {{
+                advice.parent_id == 0
+                ? parseTime(advice.start_time, "{m}-{d} {h}:{i}")
+                : ""
+                }}
+              </td>
+              <td
+                :class="
                     advice.parent_id == 0
                       ? 'advice_content'
                       : 'subadvice_content'
                   "
-                >
-                  <span>{{ advice.advice_name }}</span>
-                  <span
-                    >{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</span
-                  >
-                  <span v-if="advice.prescribing_number">
-                    {{ advice.prescribing_number
-                    }}{{ advice.prescribing_number_unit }}
-                  </span>
-                  <span v-if="advice.single_dose">
-                    单次用量 {{ advice.single_dose
-                    }}{{ advice.single_dose_unit }}
-                  </span>
-                  <span>{{ advice.delivery_way }}</span>
-                  <span>{{ advice.execution_frequency }}</span>
-                  <span v-if="advice.parent_id == 0 && advice.remark.length > 0"
-                    >({{ advice.remark }})</span
-                  >
-                </td>
-                <td>
-                  {{ parseTime(advice.execution_time, "{m}-{d} {h}:{i}") }}
-                </td>
-                <td>{{ getName(advice.execution_staff) }}</td>
-                <td>{{ getName(advice.checker) }}</td>
-                <td>{{ parseTime(advice.check_time, "{m}-{d} {h}:{i}") }}</td>
-                <td>{{ getName(advice.advice_doctor) }}</td>
-                <td>{{ parseTime(advice.created_time, "{m}-{d} {h}:{i}") }}</td>
-              </tr>
-            </template>
+              >
+                <span>{{ advice.advice_name }}</span>
+                <span>{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</span>
+                <span v-if="advice.prescribing_number">
+                  {{ advice.prescribing_number
+                  }}{{ advice.prescribing_number_unit }}
+                </span>
+                <span v-if="advice.single_dose">
+                  单次用量 {{ advice.single_dose
+                  }}{{ advice.single_dose_unit }}
+                </span>
+                <span>{{ advice.delivery_way }}</span>
+                <span>{{ advice.execution_frequency }}</span>
+                <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
+              </td>
+              <td>{{ parseTime(advice.execution_time, "{m}-{d} {h}:{i}") }}</td>
+              <td>{{ getName(advice.execution_staff) }}</td>
+              <td>{{ getName(advice.checker) }}</td>
+              <td>{{ parseTime(advice.check_time, "{m}-{d} {h}:{i}") }}</td>
+              <td>{{ getName(advice.advice_doctor) }}</td>
+              <td>{{ parseTime(advice.created_time, "{m}-{d} {h}:{i}") }}</td>
+            </tr>
           </template>
         </template>
+      </template>
       </table>
 
       <div class="NoData" v-show="zones.length <= 1">
-        <img
-          style="margin-top: 50px; margin-bottom: 50px"
-          src="@/assets/login/data.jpg"
-          alt
-        />
-      </div>
+        <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
+      </div>-->
+      <el-table :data="tableData" border style="width: 100%">
+        <el-table-column fixed prop="date" label="姓名" width="100"></el-table-column>
+        <el-table-column prop="name" label="透析号" width="100"></el-table-column>
+        <el-table-column prop="province" label="期效" width="100"></el-table-column>
+        <el-table-column prop="city" label="开始时间" width="100"></el-table-column>
+        <el-table-column prop="address" label="医嘱内容" width="200"></el-table-column>
+        <el-table-column prop="zip" label="执行时间" width="100"></el-table-column>
+        <el-table-column prop="zip" label="执行护士" width="150"></el-table-column>
+        <el-table-column prop="zip" label="校对护士" width="200"></el-table-column>
+        <el-table-column prop="zip" label="校对时间" width="200"></el-table-column>
+        <el-table-column prop="zip" label="开嘱医生" width="200"></el-table-column>
+        <el-table-column prop="zip" label="开嘱时间" width="200"></el-table-column>
+      </el-table>
     </div>
 
     <mt-datetime-picker
@@ -262,7 +231,105 @@ export default {
       ],
       patient_selected: 0,
 
-      scheduleMap: {}
+      scheduleMap: {},
+      tableData: [
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1517 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1519 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1516 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1517 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1519 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1516 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1517 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1519 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1516 弄",
+          zip: 200333
+        }
+      ]
     };
   },
   computed: {
@@ -555,14 +622,14 @@ export default {
 .choice {
   border-bottom: 1px #e5e5e5 solid;
   position: fixed;
-  top: 63px;
+  top: 48px;
   right: 0;
   z-index: 66;
   left: 0;
-  background: #fff;
-  @media only screen and (max-width: 415px) {
-    top: 38px !important;
-  }
+  background: #258ffc;
+  // @media only screen and (max-width: 415px) {
+  //   top: 38px !important;
+  // }
   @media only screen and (min-width: 376px) and (max-width: 812px) {
     top: 38px !important;
   }
@@ -574,14 +641,15 @@ export default {
     width: 90%;
     margin: 0 auto;
     font-size: 0.32rem;
-    color: $pgh-color;
+    // color: $pgh-color;
+    color: #fff;
     li {
       @include display-flex;
       @include align-items-center;
       @include text-align;
       @include justify-content-between;
       padding: 0.3rem 0;
-      font-size: 0.32rem;
+      font-size: 0.45rem;
       .iconfont {
         margin: 0 0.1rem;
       }
@@ -596,12 +664,12 @@ export default {
   }
 }
 .DialysisAdvice {
-  padding-top: 115px;
+  padding-top: 85px;
   background: #fff;
   min-height: calc(100vh - 2px);
-  @media only screen and (max-width: 812px) {
-    padding-top: 70px !important;
-  }
+  // @media only screen and (max-width: 812px) {
+  //   padding-top: 70px !important;
+  // }
   @media only screen and (min-width: 813px) and (max-width: 1024px) {
     padding-top: 118px !important;
   }
@@ -620,3 +688,14 @@ export default {
   // background: #fafcfe;
 }
 </style>
+<style lang="scss">
+.el-table {
+  margin-top: 64px;
+}
+.el-table td {
+  padding: 0;
+}
+.el-table th {
+  padding: 6px 0;
+}
+</style>

src/pages/home/login.vue

@@ -1,36 +1,47 @@
 <template>
   <div class="container">
-    <div class="login">
-      <div class="logo"><img src="../../assets/login/logo.png" alt=""></div>
-      <div class="reg">
-        <div class="form">
-          <ul>
-            <li>
-              <span class="iconfont">&#xe78b;</span>
-              <input placeholder="请输入手机号" type="tel" class="tel" v-model="form.mobile">
-            </li>
-            <li>
-              <span class="iconfont">&#xe6c0;</span>
-              <input placeholder="请输入密码" type="password" class="tel" v-model="form.pwd">
-            </li>
-          </ul>
+    <div class="newLogin">
+      <div class="login">
+        <div class="logo">
+          <img src="../../assets/login/newLogo.png" alt />
         </div>
-        <!-- <router-link to="/product"> -->
-          <button class="loginBtn" @click="loginAction" :class="loginDisable ? 'disableLoginBtn' : ''" :disabled="loginDisable">登录</button>
-        <!-- </router-link> -->
-        <!-- <div class="forget">
+        <div class="reg">
+          <div class="welcome">欢迎登录</div>
+          <div class="form">
+            <ul>
+              <li>
+                <span class="iconfont">&#xe78b;</span>
+                <input placeholder="请输入手机号" type="tel" class="tel" v-model="form.mobile" />
+              </li>
+              <li>
+                <span class="iconfont">&#xe6c0;</span>
+                <input placeholder="请输入密码" type="password" class="tel" v-model="form.pwd" />
+              </li>
+            </ul>
+          </div>
+          <!-- <router-link to="/product"> -->
+          <button
+            class="loginBtn"
+            @click="loginAction"
+            :class="loginDisable ? 'disableLoginBtn' : ''"
+            :disabled="loginDisable"
+          >登录</button>
+          <div class="newForget">忘记密码</div>
+          <!-- </router-link> -->
+          <!-- <div class="forget">
           <a href="">免密码登录</a>
           <a href="">忘记密码？</a>
-        </div> -->
+          </div>-->
+        </div>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import {loginByPwd} from "@/api/login"
-import {hex_md5} from "@/utils/md5"
-import { getLoginInfoCache, cacheLoginInfo } from '@/utils/admin_info_cache'
+import { loginByPwd } from "@/api/login";
+import { hex_md5 } from "@/utils/md5";
+import { getLoginInfoCache, cacheLoginInfo } from "@/utils/admin_info_cache";
 
 export default {
   name: "Home",
@@ -38,53 +49,60 @@ export default {
     return {
       form: {
         mobile: "",
-        pwd: "",
-      },
-    }
+        pwd: ""
+      }
+    };
   },
   computed: {
     loginDisable() {
       // return false
-      return this.form.mobile.length == 0 || /^1[2345789]\d{9}$/.test(this.form.mobile) == false || this.form.pwd.length == 0
+      return (
+        this.form.mobile.length == 0 ||
+        /^1[2345789]\d{9}$/.test(this.form.mobile) == false ||
+        this.form.pwd.length == 0
+      );
     }
   },
   created() {
-    var loginInfo = getLoginInfoCache()
-    this.form.mobile = loginInfo.mobile
-    this.form.pwd = loginInfo.password
+    var loginInfo = getLoginInfoCache();
+    this.form.mobile = loginInfo.mobile;
+    this.form.pwd = loginInfo.password;
   },
   methods: {
     loginAction: function() {
       loginByPwd(this.form.mobile, hex_md5(this.form.pwd)).then(rs => {
-        var resp = rs.data
+        var resp = rs.data;
 
         if (resp.state == 1) {
-          cacheLoginInfo(this.form.mobile, this.form.pwd)
-          console.log(resp)
+          cacheLoginInfo(this.form.mobile, this.form.pwd);
+          console.log(resp);
 
-          var user = resp.data.user
-          var org = resp.data.org
-          var subscibe = resp.data.subscibe
-          var config_list = resp.data.config_list
-          var template_info = resp.data.template_info
-          var filed_list = resp.data.filed_list
-          console.log(resp.data.filed_list)
-          console.log(filed_list)
+          var user = resp.data.user;
+          var org = resp.data.org;
+          var subscibe = resp.data.subscibe;
+          var config_list = resp.data.config_list;
+          var template_info = resp.data.template_info;
+          var filed_list = resp.data.filed_list;
+          console.log(resp.data.filed_list);
+          console.log(filed_list);
 
-
-
-          this.$store.dispatch("InitUserInfo", {user: user, org: org, subscibe: subscibe,template_info:template_info,filed_list:filed_list})
-          this.$store.dispatch("SetConfigList", config_list)
+          this.$store.dispatch("InitUserInfo", {
+            user: user,
+            org: org,
+            subscibe: subscibe,
+            template_info: template_info,
+            filed_list: filed_list
+          });
+          this.$store.dispatch("SetConfigList", config_list);
 
           // this.$router.push({path: "/product"})
-          this.$router.push({path: "/main"})
-
+          this.$router.push({ path: "/main" });
         } else {
           this.$toast({
-            message: resp.msg,
-          })
+            message: resp.msg
+          });
         }
-      })
+      });
     }
   }
 };
@@ -92,29 +110,56 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped >
 .container {
-  background: $white-bg;
+  // background: $white-bg;
+  background: #f5f5f5;
   @include box-sizing;
   position: fixed;
   width: 100%;
   height: 100%;
+  display: flex;
+  justify-content: space-between;
+
+  .newLogin {
+    width: 90%;
+    height: 90%;
+    margin: auto;
+    box-shadow: 0px 2px 25px 0px rgba(37, 143, 252, 0.1);
+    border-radius: 14px;
+    background: #fff;
+  }
   .login {
     // @include box-shadow;
     @include text-align;
     @include display-flex;
     @include align-items-center;
-    @include justify-content-center;
+    // @include justify-content-center;
     @include flex-direction;
     height: 100%;
     .logo {
-      padding: 0 0 1rem;
+      padding: 3rem 0 1rem;
       img {
-        width: 70%;
+        width: 40%;
         height: auto;
         display: inline-block;
       }
     }
     .reg {
-      width: 10.77rem;
+      width: 8.77rem;
+      .welcome {
+        text-align: left;
+        font-size: 0.55rem;
+        font-weight: 400;
+        color: rgba(37, 143, 252, 1);
+        margin-bottom: 0.5rem;
+        // line-height: 14px;
+      }
+      .newForget {
+        text-align: right;
+        font-size: 0.5rem;
+        font-weight: 400;
+        color: rgba(37, 143, 252, 1);
+        margin-top: 0.5rem;
+      }
       .form {
         border: 1px $border-color solid;
         border-radius: 4px;
@@ -129,7 +174,7 @@ export default {
             width: 90%;
             border: none;
             outline: none;
-            font-size: 0.34rem;
+            font-size: 0.45rem;
           }
           .mint-cell {
             width: 100%;
@@ -162,11 +207,11 @@ export default {
       }
       .loginBtn {
         width: 100%;
-        height: 1rem;
-        line-height: 1rem;
+        height: 1.3rem;
+        line-height: 1.3rem;
         background: $main-color;
         color: #fff;
-        font-size: 0.36rem;
+        font-size: 0.45rem;
         @include text-align;
         border-radius: 4px;
         margin: 40px 0 0 0;

src/pages/main/DetailsPage.vue

@@ -17,9 +17,7 @@
               :key="i"
               :class="index == i ? 'active' : ''"
               @click="ClickTab(i)"
-            >
-              {{ item }}
-            </li>
+            >{{ item }}</li>
           </ul>
         </div>
 
@@ -30,23 +28,13 @@
                   <span class="iconfont">2018-01-01&#xe74a;</span>
         </div>-->
         <div class="print" style="float: right; visibility: hidden;">
-          <el-button
-            size="mini"
-            type="primary"
-            @click="print"
-            icon="el-icon-printer"
-            >打印</el-button
-          >
+          <el-button size="mini" type="primary" @click="print" icon="el-icon-printer">打印</el-button>
         </div>
       </div>
       <div class="Tab">
         <CaseHistory v-show="index == 0" title="病历"></CaseHistory>
         <!--<check-tab v-show="index==1" title="化验单"></check-tab>-->
-        <dialysis-tab
-          v-show="index == 1"
-          title="透析"
-          v-on:records="jump(val)"
-        ></dialysis-tab>
+        <dialysis-tab v-show="index == 1" title="透析" v-on:records="jump(val)"></dialysis-tab>
         <today-tab ref="today" v-show="index == 2" title="今日"></today-tab>
       </div>
     </div>
@@ -222,21 +210,20 @@ export default {
   }
 }
 .add {
-  width: 1.5rem;
-  height: 1.5rem;
+  width: 1.8rem;
+  height: 1.8rem;
   background: #f18f68;
   // box-shadow: 0px 3px 9px 0px rgba(7, 30, 102, 0.15);
   border-radius: 50%;
   position: fixed;
   right: 0.6rem;
   bottom: 2.25rem;
-  font-size: 0.4rem;
+  font-size: 0.45rem;
   text-align: center;
-  z-index: 99;
   p {
-    width: 26px;
+    width: 30px;
     text-align: center;
-    margin: 6px auto 0;
+    margin: 9px auto 0;
     color: #fff;
     // @media only screen and (min-width: 768px) {
     //   width: 40px !important;

src/pages/main/DialysisArea.vue

@@ -3,18 +3,16 @@
     <div v-loading="loading">
       <div class="screening">
         <ul>
-          <el-popover
-            v-model="zone_options_visible"
-            placement="bottom"
-            trigger="click"
-          >
+          <el-popover v-model="zone_options_visible" placement="bottom" trigger="click">
             <li slot="reference">
               {{
-                zones.length <= 1 && zone_selected > 0
-                  ? "全部分区"
-                  : zones[zone_selected].text
+              zones.length <= 1 && zone_selected > 0
+              ? "全部分区"
+              : zones[zone_selected].text
               }}
-              <span class="iconfont">&#xe74a;</span>
+              <span
+                class="iconfont"
+              >&#xe74a;</span>
             </li>
 
             <div class="popover-demo-content">
@@ -24,18 +22,12 @@
                   :key="zone.value"
                   @click="handleZoneChange(index)"
                   :class="zone_selected == index ? 'tick' : ''"
-                >
-                  {{ zone.text }}
-                </li>
+                >{{ zone.text }}</li>
               </ul>
             </div>
           </el-popover>
 
-          <el-popover
-            v-model="sch_type_options_visible"
-            placement="bottom"
-            trigger="click"
-          >
+          <el-popover v-model="sch_type_options_visible" placement="bottom" trigger="click">
             <li slot="reference">
               {{ schedual_types[schedual_type_selected].text }}
               <span class="iconfont">&#xe74a;</span>
@@ -49,9 +41,7 @@
                   :class="
                     schedual_type_selected == schedualType.value ? 'tick' : ''
                   "
-                >
-                  {{ schedualType.text }}
-                </li>
+                >{{ schedualType.text }}</li>
               </ul>
             </div>
           </el-popover>
@@ -71,26 +61,13 @@
       <div class="stateBox">
         <div v-for="(item, index) in filtedScheduals" :key="index">
           <h2 class="title">{{ item.zone_name }}</h2>
-          <patient-box
-            class="clearfix"
-            :patients="item.scheduals"
-          ></patient-box>
+          <patient-box class="clearfix" :patients="item.scheduals"></patient-box>
         </div>
         <div class="NoData" v-if="filtedScheduals.length == 0 && networkStates">
-          <img
-            style="margin-top: 50px; margin-bottom: 50px"
-            src="@/assets/login/data.jpg"
-            alt
-          />
+          <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
         </div>
-        <div
-          class="NoData"
-          v-if="!networkStates"
-          style="display: block;text-align: center"
-        >
-          <p style="margin-top: 100px;font-size: 18px">
-            网络异常，请点击重新加载
-          </p>
+        <div class="NoData" v-if="!networkStates" style="display: block;text-align: center">
+          <p style="margin-top: 100px;font-size: 18px">网络异常，请点击重新加载</p>
 
           <!--<img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/no_network.jpg" alt="">-->
           <van-button
@@ -99,8 +76,7 @@
             type="info"
             style="display:block;margin:0 auto"
             @click="reloads()"
-            >重新加载</van-button
-          >
+          >重新加载</van-button>
         </div>
       </div>
       <mt-datetime-picker
@@ -480,7 +456,7 @@ export default {
 .screening {
   border-bottom: 1px #e5e5e5 solid;
   position: fixed;
-  top: 89px;
+  top: 98px;
   @media only screen and (min-width: 813px) and (max-width: 1024px) {
     top: 130px;
   }

src/pages/main/PatientBox.vue

@@ -355,9 +355,9 @@ export default {
       p {
         background: #c6cdd2;
         color: #fff;
-        width: 1.35rem;
-        height: 0.56rem;
-        line-height: 0.56rem;
+        width: 1.45rem;
+        height: 0.65rem;
+        line-height: 0.65rem;
         border-radius: 4px;
         margin: 0 auto;
         font-size: 0.32rem;

src/pages/main/RecordPage.vue

@@ -3,9 +3,9 @@
     <!-- <van-row class="top_row">
     <van-col :span="14">-->
     <div class="top_row">
-      <div class="head">
+      <!-- <div class="head">
         <img :src="$store.getters.user.org.org_logo" alt />
-      </div>
+      </div>-->
       <div class="floatLeft">
         <span class="title">{{ $store.getters.user.org.org_short_name }}</span>
       </div>
@@ -28,7 +28,7 @@
       <!-- <router-link to="/add_urgent_schedule">
           <van-button size="small" type="info" class="add_schedule_btn">临时排班</van-button>
       </router-link>-->
-      <div class="search">
+      <!-- <div class="search">
         <van-field v-model="search_input" ref="search_field" placeholder="透析号/姓名" class="field">
           <i class="iconfont" slot="left-icon">&#xe741;</i>
           <van-button
@@ -39,11 +39,30 @@
             @click="searchWithKeyword"
           >搜索</van-button>
         </van-field>
-      </div>
+      </div>-->
       <!-- </van-col>
       </van-row>-->
+      <div class="newSearch">
+        <!-- <van-field v-model="search_input" ref="search_field" placeholder="透析号/姓名" class="field">
+          <i class="iconfont" slot="left-icon">&#xe741;</i>
+          <van-button
+            slot="button"
+            size="small"
+            type="info"
+            style="border: none;"
+            @click="searchWithKeyword"
+          >搜索</van-button>
+        </van-field>-->
+        <el-input
+          prefix-icon="el-icon-search"
+          v-model="search_input"
+          ref="search_field"
+          placeholder="透析号/姓名"
+        ></el-input>
+        <p class="searchBtn" @click="searchWithKeyword">搜索</p>
+      </div>
       <div class="box">
-        <div class="department">
+        <div class="newDepartment">
           <ul>
             <li
               style="position: relative;"
@@ -171,11 +190,11 @@ export default {
 };
 </script>
 
-<style style="stylesheet/scss" lang="scss" scoped>
+<style lang="scss">
 .top_row {
   // height: 50px;
   font-size: 0.3rem;
-  padding: 0.3rem 0.3rem 0;
+  padding: 0 0.3rem 0;
   @media only screen and (min-width: 813px) and (max-width: 1024px) {
     padding: 0.3rem 0.3rem;
   }
@@ -184,7 +203,8 @@ export default {
   // align-items: center;
   background: #258ffc;
   .floatLeft {
-    float: left;
+    line-height: 30px;
+    height: 30px;
   }
   .search {
     float: right;
@@ -192,15 +212,15 @@ export default {
   }
 }
 .title {
-  font-size: 0.34rem;
+  font-size: 0.45rem;
   font-weight: 600;
   height: 45px;
-  line-height: 50px;
+  // line-height: 50px;
   margin-left: 8px;
   // color: $title-color;
   color: #fff;
 }
-.department {
+.newDepartment {
   text-align: center;
   // height: 100%;
   width: 60%;
@@ -212,11 +232,11 @@ export default {
     align-items: center;
     li {
       float: left;
-      font-size: 0.36rem;
+      font-size: 0.45rem;
       margin: 0 0.2rem;
-      height: 0.64rem;
-      line-height: 0.64rem;
-      padding: 0 0.3rem;
+      height: 0.8rem;
+      line-height: 0.8rem;
+      padding: 0 0.4rem;
       // color: $title-color;
       color: #fff;
       &.active {
@@ -258,7 +278,7 @@ export default {
 }
 .box {
   height: 30px;
-  margin-top: 50px;
+  margin-top: 8px;
   background: #258ffc;
 }
 .head {
@@ -274,21 +294,53 @@ export default {
     border-radius: 50%;
   }
 }
+.newSearch {
+  height: 1rem;
+  width: 100%;
+  background: #fff;
+  border-radius: 30px;
+  .searchBtn {
+    width: 15%;
+    float: left;
+    height: 1rem;
+    line-height: 1rem;
+    text-align: center;
+    font-size: 0.45rem;
+    color: #258ffc;
+  }
+}
+.el-input {
+  height: 100%;
+  width: 85%;
+  float: left;
+}
+.el-input__inner {
+  height: 100%;
+  line-height: 1rem;
+  width: 100%;
+  border-radius: 30px;
+  border: none;
+  font-size: 0.45rem;
+}
+.el-input__icon {
+  line-height: 1rem;
+  font-size: 0.45rem;
+}
 .add {
-  width: 1.5rem;
-  height: 1.5rem;
+  width: 1.8rem;
+  height: 1.8rem;
   background: #f66c6c;
   // box-shadow: 0px 3px 9px 0px rgba(7, 30, 102, 0.15);
   border-radius: 50%;
   position: fixed;
   right: 0.6rem;
   bottom: 2.25rem;
-  font-size: 0.4rem;
+  font-size: 0.45rem;
   text-align: center;
   p {
-    width: 26px;
+    width: 30px;
     text-align: center;
-    margin: 6px auto 0;
+    margin: 9px auto 0;
     color: #fff;
     // @media only screen and (min-width: 415px) and (max-width: 668px) {
     //   width: 40px;

src/pages/main/WaitingArea.vue

@@ -9,15 +9,9 @@
             :class="select_index == i ? 'active' : ''"
             @click="menuTabClick(i)"
             :key="i"
-          >
-            {{ item.label + (item.count > 0 ? "(" + item.count + ")" : "") }}
-          </li>
-
-          <el-popover
-            v-model="zone_options_visible"
-            placement="bottom"
-            trigger="click"
-          >
+          >{{ item.label + (item.count > 0 ? "(" + item.count + ")" : "") }}</li>
+
+          <el-popover v-model="zone_options_visible" placement="bottom" trigger="click">
             <li slot="reference">
               {{ zone_options[zone_selected].text }}
               <span class="iconfont">&#xe74a;</span>
@@ -29,18 +23,12 @@
                   :key="index"
                   @click="handleZoneChange(index, option)"
                   :class="zone_selected == index ? 'tick' : ''"
-                >
-                  {{ option.text }}
-                </li>
+                >{{ option.text }}</li>
               </ul>
             </div>
           </el-popover>
 
-          <el-popover
-            v-model="time_options_visible"
-            placement="bottom"
-            trigger="click"
-          >
+          <el-popover v-model="time_options_visible" placement="bottom" trigger="click">
             <li slot="reference">
               {{ time_options[time_selected].text }}
               <span class="iconfont">&#xe74a;</span>
@@ -52,9 +40,7 @@
                   :key="index"
                   @click="handleTimeChange(index)"
                   :class="time_selected == index ? 'tick' : ''"
-                >
-                  {{ option.text }}
-                </li>
+                >{{ option.text }}</li>
               </ul>
             </div>
           </el-popover>
@@ -64,36 +50,22 @@
         <!-- <patient-box class="clearfix" :patients="filtedScheduals "></patient-box> -->
         <div v-for="(item, index) in filtedScheduals" :key="index">
           <h2 class="title">{{ item.zone_name }}</h2>
-          <patient-box
-            class="clearfix"
-            :patients="item.scheduals"
-          ></patient-box>
+          <patient-box class="clearfix" :patients="item.scheduals"></patient-box>
         </div>
         <div class="NoData" v-if="filtedScheduals.length == 0 && networkStates">
-          <img
-            style="margin-top: 50px; margin-bottom: 50px"
-            src="@/assets/login/data.jpg"
-            alt
-          />
+          <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
         </div>
 
-        <div
-          class="NoData"
-          v-if="!networkStates"
-          style="display: block;text-align: center;"
-        >
+        <div class="NoData" v-if="!networkStates" style="display: block;text-align: center;">
           <!--<img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/no_network.jpg" alt="">-->
-          <p style="margin-top: 100px;font-size: 18px">
-            网络异常，请点击重新加载
-          </p>
+          <p style="margin-top: 100px;font-size: 18px">网络异常，请点击重新加载</p>
           <van-button
             slot="button"
             size="normal"
             type="info"
             style="display:block;margin:0 auto"
             @click="reloads()"
-            >重新加载</van-button
-          >
+          >重新加载</van-button>
         </div>
       </div>
     </div>
@@ -662,7 +634,7 @@ export default {
 .screening {
   border-bottom: 1px #e5e5e5 solid;
   position: fixed;
-  top: 89px;
+  top: 98px;
   @media only screen and (min-width: 813px) and (max-width: 1024px) {
     top: 130px;
   }

src/pages/main/today/dialysisMonitoring.vue

@@ -1,7 +1,11 @@
 <template>
-  <div class="plate-box" >
-    <h2 class="title border"><span class="line"></span><p>{{title}}</p><span class="line"></span> </h2>
-    <div class="dm" style="width:100%;overflow:hildden;overflow-x:auto;">
+  <div class="plate-box">
+    <h2 class="title border">
+      <span class="line"></span>
+      <p>{{title}}</p>
+      <span class="line"></span>
+    </h2>
+    <!-- <div class="dm" style="width:100%;overflow:hildden;overflow-x:auto;">
       <table  class="table" style="">
         <tr>
           <th v-if="isShow('监测时间')" width="124px">时间</th>
@@ -49,91 +53,156 @@
       </table>
       <div class="NoData" v-show="tableDate.length == 0"><img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt=""></div>
 
-    </div>
+    </div>-->
+    <el-table :data="date" border style="width: 100%">
+      <el-table-column fixed prop="date" label="时间" width="100"></el-table-column>
+      <el-table-column prop="name" label="体温(℃)" width="100"></el-table-column>
+      <el-table-column prop="province" label="血压(mmHg)" width="100"></el-table-column>
+      <el-table-column prop="city" label="脉搏(次/分)" width="100"></el-table-column>
+      <el-table-column prop="address" label="呼吸频率(次/分)" width="200"></el-table-column>
+      <el-table-column prop="zip" label="静脉压/动脉压(mmHg)" width="100"></el-table-column>
+      <el-table-column prop="zip" label="血流量(ml/min)" width="150"></el-table-column>
+      <el-table-column prop="zip" label="跨膜压(mmHg)" width="200"></el-table-column>
+      <el-table-column prop="zip" label="超滤量(ml)" width="200"></el-table-column>
+      <el-table-column prop="zip" label="钠浓度(mmol/L)" width="200"></el-table-column>
+      <el-table-column prop="zip" label="透析液温度(℃)" width="200"></el-table-column>
+      <el-table-column prop="zip" label="置换率(L/h)" width="200"></el-table-column>
+      <el-table-column prop="zip" label="置换量(L)" width="200"></el-table-column>
+      <el-table-column prop="zip" label="电导度(mS/m)" width="200"></el-table-column>
+      <el-table-column prop="zip" label="置换液流量(ml/h)" width="200"></el-table-column>
+      <el-table-column prop="zip" label="病情变化" width="200"></el-table-column>
+      <el-table-column prop="zip" label="处理" width="200"></el-table-column>
+      <el-table-column prop="zip" label="结果" width="200"></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: []
-    }
+      tableDate: [],
+      date: [
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1517 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1519 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1516 弄",
+          zip: 200333
+        }
+      ]
+    };
   },
-  created () {
-    this.template_id = this.$store.getters.user.template_info.template_id
+  created() {
+    this.template_id = this.$store.getters.user.template_info.template_id;
   },
   methods: {
-    isShow (name) {
-      var filedList = this.$store.getters.user.fileds
+    isShow(name) {
+      var filedList = this.$store.getters.user.fileds;
 
       for (let i = 0; i < filedList.length; i++) {
-        if (filedList[i].module == 4 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
-          return true
+        if (
+          filedList[i].module == 4 &&
+          filedList[i].filed_name_cn == name &&
+          filedList[i].is_show == 1
+        ) {
+          return true;
         }
       }
-      return false
+      return false;
     },
-    setRecords (records) {
+    setRecords(records) {
       if (records == null) {
-        records = []
+        records = [];
       }
-      this.tableDate.splice(0, this.tableDate.length)
-      this.tableDate.push(...records)
+      this.tableDate.splice(0, this.tableDate.length);
+      this.tableDate.push(...records);
     },
-    parseTime (time, layout) {
-      return parseTime(time, layout)
+    parseTime(time, layout) {
+      return parseTime(time, layout);
     },
-    addRecords (records) {
-      this.tableDate.push(...records)
+    addRecords(records) {
+      this.tableDate.push(...records);
     }
   }
-}
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dm {
   /* 针对缺省样式 (必须的) */
-      &::-webkit-scrollbar {
-        width: 3px;
-        height: 5px;
-      }
-      /* 滚动条的滑轨背景颜色 */
-      &::-webkit-scrollbar-track {
-        background-color: #fff;
-        border-radius: 3px;
-        -moz-border-radius: 3px;
-        -webkit-border-radius: 3px;
-      }
-      /* 滑块颜色 */
-      &::-webkit-scrollbar-thumb {
-        background: #d7dce2;
-        border-radius: 3px;
-        -moz-border-radius: 3px;
-        -webkit-border-radius: 3px;
-      }
-      /*内层轨道的颜色*/
-      &::-webkit-scrollbar-track-piece {
-        background-color: #fff;
-        border-radius: 3px;
-        -moz-border-radius: 3px;
-        -webkit-border-radius: 3px;
-      }
-      /* 滑轨两头的监听按钮颜色 */
-      &::-webkit-scrollbar-button {
-        background-color: #eee;
-        width: 0;
-        height: 0;
-      }
-      /* 横向滚动条和纵向滚动条相交处尖角的颜色 */
-      &::-webkit-scrollbar-corner {
-        background-color: #eee;
-      }
-
+  &::-webkit-scrollbar {
+    width: 3px;
+    height: 5px;
+  }
+  /* 滚动条的滑轨背景颜色 */
+  &::-webkit-scrollbar-track {
+    background-color: #fff;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+  }
+  /* 滑块颜色 */
+  &::-webkit-scrollbar-thumb {
+    background: #d7dce2;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+  }
+  /*内层轨道的颜色*/
+  &::-webkit-scrollbar-track-piece {
+    background-color: #fff;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+  }
+  /* 滑轨两头的监听按钮颜色 */
+  &::-webkit-scrollbar-button {
+    background-color: #eee;
+    width: 0;
+    height: 0;
+  }
+  /* 横向滚动条和纵向滚动条相交处尖角的颜色 */
+  &::-webkit-scrollbar-corner {
+    background-color: #eee;
+  }
+}
+</style>
+<style lang="scss">
+.el-table td {
+  padding: 0;
+}
+.el-table th {
+  padding: 6px 0;
 }
 </style>

src/pages/main/today/statOrder.vue

@@ -5,7 +5,7 @@
       <p>{{title}}</p>
       <span class="line"></span>
     </h2>
-    <div class="newDiv">
+    <!-- <div class="newDiv">
       <table class="table">
         <tr>
           <th width="12%">开嘱医生</th>
@@ -29,7 +29,7 @@
 
             <td :class="advice.parent_id == 0 ? 'advice_content' : 'subadvice_content'">
               <span>{{advice.advice_name }}</span>
-              <!-- <span>{{advice.drug_spec}}{{advice.drug_spec_unit}} * {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span> -->
+              <span>{{advice.drug_spec}}{{advice.drug_spec_unit}} * {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
               <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
               <span
                 v-if="advice.prescribing_number"
@@ -53,7 +53,14 @@
     </div>
     <div class="NoData" v-show="advice_groups.length == 0">
       <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
-    </div>
+    </div>-->
+    <el-table :data="date" border style="width: 100%">
+      <el-table-column fixed prop="date" label="开嘱医生" width="100"></el-table-column>
+      <el-table-column prop="name" label="开始时间" width="100"></el-table-column>
+      <el-table-column prop="province" label="医嘱内容" width="100"></el-table-column>
+      <el-table-column prop="city" label="执行时间" width="100"></el-table-column>
+      <el-table-column prop="address" label="执行护士" width="200"></el-table-column>
+    </el-table>
   </div>
 </template>
 
@@ -66,7 +73,41 @@ export default {
     return {
       title: "临时医嘱 ",
       template_id: 0,
-      tableDate: []
+      tableDate: [],
+      date: [
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1517 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1519 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1516 弄",
+          zip: 200333
+        }
+      ]
     };
   },
   props: {
@@ -204,3 +245,11 @@ export default {
   overflow-x: auto;
 }
 </style>
+<style lang="scss">
+.el-table td {
+  padding: 0;
+}
+.el-table th {
+  padding: 6px 0;
+}
+</style>

src/pages/monitoring/index.vue

@@ -2,10 +2,10 @@
   <div class="mainBox">
     <div class="mainContent">
       <div class="top">
-        <div class="hospital" style="width:4.2rem;">
+        <div class="hospital" style="width:4.2rem;display:none">
           <span style="visibility:hidden"></span>
         </div>
-        <div class="department">
+        <!-- <div class="department">
           <ul>
             <li>透析监控</li>
           </ul>
@@ -24,9 +24,17 @@
               type="info"
               style="border: none;"
               @click="searchWithKeyword(1)"
-              >搜索</van-button
-            >
+            >搜索</van-button>
           </van-field>
+        </div>-->
+        <div class="newSearch">
+          <el-input
+            prefix-icon="el-icon-search"
+            v-model="patient_keyword"
+            ref="search_field"
+            placeholder="透析号/姓名"
+          ></el-input>
+          <p class="searchBtn" @click="searchWithKeyword(1)">搜索</p>
         </div>
       </div>
 
@@ -44,9 +52,7 @@
                   :key="item.id"
                   @click="itemClick(item.id)"
                   :class="partition == item.id ? 'tick' : ''"
-                >
-                  {{ item.name }}
-                </li>
+                >{{ item.name }}</li>
               </ul>
             </div>
           </el-popover>
@@ -56,7 +62,7 @@
           </li>
         </ul>
       </div>
-      <van-list
+      <!-- <van-list
         v-model="loading"
         :finished="finished"
         finished-text="  "
@@ -161,7 +167,17 @@
             alt
           />
         </div>
-      </van-list>
+      </van-list>-->
+      <el-table :data="tableData" border style="width: 100%" class="newTable">
+        <el-table-column fixed prop="date" label="姓名" width="100"></el-table-column>
+        <el-table-column prop="name" label="机号" width="100"></el-table-column>
+        <el-table-column prop="province" label="透析号" width="100"></el-table-column>
+        <el-table-column prop="city" label="排班时间" width="100"></el-table-column>
+        <el-table-column prop="address" label="透析模式" width="200"></el-table-column>
+        <el-table-column prop="zip" label="脱水量" width="100"></el-table-column>
+        <el-table-column prop="zip" label="体重(透前/透后)" width="150"></el-table-column>
+        <el-table-column prop="zip" label="监控预警(血压/心率)" width="200"></el-table-column>
+      </el-table>
     </div>
     <side-bar :active_index="1"></side-bar>
     <mt-datetime-picker
@@ -194,6 +210,104 @@ export default {
   },
   data () {
     return {
+      tableData: [
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1517 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1519 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1516 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1517 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1519 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1516 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1517 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1519 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1516 弄",
+          zip: 200333
+        }
+      ],
       loading: false,
       finished: false,
 
@@ -421,17 +535,21 @@ export default {
 }
 </script>
 
-<style style="stylesheet/scss" lang="scss" scoped>
+<style lang="scss" scoped>
+.mainBox {
+  height: 100%;
+}
 .top {
   padding: 0.3rem 0.3rem;
   @include text-align;
   font-size: 0.36rem;
-  border-bottom: 1px #e5e5e5 solid;
+  // border-bottom: 1px #e5e5e5 solid;
   position: relative;
   color: $title-color;
   @include display-flex;
   @include align-items-center;
   @include justify-content-between;
+  background: #258ffc;
   .title {
     font-size: 0.3rem;
     font-weight: bold;
@@ -448,15 +566,15 @@ export default {
 .choice {
   border-bottom: 1px #e5e5e5 solid;
   position: fixed;
-  top: 63px;
+  top: 48px;
   right: 0;
   z-index: 66;
   left: 0;
-  background: #fff;
-  @media only screen and (max-width: 415px) {
-    top: 38px !important;
-  }
-  @media only screen and (min-width: 376px) and (max-width: 812px) {
+  background: #258ffc;
+  // @media only screen and (max-width: 415px) {
+  //   top: 38px !important;
+  // }
+  @media only screen and (min-width: 813px) and (max-width: 1024px) {
     top: 38px !important;
   }
   ul {
@@ -464,10 +582,11 @@ export default {
     @include align-items-center;
     @include text-align;
     @include justify-content-between;
-    width: 45%;
+    width: 55%;
     margin: 0 auto;
-    font-size: 0.32rem;
-    color: $pgh-color;
+    font-size: 0.45rem;
+    // color: $pgh-color;
+    color: #fff;
     li {
       @include display-flex;
       @include align-items-center;
@@ -513,3 +632,46 @@ export default {
   }
 }
 </style>
+<style lang="scss">
+.newSearch {
+  height: 1rem;
+  width: 100%;
+  background: #fff;
+  border-radius: 30px;
+  .searchBtn {
+    width: 15%;
+    float: left;
+    height: 1rem;
+    line-height: 1rem;
+    text-align: center;
+    font-size: 0.45rem;
+    color: #258ffc;
+  }
+}
+.el-input {
+  height: 100%;
+  width: 85%;
+  float: left;
+}
+.el-input__inner {
+  height: 100%;
+  line-height: 1rem;
+  width: 100%;
+  border-radius: 30px;
+  border: none;
+  font-size: 0.45rem;
+}
+.el-input__icon {
+  line-height: 1rem;
+  font-size: 0.45rem;
+}
+.newTable {
+  margin-top: 90px;
+}
+.el-table td {
+  padding: 0;
+}
+.el-table th {
+  padding: 6px 0;
+}
+</style>

src/styles/media.scss

@@ -1,4 +1,4 @@
-@media only screen and (max-width: 812px) {
+@media only screen and (max-width: 767px) {
   html {
     font-size: 30px;
   }

src/styles/style.scss

@@ -772,11 +772,11 @@ body {
   }
 }
 
-// .van-cell {
-//   @media only screen and (max-width: 812px) {
-//     font-size: 6px !important;
-//   }
-// }
+.van-cell {
+  @media only screen and (max-width: 812px) {
+    font-size: 12px !important;
+  }
+}
 .van-field__left-icon {
   // @media only screen and (max-width: 812px) {
   //   // margin-right: 0 !important;
@@ -870,7 +870,7 @@ body {
 //   background: #fff;
 // }
 .stateBox {
-  padding-top: 140px;
+  padding-top: 130px;
   background: #fff;
   min-height: calc(100vh - 2px);
   padding-left: 0.45rem;