9月16日

build/webpack.dev.conf.js

@@ -55,6 +55,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     new HtmlWebpackPlugin({
       filename: 'index.html',
       template: 'index.html',
+      // template: 'src/index.html',//新
       inject: true
     }),
     // copy custom static assets
@@ -88,7 +89,6 @@ module.exports = new Promise((resolve, reject) => {
         ? utils.createNotifierCallback()
         : undefined
       }))
-
       resolve(devWebpackConfig)
     }
   })

src/pages/main/RecordPage.vue

@@ -226,76 +226,52 @@
         <img src="../../assets/images/monitoring.png" alt />
       </div> -->
       
-      <div class="fixedBox"  @click="toExecution">
-        <img src="../../assets/images/advice.png" alt />
+      <div class="fixedBox2"  @click="toExecution" ref="moveBtns" @mousedown="downs" @touchstart="downs"
+        @mousemove="moves"
+        @touchmove="moves"
+        @mouseup="ends"
+        @touchend="ends"
+        @touchcancel="ends">
+        <img src="../../assets/images/advice.png"  alt />
         <span class="redpoint">
            {{ total }}
         </span> 
       </div>
 
+      <div class="popup">
+        <van-popup
+          v-model:show="showRight"
+          position="right"
+          :style="{ width: '60%', height: '100%',right: '-30%' }">
 
-      <el-dialog
-        title="未执行医嘱患者名单"
-        :visible.sync="dialogVisible"
-        width="60%">
-          <el-table
-              :data="adviceList"
-              v-if="drugStockConfig.is_open == 0 || drugStockConfig.is_open == 2"
-              border
-              style="width: 100%">
-              <el-table-column prop="date" label="姓名" width="60" align="center">
-                  <template slot-scope="scope">
-                       {{getPaitenName( scope.row.patient_id) }}
-                  </template>
-              </el-table-column>
-
-              <el-table-column prop="date" label="条数" width="60" align="center">
-                <template slot-scope="scope">
-                       {{scope.row.count }}
-                  </template>
-              </el-table-column>
-
-              <el-table-column prop="date" label="操作" width="160" align="center">
-                <template slot-scope="scope">
-                   <el-button type="primary" size="small" @click="toExecutionPatent(scope.row)">去执行</el-button>
-                  </template>
-              </el-table-column>
-              
-          </el-table>
-
-          <el-table
-              :data="tableData"
-              v-if="drugStockConfig.is_open == 1"
-              border
-              style="width: 100%">
-              <el-table-column prop="date" label="姓名" width="60" align="center">
-                  <template slot-scope="scope">
-                    {{getPaitenName( scope.row.patient_id) }}
-                  </template>
-              
-              </el-table-column>
-
-              <el-table-column prop="date" label="条数" width="60" align="center">
-                <template slot-scope="scope">
-                  {{scope.row.total }}
-                </template>
-             
-              </el-table-column>
-
-              <el-table-column prop="date" label="去执行" width="160" align="center">
-                <template slot-scope="scope">
-                   <el-button type="primary" size="small" @click="toExecutionPatent(scope.row)">去执行</el-button>
-                 </template>
-              </el-table-column>
-              
-          </el-table>
-
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-        </span>
-      </el-dialog>
-
+          <div  v-if="drugStockConfig.is_open == 0 || drugStockConfig.is_open == 2">
+            <div style="margin: 10px;border-bottom: 1px solid black;">
+              <span class="text">姓名</span>
+              <span class="text">条数</span>
+            </div>
+            <div v-for="item in adviceList">
+              <div style="margin: 10px;border-bottom: 1px solid black;" @click="toExecutionPatent(item)">
+                <span class="text">{{getPaitenName(item.patient_id) }}</span>
+                <span class="text">{{item.count }}</span>
+              </div>
+            </div>
+            
+          </div>
+          <div  v-if="drugStockConfig.is_open == 1 ">
+            <div style="margin: 10px;border-bottom: 1px solid black;">
+              <span class="text">姓名</span>
+              <span class="text">条数</span>
+            </div>
+            <div v-for="item in tableData">
+              <div style="margin: 10px;border-bottom: 1px solid black;" @click="toExecutionPatent(item)">
+                <span class="text">{{getPaitenName(item.patient_id) }}</span>
+                <span class="text">{{item.count }}</span>
+              </div>
+            </div>
+            
+          </div>
+        </van-popup>
+      </div>
   </div>
 </template>
 
@@ -311,6 +287,7 @@ import { getDialysisOrWaitSelectedConfig } from '@/utils/data_config'
 import monitoring from '../monitoring/index'
 import control   from '../control/index.vue'
 import DialysisAdviceTable from '../advice/DialysisAdviceTable'
+import DialysisAdvice from '../advice/DialysiAdive.vue'
 import beforeDialysis from './beforeDialysis/index'
 import calling from './calling/index'
 import schedule from './schedule/index'
@@ -354,6 +331,7 @@ export default {
       unReadDialysisNum: 0,
       show: false,
       load: false,
+      showRight:false,
       // 拖动
       keyBoardShow: true,
       flags: false,
@@ -361,6 +339,10 @@ export default {
         x: 0,
         y: 0
       },
+      positions: {
+        x: 0,
+        y: 0
+      },
       active: 0,
       nx: '',
       ny: '',
@@ -368,7 +350,16 @@ export default {
       dy: '',
       xPum: '',
       yPum: '',
+
+      nsx: '',
+      nsy: '',
+      dsx: '',
+      dsy: '',
+      xsPum: '',
+      ysPum: '',
+
       moveBtn: {},
+      moveBtns:{},
       dialogVisible:false,
       tableData:[],
     }
@@ -379,6 +370,7 @@ export default {
     Popover,
     monitoring,
     DialysisAdviceTable,
+    DialysisAdvice,
     beforeDialysis,
     calling,
     schedule,
@@ -395,6 +387,14 @@ export default {
     if (sessionStorage.getItem('checkBtnLeft')) {
       this.moveBtn.style.left = sessionStorage.getItem('checkBtnLeft')
     }
+    this.moveBtns= this.$refs.moveBtns
+    if (sessionStorage.getItem('checkBtnsTop')) {
+      this.moveBtns.style.top = sessionStorage.getItem('checkBtnTop')
+      this.moveBtns.style.bottom = 'initial'
+    }
+    if (sessionStorage.getItem('checkBtnsLeft')) {
+      this.moveBtns.style.left = sessionStorage.getItem('checkBtnLeft')
+    }
     const originHeight = document.documentElement.clientHeight || document.body.clientHeight
     window.addEventListener('resize', () => {
       const resizeHeight = document.documentElement.clientHeight || document.body.clientHeight
@@ -462,6 +462,62 @@ export default {
         passive: false
       })
     },
+
+    downs (event) {
+      this.flags = true
+      var touch
+      if (event.touches) {
+        touch = event.touches[0]
+      } else {
+        touch = event
+      }
+      this.positions.x = touch.clientX
+      this.positions.y = touch.clientY
+      this.dsx = this.moveBtns.offsetLeft
+      this.dsy = this.moveBtns.offsetTop
+    },
+    moves (event) {
+      if (this.flags) {
+        var touch
+        if (event.touches) {
+          touch = event.touches[0]
+        } else {
+          touch = event
+        }
+        this.nsx = touch.clientX - this.positions.x
+        this.nsy = touch.clientY - this.positions.y
+        this.xsPum = this.dsx + this.nsx
+        this.ysPum = this.dsy + this.nsy
+        var clientWidth = document.documentElement.clientWidth
+        var clientHeight = document.documentElement.clientHeight
+        if (
+          this.xsPum > 0 &&
+          this.xsPum < clientWidth - this.moveBtns.offsetWidth
+        ) {
+          this.moveBtns.style.left = this.xsPum + 'px'
+        }
+        if (
+          this.ysPum > 0 &&
+          this.ysPum < clientHeight - this.moveBtns.offsetHeight
+        ) {
+          this.moveBtns.style.top = this.ysPum + 'px'
+        }
+
+        // 阻止页面的滑动默认事件
+        document.addEventListener('touchmove', this.handler, {
+          passive: false
+        })
+      }
+    },
+    // 鼠标释放时候的函数
+    ends () {
+      this.flags = false
+      sessionStorage.setItem('checkBtnTop', this.moveBtn.style.top)
+      sessionStorage.setItem('checkBtnLeft', this.moveBtn.style.left)
+      document.addEventListener('touchmove', this.handler, {
+        passive: false
+      })
+    },
     handler () {
       if (this.flags) {
         event.preventDefault()
@@ -594,15 +650,15 @@ export default {
           
            
           }
-      this.dialogVisible = true
-      
+      // this.dialogVisible = true
+      this.showRight =true
            
     },
     toExecutionPatent(row){
      var patient_name = ""
      patient_name = this.getPaitenName(row.patient_id)
      this.$router.push('/details?patient_id='+row.patient_id+"&date="+row.advice_date+"&patient_name="+patient_name)
-     this.dialogVisible =false
+     this.showRight =false
     },
     getPaitenName(patient_id){
       var name = ""
@@ -757,9 +813,9 @@ export default {
   border-radius: 20px;
   color: #fff;
   background: #f56c6c;
-  position: absolute;
-  top: -6px;
-  right: -8px;
+  position: relative;
+  top: -64px;
+  right: 27px;
   border: 1px solid #fff;
   @media only screen and (max-width: 767px) {
     height: 16px;
@@ -819,12 +875,39 @@ export default {
     height: 1.875rem;
   }
 }
+.fixedBox2{
+  position: fixed;
+  bottom: 0.625rem;
+  right: 0.2rem;
+  z-index: 5;
+  width: 100px;
+  height: 100px;
+  img {
+    width: 1.875rem;
+    height: 1.875rem;
+  }
+}
 
 .beforeDialysis{
   width:100%;
   position: fixed;
   top: 2.75rem;
 }
+.popup{
+  .text{
+    display: inline-block;
+    width: 150px;
+    height: 30px;
+    font-size: 16px;
+  }
+  .mainBox .van-popup {
+    top: 0%;
+    right: -176px;
+    -webkit-transform: translate3d(-50%, 0, 0);
+    transform: translate3d(-50%, 0, 0);
+    border-radius: 10px;
+  }
+}
 </style>
 <style lang="scss">
 .newinput {
@@ -966,4 +1049,5 @@ export default {
 
   
 }
+
 </style>

src/pages/main/today/TodayTab.vue

@@ -548,8 +548,13 @@
     </div>
 
 
-    <div class="checkBox1"  @click="toExecution">
-        <img src="../../../assets/images/advice.png" alt />
+    <div class="checkBox3"  @click="toExecution" ref="moveBtns">
+        <img src="../../../assets/images/advice.png" @mousedown="downs" @touchstart="downs"
+      @mousemove="moves"
+      @touchmove="moves"
+      @mouseup="ends"
+      @touchend="ends"
+      @touchcancel="ends" alt />
         <span class="redpoint">
           {{ total }}
         </span> 
@@ -603,8 +608,41 @@
       </div>
     </van-dialog>
 
+    <div class="popup">
+      <van-popup
+        v-model:show="showRight"
+        position="right"
+        :style="{ width: '60%', height: '100%',right: '-30%' }">
 
-    <el-dialog
+        <div  v-if="drugStockConfig.is_open == 0 || drugStockConfig.is_open == 2">
+          <div style="margin: 10px;border-bottom: 1px solid black;">
+            <span class="text">姓名</span>
+            <span class="text">条数</span>
+          </div>
+          <div v-for="item in adviceList">
+            <div style="margin: 10px;border-bottom: 1px solid black;" @click="toExecutionPatent(item)">
+              <span class="text">{{getPaitenName(item.patient_id) }}</span>
+              <span class="text">{{item.count }}</span>
+            </div>
+          </div>
+        </div>
+        
+        <div  v-if="drugStockConfig.is_open == 1 ">
+          <div style="margin: 10px;border-bottom: 1px solid black;">
+            <span class="text">姓名</span>
+            <span class="text">条数</span>
+          </div>
+          <div v-for="item in tableData">
+            <div style="margin: 10px;border-bottom: 1px solid black;" @click="toExecutionPatent(item)">
+              <span class="text">{{getPaitenName(item.patient_id) }}</span>
+              <span class="text">{{item.count }}</span>
+            </div>
+          </div>
+        </div>
+      </van-popup>
+    </div>
+
+    <!-- <el-dialog
         title="未执行医嘱患者名单"
         :visible.sync="dialogVisible"
         width="60%">
@@ -662,7 +700,7 @@
           <el-button @click="dialogVisible = false">取 消</el-button>
           <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
         </span>
-      </el-dialog>
+      </el-dialog> -->
   </div>
 </template>
 <script>
@@ -760,6 +798,7 @@ export default {
       index: 0,
       dry_visibility:false,
       remind_lists:[],
+      showRight:false,
       // show_fixed_nav: false,
       patient_id: 0,
       date: 0,
@@ -858,6 +897,10 @@ export default {
         x: 0,
         y: 0
       },
+      positions: {
+        x: 0,
+        y: 0
+      },
       active: 0,
       nx: '',
       ny: '',
@@ -865,8 +908,16 @@ export default {
       dy: '',
       xPum: '',
       yPum: '',
+
+      nsx: '',
+      nsy: '',
+      dsx: '',
+      dsy: '',
+      xsPum: '',
+      ysPum: '',
       isShow: false,
       moveBtn: {},
+      moveBtns: {},
       is_project_open: 0,
       new_dialysis_goods: [],
       list: [],
@@ -1011,6 +1062,14 @@ export default {
     if (sessionStorage.getItem('checkBtnLeft')) {
       this.moveBtn.style.left = sessionStorage.getItem('checkBtnLeft')
     }
+    this.moveBtns =this.$refs.moveBtns
+    if (sessionStorage.getItem('checkBtnsTop')) {
+      this.moveBtns.style.top = sessionStorage.getItem('checkBtnTop')
+      this.moveBtns.style.bottom = 'initial'
+    }
+    if (sessionStorage.getItem('checkBtnsLeft')) {
+      this.moveBtns.style.left = sessionStorage.getItem('checkBtnLeft')
+    }
     window.addEventListener('scroll', this.handleScroll)
     this.appSource()
     const originHeight = document.documentElement.clientHeight || document.body.clientHeight
@@ -1136,6 +1195,62 @@ export default {
         passive: false
       })
     },
+
+    downs (event) {
+      this.flags = true
+      var touch
+      if (event.touches) {
+        touch = event.touches[0]
+      } else {
+        touch = event
+      }
+      this.positions.x = touch.clientX
+      this.positions.y = touch.clientY
+      this.dsx = this.moveBtns.offsetLeft
+      this.dsy = this.moveBtns.offsetTop
+    },
+    moves (event) {
+      if (this.flags) {
+        var touch
+        if (event.touches) {
+          touch = event.touches[0]
+        } else {
+          touch = event
+        }
+        this.nsx = touch.clientX - this.positions.x
+        this.nsy = touch.clientY - this.positions.y
+        this.xsPum = this.dsx + this.nsx
+        this.ysPum = this.dsy + this.nsy
+        var clientWidth = document.documentElement.clientWidth
+        var clientHeight = document.documentElement.clientHeight
+        if (
+          this.xsPum > 0 &&
+          this.xsPum < clientWidth - this.moveBtns.offsetWidth
+        ) {
+          this.moveBtns.style.left = this.xsPum + 'px'
+        }
+        if (
+          this.ysPum > 0 &&
+          this.ysPum < clientHeight - this.moveBtns.offsetHeight
+        ) {
+          this.moveBtns.style.top = this.ysPum + 'px'
+        }
+
+        // 阻止页面的滑动默认事件
+        document.addEventListener('touchmove', this.handler, {
+          passive: false
+        })
+      }
+    },
+    // 鼠标释放时候的函数
+    ends () {
+      this.flags = false
+      sessionStorage.setItem('checkBtnTop', this.moveBtns.style.top)
+      sessionStorage.setItem('checkBtnLeft', this.moveBtns.style.left)
+      document.addEventListener('touchmove', this.handler, {
+        passive: false
+      })
+    },
     handler () {
       if (this.flags) {
         event.preventDefault()
@@ -3704,7 +3819,7 @@ export default {
     })
   },
     toExecution(){
-      this.dialogVisible = true
+      this.showRight = true
     },
     toExecutionPatent(row){
      console.log("rowwoowowow",row)
@@ -3714,7 +3829,7 @@ export default {
      console.log("patient_id=",row.patient_id)
      console.log("datewoowo",row.advice_date)
      this.$router.push('/details?patient_id='+row.patient_id+"&date="+row.advice_date+"&patient_name="+patient_name)
-     this.dialogVisible =false
+     this.showRight =false
     },
     getPaitenName(patient_id){
       var name = ""
@@ -3838,6 +3953,21 @@ export default {
   background: #f6f6f6;
   width: 100%;
 }
+.popup{
+  .text{
+    display: inline-block;
+    width: 150px;
+    height: 30px;
+    font-size: 16px;
+  }
+  .mainBox .van-popup {
+    top: 0%;
+    right: -176px;
+    -webkit-transform: translate3d(-50%, 0, 0);
+    transform: translate3d(-50%, 0, 0);
+    border-radius: 10px;
+  }
+}
 </style>
 <style style="stylesheet/scss" lang="scss" scoped>
 #today_panel {
@@ -3905,11 +4035,11 @@ export default {
   border-radius: 20px;
   color: #fff;
   background: #f56c6c;
-  position: absolute;
+  position: relative;
   border: 1px solid #fff;
-  top: 0px;
+  top: -47px;
   // right: -8px;
-  left: 0px;
+  left: -15px;
   @media only screen and (min-width: 768px) {
     height: 30px;
     width: 30px;
@@ -3929,6 +4059,7 @@ export default {
     height: 3.5rem;
   }
 }
+
 .checkBox2 {
   position: fixed;
   left: 0.6rem;
@@ -3938,6 +4069,18 @@ export default {
     height: 3.5rem;
   }
 }
+.checkBox3 {
+  position: fixed;
+  right: 0.6rem;
+  bottom: 7.5rem;
+  width: 100px;
+  height: 100px;
+  img {
+    width: 3.5rem;
+    height: 3.5rem;
+  }
+}
+
 .contagionImg{
   width: 1rem !important;
   height: 1rem !important;