coys 2 years ago
parent
commit
68e5b558d1

+ 11 - 34
src/components/imgCom/index.vue

@@ -1,15 +1,13 @@
 <template>
   <div>
     <van-image :width="width" :height="height" :src="src" @click="onClickShow" />
-    <van-image-preview v-model="show" :images="listImg" @change="onChange">
-      <template v-slot:index>第{{ index }}页</template>
-    </van-image-preview>
-    <!-- <van-overlay :show="show" @click="onClickHide">
+    <van-overlay :show="show" @click="onClickHide">
       <div class="imgsty">
-        
-        <van-image :src="src" />
-      </div>
-    </van-overlay> -->
+
+          <van-image    :src="src" />
+        </div>
+      
+    </van-overlay>
   </div>
   <!-- <van-overlay :show="false">
     <view class="wrapper">
@@ -31,34 +29,16 @@ export default {
     src: {
       type: String,
       default: 'https://img.yzcdn.cn/vant/cat.jpeg'
-    },
-    imgList: {
-      type: Array,
-      default: () => {
-        return []
-      }
     }
   },
   name: 'SocAppIndex',
 
   data() {
     return {
-      this_:this,
-      show: false,
-      this_window:window,
-      index:'',
-      
-    }
-  },
-  computed:{
-    listImg(){
-      this.imgList.filter(item=>{
-        if(item.url&&item.type==0){
-          return item.url
-        }
-      })
+      show: false
     }
   },
+
   mounted() {},
 
   methods: {
@@ -67,16 +47,13 @@ export default {
     },
     onClickHide() {
       this.show = false
-    },
-    onChange(index) {
-      this.index = index;
     }
   }
 }
 </script>
 <style lang="scss" scoped>
-.imgsty {
-  position: absolute;
-  top: 28%;
+.imgsty{
+    position:absolute;
+    top: 28%;
 }
 </style>

+ 8 - 8
src/views/menu/monitoringCall/components/consultInfo.vue

@@ -123,18 +123,18 @@ export default {
         return
       }
 
-      // let startDate = JSON.parse(JSON.stringify(this.taskData.taskStartTime))
+      let startDate = JSON.parse(JSON.stringify(this.taskData.taskStartTime))
 
-      // startDate = Date.parse(new Date(startDate))
-      // let endDate = Date.parse(new Date())
-      // if (endDate - startDate <= 3600000) {
-      //   Dialog({ message: '该调阅未满一个小时请确认' })
+      startDate = Date.parse(new Date(startDate))
+      let endDate = Date.parse(new Date())
+      if (endDate - startDate <= 3600000) {
+        Dialog({ message: '该调阅未满一个小时请确认' })
         // 未满一小时不能结束调阅
-      // } else {
+      } else {
         this.$refs.scandialog.visible = true
 
-      //   startDate = new Date(startDate)
-      // }
+        startDate = new Date(startDate)
+      }
     },
     //文件上传
     resultImg(img) {

+ 1 - 1
src/views/menu/training/components/personnelSignature.vue

@@ -36,7 +36,7 @@
       <template v-for="item in studyList">
         <div :key="item.url" class="imglIST" style="{width:'100px',height: '100px';}">
 
-          <imgCom :width="'100'" :imgList="studyList" v-if="this_window.origin+item.url&&item.type==0"  :height="'100'" :src="this_window.origin+item.url"></imgCom>
+          <imgCom :width="'100'"  v-if="this_window.origin+item.url&&item.type==0"  :height="'100'" :src="this_window.origin+item.url"></imgCom>
           <!-- <VuePdf v-else :src="this_window.origin+item.url"></VuePdf> -->
           <VuePdf v-else  :src="this_window.origin+item.url"></VuePdf>
         </div>