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

build/webpack.base.conf.js

@@ -101,9 +101,9 @@ module.exports = webpackConfig
 // var vueLoaderConfig = require('./vue-loader.conf')
 const vuxLoader = require('vux-loader')
 
-module.exports = vuxLoader.merge(webpackConfig, {
-  plugins: ['vux-ui']
-})
+// module.exports = vuxLoader.merge(webpackConfig, {
+//   plugins: ['vux-ui']
+// })
 
 module.exports = vuxLoader.merge(webpackConfig, {
   plugins: [

config/prod.env.js

@@ -1,6 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
+  BASE_API: '"http://api.xt.kuyicloud.com"'
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
 }

package.json

@@ -87,6 +87,7 @@
     "selenium-server": "^3.0.1",
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
+    "style-loader": "^0.23.1",
     "uglifyjs-webpack-plugin": "^1.1.1",
     "url-loader": "^0.5.8",
     "vue-jest": "^1.0.2",

src/pages/main/DialysisArea.vue

@@ -1,46 +1,72 @@
 <template>
-    <div>
-       <div class="screening">
-           <ul>
-              <popover placement="bottom" >
-                <div slot="content" class="popover-demo-content">
-                  <ul>
-                    <li v-for="(zone, index) in zones" :key="zone.value" @click="handleZoneChange(index)"  :class="zone_selected == index ? 'tick' : ''">{{zone.text}}</li>
-                  </ul>
-                </div>
-               <li>{{ zones.length <= 1 && zone_selected > 0 ? "全部分区" : zones[zone_selected].text }}<span class="iconfont">&#xe74a;</span></li>
-               </popover>
-               
-               <popover placement="bottom" >  
-                <div slot="content" class="popover-demo-content">
-                  <ul>
-                    <li v-for="schedualType in schedual_types" :key="schedualType.value" @click="handletimeType(schedualType.value)" :class="schedual_type_selected == schedualType.value ? 'tick' : ''" >{{schedualType.text}}</li>
-                  </ul> 
-                </div>
-                <li>{{ schedual_types[schedual_type_selected].text}}<span class="iconfont">&#xe74a;</span></li>
-               </popover>
+  <div>
+    <div class="screening">
+      <ul>
+        <el-popover
+          v-model="zone_options_visible"
+          placement="bottom"
+          trigger="click">
+          <li slot="reference">
+            {{ zones.length <= 1 && zone_selected > 0 ? "全部分区" : zones[zone_selected].text }}
+            <span class="iconfont">&#xe74a;</span>
+          </li>
+          <div class="popover-demo-content">
+            <ul>
+              <li
+                v-for="(zone, index) in zones"
+                :key="zone.value"
+                @click="handleZoneChange(index)"
+                :class="zone_selected == index ? 'tick' : ''"
+              >{{zone.text}}</li>
+            </ul>
+          </div>
+        </el-popover>
 
-               <li @click="openPicker()">{{selected_date_str}}<span class="iconfont">&#xe74a;</span></li>
-           </ul>
-       </div>
-      <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>
-        </div>
-        <div class="NoData" v-show="filtedScheduals.length == 0"><img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt=""></div>
+        <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>
+          </li>
+          <div class="popover-demo-content">
+            <ul>
+              <li
+                v-for="schedualType in schedual_types"
+                :key="schedualType.value"
+                @click="handletimeType(schedualType.value)"
+                :class="schedual_type_selected == schedualType.value ? 'tick' : ''"
+              >{{schedualType.text}}</li>
+            </ul>
+          </div>
+        </el-popover>
 
+        <li @click="openPicker()">
+          {{selected_date_str}}
+          <span class="iconfont">&#xe74a;</span>
+        </li>
+      </ul>
+    </div>
+    <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>
       </div>
-      <mt-datetime-picker
-        v-model="selected_date"
-        ref="picker"
-        type="date"
-        year-format="{value} "
-        month-format="{value} "
-        date-format="{value} "
-        @confirm="handleScheduleDateChange">
-      </mt-datetime-picker>
-    </div>  
+      <div class="NoData" v-show="filtedScheduals.length == 0">
+        <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt>
+      </div>
+    </div>
+    <mt-datetime-picker
+      v-model="selected_date"
+      ref="picker"
+      type="date"
+      year-format="{value} "
+      month-format="{value} "
+      date-format="{value} "
+      @confirm="handleScheduleDateChange"
+    ></mt-datetime-picker>
+  </div>
 </template>
 
 <script>
@@ -71,7 +97,10 @@ export default {
 
       zone_selected: this.$store.getters.app.dialysis_area.zone_select_index,
       zones: [{ value: 0, text: "全部分区", select: true }],
-      dialysis_scheduals: []
+      dialysis_scheduals: [],
+
+      zone_options_visible: false,
+      sch_type_options_visible: false,
     };
   },
   props: {
@@ -139,7 +168,8 @@ export default {
           const schedule = originSchedules[s_i];
           if (
             zone_name.length == 0 ||
-            (zone_name.length > 0 && zone_name == schedule.device_number.zone.name)
+            (zone_name.length > 0 &&
+              zone_name == schedule.device_number.zone.name)
           ) {
             if (
               timetype_selected == 0 ||
@@ -164,6 +194,7 @@ export default {
   },
   methods: {
     handletimeType: function(index) {
+      this.sch_type_options_visible = false;
       this.schedual_type_selected = index;
       this.$emit("clear_search_keyword");
       this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
@@ -173,6 +204,7 @@ export default {
       });
     },
     handleZoneChange: function(index) {
+      this.zone_options_visible = false;
       this.zone_selected = index;
       this.$emit("clear_search_keyword");
       this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
@@ -213,7 +245,8 @@ export default {
               }
               schedualMap[schedual.device_number.zone.name].push(schedual);
               if (zoneMap[schedual.device_number.zone.name] == null) {
-                zoneMap[schedual.device_number.zone.name] = schedual.device_number.zone;
+                zoneMap[schedual.device_number.zone.name] =
+                  schedual.device_number.zone;
               }
             }
 
@@ -260,11 +293,11 @@ export default {
 .screening {
   border-bottom: 1px #e5e5e5 solid;
   position: fixed;
-    top: 63px;
-    right: 0;
-    z-index: 66;
-    left: 1.58rem;
-    background: #fff;
+  top: 63px;
+  right: 0;
+  z-index: 66;
+  left: 1.58rem;
+  background: #fff;
   ul {
     @include display-flex;
     @include align-items-center;
@@ -291,7 +324,7 @@ export default {
     font-size: 0.34rem;
     font-weight: 600;
     color: $title-color;
-    height:1rem;
+    height: 1rem;
     line-height: 0.8rem;
     display: inline-block;
   }

src/pages/main/WaitingArea.vue

@@ -2,15 +2,20 @@
   <div>
     <div class="screening">
       <ul>
-       
-        <popover placement="bottom" >
-          <div slot="content" class="popover-demo-content">
+        <el-popover
+          v-model="zone_options_visible"
+          placement="bottom"
+          trigger="click">
+          <li slot="reference">
+            {{ zone_options[zone_selected].text }}<span class="iconfont">&#xe74a;</span>
+          </li>
+          <div class="popover-demo-content">
             <ul>
               <li v-for="(option, index) in zone_options" :key="index" @click="handleZoneChange(index)" :class="zone_selected == index ? 'tick' : ''">{{ option.text }}</li>
             </ul>
           </div>
-          <li>{{ zone_options[zone_selected].text }}<span class="iconfont">&#xe74a;</span></li>
-        </popover>
+        </el-popover>
+
          <li v-for="(item,i) in menuList" :class="select_index == i ? 'active' : ''" @click="menuTabClick(i)" 
         :key="i">{{ item.label + (item.count > 0 ? '(' + item.count + ')' : '') }}</li>
       </ul>
@@ -52,7 +57,9 @@ export default {
       scheduals: [],
 
       zone_options: [{ value: 0, text: "全部分区" }],
-      zone_scheduals: []
+      zone_scheduals: [],
+
+      zone_options_visible: false,
     };
   },
   props: {
@@ -126,6 +133,7 @@ export default {
       this.zone_selected = 0;
     },
     handleZoneChange: function(index) {
+      this.zone_options_visible = false;
       this.zone_selected = index;
       this.select_index = -1;
     },

src/pages/main/dialog/MonitDialog.vue

@@ -1,6 +1,7 @@
 <template>
 <div>
-    <div class="Dialog"  v-show="listPanel" >
+  <div v-loading="loading">
+  <div class="Dialog"  v-show="listPanel" >
         <div class="DialogTit">
             <span class="iconfont" @click="close()">&#xe6e9;</span>
             <h1 class="name">透析监测</h1>
@@ -60,6 +61,7 @@
             <h1 class="name">{{formTitle}}</h1>
             <span class="success" v-if="form.id>0" @click="submitEditAction()">完成</span>
             <span class="success" v-else @click="submitAction()">完成</span>
+
         </div>
         <div class="DialogContent choose">
           <div class="content">
@@ -154,8 +156,10 @@
           </div>
         </div>
     </div>
+  </div>
+
 
-    <mt-datetime-picker
+  <mt-datetime-picker
       ref="picker"
       type="datetime"
       @confirm="handleConfirm"
@@ -201,6 +205,7 @@ export default {
   },
   data() {
     return {
+      loading:false,
       formTitle: "新增监测",
       formPanel: false,
       listPanel: true,
@@ -670,6 +675,7 @@ export default {
       // }
     },
     submitEditAction: function() {
+      this.loading = true
       Toast.loading({ forbidClick: true, duration: 0 });
       var params = {};
       params.patient_id = this.patient.id;
@@ -700,6 +706,8 @@ export default {
       editMonitorRecord(params).then(rs => {
         var resp = rs.data;
         if (resp.state == 1) {
+          this.loading = false
+
           var monitor = resp.data.monitor;
           this.$emit("did_edit_monitor", monitor);
 
@@ -729,11 +737,13 @@ export default {
           this.formPanel = false;
           this.listPanel = true;
         } else {
+          this.loading = false
           Toast.fail(resp.msg);
         }
       });
     },
     submitAction: function() {
+      this.loading = true
       Toast.loading({ forbidClick: true, duration: 0 });
       var params = {};
       params.patient_id = this.patient.id;
@@ -763,6 +773,8 @@ export default {
         .then(rs => {
           var resp = rs.data;
           if (resp.state == 1) {
+            this.loading = false
+
             var monitor = resp.data.monitor;
             this.$emit("did_add_monitor", monitor);
 
@@ -798,10 +810,12 @@ export default {
             this.formPanel = false;
             this.listPanel = true;
           } else {
+            this.loading = false
             Toast.fail(resp.msg);
           }
         })
         .catch(err => {
+          this.loading = false
           Toast.fail(err);
         });
     },

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+
     <div v-if="isShowDialog" class="Dialog">
       <div class="DialogTit">
         <span @click="close()" class="iconfont">&#xe6e9;</span>
@@ -253,6 +254,7 @@
     },
     data() {
       return {
+        loading:false,
         signUrl:"",
         isShowDesc:true,
         time: '03:00',

src/pages/main/today/detailsInfo.vue

@@ -1,7 +1,7 @@
-<template>
+x<template>
   <div class="info ">
-    <h2 class="plateTitle"><span class="line"></span><p>基本信息</p><span class="line"></span> </h2> 
-    
+    <h2 class="plateTitle"><span class="line"></span><p>基本信息</p><span class="line"></span> </h2>
+
     <div class="ui-step clearfix">
       <ul class="ui-step-ul">
         <li v-for="(item, index) in step_data" :key="index" class="ui-step-done" >
@@ -12,7 +12,7 @@
     </div>
 
     <ul class="clearfix">
-      <li>  
+      <li>
         <label>姓名 : </label>
         <span>{{patient.name}}</span>
       </li>

src/pages/personal/EditPersonal.vue

@@ -13,8 +13,12 @@
                    <div class="item">
                         <h2>个人头像</h2>
                        <div class="tx">
-                           <img src="@/assets/product/test.jpg" alt="">
-                           <span class="iconfont">&#xe6f9;</span>
+
+                         <!--<img :src="myinfo.avatar" alt="" v-if="myinfo.avatar != ''">-->
+                         <!--&lt;!&ndash;<h2>个人信息</h2>&ndash;&gt;-->
+                         <!--<img :src="avatar" alt="" v-if="myinfo.avatar == ''">-->
+
+
                        </div>
                    </div>
                 </div>
@@ -45,28 +49,28 @@
                        <div class="tx">
                            <input type="text" class="InputBox" placeholder="性别">
                            <span class="iconfont">&#xe6f9;</span>
-                       </div>                       
+                       </div>
                    </div>
                    <div class="item">
                         <h2>出生日期</h2>
                         <div class="tx">
                            <input type="text" class="InputBox" placeholder="出生日期">
                            <span class="iconfont">&#xe6f9;</span>
-                       </div>     
+                       </div>
                    </div>
                    <div class="item">
                         <h2>微信号</h2>
                        <div class="tx">
                            <input type="text" class="InputBox" placeholder="微信号">
                            <span class="iconfont">&#xe6f9;</span>
-                       </div> 
+                       </div>
                    </div>
                     <div class="item">
                         <h2>QQ号</h2>
                        <div class="tx">
                            <input type="text" class="InputBox" placeholder="QQ号">
                            <span class="iconfont">&#xe6f9;</span>
-                       </div> 
+                       </div>
                    </div>
                 </div>
             </div>

src/pages/personal/index.vue

@@ -6,15 +6,15 @@
             <div class="information">
                 <div class="blueBorder"></div>
                 <div class="name">
-                    <router-link to="/EditPersonal">
+                    <!--<router-link to="/EditPersonal">-->
                         <div class="item">
                             <div class="tx">
-                                <img :src="myinfo.avatar" alt="" v-if="myinfo.avatar != ''">
-                                <h2>个人信息</h2>
+                              <img :src="myinfo.avatar" alt="" v-if="myinfo.avatar != ''">
+                              <img :src="avatar" alt="" v-if="myinfo.avatar == ''">
                             </div>
-                            <span class="iconfont">&#xe6f9;</span>
+                            <!--<span class="iconfont">&#xe6f9;</span>-->
                         </div>
-                    </router-link>
+                    <!--</router-link>-->
                 </div>
                 <div class="name">
                     <router-link to="/ElectronicSignature">
@@ -86,7 +86,8 @@ export default {
   data() {
     return {
       electronicsignature: "",
-      myinfo: {}
+      myinfo: {},
+      avatar:"@/assets/product/test.jpg"
     };
   },
   created() {