Merge branch 'master' of ssh://git.czcyedu.com:222/huoran/FE_bankTeaching into master

src/components/case/index.vue

@@ -65,7 +65,7 @@
                   <el-card shadow="hover">
                     <el-table :data="requires" stripe height="405" v-loading="loading" :key="Math.random()">
                       <el-table-column type="index"></el-table-column>
-                      <el-table-column prop="name" label="判分标准" align="center">
+                      <el-table-column prop="name" label="判分指标" align="center">
                       </el-table-column>
                       <el-table-column prop="right" label="完成结果" align="center">
                         <template slot-scope="scope">

src/pages/counter/list/index.vue

@@ -113,7 +113,7 @@
         </div>
 
         <!-- 硬件交互--弹框 -->
-        <div v-show="showPop" width="900px" class="data-dia">
+        <div v-show="showPop" width="900px" class="data-dia" ref="dataDia" v-drag>
             <div class="dia-header">
                 <div class="data-title">{{ popText }}</div>
                 <img class="close" v-lazy="lazyImg[28]" alt="" @click="closePop" />
@@ -533,6 +533,14 @@ export default {
             return this.$store.state.system.fullScreen;
         },
         showPop:function(){/* 展示弹框 */
+            const dataDia = this.$refs.dataDia
+            // 每次显示弹框时重置方位
+            if (dataDia) {
+                dataDia.style.top = '68px'
+                dataDia.style.left = '50%'
+            }
+                
+            this.$refs.dataDia
             this.receptionList = []
             if(this.$store.state.system.popText == '刷卡器'){
                 if (this.$store.state.system.id == '62,1'){