Bladeren bron

修改bug

gaoxiong 1 jaar geleden
bovenliggende
commit
4b15a6f174

+ 7 - 0
src/api/toConsult.js

@@ -119,6 +119,13 @@ export function finishRegistration(data) {
     data
   })
 }
+export function storageTask(data) {
+  return request({
+    url: `/core/storageTask`,
+    method: 'post',
+    data
+  })
+}
 
 // 获取调阅统计情况表
 export function selectMonitorReport(data) {

+ 41 - 18
src/views/menu/monitoringCall/components/consultInfo.vue

@@ -40,7 +40,7 @@
         </van-row> -->
         <van-row v-if="retrievalAreaList && retrievalAreaList.length > 0" gutter="10">
           <van-col span="12">
-            <van-button type="default" @click="endMontor">保存</van-button>
+            <van-button type="default" @click="storagMontor">保存</van-button>
           </van-col>
           <van-col span="12">
             <van-button type="info" @click="endMontor">结束调阅</van-button>
@@ -70,7 +70,7 @@ import areaMonitoringList from './areaMonitoringList.vue'
 
 import { upload } from '@/api/public'
 import { Col, Row, Dialog, Toast, Icon, Picker } from 'vant'
-import { registrationList, finishRegistration, login, getSysDeviceByTaskId, registration } from '@/api/toConsult.js'
+import { registrationList, finishRegistration, login, getSysDeviceByTaskId, registration,storageTask } from '@/api/toConsult.js'
 import scandialog from '@/components/nfcPopup/alone.vue'
 import writingPad from '@/components/writingPad/index.vue'
 import imgCom from '@/components/imgCom/index.vue'
@@ -137,19 +137,6 @@ export default {
       this.init(num)
     },
     getHostHandler(num = 0) {
-      // num//判断是不是第一次初始化
-      // getSysDeviceByTaskId({ taskId: this.$route.params.id.split('_')[0] }).then(res => {
-      //   let { code, data, msg } = res
-      //   if (code == 200) {
-      //     this.hostList = data
-      //     if (num == 1) {
-      //       this.activeNames = [this.hostList[0].hostId]
-      //     } else {
-      //       console.log(this.activeNames, '////')
-      //     }
-      //   }
-      // })
-
        //获取调阅字典
        this.getDictHandler('video_retrieval_area', res => {
            let areaList = JSON.parse(JSON.stringify(res));
@@ -206,9 +193,9 @@ export default {
           startDate = Date.parse(new Date(obj));
         }
         let endDate = Date.parse(new Date())
-
+        let taskTotalTime = this.taskData.taskTotalTime  + parseFloat(endDate - startDate / 3600.0);
         if (endDate - startDate) {
-          this.shwoSignTitle= `调阅时长为${this.dateTime(endDate - startDate)},是否结束调阅?`;
+          this.shwoSignTitle= `本次调阅时长为${this.dateTime(endDate - startDate)},调阅总时长为:${taskTotalTime}小时,是否结束调阅?`;
           this.showSign=true;
         }
 
@@ -223,6 +210,43 @@ export default {
       //   startDate = new Date(startDate)
       // }
     },
+    storagMontor(){
+      //暂存数据
+      let falg = this.taskData.coreMonitoringTaskRegistrationMonitorVOList
+      if (falg && falg.length > 0) {
+        let startDate = JSON.parse(JSON.stringify(this.taskData.taskStartTime))
+        let obj=startDate.replace(/-/g,"/");
+
+        startDate = Date.parse(new Date(startDate))
+        if(!startDate){
+          startDate = Date.parse(new Date(obj));
+        }
+        let endDate = Date.parse(new Date())
+
+        let taskTotalTime = this.taskData.taskTotalTime  + parseFloat(endDate - startDate / 3600.0);
+        if (endDate - startDate) {
+          let msg = `本次调阅时长为${this.dateTime(endDate - startDate)},调阅总时长为:${taskTotalTime}小时,是否结束调阅?`;
+          Dialog.confirm({
+            message: msg,
+          }).then(() => {
+            storageTask({
+              id: this.taskData.id,
+              signImgUrl:this.signImgUrl,
+              taskId: this.$route.params.id.split('_')[0]
+            }).then(res => {
+              this.$router.go(-1)
+            })
+          }).catch(() => {
+            // on cancel
+          });
+        }
+
+      } else {
+        Dialog({ message: '调阅项目登记不能为全空!' })
+        return
+      }
+
+    },
     dateTime(msd) {
       //将毫秒秒转化为xx小时xx分钟xx秒
 
@@ -319,7 +343,6 @@ export default {
         taskId: this.$route.params.id.split('_')[0]
       }).then(res => {
         this.$router.go(-1)
-
       })
     },
     addActiveNames() {

+ 2 - 1
src/views/menu/monitoringCall/index.vue

@@ -311,7 +311,8 @@ export default {
       let obj = {
         startPicture: img,
         startNfc: nfc,
-        taskId: this.taskId
+        taskId: this.taskId,
+        monitorFlag: 0
       }
       registration(obj).then(res => {
         let { code, data, msg } = res