From 735d6c0179b42b029975410ee3852974d7d97fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Fri, 27 Sep 2024 14:25:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=A6=E6=83=85=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/LifeCircleManagement/add.vue    | 633 ++++--------------
 .../volunteer/LifeCircleManagement/index.vue  | 147 ++--
 .../volunteer/LifeCircleManagement/info.vue   | 492 ++++++++++++++
 .../volunteer/SiteManagement/index.vue        |   2 +-
 4 files changed, 692 insertions(+), 582 deletions(-)
 create mode 100644 src/views/modules/volunteer/LifeCircleManagement/info.vue

diff --git a/src/views/modules/volunteer/LifeCircleManagement/add.vue b/src/views/modules/volunteer/LifeCircleManagement/add.vue
index 588e872ca..9527b99e8 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/add.vue
+++ b/src/views/modules/volunteer/LifeCircleManagement/add.vue
@@ -5,20 +5,20 @@
 
       <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
         <el-row>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="所属组织" prop="agencyName" label-width="100px">
               <el-input v-model.trim="formData.agencyName" size="small" clearable placeholder="请输入活动名称" :disabled="true"
                 class="u-item-width-normal"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
-            <el-form-item label="组织类型" prop="typeName" label-width="100px">
-              <el-cascader v-model="formData.typeName" :options="options" @change="handleChange" :disabled="showdisabled"></el-cascader>
+            <el-form-item label="类型" prop="type" label-width="100px">
+              <el-cascader v-model="formData.type" :options="options" @change="handleChange" :disabled="showdisabled"></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="名称" label-width="100px" prop="Name">
-              <el-input v-model.trim="formData.Name" size="small" clearable placeholder="请输入活动名称" :disabled="showdisabled"
+            <el-form-item label="名称" label-width="100px" prop="name">
+              <el-input v-model.trim="formData.name" size="small" clearable placeholder="请输入活动名称" :disabled="showdisabled"
                 class="u-item-width-normal"></el-input>
             </el-form-item>
           </el-col>
@@ -33,7 +33,7 @@
                         </el-form-item>
                     </el-col> -->
           <el-col :span="24">
-            <el-form-item label="位置" prop="address" label-width="100px" style="display: block">
+            <el-form-item label="位置" prop="searchValue" label-width="100px" style="display: block">
               <div style="width: 634px">
                 <el-select v-model.trim="searchValue" filterable style="width: 634px" remote :reserve-keyword="true" :disabled="showdisabled"
                   placeholder="请输入关键词" :remote-method="remoteMethod" >
@@ -46,35 +46,36 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="联系人" prop="operator" label-width="100px">
-              <el-input v-model.trim="formData.operator" size="small" clearable placeholder="请输入管理员姓名" :disabled="showdisabled"
+            <el-form-item label="联系人" prop="linkman" label-width="100px">
+              <el-input v-model.trim="formData.linkman" size="small" clearable placeholder="请输入联系人" :disabled="showdisabled"
                 class="u-item-width-normal"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="联系电话" prop="mobile" label-width="100px">
-              <el-input v-model.trim="formData.mobile" size="small" clearable placeholder="请输入手机号" :disabled="showdisabled"
+            <el-form-item label="联系电话" prop="linkPhone" label-width="100px">
+              <el-input v-model.trim="formData.linkPhone" size="small" clearable placeholder="请输入手机号" :disabled="showdisabled"
                 class="u-item-width-normal"></el-input>
             </el-form-item>
           </el-col> 
           <el-col :span="12">
-            <div v-if="formData.sponsors" style="display: flex; ">
-              <div  >
-                <div v-for="(item, index) in formData.sponsors" :label="index" :key="item.name" :prop=index style="display: flex;">
-                  <el-form-item label="标签" prop="sponsors" label-width="100px" >
-                    <el-input :disabled="showdisabled" v-model="item.name" placeholder="请输入(最多添加四个)"  lass="u-item-width-normal"></el-input>
-                  </el-form-item>
-                  <div  v-if="index > 0"  @click="removeDomain(item)" style="color: blue; font-size: 12px;  margin-top: 15px">删除
-                  </div>
-                </div>
-              </div>
-              <div  @click="addDomain" style="color: blue; font-size: 12px;  margin-top: 15px">添加
-                </div>
+            <!-- <div v-if="formData.tags" style="display: flex; "> -->
+              <div >
+                <!-- <div v-for="(item, index) in formData.tags" :label="index" :key="item.name" :prop=index style="display: flex;">
+                -->
+                <el-form-item label="标签" prop="tags" label-width="100px" >
+                    <el-input :disabled="showdisabled" v-model="formData.tags" placeholder="请输入(最多添加四个)"  lass="u-item-width-normal"></el-input>
+      </el-form-item>
+                  <!-- <div  v-if="index > 0"  @click="removeDomain(item)" style="color: blue; font-size: 12px;  margin-top: 15px">删除
+                  </div> -->
+                <!-- </div> -->
+              <!-- </div> -->
+              <!-- <div  @click="addDomain" style="color: blue; font-size: 12px;  margin-top: 15px">添加
+                </div> -->
               <!-- <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;"></i> -->
             </div>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="展示图片" label-width="100px" prop="coverImg">
+            <el-form-item label="展示图片" label-width="100px" prop="attrs">
               <template>
                 <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList" v-if="!showdisabled"
                   @file-removed="removedImg"></upload-image>
@@ -85,14 +86,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="营业时间" label-width="100px" prop="datatime">
-              <el-input v-model.trim="formData.datatime" size="small" clearable placeholder="请输入营业时间" :disabled="showdisabled"
+            <el-form-item label="营业时间" label-width="100px" prop="workTime">
+              <el-input v-model.trim="formData.workTime" size="small" clearable placeholder="请输入营业时间" :disabled="showdisabled"
                 class="u-item-width-normal"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="备注" label-width="100px" prop="beizhu">
-              <el-input v-model.trim="formData.beizhu" size="small" clearable placeholder="请输入备注" :disabled="showdisabled"
+            <el-form-item label="备注" label-width="100px" prop="beiremarkzhu">
+              <el-input v-model.trim="formData.remark" size="small" clearable placeholder="请输入备注" :disabled="showdisabled"
                 class="u-item-width-normal"></el-input>
             </el-form-item>
           </el-col>
@@ -121,7 +122,7 @@
     </div>
     <div class="div_btn">
       <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable" @click="handleComfirm">确
+      <el-button size="small"  type="primary"  @click="handleComfirm">确
         定</el-button>
 
     </div>
@@ -131,7 +132,7 @@
  <script>
  import { mapGetters } from 'vuex'
 //  import { Loading } from 'element-ui' // 引入Loading服务
- import { requestPost } from '@/js/dai/request'
+ import { requestPost,requestGet } from '@/js/dai/request'
  import Tinymce from '@c/tinymce2/index.vue'
  import daiMap from "@/utils/dai-map";
  import util from '@js/util.js';
@@ -150,201 +151,8 @@
         return {
           showdisabled:false,
           searchOptions:[],
-            options: [{
-          value: 'zhinan',
-          label: '指南',
-          children: [{
-            value: 'shejiyuanze',
-            label: '设计原则',
-            children: [{
-              value: 'yizhi',
-              label: '一致'
-            }, {
-              value: 'fankui',
-              label: '反馈'
-            }, {
-              value: 'xiaolv',
-              label: '效率'
-            }, {
-              value: 'kekong',
-              label: '可控'
-            }]
-          }, {
-            value: 'daohang',
-            label: '导航',
-            children: [{
-              value: 'cexiangdaohang',
-              label: '侧向导航'
-            }, {
-              value: 'dingbudaohang',
-              label: '顶部导航'
-            }]
-          }]
-        }, {
-          value: 'zujian',
-          label: '组件',
-          children: [{
-            value: 'basic',
-            label: 'Basic',
-            children: [{
-              value: 'layout',
-              label: 'Layout 布局'
-            }, {
-              value: 'color',
-              label: 'Color 色彩'
-            }, {
-              value: 'typography',
-              label: 'Typography 字体'
-            }, {
-              value: 'icon',
-              label: 'Icon 图标'
-            }, {
-              value: 'button',
-              label: 'Button 按钮'
-            }]
-          }, {
-            value: 'form',
-            label: 'Form',
-            children: [{
-              value: 'radio',
-              label: 'Radio 单选框'
-            }, {
-              value: 'checkbox',
-              label: 'Checkbox 多选框'
-            }, {
-              value: 'input',
-              label: 'Input 输入框'
-            }, {
-              value: 'input-number',
-              label: 'InputNumber 计数器'
-            }, {
-              value: 'select',
-              label: 'Select 选择器'
-            }, {
-              value: 'cascader',
-              label: 'Cascader 级联选择器'
-            }, {
-              value: 'switch',
-              label: 'Switch 开关'
-            }, {
-              value: 'slider',
-              label: 'Slider 滑块'
-            }, {
-              value: 'time-picker',
-              label: 'TimePicker 时间选择器'
-            }, {
-              value: 'date-picker',
-              label: 'DatePicker 日期选择器'
-            }, {
-              value: 'datetime-picker',
-              label: 'DateTimePicker 日期时间选择器'
-            }, {
-              value: 'upload',
-              label: 'Upload 上传'
-            }, {
-              value: 'rate',
-              label: 'Rate 评分'
-            }, {
-              value: 'form',
-              label: 'Form 表单'
-            }]
-          }, {
-            value: 'data',
-            label: 'Data',
-            children: [{
-              value: 'table',
-              label: 'Table 表格'
-            }, {
-              value: 'tag',
-              label: 'Tag 标签'
-            }, {
-              value: 'progress',
-              label: 'Progress 进度条'
-            }, {
-              value: 'tree',
-              label: 'Tree 树形控件'
-            }, {
-              value: 'pagination',
-              label: 'Pagination 分页'
-            }, {
-              value: 'badge',
-              label: 'Badge 标记'
-            }]
-          }, {
-            value: 'notice',
-            label: 'Notice',
-            children: [{
-              value: 'alert',
-              label: 'Alert 警告'
-            }, {
-              value: 'loading',
-              label: 'Loading 加载'
-            }, {
-              value: 'message',
-              label: 'Message 消息提示'
-            }, {
-              value: 'message-box',
-              label: 'MessageBox 弹框'
-            }, {
-              value: 'notification',
-              label: 'Notification 通知'
-            }]
-          }, {
-            value: 'navigation',
-            label: 'Navigation',
-            children: [{
-              value: 'menu',
-              label: 'NavMenu 导航菜单'
-            }, {
-              value: 'tabs',
-              label: 'Tabs 标签页'
-            }, {
-              value: 'breadcrumb',
-              label: 'Breadcrumb 面包屑'
-            }, {
-              value: 'dropdown',
-              label: 'Dropdown 下拉菜单'
-            }, {
-              value: 'steps',
-              label: 'Steps 步骤条'
-            }]
-          }, {
-            value: 'others',
-            label: 'Others',
-            children: [{
-              value: 'dialog',
-              label: 'Dialog 对话框'
-            }, {
-              value: 'tooltip',
-              label: 'Tooltip 文字提示'
-            }, {
-              value: 'popover',
-              label: 'Popover 弹出框'
-            }, {
-              value: 'card',
-              label: 'Card 卡片'
-            }, {
-              value: 'carousel',
-              label: 'Carousel 走马灯'
-            }, {
-              value: 'collapse',
-              label: 'Collapse 折叠面板'
-            }]
-          }]
-        }, {
-          value: 'ziyuan',
-          label: '资源',
-          children: [{
-            value: 'axure',
-            label: 'Axure Components'
-          }, {
-            value: 'sketch',
-            label: 'Sketch Templates'
-          }, {
-            value: 'jiaohu',
-            label: '组件交互文档'
-          }]
-        }],
+          options: [{
+          }],
             fileList:[],
             searchValue:"",
             OrganizationaltypeList:[],
@@ -357,28 +165,16 @@
             tableDate:{},
             formData:    
                 {
-                sponsors: [{ name: ""}],//标签
-                typeName:"",//类型名称
-                status:"pass",//审核状态
-                numberNum:"",//组织成员数量
-                userId:"",//志愿者id
-                agencyId:"",//组织id
-                orgType:"",
-                brandImg:"",//品牌图片
-                brand:"",//志愿品牌
-                introduction:"",//组织介绍
-                qualification: "",//封面图片
-                idCard:"",//身份证信息
-                mobile:"",//管理员电话
-                operator:"",//管理员姓名
-                Organizationaltype:"",//组织类型
-             //    serviceTypeList:"",//服务类型
-                orgName:"",//组织名称
-                agencyName:"",//所属组织
-                serviceTypeList:[],//服务类型
-                address: "",//地址
-                longitude: this.$store.state.user.longitude, //经度
-                latitude: this.$store.state.user.latitude,//纬度
+              agencyName:"",
+              linkman: "",
+              linkPhone: "",
+              workTime: "",
+              type: "1",
+              tags: "",//标签
+              agencyId: this.$store.state.user.agencyId,
+              address: "",//地址
+              longitude: this.$store.state.user.longitude, //经度
+              latitude: this.$store.state.user.latitude,//纬度
                 },
             corganizerList: [],
             uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
@@ -390,7 +186,7 @@
  
     components: { Tinymce, UploadImage },
     mounted() {
-     this.formData.agencyId=this.$store.state.user.agencyId
+       this.formData.agencyId=this.$store.state.user.agencyId
        this.formData.agencyName=this.$store.state.user.agencyName
        let { latitude, longitude } = this.$store.state.user;
         if (!latitude || latitude == "" || latitude == "0") {
@@ -411,6 +207,9 @@
         if(type=="info"){
           this.showdisabled=true
         }
+        if (type=="edit") {
+              this.getTableDetail(unitId)
+          }
       // await this.getDemandOptions()
       // console.log(this.demandOptions);
       // let { latitude, longitude } = this.$store.state.user;
@@ -431,13 +230,29 @@
 
       // this.endLoading();
     },
+          //获取详情
+          getTableDetail(id) {
+          console.log(id,"dskljfksdljf");
+          let url = `/voluntary/sphereLife/detail/${id}`;
+          console.log(url,"url");
+            requestGet(url).then((res) => {
+              console.log(res);
+              if (res.code == 0) {
+                  this.formData = res.data
+                  this.fileList=[{fileUrl:res.data.attrs[0].url}]
+                  this.searchValue=res.data.address
+                  console.log(this.formData,"this.formData");
+              } else {
+                  this.$message.error(res.msg)
+              }
+          })
+           
+          
+      },
       //添加标签
       addDomain() {
-        if (this.formData.sponsors.length < 4) {
-          console.log("jshdfdsjdfkl");
-      console.log(this.formData.sponsors,this.tableDate,);
-        this.formData.sponsors.push(this.tableDate);
-        console.log(this.formData.sponsors,this.tableDate,);
+        if (this.formData.tags.length < 4) {
+        this.formData.tags.push(this.tableDate);
         }else{
           this.$message.error("最多添加4个标签");
         }
@@ -465,84 +280,9 @@
       return div.textContent || div.innerText || '';
     },
  
-     //    // 上传成功
-     //    handleImgSuccess(res, file, fileList) {
-     //        if (res.code === 0 && res.msg === 'success') {
-     //            let format = file.name.split('.').pop();
-     //            let srcType = file.raw.type;
-     //            let type = 'file';
-     //            if (srcType.indexOf('image') != -1) {
-     //                type = 'image';
-     //            } else if (srcType.indexOf('video') != -1) {
-     //                type = 'video';
-     //            }
-     //            // this.formData.activityImgs.push({
-     //            //     format,
-     //            //     name: file.name,
-     //            //     size: file.size,
-     //            //     type,
-     //            //     url: res.data.url
-     //            // });
-     //            // console.log('this.formData.activityImgs',res.data.url)
-     //            this.formData.activityImgs.push(res.data.url);
- 
-     //        } else {
-     //            this.$message.error(res.msg);
-     //        }
-     //    },
-     //    // 删除图片
-     //    handleImgRemove(file) {
-     //        console.log('handleImgRemove', file);
-     //        if (file.response) {
-     //            let index = this.formData.activityImgs.findIndex(item => item.url == file.response.data.url);
-     //            this.formData.activityImgs.splice(index, 1);
-     //        } else if (file.url) {
-     //            let index = this.formData.activityImgs.findIndex(item => item.url == file.url);
-     //            this.formData.activityImgs.splice(index, 1);
-     //        }
-     //    },
-        // 图片预览
-     //    handleImgPreview(file) {
-     //        console.log(file);
-     //        window.open(file.url || file.response.data.url);
-     //    },
-     //    // 文件数量超过限制
-     //    handleImgExceed() {
-     //        this.$message({
-     //            type: 'warning',
-     //            message: '文件数量最多不超过三个'
-     //        });
-     //    },
-        // 上传前的验证
-     //    beforeImgUpload(file) {
-     //        const isLt1M = file.size / 1024 / 1024 < 10;
-     //        const srcType = file.type;
-     //        const format = file.name.split('.').pop();
-     //        if (!isLt1M) {
-     //            this.$message.error('上传文件大小不能超过 10MB!');
-     //            return false;
-     //        }
-     //        if (srcType.indexOf('image') == -1) {
-     //            this.$message.error('仅限图片格式');
-     //            return false;
-     //        }
-     //        return true;
-     //    },
  
         async activityType() {
-            const url = "/actual/base/activityType/page"
-            let params = {
-                // agencyId: this.agencyId
-                pageSize: 20,
-                pageNo: 1,
-                enabled: 1
-            }
-            const { data, code, msg } = await requestPost(url, params)
-            if (code === 0) {
-                this.typeList = data.list
-            } else {
-                this.$message.error(msg)
-            }
+
             this.$nextTick(() => {
                 if (!map) {
                     this.initMap(this.formData.latitude, this.formData.longitude);
@@ -567,18 +307,25 @@
             }
         },
         onChangeFileList(e) {
-            console.log(e, 'sssssb');
-            this.fileList = e.length > 0 ? e.map(item => ({
-                fileType: '0',
-                fileUrl: item.response.data.url
-            })) : []; // 当e为空时清空fileList
-            if (e.length > 0) {
-                this.formData.coverPic = e[0].response.data.url;
-            } else {
-                this.formData.coverPic = '';
-            }
-        },
- 
+              console.log(e, 'sssssb');
+              this.fileList = e.length > 0 ? e.map(item => ({
+                  fileType: '0',
+                  type:'image',
+                  fileType: '0',
+                  name:item.response.data.fileName,
+                  fileUrl: item.response.data.url,
+                  format: item.response.data.fileName.split('.').pop(),
+                  url: item.response.data.url
+              })) : []; // 当e为空时清空fileList
+              if (e.length > 0) {
+                  console.log(this.fileList,"this.fileList");
+                  this.formData.attrs=this.fileList;
+                 console.log(this.formData.attrs,"this.fileList");
+                
+              } else {
+                  this.formData.coverPic = '';
+              }
+          },
         removedImg() {
             this.formData.coverPic = ''
         },
@@ -594,19 +341,7 @@
         //         this.formData.qualification = '';
         //     }
         // },
-        onChangeFileList1(e) {
-            console.log(e, 'sssssb');
-            this.fileList1 = e.length > 0 ? e.map(item => ({
-                fileType: '0',
-                fileUrl: item.response.data.url
-            })) : []; // 当e为空时清空fileList
-            if (e.length > 0) {
-                this.formData.brandImg = e[0].response.data.url;
-            } else {
-                this.formData.brandImg = '';
-            }
-        },
- 
+
         onChangeImgs(e, rowIndex = 0) {
             console.log('onChangeFileList', e)
             if (e.length > 0) {
@@ -621,21 +356,8 @@
             }
         },
  
-        // onChangeImgs(e) {
-        //     this.activityImgs = [];
-        //     if (e.length > 0) {
-        //         e.forEach(item => {
-        //             let ob = {
-        //                 fileType: '0',
-        //                 fileUrl: item.response.data.url
-        //             };
-        //             this.activityImgs.push(ob);
-        //         });
-        //         console.log('this.activityImgs',this.activityImgs)
-        //     }
-        // },
- 
-        handleChange(value) {},
+
+   
         handleTimeChange(time) {
             if (time) {
                 const startTimeArray = util.dateFormatter(time[0], 'time').split('-')
@@ -652,160 +374,49 @@
             }
  
         },
-     //    async initForm(type, activityId) {
-     //        this.startLoading()
-     //        this.formType = type
-     //        if (type === 'edit') {
-     //            if (activityId.activityImgs || activityId.sumUp) {
-     //                this.records = true
-     //            } else {
-     //                this.records = false
-     //            }
-     //            this.formData = activityId
-     //            this.timeRange = [this.formData.startTime, this.formData.endTime]
-     //            console.log(activityId,"activityId");
-                
-     //            if (activityId.coverPic) {
-     //                let ob = {
-     //                    fileType: '0',
-     //                    fileUrl: activityId.coverPic
-     //                };
-     //                this.fileList = [ob];
-     //                this.formData.coverPic = ob.fileUrl;
-     //                if (this.formData.online == 1) {
-     //                    this.online = true
-     //                }
-     //            }
-     //        } else if (type === 'records') {
-     //            this.records = true
-     //        } else if (type === 'summary') {
-     //            this.formData = activityId
-     //            this.formData.activityImgs = []
-     //            console.log("this.formData", this.formData)
-     //            this.records = true
-     //            this.summary = false
-     //        } else {
-     //            this.records = false
-     //        }
-     //        this.endLoading()
- 
-     //    },
- 
-        async getDemandOptions() {
-            this.$http
-                .post("/actual/base/serviceitem/listAllCategory")
-                .then(({ data: res }) => {
-                    if (res.code !== 0) {
-                        return this.$message.error(res.msg);
-                    } else {
-                        console.log(res.data);
-                        this.demandOptions = this.getFlagData(
-                            this.getTreeData(res.data),
-                            "usableFlag"
-                        );
-                    }
-                })
-                .catch(() => {
-                    return this.$message.error("网络错误");
-                });
-        },
-        getFlagData(data, flag) {
-            if (!Array.isArray(data)) return [];
-            let arr1 = data.filter((item) => item[flag]);
-            let arr2 = arr1.map((item) => {
-                if (item.childCateList)
-                    return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
-                else return item;
-            });
-            return arr2;
-        },
-        getTreeData(data) {
-            if (!Array.isArray(data)) return [];
-            let arr = data.map((item) => {
-                let _item = {};
-                if (item.childCateList) {
-                    if (item.childCateList.length === 0)
-                        _item = { ...item, childCateList: undefined };
-                    else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
-                } else {
-                    _item = { ...item };
-                }
-                return _item;
-            });
-            return arr;
-        },
-        async loadGrid() {
-            const url = "/gov/org/customergrid/gridoption"
- 
-            let params = {
-                agencyId: this.agencyId
-            }
- 
-            const { data, code, msg } = await requestPost(url, params)
- 
-            if (code === 0) {
-                this.gridList = data
- 
-            } else {
-                this.$message.error(msg)
-            }
- 
-        },
+     
+   
         async handleComfirm() {
          console.log(this.formData,"     this.formData");
-         
-           if (!this.formData.agencyName) {
-              this.$message.error('请选择所属组织');
-              return;
-           }
-    
- 
-  
-           if (!this.formData.introduction) {
+          //  if (!this.formData.type) {
+          //     this.$message.error('请选择类型');
+          //     return;
+          //  }
+           if (!this.formData.name) {
               this.$message.error('请输入组织介绍');
               return;
            }
  
-           if (this.fileList.length === 0) {
+           if (this.formData.attrs.length === 0) {
               this.$message.error('请上传封面图片');
               return;
            }
- 
-           if (!this.formData.idCard) {
-              this.$message.error('请输入身份证信息');
-              return;
-           }
- 
-           if (!this.formData.mobile) {
-              this.$message.error('请输入管理员电话');
-              return;
-           }
- 
-           if (!this.formData.operator) {
-              this.$message.error('请输入管理员姓名');
+
+           if (!this.formData.linkPhone) {
+              this.$message.error('请输入联系电话');
               return;
            }
  
-           if (!this.formData.orgType) {
-              this.$message.error('请输入组织类型');
+           if (!this.formData.linkman) {
+              this.$message.error('请输入联系人');
               return;
            }
  
-           if (!this.formData.serviceTypeList) {
-              this.$message.error('请输入服务类型');
-              return;
-           }
+          //  if (this.formData.tabs.length === 0) {
+          //     this.$message.error('请输入标签');
+          //     return;
+          //  }
  
-           if (!this.formData.orgName) {
-              this.$message.error('请输入组织名称');
-              return;
-           }
+          //  if (!this.formData.serviceTypeList) {
+          //     this.$message.error('请输入服务类型');
+          //     return;
+          //  }
            console.log(this.formData,"this.formData");
            this.addActivity()
         },
         //增加
         async addActivity() {
-                let url = '/voluntary/volunteerOrg/saveOrUpdate'
+                let url = '/voluntary/sphereLife/saveOrUpdate'
                 const { data, code, msg } = await requestPost(url, this.formData)
                 if (code === 0) {
                     this.$message({
@@ -929,30 +540,24 @@
                 typeName: [
                     { required: true, message: '请选择组织类型', trigger: 'blur' }
                 ],
-                Name: [
+                name: [
                     { required: true, message: '请填写名称', trigger: 'blur' }
                 ],
                 searchValue: [
                     { required: true, message: '请选择地址', trigger: 'blur' },
                    
                 ],
-                mobile: [
-                    { required: true, message: '管理员电话不能为空不能为空', trigger: 'blur' },
+                linkPhone: [
+                    { required: true, message: '联系电话不能为空', trigger: 'blur' },
                     { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
                 ],
-                operator: [
+                linkman: [
                     { required: true, message: '请填写联系人', trigger: 'blur' }
                 ],
-                sponsors: [
+                tags: [
                     { required: true, message: '请填写标签信息', trigger: 'blur' },
                 ],
-                fileList: [
-                    { required: true, message: '请选择封面图片', trigger: 'blur' }
-                ],
-                sumUp: [
-                    { required: true, message: '请输入活动总结', trigger: 'blur' }
-                ],
-                activityImgs: [
+                attrs: [
                     { required: true, message: '请选择活动照片', trigger: 'blur' }
                 ]
             }
diff --git a/src/views/modules/volunteer/LifeCircleManagement/index.vue b/src/views/modules/volunteer/LifeCircleManagement/index.vue
index ccbea5aa9..f41e825d4 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/index.vue
+++ b/src/views/modules/volunteer/LifeCircleManagement/index.vue
@@ -4,24 +4,24 @@
             <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
                 <div>
                     <el-form-item label="类型">
-                        <el-select v-model="formData.serviceType" placeholder="请选择" clearable>
+                        <el-select v-model="formData.tyep" placeholder="请选择" clearable>
                             <el-option v-for="item in formData.optionstype" :key="item.value" :label="item.label"
                                 :value="item.value">
                             </el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="名称">
-                        <el-input v-model.trim="formData.orgName" size="small" class="item_width_1" clearable
+                        <el-input v-model.trim="formData.name" size="small" class="item_width_1" clearable
                             placeholder="请输入">
                         </el-input>
                     </el-form-item>
                     <el-form-item label="位置">
-                        <el-input v-model.trim="formData.orgName" size="small" class="item_width_1" clearable
+                        <el-input v-model.trim="formData.address" size="small" class="item_width_1" clearable
                             placeholder="请输入">
                         </el-input>
                     </el-form-item>
                     <el-form-item label="标签">
-                        <el-input v-model.trim="formData.orgName" size="small" class="item_width_1" clearable
+                        <el-input v-model.trim="formData.tags" size="small" class="item_width_1" clearable
                             placeholder="请输入">
                         </el-input>
                     </el-form-item>
@@ -54,27 +54,27 @@
                 <el-table-column prop="agencyName" header-align="center" align="center" label="所属组织"
                     :show-overflow-tooltip="true">
                 </el-table-column>
-                <el-table-column prop="orgName" header-align="center" align="center" label="类型"
+                <el-table-column prop="type" header-align="center" align="center" label="类型"
                     :show-overflow-tooltip="true">
                     <!-- <template slot-scope="scope">
         <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
       </template> -->
                 </el-table-column>
-                <el-table-column prop="serviceTypeName" header-align="center" align="center" label="名称"
+                <el-table-column prop="name" header-align="center" align="center" label="名称"
                     :show-overflow-tooltip="true">
                 </el-table-column>
-                <el-table-column prop="numberNum" header-align="center" align="center" label="位置"
+                <el-table-column prop="address" header-align="center" align="center" label="位置"
                     :show-overflow-tooltip="true">
                 </el-table-column>
-                <el-table-column prop="operator" header-align="center" align="center" label="联系人"
+                <el-table-column prop="linkman" header-align="center" align="center" label="联系人"
                     :show-overflow-tooltip="true">
                 </el-table-column>
-                <el-table-column prop="mobile" header-align="center" align="center" label="联系电话"
+                <el-table-column prop="linkPhone" header-align="center" align="center" label="联系电话"
                     :show-overflow-tooltip="true">
                 </el-table-column>
-                 <el-table-column prop="createdTime" header-align="center" align="center" label="标签" :show-overflow-tooltip="true">
+                 <el-table-column prop="tags" header-align="center" align="center" label="标签" :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="points" header-align="center" align="center" label="备注":show-overflow-tooltip="true">
+          <el-table-column prop="remark" header-align="center" align="center" label="备注":show-overflow-tooltip="true">
           </el-table-column>
                 <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center"
                     class="operate">
@@ -98,14 +98,11 @@
                 width="850px" top="10vh" class="dialog-h" @closed="showAddClose">
                 <add   ref="ref_form" v-if="showAdd" @showAddClose="showAddClose" />
             </el-dialog>
-            <el-dialog :visible.sync="showInfo" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
-                width="850px" top="10vh" class="dialog-h" @closed="showInfoClose">
-                <info v-if="showInfo" :VolunteerList="fmData" @showInfoClose="showInfoClose" />
-            </el-dialog>
-            <el-dialog :visible.sync="showEdit" :close-on-click-modal="false" :close-on-press-escape="false" title="修改"
-                width="850px" top="10vh" class="dialog-h" @closed="showEditClose">
-                <edit v-if="showEdit" :VolunteerList="EditList" @showEditClose="showEditClose" />
-            </el-dialog>
+              <el-dialog :visible.sync="showInfo" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
+                  width="850px" top="10vh" class="dialog-h" @closed="showInfoClose">
+                  <info ref="ref_form" v-if="showInfo" :VolunteerList="fmData" @showInfoClose="showInfoClose" />
+              </el-dialog>
+
      
         </div>
     </div>
@@ -116,7 +113,7 @@ import { requestPost, requestGet } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
 import add from "./add.vue"
-// import info from "./info.vue"
+import info from "./info.vue"
 // import edit from "./edit.vue"
 // import MemberManagement from "./MemberManagement.vue"
 // import process from "./process.vue"
@@ -126,19 +123,23 @@ import add from "./add.vue"
 import axios from "axios";
 
 export default {
-    components: { add},
+    components: { add,info},
 
     data() {
         return {
             formTitle:"",
             formData: {
-                orgName: "",
-                serviceType: "",
-                optionstype: [
+                name:"",
+                tyep:"",
+                tags:"",
+                address:"",
+   
+               
+            },
+            optionstype: [
                     { value: 1, label: "志愿者服务组织" },
                     { value: 2, label: "志愿者服务团队" },
-                ]
-            },
+                ],
             showprocess:false,
             EditList:{},
 
@@ -169,9 +170,23 @@ export default {
     
       },
       mounted() {
+        this.getLifeType()
         this.getTableData();
       },
       methods: {
+           // 获取生活圈类型
+   async getLifeType () {
+       const url = "/sys/dict/data/dictlist"
+       let params = {
+         dictType: 'voluntary_sphereLife_type'
+       }
+       const { data, code, msg } = await requestPost(url, params)
+       if (code === 0) {
+         this.OrganizationaltypeList = data;
+       } else {
+         this.$message.error(msg)
+       }
+     },
         //审查
         handleprocessl(row){
             this.showprocess=true
@@ -202,7 +217,7 @@ export default {
             this.formTitle="新增"
              console.log(row,"row");
              this.$nextTick(() => {
-             this.$refs.ref_form.initForm("edit", row);
+             this.$refs.ref_form.initForm("edit", row.id);
       });
              
         },
@@ -234,10 +249,10 @@ export default {
         handleDetail(row){
           // console.log(row,"row");
           // this.showInfo=true
-            this.showAdd=true
+            this.showInfo=true
             this.formTitle="查看"
             this.$nextTick(() => {
-        this.$refs.ref_form.initForm("info", row);
+        this.$refs.ref_form.initForm("info", row.id);
       });
          
   
@@ -245,15 +260,13 @@ export default {
         //查询列表
         async getTableData() {
           // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
-          const url = "/voluntary/volunteerOrg/page";
-  
+          const url = "/voluntary/sphereLife/list";
           let params={
-              orgName: this.formData.orgName,
-              serviceType: this.formData.serviceType,
+              ...this.formData,
               pageNo:this.pageNo,
               pageSize: this.pageSize
           }
-          const { data, code, msg } = await requestPost(url,params);
+          const { data, code, msg } = await requestGet(url,params);
           if (code === 0) {
             console.log("列表请求成功！！！！！！！！！！！！！！");
             this.total = data.total || 0;
@@ -263,28 +276,28 @@ export default {
         },
         //模板
         async uploadHttpRequest(file) {
-          debugger
+  
       
               // this.importLoading = true;
             console.log(this.importLoading,"this.importLoading");
-            debugger
+
               // this.importBtnTitle = '正在上传中...';
               this.$message({
                   showClose: true,
                   dangerouslyUseHTMLString: true,
                   message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
                   duration: 3000
-              });debugger
+              });
               let than = this;
               console.log(than,"than");
-              debugger
+              
               // document.getElementById('clickA').addEventListener('click', function () {
               //     than.$router.replace('/main/importRecord-index');
               // });
               const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
               formData.append('file', file.file); //添加文件对象
               formData.append('code', ''); //添加文件对象
-              debugger
+              
               console.log(formData,"formData");
               
               let url = '/voluntary/volunteerOrg/import'
@@ -338,48 +351,42 @@ export default {
         },
         beforeExcelUpload(file) {
               console.log(file,"file1");
-              debugger
+              
               const isType = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
-              debugger
+              
               const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
               const fileType = isType || isTypeComputer;
-              debugger
+              
               const isLt1M = file.size / 1024 / 1024 < 10;
-              debugger
+              
               if (!fileType) {
                   this.$message.error('上传文件只能是xls/xlsx格式！');
               }
-              debugger
+              
               if (!isLt1M) {
                   this.$message.error('上传文件大小不能超过 10MB!');
               }
               console.log(isLt1M,"isLt1M");
-              debugger
+              
               return fileType && isLt1M;
           },
-          handleDel(row){
-        console.log(row,"row");
-        let url="/voluntary/volunteerOrg/delete";
-        let params={
-          id:row.id
-        }
-        requestPost(
-        url,params
-        ).then(({data}) => {
-          if (data && data.code === 0) {
-            this.$message({
-              message: '删除成功',
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
+        handleDel(row) {
+          console.log(row, "row");
+          let url = "/voluntary/sphereLife/delete";
+          let params = [String(row.id)];
+          axios.delete(this.processUrl(url), { data: params })
+            .then((res) => {
+              if (res.data.code === 0) {
+                this.$message.success("删除成功");
+                this.getTableData();
+              } else {
+                this.$message.error(res.data.msg);
               }
             })
-            this.getTableData()
-          } else {
-            this.$message.error(data.msg)
-          }
-        })
-         
+            .catch((error) => {
+              console.error("删除失败", error);
+              this.$message.error("删除失败，请稍后重试");
+            });
         },
         diaClose(){
           this.formShow=false
@@ -460,7 +467,13 @@ export default {
           this.handleClose();
           this.getTableData();
         },
-  
+          // 添加服务器端URL
+        processUrl(url) {
+          if (url.indexOf("http://") > -1 || url.indexOf("https://") > -1) {
+            return url;
+          }
+          return process.env.VUE_APP_API_SERVER + url;
+        }
       },
     };
     </script>
diff --git a/src/views/modules/volunteer/LifeCircleManagement/info.vue b/src/views/modules/volunteer/LifeCircleManagement/info.vue
new file mode 100644
index 000000000..cb5bdb49a
--- /dev/null
+++ b/src/views/modules/volunteer/LifeCircleManagement/info.vue
@@ -0,0 +1,492 @@
+<template>
+    <div>
+
+        <div class="dialog-h-content scroll-h">
+
+            <el-form ref="ref_form" :model="formData" :rules="dataRule" class="form">
+                    <!-- <el-col :span="12">
+                        <el-form-item label="所属组织" prop="agencyName" label-width="100px">
+                            <el-input v-model.trim="formData.agencyName" size="small" clearable placeholder="请输入组织名称"
+                                :disabled="true" class="u-item-width-normal"></el-input>
+                        </el-form-item>
+                     -->
+                        <el-form-item label="类型" prop="type" label-width="100px">
+                            <!-- <el-select  :disabled="showdisabled" v-model="formData.type" placeholder="请选择" clearable class="u-item-width-normal">
+                            <el-option  :disabled="showdisabled" class="u-item-width-normal" v-for="item in formData.optionstype" :key="item.value" :label="item.label"
+                                :value="item.value">typeName
+                                   <div>{{ formData.typeName }}</div>
+                            </el-option>
+                        </el-select> -->
+                        <div>{{ formData.positionName }}</div>
+                        </el-form-item>
+                        <el-form-item label="名称" label-width="100px" prop="name">
+                            <!-- <el-input v-model.trim="formData.name" size="small" clearable placeholder="请输入名称"
+                                :disabled="showdisabled" class="u-item-width-normal"></el-input> -->
+                                <div>{{ formData.name }}</div>
+                        </el-form-item>
+                        <el-form-item label="联系人" prop="linkPhone" label-width="100px">
+                            <div>{{ formData.linkPhone }}</div>
+                        </el-form-item>
+                        <el-form-item label="联系电话" prop="linkPhone" label-width="100px">
+                            <div>{{ formData.linkPhone }}</div>
+                        </el-form-item>
+                        <el-form-item label="标签" prop="linkPhone" label-width="100px">
+                            <div>{{ formData.tags }}</div>
+                        </el-form-item>
+                     
+                        <!-- <el-form-item label="办公时间" prop="workTime" label-width="100px">
+                            <div>{{ formData.workTime }}</div>
+                        </el-form-item> -->
+                        <el-form-item label="图片" label-width="100px" prop="attrs">
+                            <template>
+                                    <img v-for="(item, index) in this.formData.attrs" :key="index" :src="item.url" style="width: 100px; height: 100px;">
+                            </template>
+                        </el-form-item>
+                        <!-- <el-form-item label="阵地简介" prop="content" label-width="100px" style="display: block">
+                            <div>{{ formData.content }}</div>
+                        </el-form-item> -->
+                        <el-form-item label="营业时间" prop="workTime" label-width="100px">
+                            <div>{{ formData.workTime }}</div>
+                        </el-form-item>
+                        <el-form-item label="备注" prop="workTime" label-width="100px">
+                            <div>{{ formData.remark }}</div>
+                        </el-form-item>
+                        <el-form-item label="位置" prop="address" label-width="100px" style="display: block">
+                            <div style="width: 300px">
+                                <div>{{ formData.address }}</div>
+                                <div id="app_activity" class="div_map"></div>
+                            </div>
+                        </el-form-item>
+               </el-form>
+        </div>
+        <!-- <div class="div_btn">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+            <el-button size="small" v-if="formType != 'detail'" type="primary" 
+                @click="handleComfirm">确
+                定</el-button>
+
+        </div> -->
+    </div>
+</template>
+   
+   <script>
+   import { mapGetters } from 'vuex'
+  //  import { Loading } from 'element-ui' // 引入Loading服务
+   import { requestPost,requestGet } from '@/js/dai/request'
+   import Tinymce from '@c/tinymce2/index.vue'
+   import daiMap from "@/utils/dai-map";
+   import util from '@js/util.js';
+   // import UploadImage from './upload-image.vue'
+   import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
+   
+   var map
+   var search
+   var markers
+   var infoWindowList
+   var geocoder // 新建一个正逆地址解析类
+   
+  
+   export default {
+      data() {
+          return {
+              formData:
+              {
+                agencyName:"",
+                  agencyId: "",
+                  linkman: "",
+                  linkPhone: "",
+                  content: "",
+                  workTime: "",
+                  attrs: [],
+                  type: "",
+                  name: "",
+                  optionstype: [
+                      { value: 0, label: "实践站" },
+                      { value: 1, label: "实践点" },
+                      { value: 2, label: "其它" },
+
+                  ],
+                  address: "",//地址
+                  longitude: this.$store.state.user.longitude, //经度
+                  latitude: this.$store.state.user.latitude,//纬度
+                  },
+                  showdisabled:false,
+              uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+              customerId: localStorage.getItem('customerId'),
+   
+          }
+          
+      },
+   
+      components: { Tinymce, UploadImage },
+      mounted() {
+       this.formData.agencyId=this.$store.state.user.agencyId
+         this.formData.agencyName=this.$store.state.user.agencyName
+         let { latitude, longitude } = this.$store.state.user;
+          if (!latitude || latitude == "" || latitude == "0") {
+              latitude = 39.9088810666821;
+              longitude = 116.39743841556731;
+          }
+          this.formData.latitude = latitude;
+          this.formData.longitude = longitude;
+          this.activityType()
+          this.listServerOrg()
+   
+      },
+   
+      methods: {
+        //父组件传的
+        async initForm(type, unitId) {
+            this.getTableDetail(unitId)
+       
+      },
+          //获取详情
+          getTableDetail(id) {
+          console.log(id,"dskljfksdljf");
+          let url = `/voluntary/sphereLife/detail/${id}`;
+          console.log(url,"url");
+            requestGet(url).then((res) => {
+              console.log(res);
+              if (res.code == 0) {
+                  this.formData = res.data
+                  this.fileList=[{fileUrl:res.data.attrs[0].url}]
+                  this.searchValue=res.data.address
+                  console.log(this.formData,"this.formData");
+              } else {
+                  this.$message.error(res.msg)
+              }
+          })
+           
+          
+      },
+        //添加标签
+        addDomain() {
+          if (this.formData.sponsors.length < 4) {
+            console.log("jshdfdsjdfkl");
+        console.log(this.formData.sponsors,this.tableDate,);
+          this.formData.sponsors.push(this.tableDate);
+          console.log(this.formData.sponsors,this.tableDate,);
+          }else{
+            this.$message.error("最多添加4个标签");
+          }
+     
+        },
+        //删除动态
+        removeDomain(item) {
+          console.log(item);
+          var index = this.formData.sponsors.indexOf(item)
+          if (index !== -1) {
+            this.formData.sponsors.splice(index, 1)
+            this.tableDate = {}
+          }
+        },
+          validateContent() {
+        // 使用正则表达式去除HTML标签后检查内容
+        const textContent = this.stripHtml(this.formData.sumUp);
+        if (textContent.trim() === '') {
+          this.formData.sumUp = null;
+        }
+      },
+      stripHtml(html) {
+        const div = document.createElement('div');
+        div.innerHTML = html;
+        return div.textContent || div.innerText || '';
+      },
+          async activityType() {
+              this.$nextTick(() => {
+                  if (!map) {
+                      this.initMap(this.formData.latitude, this.formData.longitude);
+                      console.log("map", map,this.formData.latitude, this.formData.longitude)
+                  } else {
+                      map.setCenter(this.formData.latitude, this.formData.longitude);
+                      map.setMarker(this.formData.latitude, this.formData.longitude);
+                      console.log("mapmapmap", map)
+                  }
+              })
+          },
+       
+          onChangeFileList(e) {
+              console.log(e, 'sssssb');
+              this.fileList = e.length > 0 ? e.map(item => ({
+                  fileType: '0',
+                  type:'image',
+                  fileType: '0',
+                  name:item.response.data.fileName,
+                  fileUrl: item.response.data.url,
+                  format: item.response.data.fileName.split('.').pop(),
+                  url: item.response.data.url
+              })) : []; // 当e为空时清空fileList
+              if (e.length > 0) {
+                  console.log(this.fileList,"this.fileList");
+                  this.formData.attrs=this.fileList;
+                 console.log(this.formData.attrs,"this.fileList");
+                
+              } else {
+                  this.formData.coverPic = '';
+              }
+          },
+   
+          removedImg() {
+              this.formData.coverPic = ''
+          },
+
+   
+          onChangeImgs(e, rowIndex = 0) {
+              console.log('onChangeFileList', e)
+              if (e.length > 0) {
+                  this.activityImgs = []
+                  e.forEach(item => {
+                      let ob = {
+                          fileType: '0',
+                          fileUrl: item.response.data.url
+                      }
+                      this.activityImgs.push(ob)
+                  })
+              }
+          },
+
+        
+          async handleComfirm() {
+           console.log(this.formData,"     this.formData");
+            //  if (this.formData.type!==1&&!this.formData.type!=2&&!this.formData.type!=0) {
+            //     this.$message.error('请选择类型');
+            //     return;
+            //  }
+   
+ 
+             if (!this.formData.linkPhone) {
+                this.$message.error('请输入电话');
+                return;
+             }
+             if (!this.formData.linkman) {
+                this.$message.error('请输入姓名');
+                return;
+             }
+   
+             if (!this.formData.address) {
+                this.$message.error('请选择位置');
+                return;
+             }
+   
+             if (!this.formData.workTime) {
+                this.$message.error('请输入办公时间');
+                return;
+             }
+             console.log(this.formData,"this.formData");
+             this.addActivity()
+          },
+          //增加
+          async addActivity() {
+                  let url = '/voluntary/position/saveOrUpdate'
+                  console.log();
+                  
+                  const { data, code, msg } = await requestPost(url, this.formData)
+                  if (code === 0) {
+                      this.$message({
+                          type: 'success',
+                          message: '操作成功'
+                      })
+                   //    this.resetData()
+                      this.$emit('showAddClose')
+
+                  } else {
+                      this.$message.error(msg)
+                  }
+              
+              
+   
+   
+          },
+   
+          handleCancle() {
+               console.log("sdlkfjklsdf ");
+              this.$emit('showAddClose')
+   
+          },
+   
+          // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+          initMap(latitude, longitude) {
+              console.log(latitude, longitude,"564564568");
+              map = new daiMap(
+                  document.getElementById("app_activity"),
+                  { latitude, longitude },
+                  {
+                      zoom: 16.2, // 设置地图缩放级别
+                      pitch: 43.5, // 设置俯仰角
+                      rotation: 45, // 设置地图旋转角度
+                  }
+              );           
+   
+              // 监听地图平移结束
+              /*  map.on("dragend", (e) => {
+                  this.handleMoveCenter(e);
+                });*/
+              map.on("click", (e) => {
+                  this.handleMoveCenter(e);
+              });
+   
+              map.setCenter(latitude, longitude);
+              map.setMarker(latitude, longitude);
+   
+          },
+   
+   
+          async handleMoveCenter(e) {
+              //修改地图中心点
+              // const { lat, lng } = map.getCenter();
+              const { lat, lng } = e.latLng;
+              this.formData.latitude = lat;
+              this.formData.longitude = lng;
+              map.setMarker(lat, lng);
+   
+              let { msg, data } = await map.getAddress(lat, lng);
+              if (msg == "success") {
+                  this.formData.address = data.address;
+                //   this.searchValue=data.address
+                  console.log(this.formData.address," this.formData.address ");
+                  
+                  this.searchValue = data.address
+                  this.searchOptions = []
+                  // console.log('data,this.searchValue ', this.searchValue)
+   
+              }
+          },
+   
+          async remoteMethod(query) {
+              console.log(query, "sfsvsdv");
+              if (query !== '') {
+  
+                  const { msg, data } = await map.searchNearby(query);
+                  this.resultList = []
+   
+                  if (msg == "success" && data.resultList && data.resultList.length > 0) {
+   
+                      if (data.resultList && data.resultList.length > 0) {
+                          this.resultList = data.resultList
+                          console.log(this.resultList, "this.resultList");
+                          this.searchOptions = this.resultList.map(item => {
+                              return { value: `${item.id}`, label: `${item.address + item.title}` };
+   
+                          });
+                          console.log(this.searchOptions, "this.searchOptions");
+                      }
+                  } else {
+                      this.searchOptions = [
+                          {
+                              value: '0',
+                              label: '未检索到结果'
+                          }
+                      ]
+                  }
+              } else {
+                  this.searchOptions = [];
+              }
+          },
+   
+          handleClickKey(index) {
+              let selPosition = this.resultList[index]
+              let lonlat = selPosition.lonlat.split(" ")
+              map.setCenter(lonlat[1], lonlat[0]);
+              map.setMarker(lonlat[1], lonlat[0]);
+              this.formData.latitude = lonlat[1];
+              this.formData.longitude = lonlat[0];
+              this.searchValue = selPosition.address + selPosition.name
+          },
+   
+  
+  
+      },
+      computed: {
+          dataRule() {
+              return {
+                type: [
+                      { required: true, message: '请选择类型', trigger: 'blur' }
+                  ],
+                  name: [
+                      { required: true, message: '请选择名称', trigger: 'blur' }
+                  ],
+                  linkman: [
+                      { required: true, message: '请输入联系人', trigger: 'blur' },
+                     
+                  ],
+                  linkPhone: [
+                      { required: true, message: '请填写电话', trigger: 'blur' },
+                      { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+                  ],
+                  content: [
+                      { required: true, message: '请输入阵地介绍', trigger: 'blur' }
+                  ],
+
+                  attrs: [
+                      { required: true, message: '请选择封面图片', trigger: 'blur' }
+                  ],
+                  address: [
+                      { required: true, message: '请选择位置', trigger: 'blur' }
+                  ],
+                  workTime: [
+                      { required: true, message: '请输入办公时间', trigger: 'blur' }
+                  ]
+              }
+          },
+   
+      },
+      props: {
+   
+   
+   
+      },
+      destroyed () {
+       map = null
+     }
+   }
+   </script>
+   
+   
+   <style lang="scss" scoped>
+   @import "@/assets/scss/modules/visual/communityManageForm.scss";
+   </style>
+   <style lang="scss" scoped>
+   .item_width_1 {
+      width: 634px;
+   
+      /deep/.tox .tox-dialog {
+          z-index: 20000;
+      }
+   }
+   .u-item-width-normal{
+      width: 222px;
+   }
+   
+   .tinymce_view {
+      ::v-deep .tox .tox-dialog {
+          z-index: 2000000000;
+      }
+   }
+   
+   .div_map {
+      position: relative;
+   }
+   
+   .div_searchmap {
+      z-index: 5000;
+      position: absolute;
+      top: 5px;
+      left: 5px;
+   }
+   
+   .tinymce_view {
+      height: 400px;
+      overflow: auto;
+   }
+   
+   .text_p {
+      margin: 0;
+      padding: 0 10px;
+      border: 1px solid #d9d9d9;
+      border-radius: 5px;
+   
+      >p {
+          margin: 0;
+      }
+   }
+   </style>
\ No newline at end of file
diff --git a/src/views/modules/volunteer/SiteManagement/index.vue b/src/views/modules/volunteer/SiteManagement/index.vue
index 5c182aae3..d18c7c869 100644
--- a/src/views/modules/volunteer/SiteManagement/index.vue
+++ b/src/views/modules/volunteer/SiteManagement/index.vue
@@ -110,7 +110,7 @@ export default {
             optionstype: [
               { value: 0, label: "实践站" },
               { value: 1, label: "实践点" },
-              { value: 1, label: "其它" },
+              { value: 2, label: "其它" },
 
             ]
           },