From 31cb9747ac44c92203d3f17c7f2bb24449e9d285 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期五, 09 十二月 2022 11:33:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/intelligentPatrol/studyJudge/index.vue |   40 +++++++++++++++++++++++++---------------
 1 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue
index d9e3205..54ec2f1 100644
--- a/src/views/intelligentPatrol/studyJudge/index.vue
+++ b/src/views/intelligentPatrol/studyJudge/index.vue
@@ -39,10 +39,10 @@
                 <span>{{ currentEvent.grade }}</span>
               </el-form-item>
               <el-form-item label="棣栨鎶ヨ鏃堕棿:">
-                <span>{{ currentEvent.firstTime }}</span>
+                <span>{{ currentEvent.alarmTime }}</span>
               </el-form-item>
               <el-form-item label="鏈�杩戞姤璀︽椂闂�:">
-                <span>{{ currentEvent.recentTime }}</span>
+                <span>{{ currentEvent.currentAlarmTime }}</span>
               </el-form-item>
               <el-form-item label="鎸佺画鏃堕棿:">
                 <span>{{ currentEvent.conntinueTime }}</span>
@@ -55,9 +55,9 @@
               <el-form-item v-if="eventInfoData.store" label="搴楅摵寰楀垎:">
                 <span>{{ selectStoreChange(eventInfoData.store).storeScore }}</span>
               </el-form-item>
-              <el-form-item label="澶勭悊鎰忚:" prop="advice">
-                <el-radio-group v-model="eventInfoData.advice">
-                  <el-radio :label="item.id" v-for="item in adviceList" :key="item.id">{{ item.label }}</el-radio>
+              <el-form-item label="澶勭悊鎰忚:" prop="state">
+                <el-radio-group v-model="eventInfoData.state">
+                  <el-radio :label="item.id" v-for="item in stateList" :key="item.id">{{ item.label }}</el-radio>
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="澶х被鍚嶇О:" prop="categoryId">
@@ -87,7 +87,7 @@
       </div>
     </div>
     <el-dialog :visible="isShowDialog" title="璋冨害淇℃伅">
-      <MyDispatch v-if="isShowDialog" :mytype="1" @confirmInspection="handleConfirm" :isGetData="true" @changeDialog="closeDialog"></MyDispatch>
+      <MyDispatch v-if="isShowDialog" :mytype="1" @getDispatchData="confirmInspection" :isGetData="true" @changeDialog="closeDialog"></MyDispatch>
     </el-dialog>
   </div>
 </template>
@@ -150,7 +150,7 @@
         register: 0
       },
       currentEvent: {},
-      adviceList: [
+      stateList: [
         {
           id: 2,
           label: '涓婃姤',
@@ -170,19 +170,19 @@
       ],
       eventInfoData: null,
       rules:{
-        advice:[
+        state:[
           {
-            required: true, trigger:['blur', 'change'], message: '澶勭悊鎰忚涓嶈兘涓虹┖'
+            required: true, trigger:['blur'], message: '澶勭悊鎰忚涓嶈兘涓虹┖'
           },
         ],
         categoryId:[
           {
-            required: true, trigger:['blur', 'change'], message: '澶х被鍚嶇О涓嶈兘涓虹┖'
+            required: true, trigger:['blur'], message: '澶х被鍚嶇О涓嶈兘涓虹┖'
           }
         ],
         typeId:[
           {
-            required: true, trigger:['blur', 'change'], message: '灏忕被鍚嶇О涓嶈兘涓虹┖'
+            required: true, trigger:['blur'], message: '灏忕被鍚嶇О涓嶈兘涓虹┖'
           }
         ],
         carNumber:[{ trigger:['blur', 'change'], validator: validateCarNumber }]
@@ -213,6 +213,14 @@
             if (this.currentEvent?.picData) {
               this.imageList = this.currentEvent.picData.split(',').map(item => `${FILE_ORIGINAL_URL}${item}`);
             }
+            if (this.currentEvent?.alarmTime || this.currentEvent?.currentAlarmTime) {
+              const { alarmTime, currentAlarmTime } = this.currentEvent;
+              const continueAlarmTime = new Date().getTime() -
+                  (currentAlarmTime ? new Date(currentAlarmTime).getTime() : new Date(alarmTime).getTime());
+              const CONTINUE_DAY = continueAlarmTime / 1000 / 60 / 60 / 24;
+              const CONTINUE_HOURS = (CONTINUE_DAY - parseInt(CONTINUE_DAY)) * 24;
+              this.currentEvent.conntinueTime = `${parseInt(CONTINUE_DAY)}澶�${parseInt(CONTINUE_HOURS)}灏忔椂`;
+            }
           })
           .catch(err => this.$message.error(err))
     },
@@ -224,7 +232,7 @@
           this.eventInfoData.baseId = this.currentEvent.baseId;
 
           // 璋冨害
-          if (this.eventInfoData.advice === 6) {
+          if (this.eventInfoData.state === 6) {
             this.isShowDialog = true;
           } else {
             this.confirmInspection();
@@ -239,7 +247,7 @@
       this.eventInfoData = {
         baseId: null,
         store: null,
-        advice: null,
+        state: null,
         categoryId: null,
         typeId: null,
         carNumber: null,
@@ -254,7 +262,9 @@
     },
 
     confirmInspection(data) {
-      basecase.confirmInspection({ ...this.eventInfoData, ...data })
+      const eventParams = Object.assign({}, this.eventInfoData);
+      delete eventParams.store;
+      basecase.confirmInspection({ ...eventParams, ...data })
           .then(() => {
             this.$message.success('鎿嶄綔鎴愬姛');
             this.getInspectionData();
@@ -269,7 +279,7 @@
 
     selectStoreChange(id) {
       const selectedStore = this.storeList.find(store => store.id === id);
-      this.eventInfoData.shopName = selectedStore.storeName;
+      this.eventInfoData.shopName = selectedStore.id;
       this.eventInfoData.linkShop = 1;
       return selectedStore;
     }

--
Gitblit v1.8.0