coys

src/views/menu/monitoringCall/components/consultInfo.vue

@@ -55,7 +55,7 @@ import NavBar from '@/components/NavBar'
 import passage from './passage.vue'
 // 主机列表组件
 import MonitoingList from './monitoringList.vue'
-
+import { upload } from '@/api/public'
 import { Col, Row, Dialog, Toast, Icon, Picker } from 'vant'
 import { registrationList, getEndInfo, login, getSysDeviceByTaskId, registration } from '@/api/toConsult.js'
 import scandialog from '@/components/nfcPopup/alone.vue'
@@ -65,7 +65,7 @@ export default {
     return {
       taskData: {},
       hostList:[],//主机列表
-      activeNames: ['1']
+      activeNames: []
     }
   },
   components: {
@@ -122,18 +122,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) {
@@ -173,8 +173,11 @@ export default {
         let { code, data, msg } = res
         if (code == 200) {
           Toast.success('扫描成功')
-          //结束调阅
-          this.endHandler()
+          setTimeout(() => {
+            
+            //结束调阅
+            this.endHandler()
+          }, 2000);
         }
       })
     },

src/views/menu/monitoringCall/index.vue

@@ -287,6 +287,7 @@ export default {
     },
     //文件上传
     resultImg(img) {
+     
       let obj = base64ToBlob(img.base)
       let formData = new FormData()
 
@@ -295,8 +296,8 @@ export default {
 
       upload(formData, 'image')
         .then(res => {
-          debugger
-          console.log(process.env.NODE_ENV)
+          
+          
           /*上传成功*/
           let imgUrl = process.env.NODE_ENV === 'development' ? res.data.url : window.origin + res.data.url
           this.photoHandler(imgUrl)