Bladeren bron

修改数据

高雄 1 jaar geleden
bovenliggende
commit
e5d1dfdc7e

+ 15 - 1
src/api/toConsult.js

@@ -121,7 +121,7 @@ export function finishRegistration(data) {
 }
 export function storageTask(data) {
   return request({
-    url: `/core/storageTask`,
+    url: `/core/registration/storageTask`,
     method: 'post',
     data
   })
@@ -136,4 +136,18 @@ export function selectMonitorReport(data) {
   })
 }
 
+/**
+ * 判断是否有开始未结束的调阅数据
+ * @param data
+ * @returns {*}
+ */
+export function getMonitorStart(data) {
+  return request({
+    url: `/core/registration/storageStart`,
+    method: 'post',
+    data
+  })
+}
+
+
 ///system/device/getHostByOrgId/{orgId}

+ 1 - 1
src/components/nfcPopup/alone.vue

@@ -64,7 +64,7 @@ export default {
     submitNFC() {
       // window.openNFCScanCallBack=null
       window.openNFCScanCallBack = this.openNFCScanCallBack
-      
+
       this.useNFC()
       this.$toast.loading({
         duration: 0, // 持续展示 toast

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

@@ -193,7 +193,8 @@ export default {
           startDate = Date.parse(new Date(obj));
         }
         let endDate = Date.parse(new Date())
-        let taskTotalTime = this.taskData.taskTotalTime  + parseFloat(endDate - startDate / 3600.0);
+
+        let taskTotalTime = this.taskData.taskTotalTime  + parseFloat((endDate - startDate) / 3600.0);
         if (endDate - startDate) {
           this.shwoSignTitle= `本次调阅时长为${this.dateTime(endDate - startDate)},调阅总时长为:${taskTotalTime}小时,是否结束调阅?`;
           this.showSign=true;
@@ -222,10 +223,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);
+        let taskTotalTime = this.taskData.taskTotalTime  + parseFloat((endDate - startDate)/1000.0/ 3600.0);
         if (endDate - startDate) {
-          let msg = `本次调阅时长为${this.dateTime(endDate - startDate)},调阅总时长为:${taskTotalTime}小时,是否结束调阅?`;
+          let msg = `本次调阅时长为${this.dateTime(endDate - startDate)},调阅总时长为:${taskTotalTime.toFixed(2)}小时,是否暂存调阅?`;
           Dialog.confirm({
             message: msg,
           }).then(() => {

+ 8 - 4
src/views/menu/monitoringCall/index.vue

@@ -82,7 +82,7 @@
 <script>
 import NavBar from '@/components/NavBar'
 import { Col, Row, Cascader, Dialog, DatetimePicker, Icon, Picker } from 'vant'
-import { deptTreeList, selectListApp, registration, resetTask } from '@/api/toConsult.js'
+import { deptTreeList, selectListApp, registration, resetTask ,getMonitorStart} from '@/api/toConsult.js'
 import { Toast } from 'vant'
 import OrgTree from '@/components/orgTree'
 import { newDateMonth } from '@/utils/date.js'
@@ -337,9 +337,13 @@ export default {
     },
     // 开始调阅事件
     startMonitorHandler(taskId) {
-      this.taskId = taskId
-      this.$refs.scandialog.visible = true
-      this.globalLoading=true
+      this.taskId = taskId;
+      getMonitorStart({taskId:taskId},res=>{
+        console.log(res);
+        this.$refs.scandialog.visible = true;
+        this.globalLoading=true;
+      })
+
     },
 
     //查看调阅详情