diff --git a/God-Vue-master/god-system/src/main/java/com/god/hfhEquipment/domain/HfhEquipmentManage.java b/God-Vue-master/god-system/src/main/java/com/god/hfhEquipment/domain/HfhEquipmentManage.java
index fd5f6a6f..ec59c8ac 100644
--- a/God-Vue-master/god-system/src/main/java/com/god/hfhEquipment/domain/HfhEquipmentManage.java
+++ b/God-Vue-master/god-system/src/main/java/com/god/hfhEquipment/domain/HfhEquipmentManage.java
@@ -1,5 +1,6 @@
 package com.god.hfhEquipment.domain;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -32,6 +33,14 @@ public class HfhEquipmentManage extends BaseEntity
     @Excel(name = "设备状态")
     private String deviceStatus;
 
+    /** 横坐标 */
+    @Excel(name = "横坐标")
+    private String abscissa;
+
+    /*纵坐标*/
+    @Excel(name = "纵坐标")
+    private String ordinate;
+
     /** 位置 */
     @Excel(name = "位置")
     private String location;
@@ -41,14 +50,38 @@ public class HfhEquipmentManage extends BaseEntity
     private String image;
 
     /** 录入时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "录入时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date recordTime;
+//    @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss")
+    @Excel(name = "录入时间")
+    private String recordTime;
 
     /** 备注 */
     @Excel(name = "备注")
     private String remarks;
 
+    public String getAbscissa() {
+        return abscissa;
+    }
+
+    public void setAbscissa(String abscissa) {
+        this.abscissa = abscissa;
+    }
+
+    public String getOrdinate() {
+        return ordinate;
+    }
+
+    public void setOrdinate(String ordinate) {
+        this.ordinate = ordinate;
+    }
+
+    public String getRecordTime() {
+        return recordTime;
+    }
+
+    public void setRecordTime(String recordTime) {
+        this.recordTime = recordTime;
+    }
+
     public void setId(String id)
     {
         this.id = id;
@@ -103,15 +136,7 @@ public class HfhEquipmentManage extends BaseEntity
     {
         return image;
     }
-    public void setRecordTime(Date recordTime)
-    {
-        this.recordTime = recordTime;
-    }
 
-    public Date getRecordTime()
-    {
-        return recordTime;
-    }
     public void setRemarks(String remarks)
     {
         this.remarks = remarks;
@@ -122,6 +147,7 @@ public class HfhEquipmentManage extends BaseEntity
         return remarks;
     }
 
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/God-Vue-master/god-system/src/main/java/com/god/hfhScenicSpot/domain/HfhScenicSpotManage.java b/God-Vue-master/god-system/src/main/java/com/god/hfhScenicSpot/domain/HfhScenicSpotManage.java
index b2a05644..3004be54 100644
--- a/God-Vue-master/god-system/src/main/java/com/god/hfhScenicSpot/domain/HfhScenicSpotManage.java
+++ b/God-Vue-master/god-system/src/main/java/com/god/hfhScenicSpot/domain/HfhScenicSpotManage.java
@@ -1,5 +1,6 @@
 package com.god.hfhScenicSpot.domain;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -32,8 +33,8 @@ public class HfhScenicSpotManage extends BaseEntity
     @Excel(name = "捕捉视频对象类型")
     private String capturedVideoObjectType;
 
-    /** 捕捉图片 */
-    @Excel(name = "捕捉图片")
+    /** 景区名称 */
+    @Excel(name = "景区名称")
     private String capturePicture;
 
     /** 视频 */
@@ -41,14 +42,23 @@ public class HfhScenicSpotManage extends BaseEntity
     private String video;
 
     /** 时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date captureTime;
+//    @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss")
+//    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd HH-mm-ss")
+    @Excel(name = "时间")
+    private String captureTime;
 
     /** 备注 */
     @Excel(name = "备注")
     private String remarks;
 
+    public String getCaptureTime() {
+        return captureTime;
+    }
+
+    public void setCaptureTime(String captureTime) {
+        this.captureTime = captureTime;
+    }
+
     public void setId(String id)
     {
         this.id = id;
@@ -103,15 +113,6 @@ public class HfhScenicSpotManage extends BaseEntity
     {
         return video;
     }
-    public void setCaptureTime(Date captureTime)
-    {
-        this.captureTime = captureTime;
-    }
-
-    public Date getCaptureTime()
-    {
-        return captureTime;
-    }
     public void setRemarks(String remarks)
     {
         this.remarks = remarks;
diff --git a/God-Vue-master/god-system/src/main/resources/mapper/hfhEquipment/HfhEquipmentManageMapper.xml b/God-Vue-master/god-system/src/main/resources/mapper/hfhEquipment/HfhEquipmentManageMapper.xml
index 42ef904b..3a7d5cbc 100644
--- a/God-Vue-master/god-system/src/main/resources/mapper/hfhEquipment/HfhEquipmentManageMapper.xml
+++ b/God-Vue-master/god-system/src/main/resources/mapper/hfhEquipment/HfhEquipmentManageMapper.xml
@@ -13,15 +13,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="image"    column="image"    />
         <result property="recordTime"    column="record_time"    />
         <result property="remarks"    column="remarks"    />
+        <result property="abscissa"    column="abscissa"    />
+        <result property="ordinate"    column="ordinate"    />
     </resultMap>
 
     <sql id="selectHfhEquipmentManageVo">
-        select id, device_name, device_ip, device_status, location, image, record_time, remarks from hfh_equipment_manage
+        select id, device_name, device_ip, device_status, location, image, record_time, remarks, abscissa, ordinate from hfh_equipment_manage
     </sql>
 
     <select id="selectHfhEquipmentManageList" parameterType="HfhEquipmentManage" resultMap="HfhEquipmentManageResult">
         <include refid="selectHfhEquipmentManageVo"/>
         <where>
+            <if test="abscissa != null  and abscissa != ''"> and abscissa like concat('%', #{abscissa}, '%')</if>
+            <if test="ordinate != null  and ordinate != ''"> and ordinate like concat('%', #{ordinate}, '%')</if>
+
             <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
             <if test="deviceIp != null  and deviceIp != ''"> and device_ip like concat('%', #{deviceIp}, '%')</if>
             <if test="deviceStatus != null  and deviceStatus != ''"> and device_status like concat('%', #{deviceStatus}, '%')</if>
@@ -48,8 +53,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="image != null">image,</if>
             <if test="recordTime != null">record_time,</if>
             <if test="remarks != null">remarks,</if>
+
+            <if test="abscissa != null">abscissa,</if>
+            <if test="ordinate != null">ordinate,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+
             <if test="id != null">#{id},</if>
             <if test="deviceName != null">#{deviceName},</if>
             <if test="deviceIp != null">#{deviceIp},</if>
@@ -58,12 +67,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="image != null">#{image},</if>
             <if test="recordTime != null">#{recordTime},</if>
             <if test="remarks != null">#{remarks},</if>
+
+            <if test="abscissa != null">#{abscissa},</if>
+            <if test="ordinate != null">#{ordinate},</if>
+
          </trim>
     </insert>
 
     <update id="updateHfhEquipmentManage" parameterType="HfhEquipmentManage">
         update hfh_equipment_manage
         <trim prefix="SET" suffixOverrides=",">
+            <if test="abscissa != null">abscissa = #{abscissa},</if>
+            <if test="ordinate != null">ordinate  = #{ordinate},</if>
+
             <if test="deviceName != null">device_name = #{deviceName},</if>
             <if test="deviceIp != null">device_ip = #{deviceIp},</if>
             <if test="deviceStatus != null">device_status = #{deviceStatus},</if>
diff --git a/god-ui/src/views/godTemplateInfo/templateInfoSet/index.vue b/god-ui/src/views/godTemplateInfo/templateInfoSet/index.vue
index 6eba3427..730e162b 100644
--- a/god-ui/src/views/godTemplateInfo/templateInfoSet/index.vue
+++ b/god-ui/src/views/godTemplateInfo/templateInfoSet/index.vue
@@ -227,7 +227,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="折扣" prop="reserveTwo">
-              <el-select v-model="form.reserveTwo" placeholder="请选择折扣" style="width: 100%">
+              <el-select v-model="form.reserveTwo" placeholder="请选择折扣" style="width: 100%"  @change="changeA">
                 <el-option
                   v-for="dict in dict.type.hfh_discount_type"
                   :key="dict.value"
@@ -444,7 +444,6 @@ export default {
           this.$message.success('上传成功')
           // this.open = false;
           // this.getList();
-          console.log('查看上传结果：', res)
           if (res.data) {
             this.form.video = res.data.fileUrl
           }
@@ -464,6 +463,18 @@ export default {
         this.templateInfoList = response.rows
         this.total = response.total
         this.loading = false
+        this.templateInfoList.forEach(item => {
+          if(item.reserveTwo){
+            if(item.reserveTwo === '1'){
+              item.reserveThree = (item.price * 0.68).toFixed(2)
+            }
+            if(item.reserveTwo === '2'){
+              item.reserveThree = (item.price * 0.88).toFixed(2)
+            }
+          }else {
+            item.reserveThree = 0.00
+          }
+        })
       })
     },
     // 取消按钮
@@ -525,6 +536,11 @@ export default {
         this.form = response.data
         this.open = true
         this.title = 'Vlog价格配置'
+        if(this.form.reserveTwo){
+          this.changeA(this.form.reserveTwo);
+        }else {
+          this.form.reserveThree = 0.00
+        }
       })
     },
     /** 提交按钮 */
@@ -558,6 +574,14 @@ export default {
       }).catch(() => {
       })
     },
+    changeA(res){
+      if(res === '1'){
+        this.form.reserveThree = (this.form.price * 0.68).toFixed(2)
+      }
+      if(res === '2'){
+        this.form.reserveThree = (this.form.price * 0.88).toFixed(2)
+      }
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('godTemplateInfo/templateInfo/export', {
diff --git a/god-ui/src/views/hfhActivity/activityManage/index.vue b/god-ui/src/views/hfhActivity/activityManage/index.vue
index 83c76b64..939053fe 100644
--- a/god-ui/src/views/hfhActivity/activityManage/index.vue
+++ b/god-ui/src/views/hfhActivity/activityManage/index.vue
@@ -1,29 +1,33 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="活动名称" prop="taskName">
+      <el-form-item label="模板名称" prop="taskName">
         <el-input
           v-model="queryParams.taskName"
-          placeholder="请输入活动名称"
+          placeholder="请输入vlog模板名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="视频名称" prop="vlogName">
-        <el-input
-          v-model="queryParams.vlogName"
-          placeholder="请输入视频名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="合成时机" prop="endTime">
+        <el-select v-model="queryParams.endTime" placeholder="请选择vlog合成时机">
+          <el-option
+            v-for="dict in dict.type.hfh_crafting_timing"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="负责人" prop="userName">
-        <el-input
-          v-model="queryParams.userName"
-          placeholder="请输入负责人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="抓拍排序" prop="taskStatus">
+        <el-select v-model="queryParams.taskStatus" placeholder="请选择vlog抓拍片段排序">
+          <el-option
+            v-for="dict in dict.type.hfh_fragment_sorting"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -64,40 +68,35 @@
           v-hasPermi="['activity:activityManage:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['activity:activityManage:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['activity:activityManage:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="activityManageList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="activityManageList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="活动名称" align="center" prop="taskName" />
-      <el-table-column label="活动描述" align="center" prop="taskDesc" />
-      <el-table-column label="负责人" align="center" prop="userName" />
-      <el-table-column label="开始时间" align="center" prop="startTime" >
+      <el-table-column label="vlog模板名称" align="center" prop="taskName" />
+      <el-table-column label="单用户日单最大合成vlog数" align="center" prop="taskDesc"/>
+      <el-table-column label="单个vlog采用抓拍数量" align="center" prop="startTime"/>
+      <el-table-column label="vlog合成时机" align="center" prop="endTime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
+          <dict-tag :options="dict.type.hfh_crafting_timing" :value="scope.row.endTime"/>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endTime" >
+      <el-table-column label="vlog抓拍片段排序" align="center" prop="taskStatus">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
+          <dict-tag :options="dict.type.hfh_fragment_sorting" :value="scope.row.taskStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="活动状态" align="center" prop="taskStatus" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.hfh_activity_status" :value="scope.row.taskStatus"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="视频名称" align="center" prop="vlogName" />
+      <el-table-column label="vlog配乐" align="center" prop="vlogId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -127,40 +126,34 @@
     />
 
     <!-- 添加或修改活动管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="活动名称" prop="taskName">
-          <el-input v-model="form.taskName" placeholder="请输入活动名称" />
+    <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="模板名称" prop="taskName">
+          <el-input v-model="form.taskName" placeholder="请输入vlog模板名称" />
         </el-form-item>
-        <el-form-item label="活动描述" prop="taskDesc">
-          <el-input v-model="form.taskDesc" type="textarea" placeholder="请输入内容" />
+        <el-form-item label="最大合成数" prop="taskDesc">
+          <el-input v-model="form.taskDesc" placeholder="请输入单用户日单最大合成vlog数" />
         </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker clearable
-                          v-model="form.startTime"
-                          type="datetime"
-                          value-format="yyyy-MM-dd hh:mm:ss"
-                          placeholder="请选择开始时间">
-          </el-date-picker>
+        <el-form-item label="抓拍数量" prop="startTime">
+          <el-input v-model="form.startTime" placeholder="请输入单个vlog采用抓拍数量" />
         </el-form-item>
-        <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker clearable
-                          v-model="form.endTime"
-                          type="datetime"
-                          value-format="yyyy-MM-dd hh:mm:ss"
-                          placeholder="请选择结束时间">
-          </el-date-picker>
+        <el-form-item label="合成时机" prop="endTime">
+          <el-select v-model="form.endTime" placeholder="请选择vlog合成时机" style="width: 100%">
+            <el-option
+              v-for="dict in dict.type.hfh_crafting_timing"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
 <!--        <el-form-item label="视频id" prop="vlogId">-->
 <!--          <el-input v-model="form.vlogId" placeholder="请输入视频id" />-->
 <!--        </el-form-item>-->
-        <el-form-item label="视频名称" prop="vlogName">
-          <el-input v-model="form.vlogName" placeholder="请输入视频名称" />
-        </el-form-item>
-        <el-form-item label="活动状态" prop="taskStatus">
-          <el-select v-model="form.taskStatus" placeholder="请选择活动状态">
+        <el-form-item label="抓拍排序" prop="taskStatus">
+          <el-select v-model="form.taskStatus" placeholder="请选择vlog抓拍片段排序" style="width: 100%">
             <el-option
-              v-for="dict in dict.type.hfh_activity_status"
+              v-for="dict in dict.type.hfh_fragment_sorting"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -170,8 +163,8 @@
 <!--        <el-form-item label="负责人id" prop="userId">-->
 <!--          <el-input v-model="form.userId" placeholder="请输入负责人id" />-->
 <!--        </el-form-item>-->
-        <el-form-item label="负责人" prop="userName">
-          <el-input v-model="form.userName" placeholder="请输入负责人" />
+        <el-form-item label="vlog配乐" prop="vlogId">
+          <el-input v-model="form.vlogId" placeholder="请输入vlog配乐" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -187,7 +180,7 @@ import { listActivityManage, getActivityManage, delActivityManage, addActivityMa
 
 export default {
   name: "ActivityManage",
-  dicts: ['hfh_activity_status'],
+  dicts: ['hfh_crafting_timing', 'hfh_fragment_sorting'],
   data() {
     return {
       // 遮罩层
@@ -227,10 +220,10 @@ export default {
       // 表单校验
       rules: {
         taskName: [
-          { required: true, message: "活动名称不能为空", trigger: "blur" }
+          { required: true, message: "vlog模板名称不能为空", trigger: "blur" }
         ],
         taskStatus: [
-          { required: true, message: "活动状态不能为空", trigger: "change" }
+          { required: true, message: "请选择vlog抓拍片段排序", trigger: "change" }
         ],
       }
     };
diff --git a/god-ui/src/views/hfhEquipment/manage/index.vue b/god-ui/src/views/hfhEquipment/manage/index.vue
index 3d5eeeaa..3ee37117 100644
--- a/god-ui/src/views/hfhEquipment/manage/index.vue
+++ b/god-ui/src/views/hfhEquipment/manage/index.vue
@@ -27,6 +27,26 @@
           />
         </el-select>
       </el-form-item>
+
+      <el-form-item label="横坐标" prop="abscissa">
+        <el-input
+          v-model="queryParams.abscissa"
+          placeholder="请输入横坐标"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="纵坐标" prop="ordinate">
+        <el-input
+          v-model="queryParams.ordinate"
+          placeholder="请输入纵坐标"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+
       <el-form-item label="位置" prop="location">
         <el-input
           v-model="queryParams.location"
@@ -108,6 +128,9 @@
           <dict-tag :options="dict.type.hfh_equipment_status" :value="scope.row.deviceStatus"/>
         </template>
       </el-table-column>
+      <el-table-column label="横坐标" align="center" prop="abscissa" />
+      <el-table-column label="纵坐标" align="center" prop="ordinate" />
+
       <el-table-column label="位置" align="center" prop="location" />
       <el-table-column label="图片" align="center" prop="image" width="100">
         <template slot-scope="scope">
@@ -167,6 +190,16 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        
+      <el-form-item label="横坐标" prop="abscissa">
+          <el-input v-model="form.abscissa" placeholder="请输入横坐标" />
+        </el-form-item>
+
+        <el-form-item label="纵坐标" prop="ordinate">
+          <el-input v-model="form.ordinate" placeholder="请输入纵坐标" />
+        </el-form-item>
+
+
         <el-form-item label="位置" prop="location">
           <el-input v-model="form.location" placeholder="请输入位置" />
         </el-form-item>
diff --git a/god-ui/src/views/hfhScenicSpot/manage/index.vue b/god-ui/src/views/hfhScenicSpot/manage/index.vue
index b2e3c0d5..c8c39ebc 100644
--- a/god-ui/src/views/hfhScenicSpot/manage/index.vue
+++ b/god-ui/src/views/hfhScenicSpot/manage/index.vue
@@ -9,6 +9,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      
+      <el-form-item label="景区名称" prop="parkName">
+        <el-input
+          v-model="queryParams.capturePicture"
+          placeholder="请输入景区名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="位置" prop="location">
         <el-input
           v-model="queryParams.location"
@@ -92,16 +101,18 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="id" align="center" prop="id" /> -->
       <el-table-column label="公园名称" align="center" prop="parkName" />
+      <el-table-column label="景区名称" align="center" prop="capturePicture" />
       <el-table-column label="位置" align="center" prop="location" :show-overflow-tooltip="true"/>
       <el-table-column label="捕捉对象" align="center" prop="capturedVideoObjectType" />
-      <el-table-column label="捕捉图片" align="center" prop="capturePicture" width="100">
-        <template slot-scope="scope">
+      
+        <!-- <template slot-scope="scope">
           <image-preview :src="scope.row.capturePicture" :width="50" :height="50"/>
         </template>
-      </el-table-column>
+      </el-table-column> -->
+      
       <el-table-column label="时间" align="center" prop="captureTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.captureTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
+          <span>{{ parseTime(scope.row.captureTime, '{y}-{m}-{d} {h}:{mi}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
@@ -139,20 +150,22 @@
         <el-form-item label="公园名称" prop="parkName">
           <el-input v-model="form.parkName" placeholder="请输入公园名称" />
         </el-form-item>
+        <el-form-item label="景区名称" prop="capturePicture">
+          <el-input v-model="form.capturePicture" placeholder="请输入景区名称" />
+          <!-- <image-upload v-model="form.capturePicture"/> -->
+        </el-form-item>
         <el-form-item label="位置" prop="location">
           <el-input v-model="form.location" placeholder="请输入位置" />
         </el-form-item>
         <el-form-item label="捕捉对象" prop="capturedVideoObjectType">
           <el-input v-model="form.capturedVideoObjectType" placeholder="请输入捕捉视频对象类型" />
         </el-form-item>
-        <el-form-item label="捕捉图片" prop="capturePicture">
-          <image-upload v-model="form.capturePicture"/>
-        </el-form-item>
+       
         <el-form-item label="时间" prop="captureTime">
           <el-date-picker clearable
             v-model="form.captureTime"
             type="datetime"
-            value-format="yyyy-MM-dd hh:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择时间">
           </el-date-picker>
         </el-form-item>