From 2b6f23b6039be670be04f14fe49442696741a8b5 Mon Sep 17 00:00:00 2001
From: fangyuan <527392886@qq.com>
Date: 星期一, 12 十二月 2022 17:31:28 +0800
Subject: [PATCH] 图片和视频的新增按钮

---
 src/views/intelligentPatrol/studyJudge/index.vue |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue
index f3960a0..b5fc94f 100644
--- a/src/views/intelligentPatrol/studyJudge/index.vue
+++ b/src/views/intelligentPatrol/studyJudge/index.vue
@@ -1,13 +1,14 @@
 <template>
   <div class="study-judge">
     <div class="study-judge-header">
-      <span>鎮ㄦ湁{{ countData.register }}鏉″緟瀹℃牳鎶ヨ淇℃伅,浠婃棩绔嬫{{ countData.review }}鏉�,鍐嶅涔爗{ countData.study }}鏉�</span>
+      <span>鎮ㄦ湁{{ countData.review }}鏉″緟瀹℃牳鎶ヨ淇℃伅,浠婃棩绔嬫{{ countData.register }}鏉�,鍐嶅涔爗{ countData.study }}鏉�</span>
     </div>
     <div class="study-judge-main">
       <div class="sjm-header">
         <div class="sjm-header-left">
           <span class="moni-name">鐩戞帶鐐逛綅鍚嶇О: {{ currentEvent.name }} </span>
           <span class="moni-area">{{ currentEvent.street }}</span>
+          <span>{{ currentEvent.address }}</span>
         </div>
         <div class="sjm-header-right">
           <el-button size="small">瀹炴椂棰勮</el-button>
@@ -48,16 +49,16 @@
                 <span>{{ currentEvent.conntinueTime }}</span>
               </el-form-item>
               <el-form-item label="鍏宠仈搴楅摵" prop="store">
-                <el-select v-model="eventInfoData.store" @change="selectStoreChange" placeholder="璇烽�夋嫨鍏宠仈搴楅摵">
+                <el-select v-model="eventInfoData.store" clearable @change="selectStoreChange" placeholder="璇烽�夋嫨鍏宠仈搴楅摵">
                   <el-option v-for="store in storeList" :value="store.id" :label="store.storeName" :key="store.id" />
                 </el-select>
               </el-form-item>
               <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 +88,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>
@@ -99,7 +100,6 @@
 import { FILE_ORIGINAL_URL } from "@/utils";
 import { validateCarNum } from "@/utils/validate";
 import MyDispatch from '@/components/dispatch';
-import { formatDate } from "@/utils/date";
 
 export default {
   components: { MyDispatch },
@@ -151,7 +151,7 @@
         register: 0
       },
       currentEvent: {},
-      adviceList: [
+      stateList: [
         {
           id: 2,
           label: '涓婃姤',
@@ -171,19 +171,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 }]
@@ -233,7 +233,7 @@
           this.eventInfoData.baseId = this.currentEvent.baseId;
 
           // 璋冨害
-          if (this.eventInfoData.advice === 6) {
+          if (this.eventInfoData.state === 6) {
             this.isShowDialog = true;
           } else {
             this.confirmInspection();
@@ -248,7 +248,7 @@
       this.eventInfoData = {
         baseId: null,
         store: null,
-        advice: null,
+        state: null,
         categoryId: null,
         typeId: null,
         carNumber: null,
@@ -263,7 +263,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();
@@ -278,7 +280,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;
     }
@@ -368,4 +370,4 @@
     color: #4b9bb7;
   }
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.8.0