From d60892249cd15d2a3b3e7383c48334e169499736 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 3 Nov 2023 14:45:23 +0800
Subject: [PATCH] up

---
 src/views/address/components/addAddress.vue   |  8 +--
 src/views/task/list/components/addPatrol.vue  | 70 +++++++++++++++----
 src/views/task/list/components/addUnit.vue    | 12 ++--
 src/views/task/list/components/showPatrol.vue |  2 +-
 4 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/src/views/address/components/addAddress.vue b/src/views/address/components/addAddress.vue
index 385b6fb..254820d 100644
--- a/src/views/address/components/addAddress.vue
+++ b/src/views/address/components/addAddress.vue
@@ -8,7 +8,7 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>枢纽名称：
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.name" placeholder="请输入枢纽名称" clearable style="width: 300px;"></el-input>
+            <el-input v-model="form.name" placeholder="请输入枢纽名称" clearable style="width: 400px;"></el-input>
           </div>
         </div>
       </template>
@@ -20,7 +20,7 @@
           <div class="xy-table-item-content">
             <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="mapform"></avue-input-map>
 
-            <!-- <el-input v-model="form.address" placeholder="请输入地址" clearable style="width: 300px;"></el-input> -->
+            <!-- <el-input v-model="form.address" placeholder="请输入地址" clearable style="width: 400px;"></el-input> -->
           </div>
         </div>
       </template>
@@ -30,7 +30,7 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;"></span>经度：
           </div>
           <div class="xy-table-item-content">
-            <el-input class='maps' v-model="form.lon" disabled placeholder="请输入经度" clearable style="width: 300px;"></el-input>
+            <el-input class='maps' v-model="form.lon" disabled placeholder="请输入经度" clearable style="width: 400px;"></el-input>
           </div>
         </div>
       </template>
@@ -40,7 +40,7 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;"></span>纬度：
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.lat" disabled placeholder="请输入地址" clearable style="width: 300px;"></el-input>
+            <el-input v-model="form.lat" disabled placeholder="请输入地址" clearable style="width: 400px;"></el-input>
           </div>
         </div>
       </template>
diff --git a/src/views/task/list/components/addPatrol.vue b/src/views/task/list/components/addPatrol.vue
index b502d06..6ecec7c 100644
--- a/src/views/task/list/components/addPatrol.vue
+++ b/src/views/task/list/components/addPatrol.vue
@@ -8,7 +8,7 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>任务专题：
           </div>
           <div class="xy-table-item-content">
-            <el-select v-model="form.mission_id" filterable clearable placeholder="请选择任务专题" style="width: 300px;">
+            <el-select v-model="form.mission_id" filterable clearable placeholder="请选择任务专题" style="width: 400px;">
               <el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id">
               </el-option>
             </el-select>
@@ -21,19 +21,19 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>检查日期：
           </div>
           <div class="xy-table-item-content">
-            <el-date-picker style="width: 300px;" v-model="form.date" value-format="yyyy-MM-dd" type="date"
+            <el-date-picker style="width: 400px;" v-model="form.date" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" type="datetime"
               placeholder="选择检查日期">
             </el-date-picker>
           </div>
         </div>
       </template>
-      <template v-slot:site_id>
+      <template v-slot:siteName>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>检查地点：
           </div>
           <div class="xy-table-item-content">
-            <el-select @change="changeSite" v-model="form.site_id" filterable clearable placeholder="请选择检查地点" style="width: 300px;">
+            <el-select @change="changeSite" v-model="form.siteName" filterable clearable placeholder="请选择检查地点" style="width: 400px;">
               <el-option v-for="item in siteList" :key="-1" label="选择地图位置" :value="-1">
               </el-option>
               <el-option v-for="item in siteList" :key="item.id" :label="item.name" :value="item.id">
@@ -48,7 +48,7 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>问题类型：
           </div>
           <div class="xy-table-item-content">
-            <el-select v-model="form.ask_id" filterable clearable placeholder="请选择问题类型" style="width: 300px;">
+            <el-select v-model="form.ask_id" filterable clearable placeholder="请选择问题类型" style="width: 400px;">
               <el-option v-for="item in askList" :key="item.id" :label="item.value" :value="item.id">
               </el-option>
             </el-select>
@@ -62,7 +62,7 @@
           </div>
           <div class="xy-table-item-content">
             <el-input v-model="form.ask_introduce" :rows='5' type='textarea' placeholder="请输入问题描述" clearable
-              style="width: 300px;"></el-input>
+              style="width: 400px;"></el-input>
           </div>
         </div>
       </template>
@@ -73,7 +73,7 @@
           </div>
           <div class="xy-table-item-content">
             <el-input v-model="form.tips" :rows='5' type='textarea' placeholder="请输入整改建议" clearable
-              style="width: 300px;"></el-input>
+              style="width: 400px;"></el-input>
           </div>
         </div>
       </template>
@@ -94,7 +94,9 @@
     </xy-dialog>
     <el-dialog :visible.sync="showPic">
       <img width="100%" :src="showPicUrl" alt="">
-    </el-dialog>
+    </el-dialog>
+    <avue-input-map ref="maps" :params="mapparams" placeholder="请选择地图" v-model="mapform"></avue-input-map>
+
 
   </div>
 </template>
@@ -144,11 +146,19 @@
         unitList: [],
         siteList: [],
         askList: [],
-        mission_id:'',
+        mission_id:'',
+        mapparams: {
+          zoom: 11,
+        },
+        mapform: [],
         form: {
           mission_id: '',
           date: '',
           site_id: '',
+          siteName:'',
+          address:'',
+          lat:'',
+          lon:'',
           ask_id: '',
           ask_introduce: '',
           tips: '',
@@ -164,7 +174,7 @@
             required: true,
             message: '请选择检查日期'
           }],
-          site_id: [{
+          siteName: [{
             required: true,
             message: '请选择检查地点'
           }],
@@ -198,6 +208,24 @@
       },
       changeSite(e){
         console.log(e)
+        if(e==-1){
+          this.form.site_id = ''
+          this.form.address = ''
+          this.form.lat = ''
+          this.form.lon = ''
+          this.form.siteName = ''
+          this.$refs.maps.box = true
+        }else{
+          this.siteList.map(item=>{
+            if(item.id==e){
+              this.form.site_id = item.id
+              this.form.address = item.address
+              this.form.lat = item.lat
+              this.form.lon = item.lon
+              this.form.siteName = item.name
+            }
+          })
+        }
       },
       async getAddress() {
         const res = await listaddress({
@@ -225,13 +253,17 @@
         this.form = {
           mission_id: res?.mission_id,
           date: res?.date,
-          site_id: res?.site_id,
+          site_id: res?.site_id,
+          siteName:'',
+          address:res?.address,
+          lat:res?.lat,
+          lon:res?.lon,
           ask_id: res?.ask_id,
           ask_introduce: res?.ask_introduce,
           tips: res?.tips,
           file_ids: res?.file_ids,
         }
-
+        this.mapform = [res.lon, res.lat, res.address]
         for (var f of res.files) {
           this.pictureList.push({
             id: f.id,
@@ -294,7 +326,8 @@
         } else {
           this.id = ''
           this.pictureList = []
-          this.mission_id = ''
+          this.mission_id = ''
+          this.mapform=[]
           this.$refs['dialog'].reset()
         }
       },
@@ -303,6 +336,12 @@
         if(newval){
           this.form.mission_id = this.mission_id
         }
+      },
+      mapform(newVal, oldVal) {
+        this.form.lon = newVal[0];
+        this.form.lat = newVal[1];
+        this.form.address = newVal[2];
+        this.form.siteName = newVal[2]
       }
     }
 
@@ -312,7 +351,10 @@
 <style scoped lang="scss">
   // .xy-table-item-label {
   //   width: 160px;
-  // }
+  // }
+  ::v-deep .site_id,::v-deep .address,::v-deep .lat,::v-deep .lon{
+    display: none;
+  }
   .img__delete {
     transform: scale(0.8, 0.8);
 
diff --git a/src/views/task/list/components/addUnit.vue b/src/views/task/list/components/addUnit.vue
index d769e50..540a6a0 100644
--- a/src/views/task/list/components/addUnit.vue
+++ b/src/views/task/list/components/addUnit.vue
@@ -8,7 +8,7 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>任务名称：
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.name" placeholder="请输入任务名称" clearable style="width: 310px;"></el-input>
+            <el-input v-model="form.name" placeholder="请输入任务名称" clearable style="width: 400px;"></el-input>
           </div>
         </div>
       </template>
@@ -18,7 +18,7 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>任务类型：
           </div>
           <div class="xy-table-item-content">
-            <el-select v-model="form.unit_type" filterable clearable placeholder="请选择任务类型" style="width: 310px;">
+            <el-select v-model="form.unit_type" filterable clearable placeholder="请选择任务类型" style="width: 400px;">
               <el-option v-for="item in unitTypeList" :key="item.id" :label="item.value" :value="item.id">
               </el-option>
             </el-select>
@@ -31,7 +31,7 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>开始日期：
           </div>
           <div class="xy-table-item-content">
-            <el-date-picker style="width: 310px;" v-model="form.start_date" value-format="yyyy-MM-dd" type="date"
+            <el-date-picker style="width: 400px;" v-model="form.start_date" value-format="yyyy-MM-dd" type="date"
               placeholder="选择开始日期">
             </el-date-picker>
           </div>
@@ -43,7 +43,7 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>结束日期：
           </div>
           <div class="xy-table-item-content">
-            <el-date-picker style="width: 310px;" v-model="form.end_date" value-format="yyyy-MM-dd" type="date"
+            <el-date-picker style="width: 400px;" v-model="form.end_date" value-format="yyyy-MM-dd" type="date"
               placeholder="选择结束日期">
             </el-date-picker>
           </div>
@@ -81,7 +81,7 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;"></span>任务完成要求：
           </div>
           <div class="xy-table-item-content" style='min-width:600px'>
-            <el-select style="width: 310px;" v-model="form.end_type" filterable clearable placeholder="请选择任务完成要求">
+            <el-select style="width: 400px;" v-model="form.end_type" filterable clearable placeholder="请选择任务完成要求">
               <el-option v-for="item in endTypeList" :key="item.id" :label="item.name" :value="item.id">
               </el-option>
             </el-select>
@@ -95,7 +95,7 @@
           </div>
           <div class="xy-table-item-content">
             <el-input v-model="form.end_content" :rows='5' type='textarea' placeholder="请输入任务完成详情" clearable
-              style="width: 310px;"></el-input>
+              style="width: 400px;"></el-input>
           </div>
         </div>
       </template>
diff --git a/src/views/task/list/components/showPatrol.vue b/src/views/task/list/components/showPatrol.vue
index 3a61a2c..919a4fd 100644
--- a/src/views/task/list/components/showPatrol.vue
+++ b/src/views/task/list/components/showPatrol.vue
@@ -42,7 +42,7 @@
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
-                巡查地点
+                检查地点
               </template>
               {{showform.site?showform.site.name:(showform.address?showform.address:'')}}
             </el-descriptions-item>