From 88493f318f03e9b3423fc2ec46fcfa29d8afe6e7 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: Tue, 24 Sep 2024 14:51:43 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E9=98=B5=E8=90=A5=E5=90=88=E5=9C=BA?=
 =?UTF-8?q?=E6=89=80=E7=9A=84=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   3 +-
 .../modules/volunteer/SiteManagement/add.vue  | 523 ++++--------------
 .../volunteer/SiteManagement/index.vue        | 102 ++--
 .../modules/volunteer/Venuemanagement/add.vue | 370 +++----------
 .../volunteer/Venuemanagement/index.vue       | 105 ++--
 5 files changed, 305 insertions(+), 798 deletions(-)

diff --git a/.gitignore b/.gitignore
index aeed0ec37..51ef59bc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,5 @@ dist
 epmet-oper
 epmet-work-pc
 package-lock.json
-.idea/
\ No newline at end of file
+.idea/
+report.20240923.092213.21116.0.001.json
diff --git a/src/views/modules/volunteer/SiteManagement/add.vue b/src/views/modules/volunteer/SiteManagement/add.vue
index e7ad8d61e..3ee330903 100644
--- a/src/views/modules/volunteer/SiteManagement/add.vue
+++ b/src/views/modules/volunteer/SiteManagement/add.vue
@@ -7,60 +7,60 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="所属组织" prop="agencyName" label-width="100px">
-                            <el-input v-model.trim="formData.agencyName" size="small" clearable placeholder="请输入活动名称"
+                            <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 :span="12">
-                        <el-form-item label="类型" prop="typeName" label-width="100px">
-                            <el-cascader class="u-item-width-normal" v-model="formData.typeName" :options="options"
-                                @change="handleChange" :disabled="showdisabled"></el-cascader>
+                        <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">
+                            </el-option>
+                        </el-select>
                         </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="请输入活动名称"
+                        <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>
                     <el-col :span="12">
-                        <el-form-item label="联系人" prop="operator" label-width="100px">
-                            <el-input v-model.trim="formData.operator" size="small" clearable placeholder="请输入管理员姓名"
+                        <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="请输入手机号"
+                        <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">
-                        <el-form-item label="图片" label-width="100px" prop="coverImg">
+                        <el-form-item label="办公时间" prop="workTime" label-width="100px">
+                            <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="attrs">
                             <template>
-                                <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
+                                <upload-image :defaultFileList="fileList" :limit="3" @change="onChangeFileList"
                                     v-if="!showdisabled" @file-removed="removedImg"></upload-image>
                                 <div v-else>
-                                    <img :src="formData.coverImg" alt="" style="width: 100px; height: 100px;">
+                                    <img v-for="(item, index) in this.formData.attrs" :key="index" :src="item.url" style="width: 100px; height: 100px;">
                                 </div>
                             </template>
                         </el-form-item>
                     </el-col>
-                    <!-- <el-col :span="12">
-                          <el-form-item label="组织类型" label-width="100px" prop="orgType">
-                              <el-select class="u-item-width-normal" v-model.trim="formData.orgType" placeholder="请选择"
-                                  clearable>
-                                  <el-option v-for="item in OrganizationaltypeList" :key="item.value" :label="item.label"
-                                      :value="item.value">
-                                  </el-option>
-                              </el-select>
-                          </el-form-item>
-                      </el-col> -->
+
                     <el-col :span="24">
-                        <el-form-item label="阵地简介" prop="description" label-width="100px" style="display: block">
+                        <el-form-item label="阵地简介" prop="content" label-width="100px" style="display: block">
                             <div class="item_width_1">
-                                <el-input :disabled="showdisabled" type="textarea" autosize placeholder="请填写组织介绍"
-                                    v-model.trim="formData.description" :autosize="{ minRows:4., maxRows: 10}">
+                                <el-input :disabled="showdisabled" type="textarea" autosize placeholder="请填写阵地介绍"
+                                    v-model.trim="formData.content" :autosize="{ minRows:4., maxRows: 10}">
                                 </el-input>
                             </div>
                         </el-form-item>
@@ -68,7 +68,7 @@
                     <el-col :span="24">
                         <el-form-item label="位置" prop="address" label-width="100px" style="display: block">
                             <div style="width: 634px">
-                                <el-select v-model.trim="searchValue" filterable style="width: 634px" remote
+                                <el-select v-model.trim="this.formData.address" filterable style="width: 634px" remote
                                     :reserve-keyword="true" :disabled="showdisabled" placeholder="请输入关键词"
                                     :remote-method="remoteMethod">
                                     <el-option v-for="(item, index) in searchOptions"
@@ -82,32 +82,11 @@
                     </el-col>
 
 
-                    <!-- <el-form-item label="组织介绍" prop="introduction" label-width="100px" style="display: block">
-                          <div class="item_width_1">
-                              <el-input type="textarea" autosize placeholder="请填写组织介绍"
-                                  v-model.trim="formData.introduction" :autosize="{ minRows:4., maxRows: 10}">
-                              </el-input>
-                          </div>
-                      </el-form-item> -->
-                    <!-- 
-                      <el-form-item label="志愿品牌" prop="brand" label-width="100px" style="display: block">
-                          <div class="item_width_1">
-                              <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.brand"
-                                  :autosize="{ minRows:4., maxRows: 10}">
-                              </el-input>
-                          </div>
-                      </el-form-item>
-                      <el-form-item label="品牌展示图" label-width="100px" prop="brandImg">
-                          <template>
-                              <upload-image :defaultFileList="formData.brandImg" :limit="1" @change="onChangeFileList1"
-                                  @file-removed="removedImg"></upload-image>
-                          </template>
-                      </el-form-item> -->
                 </el-row></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" :disabled="btnDisable"
+            <el-button size="small" v-if="formType != 'detail'" type="primary" 
                 @click="handleComfirm">确
                 定</el-button>
 
@@ -118,7 +97,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';
@@ -135,41 +114,28 @@
    export default {
       data() {
           return {
-            showdisabled:false,
-            searchOptions:[],
-              fileList:[],
-              searchValue:"",
-              Organizationaltype:[
-                  { label: "社区", value: 1 },
-                  { label: "企业", value: 2 },
-                  { label: "学校", value: 3 },
-              ],
-              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:[],//服务类型
+              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'),
    
@@ -199,26 +165,32 @@
           console.log(type, unitId,"i就理解哦i");
           if(type=="info"){
             this.showdisabled=true
+            this.getTableDetail(unitId)
           }
-        // await this.getDemandOptions()
-        // console.log(this.demandOptions);
-        // let { latitude, longitude } = this.$store.state.user;
-  
-        // this.formType = type;
-        // if (unitId) {
-        //   this.unitId = unitId;
-        //   this.formData.id = unitId;
-        //   await this.loadFormData();
-        // } else {
-        //   this.formData.latitude = latitude;
-        //   this.formData.longitude = longitude;
-        // }
-  
-        // // if (!map) {
-        // this.initMap(this.formData.latitude, this.formData.longitude);
-        // // }
-  
-        // this.endLoading();
+          if (type=="edit") {
+              this.getTableDetail(unitId)
+          }
+       
+      },
+      //获取详情
+      getTableDetail(id) {
+          console.log(id,"dskljfksdljf");
+          let url = `/voluntary/position/edit/${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}]
+                  console.log(this.formData,"this.formData");
+                  
+              } else {
+                  this.$message.error(res.msg)
+              }
+          
+          })
+           
+          
       },
         //添加标签
         addDomain() {
@@ -253,85 +225,7 @@
         div.innerHTML = html;
         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);
@@ -343,26 +237,23 @@
                   }
               })
           },
-   
-          handleOnlineRegistration(value) {
-              // 
-              if (value) {
-                  this.online = true;
-                  this.formData.online = 1;
-              } else {
-                  this.online = false;
-                  this.formData.cutOffTime = ''
-                  this.formData.online = 0;
-              }
-          },
+       
           onChangeFileList(e) {
               console.log(e, 'sssssb');
               this.fileList = e.length > 0 ? e.map(item => ({
                   fileType: '0',
-                  fileUrl: item.response.data.url
+                  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) {
-                  this.formData.coverPic = e[0].response.data.url;
+                  console.log(this.fileList,"this.fileList");
+                  this.formData.attrs=this.fileList;
+                 console.log(this.formData.attrs,"this.fileList");
+                
               } else {
                   this.formData.coverPic = '';
               }
@@ -371,30 +262,7 @@
           removedImg() {
               this.formData.coverPic = ''
           },
-          // 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.qualification = e[0].response.data.url;
-          //     } else {
-          //         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)
@@ -409,184 +277,32 @@
                   })
               }
           },
-   
-          // 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('-')
-                  console.log(startTimeArray);
-                  const endTimeArray = util.dateFormatter(time[1], 'time').split('-')
-                  console.log(endTimeArray);
-                  this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] 
-                  this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] 
-                  // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
-                  // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
-              } else {
-                  this.formData.startTime = ''
-                  this.formData.endTime = ''
-              }
-   
-          },
-       //    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('请选择所属组织');
+            //  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.introduction) {
-                this.$message.error('请输入组织介绍');
-                return;
-             }
-   
-             if (this.fileList.length === 0) {
-                this.$message.error('请上传封面图片');
-                return;
-             }
-   
-             if (!this.formData.idCard) {
-                this.$message.error('请输入身份证信息');
-                return;
-             }
-   
-             if (!this.formData.mobile) {
-                this.$message.error('请输入管理员电话');
+             if (!this.formData.linkman) {
+                this.$message.error('请输入姓名');
                 return;
              }
    
-             if (!this.formData.operator) {
-                this.$message.error('请输入管理员姓名');
+             if (!this.formData.address) {
+                this.$message.error('请选择位置');
                 return;
              }
    
-             if (!this.formData.orgType) {
-                this.$message.error('请输入组织类型');
-                return;
-             }
-   
-             if (!this.formData.serviceTypeList) {
-                this.$message.error('请输入服务类型');
-                return;
-             }
-   
-             if (!this.formData.orgName) {
-                this.$message.error('请输入组织名称');
+             if (!this.formData.workTime) {
+                this.$message.error('请输入办公时间');
                 return;
              }
              console.log(this.formData,"this.formData");
@@ -594,7 +310,9 @@
           },
           //增加
           async addActivity() {
-                  let url = '/voluntary/volunteerOrg/saveOrUpdate'
+                  let url = '/voluntary/position/saveOrUpdate'
+                  console.log();
+                  
                   const { data, code, msg } = await requestPost(url, this.formData)
                   if (code === 0) {
                       this.$message({
@@ -603,9 +321,8 @@
                       })
                    //    this.resetData()
                       this.$emit('showAddClose')
-                      this.btnDisable = false
+
                   } else {
-                      this.btnDisable = false
                       this.$message.error(msg)
                   }
               
@@ -658,7 +375,7 @@
               let { msg, data } = await map.getAddress(lat, lng);
               if (msg == "success") {
                   this.formData.address = data.address;
-                  this.searchValue=data.address
+                //   this.searchValue=data.address
                   console.log(this.formData.address," this.formData.address ");
                   
                   this.searchValue = data.address
@@ -715,34 +432,32 @@
       computed: {
           dataRule() {
               return {
-                  typeName: [
-                      { required: true, message: '请选择组织类型', trigger: 'blur' }
+                type: [
+                      { required: true, message: '请选择类型', trigger: 'blur' }
                   ],
-                  Name: [
-                      { required: true, message: '请填写名称', trigger: 'blur' }
+                  name: [
+                      { required: true, message: '请选择名称', trigger: 'blur' }
                   ],
-                  searchValue: [
-                      { required: true, message: '请选择地址', trigger: 'blur' },
+                  linkman: [
+                      { 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: [
-                      { required: true, message: '请填写联系人', trigger: 'blur' }
+                  content: [
+                      { required: true, message: '请输入阵地介绍', trigger: 'blur' }
                   ],
-                  description: [
-                      { required: true, message: '请填写阵地介绍', trigger: 'blur' },
-                  ],
-                  fileList: [
+
+                  attrs: [
                       { required: true, message: '请选择封面图片', trigger: 'blur' }
                   ],
                   address: [
                       { required: true, message: '请选择位置', trigger: 'blur' }
                   ],
-                  coverImg: [
-                      { required: true, message: '请选择照片', trigger: 'blur' }
+                  workTime: [
+                      { required: true, message: '请输入办公时间', trigger: 'blur' }
                   ]
               }
           },
diff --git a/src/views/modules/volunteer/SiteManagement/index.vue b/src/views/modules/volunteer/SiteManagement/index.vue
index a3d3048ad..e9dc1a0aa 100644
--- a/src/views/modules/volunteer/SiteManagement/index.vue
+++ b/src/views/modules/volunteer/SiteManagement/index.vue
@@ -4,12 +4,12 @@
             <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
                 <div>
                     <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-select v-model="formData.serviceType" placeholder="请选择" clearable>
+                        <el-select v-model="formData.type" placeholder="请选择" clearable>
                             <el-option v-for="item in formData.optionstype" :key="item.value" :label="item.label"
                                 :value="item.value">
                             </el-option>
@@ -44,22 +44,22 @@
                 <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> -->
+                    <template slot-scope="scope">
+        <span>{{ scope.row.type === 0 ? '实践站' : scope.row.type === 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="operator" 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="operator" header-align="center" align="center" label="办公时间"
@@ -120,14 +120,16 @@ export default {
     data() {
         return {
             formTitle:"",
-            formData: {
-                orgName: "",
-                serviceType: "",
-                optionstype: [
-                    { value: 1, label: "志愿者服务组织" },
-                    { value: 2, label: "志愿者服务团队" },
-                ]
-            },
+          formData: {
+            type: "",
+            name: "",
+            optionstype: [
+              { value: 0, label: "实践站" },
+              { value: 1, label: "实践点" },
+              { value: 1, label: "其它" },
+
+            ]
+          },
             showprocess:false,
             EditList:{},
 
@@ -188,10 +190,10 @@ export default {
         //修改
         handleEdit(row){
              this.showAdd=true
-            this.formTitle="新增"
+            this.formTitle="修改"
              console.log(row,"row");
              this.$nextTick(() => {
-             this.$refs.ref_form.initForm("edit", row);
+             this.$refs.ref_form.initForm("edit", row.id);
       });
              
         },
@@ -226,7 +228,7 @@ export default {
             this.showAdd=true
             this.formTitle="查看"
             this.$nextTick(() => {
-        this.$refs.ref_form.initForm("info", row);
+        this.$refs.ref_form.initForm("info", row.id);
       });
          
   
@@ -234,15 +236,15 @@ 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/position/list";
   
           let params={
-              orgName: this.formData.orgName,
-              serviceType: this.formData.serviceType,
+              name: this.formData.name,
+              type: this.formData.type,
               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;
@@ -346,29 +348,35 @@ export default {
               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: () => {
-              }
-            })
-            this.getTableData()
-          } else {
-            this.$message.error(data.msg)
+        handleDel(row) {
+          console.log(row, "row");
+          let url = "/voluntary/position/delete";
+          let params = {
+            ids: [row.id]
           }
-        })
-         
+          console.log(row,"删除活动");
+          axios.delete(url, [row.id]).then((res) => {
+            if (res.code == 0) {
+              this.$message.success("删除成功")
+              this.getTableData()
+            } else {
+              this.$message.error(res.msg)
+            }
+          })
+      // axios({
+      //   url: window.SITE_CONFIG["apiURL"] + url,
+      //   method: "DELETE",
+      //   params
+      // })
+      //   .then((res) => {
+      //    if(res.code==0){
+      //     this.$message.success("删除成功")
+      //     this.getTableData()
+      //   }else{
+      //     this.$message.error(res.msg)
+      //   }
+      //   })
+
         },
         diaClose(){
           this.formShow=false
diff --git a/src/views/modules/volunteer/Venuemanagement/add.vue b/src/views/modules/volunteer/Venuemanagement/add.vue
index 58c6d25b6..74a1d6297 100644
--- a/src/views/modules/volunteer/Venuemanagement/add.vue
+++ b/src/views/modules/volunteer/Venuemanagement/add.vue
@@ -8,18 +8,22 @@
 
             <el-col :span="12">
               <el-form-item label="挂靠阵地" prop="typeName" label-width="100px">
-                <el-cascader    class="u-item-width-normal" v-model="formData.typeName" :options="options" @change="handleChange" :disabled="showdisabled"></el-cascader>
+                <el-select v-model="formData.positionId" placeholder="请选择" clearable>
+                            <el-option v-for="item in SiteData" :key="item.id" :label="item.name"
+                                :value="item.id">
+                            </el-option>
+                        </el-select>
               </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>
             <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> 
@@ -29,21 +33,11 @@
                   <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList" v-if="!showdisabled"
                     @file-removed="removedImg"></upload-image>
                     <div v-else>
-                    <img :src="formData.coverImg" alt="" style="width: 100px; height: 100px;">
+                    <img :src="formData.attrs[0].url" alt="" style="width: 100px; height: 100px;">
                   </div>
                 </template>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="12">
-                          <el-form-item label="组织类型" label-width="100px" prop="orgType">
-                              <el-select class="u-item-width-normal" v-model.trim="formData.orgType" placeholder="请选择"
-                                  clearable>
-                                  <el-option v-for="item in OrganizationaltypeList" :key="item.value" :label="item.label"
-                                      :value="item.value">
-                                  </el-option>
-                              </el-select>
-                          </el-form-item>
-                      </el-col> -->
             <el-col :span="24">
               <el-form-item label="位置" prop="address" label-width="100px" style="display: block">
                 <div style="width: 634px">
@@ -57,34 +51,11 @@
                 </div>
               </el-form-item>
             </el-col>
-          
-
-            <!-- <el-form-item label="组织介绍" prop="introduction" label-width="100px" style="display: block">
-                          <div class="item_width_1">
-                              <el-input type="textarea" autosize placeholder="请填写组织介绍"
-                                  v-model.trim="formData.introduction" :autosize="{ minRows:4., maxRows: 10}">
-                              </el-input>
-                          </div>
-                      </el-form-item> -->
-            <!-- 
-                      <el-form-item label="志愿品牌" prop="brand" label-width="100px" style="display: block">
-                          <div class="item_width_1">
-                              <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.brand"
-                                  :autosize="{ minRows:4., maxRows: 10}">
-                              </el-input>
-                          </div>
-                      </el-form-item>
-                      <el-form-item label="品牌展示图" label-width="100px" prop="brandImg">
-                          <template>
-                              <upload-image :defaultFileList="formData.brandImg" :limit="1" @change="onChangeFileList1"
-                                  @file-removed="removedImg"></upload-image>
-                          </template>
-                      </el-form-item> -->
           </el-row></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" :disabled="btnDisable" @click="handleComfirm">确
+        <el-button size="small" type="primary"  @click="handleComfirm">确
           定</el-button>
   
       </div>
@@ -94,7 +65,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';
@@ -111,6 +82,7 @@
    export default {
       data() {
           return {
+
             showdisabled:false,
             searchOptions:[],
               fileList:[],
@@ -120,28 +92,12 @@
                   { label: "企业", value: 2 },
                   { label: "学校", value: 3 },
               ],
+              SiteData:[],
               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:[],//服务类型
+                    attrs:[],
+                  positionId:"",//挂靠阵地
                   address: "",//地址
                   longitude: this.$store.state.user.longitude, //经度
                   latitude: this.$store.state.user.latitude,//纬度
@@ -155,7 +111,8 @@
    
       components: { Tinymce, UploadImage },
       mounted() {
-       this.formData.agencyId=this.$store.state.user.agencyId
+        this.getSiteTableData()
+         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") {
@@ -165,149 +122,61 @@
           this.formData.latitude = latitude;
           this.formData.longitude = longitude;
           this.activityType()
-          this.listServerOrg()
-   
       },
    
       methods: {
+          //获取阵地列表
+          async getSiteTableData() {
+              // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
+              const url = "/voluntary/position/list";
+              let params = {
+                  name: "",
+                  type: "",
+                  pageNo: "",
+                  pageSize: ""
+              }
+              const { data, code, msg } = await requestGet(url, params);
+              if (code === 0) {
+                  console.log("列表请求成功！！！！！！！！！！！！！！");
+                  // this.total = data.total || 0;
+                  this.SiteData = data.list
+              } else {
+              }
+          },
         //父组件传的
         async initForm(type, unitId) {
           console.log(type, unitId,"i就理解哦i");
           if(type=="info"){
             this.showdisabled=true
+            this.getTableDetail(unitId)
           }
-        // await this.getDemandOptions()
-        // console.log(this.demandOptions);
-        // let { latitude, longitude } = this.$store.state.user;
-  
-        // this.formType = type;
-        // if (unitId) {
-        //   this.unitId = unitId;
-        //   this.formData.id = unitId;
-        //   await this.loadFormData();
-        // } else {
-        //   this.formData.latitude = latitude;
-        //   this.formData.longitude = longitude;
-        // }
-  
-        // // if (!map) {
-        // this.initMap(this.formData.latitude, this.formData.longitude);
-        // // }
-  
-        // this.endLoading();
-      },
-        //添加标签
-        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 = {}
+          if (type == "edit") {
+            this.getTableDetail(unitId)
           }
-        },
-          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 || '';
+      //获取详情
+      getTableDetail(id) {
+          console.log(id,"dskljfksdljf");
+          let url = `/voluntary/positionVenues/edit/${id}`;
+            requestGet(url).then((res) => {
+              console.log(res);
+              if (res.code == 0) {
+                  this.formData = res.data
+                  this.searchValue= res.data.address
+                  this.fileList=[{fileUrl:res.data.attrs[0].url}]
+              } else {
+                  this.$message.error(res.msg)
+              }
+          
+          })
+           
+          
       },
-   
-       //    // 上传成功
-       //    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);
@@ -334,11 +203,18 @@
           onChangeFileList(e) {
               console.log(e, 'sssssb');
               this.fileList = e.length > 0 ? e.map(item => ({
+                fileType: '0',
+                  type:'image',
                   fileType: '0',
-                  fileUrl: item.response.data.url
+                  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) {
-                  this.formData.coverPic = e[0].response.data.url;
+                console.log(this.fileList,"this.fileList");
+                  this.formData.attrs=this.fileList;
+                 console.log(this.formData.attrs,"this.fileList");
               } else {
                   this.formData.coverPic = '';
               }
@@ -417,44 +293,7 @@
               }
    
           },
-       //    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
@@ -519,58 +358,34 @@
           async handleComfirm() {
            console.log(this.formData,"     this.formData");
            
-             if (!this.formData.agencyName) {
-                this.$message.error('请选择所属组织');
+             if (!this.formData.address) {
+                this.$message.error('请输入具体位置');
                 return;
              }
       
    
     
-             if (!this.formData.introduction) {
-                this.$message.error('请输入组织介绍');
+             if (!this.formData.attrs             ) {
+                this.$message.error('请上传图片');
                 return;
              }
    
-             if (this.fileList.length === 0) {
-                this.$message.error('请上传封面图片');
+             if (!this.formData.linkPhone) {
+                this.$message.error('请填写联系电话');
                 return;
              }
    
-             if (!this.formData.idCard) {
-                this.$message.error('请输入身份证信息');
+             if (!this.formData.positionId) {
+                this.$message.error('请选择挂靠阵地');
                 return;
              }
    
-             if (!this.formData.mobile) {
-                this.$message.error('请输入管理员电话');
-                return;
-             }
-   
-             if (!this.formData.operator) {
-                this.$message.error('请输入管理员姓名');
-                return;
-             }
-   
-             if (!this.formData.orgType) {
-                this.$message.error('请输入组织类型');
-                return;
-             }
-   
-             if (!this.formData.serviceTypeList) {
-                this.$message.error('请输入服务类型');
-                return;
-             }
-   
-             if (!this.formData.orgName) {
-                this.$message.error('请输入组织名称');
-                return;
-             }
-             console.log(this.formData,"this.formData");
+     
              this.addActivity()
           },
           //增加
           async addActivity() {
-                  let url = '/voluntary/volunteerOrg/saveOrUpdate'
+                  let url = '/voluntary/positionVenues/saveOrUpdate'
                   const { data, code, msg } = await requestPost(url, this.formData)
                   if (code === 0) {
                       this.$message({
@@ -579,9 +394,7 @@
                       })
                    //    this.resetData()
                       this.$emit('showAddClose')
-                      this.btnDisable = false
                   } else {
-                      this.btnDisable = false
                       this.$message.error(msg)
                   }
               
@@ -691,35 +504,24 @@
       computed: {
           dataRule() {
               return {
-                  typeName: [
-                      { required: true, message: '请选择组织类型', trigger: 'blur' }
+                positionId: [
+                      { 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: [
-                      { required: true, message: '请填写联系人', trigger: 'blur' }
-                  ],
-                  sponsors: [
-                      { required: true, message: '请填写标签信息', trigger: 'blur' },
-                  ],
+              
                   fileList: [
                       { required: true, message: '请选择封面图片', trigger: 'blur' }
                   ],
                   address: [
                       { required: true, message: '请选择位置', trigger: 'blur' }
                   ],
-                  coverImg: [
-                      { required: true, message: '请选择照片', trigger: 'blur' }
-                  ]
+
               }
           },
    
diff --git a/src/views/modules/volunteer/Venuemanagement/index.vue b/src/views/modules/volunteer/Venuemanagement/index.vue
index fb7709095..ada2f288a 100644
--- a/src/views/modules/volunteer/Venuemanagement/index.vue
+++ b/src/views/modules/volunteer/Venuemanagement/index.vue
@@ -4,14 +4,14 @@
             <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
                 <div>
                     <el-form-item label="挂靠阵地">
-                        <el-select v-model="formData.serviceType" placeholder="请选择" clearable>
-                            <el-option v-for="item in formData.optionstype" :key="item.value" :label="item.label"
-                                :value="item.value">
+                        <el-select v-model="formData.positionId" placeholder="请选择" clearable>
+                            <el-option v-for="item in SiteData" :key="item.id" :label="item.name"
+                                :value="item.id">
                             </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>
@@ -40,24 +40,24 @@
             <el-table class="table" :data="tableData" border  style="width: 100%">
                 <el-table-column label="序号" header-align="center" align="center" type="index"
                     width="80"></el-table-column>
-                <el-table-column prop="agencyName" header-align="center" align="center" label="挂靠阵地"
+                <el-table-column prop="positionName" 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="name" 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="linkPhone" header-align="center" align="center" label="咨询电话"
                     :show-overflow-tooltip="true">
                 </el-table-column>
-                <el-table-column prop="numberNum" 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="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="预约时间"
+                    :show-overflow-tooltip="true"> 
+                </el-table-column>-->
                 <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center"
                     class="operate">
                     <template slot-scope="scope">
@@ -80,14 +80,7 @@
                 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>
+
      
         </div>
     </div>
@@ -114,8 +107,9 @@ export default {
         return {
             formTitle:"",
             formData: {
-                orgName: "",
-                serviceType: "",
+                agencyId:"",
+                name: "",
+                positionId: "",
                 optionstype: [
                     { value: 1, label: "志愿者服务组织" },
                     { value: 2, label: "志愿者服务团队" },
@@ -134,6 +128,7 @@ export default {
             tableData: [
                
           ],
+          SiteData:[],
           importLoading:false,
           showInfo:false,
 
@@ -151,48 +146,38 @@ export default {
     
       },
       mounted() {
+        this.getSiteTableData()
         this.getTableData();
       },
       methods: {
-        //审查
-        handleprocessl(row){
-            this.showprocess=true
-            this.EditList=row
-            console.log(row,this.fmData,"row");
-        },
-        //关闭审查
-        
-        handleprocesslClose(){
-            this.showprocess=false
-            this.getTableData()
-        },
-        //成员管理
-        handleshowMember(row){
-          console.log    (row,this.fmData,"row");
-            this.showMember=true
-            this.fmData=row
-   
-        },
-        //关闭成员管理
-        MemberManagementClose(){
-            this.showMember=false  
-            this.getTableData()
+          //获取阵地列表
+          async getSiteTableData() {
+          // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
+          const url = "/voluntary/position/list";
+          let params={
+              name:"",
+              type: "",
+              pageNo:"",
+              pageSize: ""
+          }
+          const { data, code, msg } = await requestGet(url,params);
+          if (code === 0) {
+            console.log("列表请求成功！！！！！！！！！！！！！！");
+            // this.total = data.total || 0;
+            this.SiteData = data.list
+          } else {
+          }
         },
         //修改
         handleEdit(row){
              this.showAdd=true
-            this.formTitle="新增"
+             this.formTitle="修改"
              console.log(row,"row");
              this.$nextTick(() => {
-             this.$refs.ref_form.initForm("edit", row);
+             this.$refs.ref_form.initForm("edit", row.id);
       });
              
         },
-        //关闭修改
-        showEditClose(){
-            this.showEdit=false
-            this.getTableData()
-        },
         //新增
         handleAdd(){
             this.showAdd=true
@@ -208,10 +193,7 @@ export default {
             this.showAdd=false
             this.getTableData()
         },
-        //关闭查看
-        showInfoClose(){
-            this.showEdit=false
-        },
+
         //打开查看
         handleDetail(row){
           // console.log(row,"row");
@@ -219,23 +201,22 @@ export default {
             this.showAdd=true
             this.formTitle="查看"
             this.$nextTick(() => {
-        this.$refs.ref_form.initForm("info", row);
+        this.$refs.ref_form.initForm("info", row.id);
       });
          
   
         },
         //查询列表
         async getTableData() {
-          // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
-          const url = "/voluntary/volunteerOrg/page";
-  
+          const url = "/voluntary/positionVenues/list";
           let params={
-              orgName: this.formData.orgName,
-              serviceType: this.formData.serviceType,
+              name: this.formData.name,
+              positionId : this.formData.positionId ,
+              agencyId  : this.formData.agencyId,
               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;

From 5409992295ed003576373f50acc2bbab04116fc0 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: Wed, 25 Sep 2024 10:19:28 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/SiteManagement/index.vue        | 61 ++++++++++---------
 .../volunteer/Venuemanagement/index.vue       | 43 ++++++-------
 2 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/src/views/modules/volunteer/SiteManagement/index.vue b/src/views/modules/volunteer/SiteManagement/index.vue
index e9dc1a0aa..63a71a9da 100644
--- a/src/views/modules/volunteer/SiteManagement/index.vue
+++ b/src/views/modules/volunteer/SiteManagement/index.vue
@@ -348,35 +348,26 @@ export default {
               debugger
               return fileType && isLt1M;
           },
-        handleDel(row) {
-          console.log(row, "row");
-          let url = "/voluntary/position/delete";
-          let params = {
-            ids: [row.id]
-          }
-          console.log(row,"删除活动");
-          axios.delete(url, [row.id]).then((res) => {
-            if (res.code == 0) {
-              this.$message.success("删除成功")
-              this.getTableData()
-            } else {
-              this.$message.error(res.msg)
-            }
-          })
-      // axios({
-      //   url: window.SITE_CONFIG["apiURL"] + url,
-      //   method: "DELETE",
-      //   params
-      // })
-      //   .then((res) => {
-      //    if(res.code==0){
-      //     this.$message.success("删除成功")
-      //     this.getTableData()
-      //   }else{
-      //     this.$message.error(res.msg)
-      //   }
-      //   })
-
+          handleDel(row) {
+  console.log(row, "row");
+  let url = "/voluntary/position/delete";
+  // let params = {
+  //   ids: [String(row.id)] // 将 row.id 转换为字符串并放入数组中
+  // };
+  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);
+      }
+    })
+    .catch((error) => {
+      console.error("删除失败", error);
+      this.$message.error("删除失败，请稍后重试");
+    });
         },
         diaClose(){
           this.formShow=false
@@ -457,8 +448,18 @@ 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/Venuemanagement/index.vue b/src/views/modules/volunteer/Venuemanagement/index.vue
index ada2f288a..72647a958 100644
--- a/src/views/modules/volunteer/Venuemanagement/index.vue
+++ b/src/views/modules/volunteer/Venuemanagement/index.vue
@@ -320,28 +320,23 @@ export default {
               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/positionVenues/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(){
@@ -423,7 +418,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>

From e06344d6fce1c69140607fa00adc4fd9fcd0db90 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: Wed, 25 Sep 2024 11:07:34 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=9B=BE=E5=8A=A0*?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/volunteer/VolunteerProjects/add.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/volunteer/VolunteerProjects/add.vue b/src/views/modules/volunteer/VolunteerProjects/add.vue
index bed6e19f1..b48b0ecd0 100644
--- a/src/views/modules/volunteer/VolunteerProjects/add.vue
+++ b/src/views/modules/volunteer/VolunteerProjects/add.vue
@@ -40,7 +40,7 @@
              </el-form-item>
             </el-col>
             <el-col :span="12">
-             <el-form-item label="项目展示图" label-width="150px" prop="">
+             <el-form-item label="项目展示图" label-width="150px" prop="activityImgs">
                              <template>
                              <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
                                  @file-removed="removedImg"></upload-image>

From 952e024c3d52ed6023734c20ccf59cdd30ef4f73 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: Wed, 25 Sep 2024 15:44:27 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E9=80=89=E6=B4=BB=E5=8A=A8=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=8D=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 .../volunteer/VolunteerProjects/add.vue       | 86 +++++++++----------
 .../volunteer/VolunteerProjects/index.vue     |  2 +-
 .../volunteer/activityArchive/realselect.vue  |  1 +
 .../volunteer/pointsRedemption/add.vue        | 49 +++++++++--
 .../volunteer/pointsRedemption/index.vue      |  2 +-
 .../volunteer/pointsRedemption/update.vue     | 20 +++--
 7 files changed, 102 insertions(+), 60 deletions(-)

diff --git a/package.json b/package.json
index 1bb574cc2..75c94e25c 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "build:uat": "vue-cli-service build --mode production.uat",
     "build:preview": "vue-cli-service build --mode preview",
     "build:prod": "vue-cli-service build --mode production",
-    "build:test": "vue-cli-service build --mode test",
+    "build:test": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode test",
     "build:shibei_prod": "vue-cli-service build --mode shibei_production",
     "lint": "vue-cli-service lint",
     "et": "node_modules/.bin/et",
diff --git a/src/views/modules/volunteer/VolunteerProjects/add.vue b/src/views/modules/volunteer/VolunteerProjects/add.vue
index b48b0ecd0..73873cb40 100644
--- a/src/views/modules/volunteer/VolunteerProjects/add.vue
+++ b/src/views/modules/volunteer/VolunteerProjects/add.vue
@@ -21,13 +21,13 @@
                  </el-col>
                  <el-col :span="12">
                  <el-form-item label="发布单位" prop="publishUnitName" label-width="150px">
-                <el-input v-model.trim="formData.publishUnitName" size="small" clearable placeholder="请输入活动名称"
+                <el-input v-model.trim="formData.publishUnitName" size="small" clearable placeholder="请输入"
                    class="u-item-width-normal"></el-input>
              </el-form-item>
                  </el-col>
                  <el-col :span="12">
                  <el-form-item label="名称" prop="projectTitle" label-width="150px">
-                <el-input v-model.trim="formData.projectTitle" size="small" clearable placeholder="请输入活动名称"
+                <el-input v-model.trim="formData.projectTitle" size="small" clearable placeholder="请输入名称"
                    class="u-item-width-normal"></el-input>
              </el-form-item>
                  </el-col>
@@ -569,52 +569,48 @@
         },
  
         async handleComfirm() {
-        //    if (!this.formData.agencyName) {
-        //       this.$message.error('请选择所属组织');
-        //       return;
-        //    }
+           if (!this.formData.projectTitle) {
+              this.$message.error('请填写名称');
+              return;
+           }
     
  
   
-        //    if (!this.formData.Organizational) {
-        //       this.$message.error('请填写项目介绍');
-        //       return;
-        //    }
- 
-        //    if (this.fileList.length === 0) {
-        //       this.$message.error('请上传封面图片');
-        //       return;
-        //    }
- 
-        //    if (!this.formData.AdministratorIDCard) {
-        //       this.$message.error('请输入身份证信息');
-        //       return;
-        //    }
- 
-        //    if (!this.formData.Administratorphone) {
-        //       this.$message.error('请输入管理员电话');
-        //       return;
-        //    }
- 
-        //    if (!this.formData.AdministratorName) {
-        //       this.$message.error('请输入管理员姓名');
-        //       return;
-        //    }
- 
-        //    if (!this.formData.Organizationaltype) {
-        //       this.$message.error('请输入组织类型');
-        //       return;
-        //    }
- 
-        //    if (!this.formData.Servicetype) {
-        //       this.$message.error('请输入服务类型');
-        //       return;
-        //    }
- 
-        //    if (!this.formData.OrganizationName) {
-        //       this.$message.error('请填写发布单位');
-        //       return;
-        //    }
+           if (!this.formData.description) {
+              this.$message.error('请填写项目介绍');
+              return;
+           }
+ 
+ 
+           if (!this.formData.serviceClasses) {
+              this.$message.error('请选择服务类型');
+              return;
+           }
+ 
+           if (!this.formData.recruitDeadline) {
+              this.$message.error('请选择服务截止时间');
+              return;
+           }
+ 
+           if (!this.formData.recruitRequirement) {
+              this.$message.error('请填写招募要求');
+              return;
+           }
+ 
+           if (!this.formData.Organizationaltype) {
+              this.$message.error('请输入组织类型');
+              return;
+           }
+ 
+           if (!this.formData.serviceTimeFrom&&!this.formData.serviceTimeTo) {
+              this.$message.error('请选择服务期限');
+              return;
+           }
+ 
+           if (!this.formData.OrganizationName) {
+              this.$message.error('请填写发布单位');
+              return;
+           }
            console.log(this.formData,"this.formData");
            this.addActivity()
         },
diff --git a/src/views/modules/volunteer/VolunteerProjects/index.vue b/src/views/modules/volunteer/VolunteerProjects/index.vue
index ff5d51d56..3a011b20d 100644
--- a/src/views/modules/volunteer/VolunteerProjects/index.vue
+++ b/src/views/modules/volunteer/VolunteerProjects/index.vue
@@ -91,7 +91,7 @@
                             style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">上线</el-button>
                         <el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.onlineStatus==0&&scope.row.projectStatus==10"
                             @click="handledelete(scope.row)">删除</el-button>
-                        <el-button type="text" style="color:#1C6AFD;" size="small"
+                        <el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.source==1"
                             @click="handlerecruit(scope.row)">招募</el-button>
                         <!-- <el-button type="text" style="color:#1C6AFD;" size="small"
                             @click="handleprocessl(scope.row)">审核</el-button> -->
diff --git a/src/views/modules/volunteer/activityArchive/realselect.vue b/src/views/modules/volunteer/activityArchive/realselect.vue
index 9e322ed6e..2532608b1 100644
--- a/src/views/modules/volunteer/activityArchive/realselect.vue
+++ b/src/views/modules/volunteer/activityArchive/realselect.vue
@@ -318,6 +318,7 @@
                 if (item.value == this.formData.type.toString()) {
                   console.log(item.projectTitle,"item.label");
                     this.formData.typeName=item.label
+                    return
                 }
               });
 
diff --git a/src/views/modules/volunteer/pointsRedemption/add.vue b/src/views/modules/volunteer/pointsRedemption/add.vue
index 5fabc40ec..078993695 100644
--- a/src/views/modules/volunteer/pointsRedemption/add.vue
+++ b/src/views/modules/volunteer/pointsRedemption/add.vue
@@ -85,6 +85,7 @@
                   </el-select>
                </el-form-item>
             </el-col>
+         
 
             <el-form-item :inline="true" required v-if="formData.classKey == 'zkq'" label="折扣" label-width="150px">
                <div class="item_width_2" style="display: flex;">
@@ -105,8 +106,17 @@
                   <el-input v-model="formData.worthAmount" placeholder="请输入内容"></el-input>
                </div>
             </el-form-item>
-
-
+            <el-col :span="12" v-if="formData.classKey == 'hwjh'">
+               <el-form-item label="展示图" required label-width="150px" >
+                  <template>
+                                <upload-image :defaultFileList="fileList" :limit="3" @change="onChangeFileList"
+                                    v-if="!showdisabled" @file-removed="removedImg"></upload-image>
+                                <div v-else>
+                                    <img v-for="(item, index) in this.formData.attrs" :key="index" :src="item.url" style="width: 100px; height: 100px;">
+                                </div>
+                            </template>
+               </el-form-item>
+            </el-col>
             <el-form-item label="规则说明" label-width="150px">
                <Tinymce style="width: 763px;" class="tinymce_view" v-model="formData.description" :height="250"
                   placeholder="请输入活动内容" />
@@ -129,12 +139,10 @@
 <script>
 import { requestPost, requestGet } from "@/js/dai/request";
 import Tinymce from '@c/tinymce2/index.vue'
+import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
 export default {
-   components: {
-      Tinymce
-   },
+   components: { Tinymce, UploadImage },
    name: "see",
-
    data() {
       return {
          checked:false,
@@ -181,8 +189,9 @@ export default {
             }
 
          ],
-         
+         fileList:[],
          formData: {
+            imgAttachments:[],
             Servicelevel:"",
             starLevel:"",
             redeemTimesEveryone:'',
@@ -248,6 +257,32 @@ export default {
       this.getOrgTreeList()
    },
    methods: {
+      //删除图片
+      removedImg() {
+              this.formData.coverPic = ''
+          },
+      //上传图片
+      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.imgAttachments=this.fileList;
+                 console.log(this.formData.imgAttachments,"this.fileList");
+                
+              } else {
+                  this.formData.coverPic = '';
+              }
+          },
+   
       //获取当前组织
       getOrgTreeList() {
          this.$http
diff --git a/src/views/modules/volunteer/pointsRedemption/index.vue b/src/views/modules/volunteer/pointsRedemption/index.vue
index 280242f7e..bd73c3dd1 100644
--- a/src/views/modules/volunteer/pointsRedemption/index.vue
+++ b/src/views/modules/volunteer/pointsRedemption/index.vue
@@ -97,7 +97,7 @@
         <add v-if="add" :list="fmData" @closeDialog="closeDialog" />
       </el-dialog>
       <el-dialog :visible.sync="updateshow" :close-on-click-modal="false" :close-on-press-escape="false" title="修改"
-        width="1000px" top="10vh" class="dialog-h" @closed="closeupdate">
+        width="1200px" top="10vh" class="dialog-h" @closed="closeupdate">
         <update v-if="updateshow" :list="fmData" @closeupdate="closeupdate" />
       </el-dialog>
       <el-dialog :visible.sync="recordshow" :close-on-click-modal="false" :close-on-press-escape="false" title="兑换记录"
diff --git a/src/views/modules/volunteer/pointsRedemption/update.vue b/src/views/modules/volunteer/pointsRedemption/update.vue
index 50d77f330..f953c3a94 100644
--- a/src/views/modules/volunteer/pointsRedemption/update.vue
+++ b/src/views/modules/volunteer/pointsRedemption/update.vue
@@ -99,7 +99,17 @@
            </div>
         </el-form-item>
 
-
+        <el-col :span="12" v-if="formData.classKey == 'hwjh'">
+               <el-form-item label="展示图" required label-width="150px" >
+                  <template>
+                                <upload-image :defaultFileList="fileList" :limit="3" @change="onChangeFileList"
+                                    v-if="!showdisabled" @file-removed="removedImg"></upload-image>
+                                <div v-else>
+                                    <img v-for="(item, index) in this.formData.attrs" :key="index" :src="item.url" style="width: 100px; height: 100px;">
+                                </div>
+                            </template>
+               </el-form-item>
+            </el-col>
         <el-form-item label="规则说明" label-width="150px">
            <Tinymce style="width: 763px;" class="tinymce_view" v-model="formData.description" :height="250"
               placeholder="请输入活动内容" />
@@ -121,11 +131,10 @@
 </template>
  <script>
  import { requestPost,requestGet } from "@/js/dai/request";
- import Tinymce from '@c/tinymce2/index.vue'
+ import Tinymce from '@c/tinymce2/index.vue';
+import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
  export default {
-    components: {
-     Tinymce
-   },
+   components: { Tinymce, UploadImage },
     name: "see",
     
      data() {
@@ -254,6 +263,7 @@
           }else{
             this.radio='2'
           }
+          this.fileList=[{fileUrl:this.formData.imgAttachments[0].url}]
 
           
 

From 7e5a45e8bf5680fbeaac513cbd8771e4f19e65cd 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: Wed, 25 Sep 2024 16:11:33 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/activityArchive/realselect.vue  | 116 +++---------------
 1 file changed, 17 insertions(+), 99 deletions(-)

diff --git a/src/views/modules/volunteer/activityArchive/realselect.vue b/src/views/modules/volunteer/activityArchive/realselect.vue
index 2532608b1..56b6106f2 100644
--- a/src/views/modules/volunteer/activityArchive/realselect.vue
+++ b/src/views/modules/volunteer/activityArchive/realselect.vue
@@ -31,11 +31,6 @@
           </el-form-item>
 
           <el-form-item label="活动时间" prop="strTime" required>
-            <!-- <el-date-picker v-model="formData.strTime" type="datetime" placeholder="开始时间" format="yyyy-MM-dd HH:mm:ss"
-                value-format="yyyy-MM-dd HH:mm:ss" style="width: 150px;">
-              </el-date-picker>至 <el-date-picker v-model="formData.endTime" type="datetime" placeholder="结束时间"
-                format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"style="width: 150px;"@change="actcontrolTime">
-              </el-date-picker> -->
             {{ formData.strTime }} <span style="margin: 0 10px">至</span>{{ formData.endTime }}
           </el-form-item>
           <el-form-item label="活动范围" prop="strTime" required>
@@ -43,7 +38,7 @@
           </el-form-item>
           <el-form-item label="活动名额" prop="points" required>
             <div style="display: flex; flex-direction: column;">
-              <el-input-number disabled="false" v-model.trim="formData.quota" label="描述文字" v-if="formData.notQuota!=0"
+              <el-input-number :disabled=disabled v-model.trim="formData.quota" label="描述文字" v-if="formData.notQuota!=0"
                 type="number"></el-input-number>
               <span v-if="formData.notQuota==0">不限名额</span>
             </div>
@@ -55,10 +50,10 @@
           <el-form-item label="活动地址" prop="address" required>
             {{ formData.address }}
           </el-form-item>
-          <el-form-item label="活动对象" prop="activityObject" required>
+          <!-- <el-form-item label="活动对象" prop="activityObject" required>
             <template slot-scope="scope">{{ scope.row.strTime }}至{{ scope.row.endTime}}
             </template>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label=" 联系人" prop="linkman" required>
             {{ formData.linkman }}
           </el-form-item>
@@ -72,12 +67,12 @@
         <el-form ref="ref_form" :inline="true" :model="formData" class="form" label-width="115px">
           <div>
             <el-form-item label="活动积分" prop="integral">
-              <el-input-number disabled="false" v-model="formData.points" :min="1" :max="10"
+              <el-input-number :disabled=disabled v-model="formData.points" :min="1" :max="10"
                 label="描述文字"></el-input-number>
             </el-form-item>
             <el-form-item label="服务时长" prop="serviceTime" required>
               <div style="display: flex; justify-items:center; align-items: center;">
-                <el-input-number disabled="false"  v-model.trim="formData.serviceTime" :min="1" label="描述文字"
+                <el-input-number :disabled=disabled  v-model.trim="formData.serviceTime" :min="1" label="描述文字"
                   type="number"></el-input-number>
               </div>
             </el-form-item>
@@ -98,7 +93,7 @@
             </el-form-item>
 
             <el-form-item v-if="formType!=='records'" label="上线" style="display: block" prop="peopleCount">
-              <el-switch disabled="false" v-model="formData.online" :active-value='1' :inactive-value='0'
+              <el-switch :disabled=disabled v-model="formData.online" :active-value='1' :inactive-value='0'
                 @change="handleSwitchChange"></el-switch>
             </el-form-item>
           </div>
@@ -145,6 +140,7 @@
   export default {
     data () {
       return {
+        disabled:false,
         loading: false,
         searchOptions: [],
         orgOptionProps: {
@@ -233,15 +229,16 @@
     },
     components: { fileList,Tinymce,UploadImage},
     async mounted () {
-      this.volunteerservicetype()
-      this.getTableData1()
-      this.getTableData()
+      await this.volunteerservicetype()
+      await this.getTableData1()
+      await  this.getOrgTreeList()
+      await  this.getTableData()
 
       // this.startLoading()
       // await this.loadInfo()
       // this.endLoading()
       console.log(this.list,"dsfslfjl");
-      this.getOrgTreeList()
+
   
     },
   
@@ -299,9 +296,11 @@
         }
         requestGet(url, params).then((res) => {
           if (res.code == 0) {
+
               this.formData=res.data;
-              this.tableDate=res.data.sponsors[0],
+              this.tableDate=res.data.sponsors?res.data.sponsors:{},
               this.searchValue=res.data.address
+              console.log(this.typeList,"this.sfaafsd");
               this.formData.activityImgs=[{url:res.data.imgs}]
               console.log(this.typeList,"this.sfaafsd");
               this.typeList.list.forEach(item => {
@@ -339,15 +338,7 @@
           // } else {
           // }
         },
-          //控制活动时间
-          actcontrolTime(){
-        console.log("dislfj");
-          if(this.formData.strTime>this.formData.endTime){
-            this.$message.error('活动结束时间不能在活动开始时间之前');
-            this.formData.endTime=''
-            return
-          }
-      },
+
       //控制签到时间
       controlTime(){
         console.log("dislfj");
@@ -358,80 +349,7 @@
           }
       },
          //提交
-        async  handleComfirm() {
-          console.log(this.tableDate);
-        this.formData.sponsors.push(this.tableDate);
-        console.log(this.formData,"this,formD");
-        if (this.formData.address == '') {
-          this.$message.error('请输入活动地点');
-          return;
-        }
-        if (this.formData.agencyId == '') {
-          this.$message.error('请选择主办方');
-          return;
-        }
-        if (this.formData.title == '') {
-          this.$message.error('请输入活动标题');
-          return;
-        }
-        if (this.formData.content == '') {
-          this.$message.error('请输入活动详情');
-          return;
-        }
-        // if (this.formData.imgs == '') {
-        //   this.$message.error('请上传图片');
-        //   return;
-        // }
-        if (this.formData.strTime  == '') {
-          this.$message.error('请填写活动开始时间');
-          return;
-        }
-        if (this.formData.endTime  == '') {
-          this.$message.error('请填写活动结束时间');
-          return;
-        }
-        if (this.formData.type=='') {
-          this.$message.error('请填写活动和类型');
-          return;
-        }
-        if (this.formData.linkman=='') {
-          this.$message.error('请填写联系人');
-          return;
-        }
-        if (this.formData.linkMobile=='') {
-          this.$message.error('请填写联系电话');
-          return;
-        }
-        if (this.formData.signInTime=='') {
-          this.$message.error('请填写签到开始时间');
-          return;
-        }
-        if (this.formData.signOutTime=='') {
-          this.$message.error('请填写签到结束时间');
-          return;
-        }
-        if (this.formData.deadline=='') {
-          this.$message.error('请填写报名截止时间');
-          return;
-        }
-        let url="/voluntary/activityInfo/updateInfo";
-        let parms={
-          ...this.formData
-        }
-        console.log(parms,"parms");
-        
-        await requestPost(url,parms).then((res)=>{
-          console.log(res,"res");
-          if (res.code==0) {
-            this.$message.success('添加成功');
-            this.$emit('updateClose')
-            // this.$router.push({path:'/volunteer/activityArchive'})
-          }else{
-            this.$message.error(res.msg);
-          }
-          
-        })
-      },
+
       addDomain() {
         console.log(this.formData.sponsors,this.tableDate,);
           this.formData.sponsors.push(this.tableDate);

From 4fae9de31d5c283c5ab2780e3b7dbabc0172c723 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: Thu, 26 Sep 2024 11:00:05 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A6=81=E7=94=A8=E7=BB=84=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=89=93=E5=8D=A1=E7=A7=AF=E5=88=86=E6=89=93=E5=8D=A1=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/volunteer/activityArchive/Points.vue    | 8 +++++---
 .../modules/volunteer/activityArchive/realselect.vue      | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/volunteer/activityArchive/Points.vue b/src/views/modules/volunteer/activityArchive/Points.vue
index b722b6d3f..e5cb50cb2 100644
--- a/src/views/modules/volunteer/activityArchive/Points.vue
+++ b/src/views/modules/volunteer/activityArchive/Points.vue
@@ -30,13 +30,15 @@
         </el-table-column>
         <el-table-column prop="mobile" header-align="center" align="center" label="手机号">
         </el-table-column>
-        . <el-table-column prop="idCard" header-align="center" align="center" label="证件号">
+        <el-table-column prop="idCard" header-align="center" align="center" label="证件号">
         </el-table-column>
-        . <el-table-column prop="applyTime" header-align="center" align="center" label="打卡时间">
+        <el-table-column prop="applyTime" header-align="center" align="center" label="打卡时间">
         </el-table-column>
         <!-- <el-table-column prop="ActivityCount" header-align="center" align="center" label="打卡次数">
         </el-table-column> -->
-        . <el-table-column prop="address" header-align="center" align="center" label="打开地点">
+        <el-table-column prop="address" header-align="center" align="center" label="打卡地点">
+        </el-table-column>
+        <el-table-column prop="content" header-align="center" align="center" label="打卡信息">
         </el-table-column>
         <el-table-column prop="whether" header-align="center" align="center" label="是否发放积分">
         </el-table-column>
diff --git a/src/views/modules/volunteer/activityArchive/realselect.vue b/src/views/modules/volunteer/activityArchive/realselect.vue
index 56b6106f2..c76937208 100644
--- a/src/views/modules/volunteer/activityArchive/realselect.vue
+++ b/src/views/modules/volunteer/activityArchive/realselect.vue
@@ -38,7 +38,7 @@
           </el-form-item>
           <el-form-item label="活动名额" prop="points" required>
             <div style="display: flex; flex-direction: column;">
-              <el-input-number :disabled=disabled v-model.trim="formData.quota" label="描述文字" v-if="formData.notQuota!=0"
+              <el-input-number  disabled=fasle v-model.trim="formData.quota" label="描述文字" v-if="formData.notQuota!=0"
                 type="number"></el-input-number>
               <span v-if="formData.notQuota==0">不限名额</span>
             </div>
@@ -67,12 +67,12 @@
         <el-form ref="ref_form" :inline="true" :model="formData" class="form" label-width="115px">
           <div>
             <el-form-item label="活动积分" prop="integral">
-              <el-input-number :disabled=disabled v-model="formData.points" :min="1" :max="10"
+              <el-input-number  disabled=fasle v-model="formData.points" :min="1" :max="10"
                 label="描述文字"></el-input-number>
             </el-form-item>
             <el-form-item label="服务时长" prop="serviceTime" required>
               <div style="display: flex; justify-items:center; align-items: center;">
-                <el-input-number :disabled=disabled  v-model.trim="formData.serviceTime" :min="1" label="描述文字"
+                <el-input-number  disabled=fasle  v-model.trim="formData.serviceTime" :min="1" label="描述文字"
                   type="number"></el-input-number>
               </div>
             </el-form-item>
@@ -93,7 +93,7 @@
             </el-form-item>
 
             <el-form-item v-if="formType!=='records'" label="上线" style="display: block" prop="peopleCount">
-              <el-switch :disabled=disabled v-model="formData.online" :active-value='1' :inactive-value='0'
+              <el-switch disabled=fasle v-model="formData.online" :active-value='1' :inactive-value='0'
                 @change="handleSwitchChange"></el-switch>
             </el-form-item>
           </div>

From fef638b4c0ff6b6259d6903b32a4948b3c48fd16 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: Thu, 26 Sep 2024 13:54:26 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=87=BA=E9=94=99=EF=BC=8C=E5=A4=9A=E9=80=89=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=8D=95=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/volunteer/VolunteerProjects/add.vue  | 16 ++--------------
 .../modules/volunteer/VolunteerProjects/edit.vue |  6 +-----
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/volunteer/VolunteerProjects/add.vue b/src/views/modules/volunteer/VolunteerProjects/add.vue
index 73873cb40..bf4662e1b 100644
--- a/src/views/modules/volunteer/VolunteerProjects/add.vue
+++ b/src/views/modules/volunteer/VolunteerProjects/add.vue
@@ -49,7 +49,7 @@
           </el-col>
                  <el-col :span="12">
              <el-form-item label="服务类型" label-width="150px" prop="serviceClasses">
-                <el-select  multiple-limit=4 class="u-item-width-normal" v-model.trim="formData.serviceClasses" placeholder="请选择" clearable multiple>
+                <el-select  multiple-limit=1 class="u-item-width-normal" v-model.trim="formData.serviceClasses" placeholder="请选择" clearable multiple>
                    <el-option v-for="item in ServicetypeListName" :key="item.value" :label="item.label" :value="item.value" >
                    </el-option>
                 </el-select>
@@ -597,20 +597,11 @@
               return;
            }
  
-           if (!this.formData.Organizationaltype) {
-              this.$message.error('请输入组织类型');
-              return;
-           }
- 
+
            if (!this.formData.serviceTimeFrom&&!this.formData.serviceTimeTo) {
               this.$message.error('请选择服务期限');
               return;
            }
- 
-           if (!this.formData.OrganizationName) {
-              this.$message.error('请填写发布单位');
-              return;
-           }
            console.log(this.formData,"this.formData");
            this.addActivity()
         },
@@ -624,11 +615,8 @@
                         type: 'success',
                         message: '操作成功'
                     })
-                    this.resetData()
                     this.$emit('showAddClose')
-                    this.btnDisable = false
                 } else {
-                    this.btnDisable = false
                     this.$message.error(msg)
                 }
             
diff --git a/src/views/modules/volunteer/VolunteerProjects/edit.vue b/src/views/modules/volunteer/VolunteerProjects/edit.vue
index 0d1cd2a9b..c15e49e29 100644
--- a/src/views/modules/volunteer/VolunteerProjects/edit.vue
+++ b/src/views/modules/volunteer/VolunteerProjects/edit.vue
@@ -40,7 +40,7 @@
              </el-form-item>
             </el-col>
             <el-col :span="12">
-             <el-form-item label="项目展示图" label-width="150px" prop="fileList">
+             <el-form-item label="项目展示图" label-width="150px" prop="activityImgs">
                          <template>
                              <upload-image  :defaultFileList="fileList1" :limit="1" @change="onChangeFileList"
                                  @file-removed="removedImg"></upload-image>
@@ -509,11 +509,8 @@
                         type: 'success',
                         message: '操作成功'
                     })
-                    this.resetData()
                     this.$emit('showEditClose')
-                    this.btnDisable = false
                 } else {
-                    this.btnDisable = false
                     this.$message.error(msg)
                 }
             
@@ -635,7 +632,6 @@
     computed: {
         dataRule() {
             return {
- 
                 projectTitle: [
                     { required: true, message: '名称不能为空', trigger: 'blur' }
                 ],

From 80f38fba0e237077cef0ec72f8660388b605f085 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: Thu, 26 Sep 2024 18:36:42 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/volunteer/SiteManagement/add.vue  |  19 +-
 .../volunteer/SiteManagement/index.vue        |  18 +-
 .../modules/volunteer/SiteManagement/info.vue | 482 ++++++++++++++++++
 .../volunteer/Venuemanagement/index.vue       |   4 +-
 .../volunteer/Venuemanagement/info.vue        | 482 ++++++++++++++++++
 .../volunteer/VoluntaryOrganization/info.vue  |   4 +-
 .../volunteer/VolunteerProjects/add.vue       |   6 +-
 .../volunteer/VolunteerProjects/edit.vue      |   4 +-
 .../volunteer/activityArchive/index.vue       |   3 +-
 9 files changed, 994 insertions(+), 28 deletions(-)
 create mode 100644 src/views/modules/volunteer/SiteManagement/info.vue
 create mode 100644 src/views/modules/volunteer/Venuemanagement/info.vue

diff --git a/src/views/modules/volunteer/SiteManagement/add.vue b/src/views/modules/volunteer/SiteManagement/add.vue
index 3ee330903..b8ac7b3af 100644
--- a/src/views/modules/volunteer/SiteManagement/add.vue
+++ b/src/views/modules/volunteer/SiteManagement/add.vue
@@ -5,16 +5,16 @@
 
             <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="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"
+                            <el-option  :disabled="showdisabled" class="u-item-width-normal" v-for="item in optionstype" :key="item.value" :label="item.label"
                                 :value="item.value">
                             </el-option>
                         </el-select>
@@ -114,6 +114,12 @@
    export default {
       data() {
           return {
+            optionstype: [
+                      { value: 0, label: "实践站" },
+                      { value: 1, label: "实践点" },
+                      { value: 2, label: "其它" },
+
+                  ],
               formData:
               {
                 agencyName:"",
@@ -125,12 +131,7 @@
                   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,//纬度
diff --git a/src/views/modules/volunteer/SiteManagement/index.vue b/src/views/modules/volunteer/SiteManagement/index.vue
index 63a71a9da..c6ad54661 100644
--- a/src/views/modules/volunteer/SiteManagement/index.vue
+++ b/src/views/modules/volunteer/SiteManagement/index.vue
@@ -87,15 +87,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="查看"
+            <el-dialog x :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" />
+                <info v-if="showInfo" :VolunteerList="fmData"  ref="ref_form" @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>
-     
+         
         </div>
     </div>
 </template>
@@ -105,7 +101,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"
@@ -115,7 +111,7 @@ import add from "./add.vue"
 import axios from "axios";
 
 export default {
-    components: { add},
+    components: { add,info},
 
     data() {
         return {
@@ -223,9 +219,7 @@ 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.id);
diff --git a/src/views/modules/volunteer/SiteManagement/info.vue b/src/views/modules/volunteer/SiteManagement/info.vue
new file mode 100644
index 000000000..016fb19a1
--- /dev/null
+++ b/src/views/modules/volunteer/SiteManagement/info.vue
@@ -0,0 +1,482 @@
+<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">
+                            </el-option>
+                        </el-select> -->
+                        </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="linkman" label-width="100px">
+                            <div>{{ formData.linkman }}</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="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="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/position/edit/${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}]
+                  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/Venuemanagement/index.vue b/src/views/modules/volunteer/Venuemanagement/index.vue
index 72647a958..87976e228 100644
--- a/src/views/modules/volunteer/Venuemanagement/index.vue
+++ b/src/views/modules/volunteer/Venuemanagement/index.vue
@@ -91,7 +91,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"
@@ -101,7 +101,7 @@ import add from "./add.vue"
 import axios from "axios";
 
 export default {
-    components: { add},
+    components: { add,info},
 
     data() {
         return {
diff --git a/src/views/modules/volunteer/Venuemanagement/info.vue b/src/views/modules/volunteer/Venuemanagement/info.vue
new file mode 100644
index 000000000..016fb19a1
--- /dev/null
+++ b/src/views/modules/volunteer/Venuemanagement/info.vue
@@ -0,0 +1,482 @@
+<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">
+                            </el-option>
+                        </el-select> -->
+                        </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="linkman" label-width="100px">
+                            <div>{{ formData.linkman }}</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="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="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/position/edit/${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}]
+                  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/VoluntaryOrganization/info.vue b/src/views/modules/volunteer/VoluntaryOrganization/info.vue
index 2cbccbc19..54d6b3127 100644
--- a/src/views/modules/volunteer/VoluntaryOrganization/info.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/info.vue
@@ -70,8 +70,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="组织封面图" label-width="150px" prop="fileList">
-                            <template>
+                        <el-form-item label="组织封面图" label-width="150px" prop="fileList" >
+                            <template v-if="formData.orgImage">
                                 <!-- <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"  :file-list="formData.fileList"
                                  @file-removed="removedImg"></upload-image> -->
                                 <div class="demo-image__preview">
diff --git a/src/views/modules/volunteer/VolunteerProjects/add.vue b/src/views/modules/volunteer/VolunteerProjects/add.vue
index bf4662e1b..acbf8068d 100644
--- a/src/views/modules/volunteer/VolunteerProjects/add.vue
+++ b/src/views/modules/volunteer/VolunteerProjects/add.vue
@@ -49,7 +49,7 @@
           </el-col>
                  <el-col :span="12">
              <el-form-item label="服务类型" label-width="150px" prop="serviceClasses">
-                <el-select  multiple-limit=1 class="u-item-width-normal" v-model.trim="formData.serviceClasses" placeholder="请选择" clearable multiple>
+                <el-select  multiple-limit=1 class="u-item-width-normal"  placeholder="请选择" clearable @click="getServiceTypeList" v-model="formData.serviceClasses" >
                    <el-option v-for="item in ServicetypeListName" :key="item.value" :label="item.label" :value="item.value" >
                    </el-option>
                 </el-select>
@@ -186,6 +186,10 @@
     },
  
     methods: {
+        // 获取志愿组织服务类型
+        getServiceTypeList(){
+
+        },
         //控制活动时间
         actcontrolTime() {
             console.log("dislfj");
diff --git a/src/views/modules/volunteer/VolunteerProjects/edit.vue b/src/views/modules/volunteer/VolunteerProjects/edit.vue
index c15e49e29..5e22ae64b 100644
--- a/src/views/modules/volunteer/VolunteerProjects/edit.vue
+++ b/src/views/modules/volunteer/VolunteerProjects/edit.vue
@@ -49,11 +49,13 @@
           </el-col>
                  <el-col :span="12">
              <el-form-item label="服务类型" label-width="150px" prop="serviceClasses">
-                <el-select  multiple-limit=4 class="u-item-width-normal" v-model.trim="formData.serviceClasses" placeholder="请选择" clearable multiple>
+                <el-form-item label="服务类型" label-width="150px" prop="serviceClasses">
+                <el-select  multiple-limit=1 class="u-item-width-normal" v-model.trim="formData.serviceClasses" placeholder="请选择" clearable multiple>
                    <el-option v-for="item in ServicetypeListName" :key="item.value" :label="item.label" :value="item.value" >
                    </el-option>
                 </el-select>
              </el-form-item>
+             </el-form-item>
           </el-col>
           <el-col :span="12">
                <el-form-item label="招募截止时间" label-width="150px" prop="recruitDeadline">
diff --git a/src/views/modules/volunteer/activityArchive/index.vue b/src/views/modules/volunteer/activityArchive/index.vue
index 071198406..2aaa0fc12 100644
--- a/src/views/modules/volunteer/activityArchive/index.vue
+++ b/src/views/modules/volunteer/activityArchive/index.vue
@@ -4,7 +4,7 @@
       <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
         <div>
           <el-form-item label="活动标题">
-            <el-input v-model.trim="formData.content" class="item_width_1" clearable placeholder="请输入">
+            <el-input v-model.trim="formData.title" class="item_width_1" clearable placeholder="请输入">
             </el-input>
           </el-form-item>
           <el-form-item label="活动时间">
@@ -269,6 +269,7 @@
           statusType:this.formData.statusType,
           endTime:this.formData.endTime,
           online:this.formData.online,
+          title:this.formData.title,
           // district: this.$store.state.user.agencyId,
       }
       requestPost(url, params).then((res) => {

From 02b71659bb62a477a3745837b411e80ce8036d76 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 09:29:15 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0info?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/SiteManagement/index.vue        | 168 ++++++++----------
 .../volunteer/Venuemanagement/index.vue       |   8 +-
 .../volunteer/Venuemanagement/info.vue        |  20 +--
 3 files changed, 94 insertions(+), 102 deletions(-)

diff --git a/src/views/modules/volunteer/SiteManagement/index.vue b/src/views/modules/volunteer/SiteManagement/index.vue
index c6ad54661..5c182aae3 100644
--- a/src/views/modules/volunteer/SiteManagement/index.vue
+++ b/src/views/modules/volunteer/SiteManagement/index.vue
@@ -1,99 +1,87 @@
 <template>
-    <div class="g-main">
-        <div class="m-search">
-            <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
-                <div>
-                    <el-form-item label="名称">
-                        <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-select v-model="formData.type" 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>
+  <div class="g-main">
+    <div class="m-search">
+      <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
+        <div>
+          <el-form-item label="名称">
+            <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-select v-model="formData.type" 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>
 
-                </div>
-                <div class="block">
-                    <div style="display: flex; justify-content: flex-end;">
-                        <el-button style="margin-left:10px" class="diy-button--blue" size="small"
-                            @click="handleSearch">查询</el-button>
-                        <el-button style="margin-left:10px" class="diy-button--white" size="small"
-                            @click="resetSearch">重置</el-button>
-                    </div>
-                </div>
-            </el-form>
         </div>
-        <div class="m-table">
-            <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
-            <el-button style="" class="diy-button--add" size="small" @click="handleExportModule()">下载模板</el-button>
-            <el-button class="diy-button--white" size="small">
-                <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr"
-                    :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false"
-                    :auto-upload="true" :on-progress="handleProgress" :on-success="handleExcelSuccess"
-                    :before-upload="beforeExcelUpload" :http-request="uploadHttpRequest">
-                    导入
-                </el-upload>
-            </el-button>
-            <el-table class="table" :data="tableData" border  style="width: 100%">
-                <el-table-column label="序号" header-align="center" align="center" type="index"
-                    width="80"></el-table-column>
-                <el-table-column prop="agencyName" header-align="center" align="center" label="所属组织"
-                    :show-overflow-tooltip="true">
-                </el-table-column>
-                <el-table-column prop="type" header-align="center" align="center" label="类型"
-                    :show-overflow-tooltip="true">
-                    <template slot-scope="scope">
-        <span>{{ scope.row.type === 0 ? '实践站' : scope.row.type === 1 ? '实践点' : '其他' }}</span>
-      </template>
-                </el-table-column>
-                <el-table-column prop="name" header-align="center" align="center" label="名称"
-                    :show-overflow-tooltip="true">
-                </el-table-column>
-                <el-table-column prop="address" header-align="center" align="center" label="地址"
-                    :show-overflow-tooltip="true">
-                </el-table-column>
-                <el-table-column prop="linkman" header-align="center" align="center" label="联系人"
-                    :show-overflow-tooltip="true">
-                </el-table-column>
-                <el-table-column prop="linkPhone" header-align="center" align="center" label="联系电话"
-                    :show-overflow-tooltip="true">
-                </el-table-column>
-                <!-- <el-table-column prop="operator" header-align="center" align="center" label="办公时间"
+        <div class="block">
+          <div style="display: flex; justify-content: flex-end;">
+            <el-button style="margin-left:10px" class="diy-button--blue" size="small"
+              @click="handleSearch">查询</el-button>
+            <el-button style="margin-left:10px" class="diy-button--white" size="small"
+              @click="resetSearch">重置</el-button>
+          </div>
+        </div>
+      </el-form>
+    </div>
+    <div class="m-table">
+      <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
+      <el-button style="" class="diy-button--add" size="small" @click="handleExportModule()">下载模板</el-button>
+      <el-button class="diy-button--white" size="small">
+        <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr" :limit="1"
+          :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false" :auto-upload="true"
+          :on-progress="handleProgress" :on-success="handleExcelSuccess" :before-upload="beforeExcelUpload"
+          :http-request="uploadHttpRequest">
+          导入
+        </el-upload>
+      </el-button>
+      <el-table class="table" :data="tableData" border style="width: 100%">
+        <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
+        <el-table-column prop="agencyName" header-align="center" align="center" label="所属组织"
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column prop="type" header-align="center" align="center" label="类型" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ scope.row.type === 0 ? '实践站' : scope.row.type === 1 ? '实践点' : '其他' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" header-align="center" align="center" label="名称" :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column prop="address" header-align="center" align="center" label="地址" :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column prop="linkman" header-align="center" align="center" label="联系人" :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column prop="linkPhone" header-align="center" align="center" label="联系电话"
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <!-- <el-table-column prop="operator" 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">
-                    <template slot-scope="scope">
-                        <el-button type="text" style="color:#1C6AFD;" size="small"
-                            @click="handleDetail(scope.row)">查看</el-button>
-                        <el-button type="text" style="color:#1C6AFD;" size="small"
-                            @click="handleEdit(scope.row)">修改</el-button>
-                        <el-button type="text" style="color:#1C6AFD;" size="small"
-                            @click="handleDel(scope.row)">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <div>
-                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                    :current-page.sync="pageNo" :page-sizes="[10, 20, 50]" :page-size="pageSize"
-                    layout="sizes, prev, pager, next, total" :total="total">
-                </el-pagination>
-            </div>
-            <el-dialog :visible.sync="showAdd" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
-                width="850px" top="10vh" class="dialog-h" @closed="showAddClose">
-                <add   ref="ref_form" v-if="showAdd" @showAddClose="showAddClose" />
-            </el-dialog>
-            <el-dialog x :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"  ref="ref_form" @showInfoClose="showInfoClose" />
-            </el-dialog>
-         
-        </div>
+        <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
+          <template slot-scope="scope">
+            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleEdit(scope.row)">修改</el-button>
+            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDel(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
+          :page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
+        </el-pagination>
+      </div>
+      <el-dialog :visible.sync="showAdd" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
+        width="850px" top="10vh" class="dialog-h" @closed="showAddClose">
+        <add ref="ref_form" v-if="showAdd" @showAddClose="showAddClose" />
+      </el-dialog>
+      <el-dialog x :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" ref="ref_form" @showInfoClose="showInfoClose" />
+      </el-dialog>
+
     </div>
+  </div>
 </template>
 
 <script>
diff --git a/src/views/modules/volunteer/Venuemanagement/index.vue b/src/views/modules/volunteer/Venuemanagement/index.vue
index 87976e228..6c4145ff2 100644
--- a/src/views/modules/volunteer/Venuemanagement/index.vue
+++ b/src/views/modules/volunteer/Venuemanagement/index.vue
@@ -80,6 +80,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="formTitle"
+                width="850px" top="10vh" class="dialog-h" @closed="showAddClose">
+                <info   ref="ref_form" v-if="showInfo" @showAddClose="showAddClose" />
+            </el-dialog>
+
 
      
         </div>
@@ -105,6 +110,7 @@ export default {
 
     data() {
         return {
+          showInfo:false,
             formTitle:"",
             formData: {
                 agencyId:"",
@@ -198,7 +204,7 @@ 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.id);
diff --git a/src/views/modules/volunteer/Venuemanagement/info.vue b/src/views/modules/volunteer/Venuemanagement/info.vue
index 016fb19a1..a096dfe22 100644
--- a/src/views/modules/volunteer/Venuemanagement/info.vue
+++ b/src/views/modules/volunteer/Venuemanagement/info.vue
@@ -10,36 +10,34 @@
                                 :disabled="true" class="u-item-width-normal"></el-input>
                         </el-form-item>
                      -->
-                        <el-form-item label="类型" prop="type" label-width="100px">
+                        <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">
+                                :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="linkman" label-width="100px">
-                            <div>{{ formData.linkman }}</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="workTime" label-width="100px">
+                        <!-- <el-form-item label="办公时间" prop="workTime" label-width="100px">
                             <div>{{ formData.workTime }}</div>
-                        </el-form-item>
+                        </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">
+                        <!-- <el-form-item label="阵地简介" prop="content" label-width="100px" style="display: block">
                             <div>{{ formData.content }}</div>
-                        </el-form-item>
+                        </el-form-item> -->
                         <el-form-item label="位置" prop="address" label-width="100px" style="display: block">
                             <div style="width: 300px">
                                 <div>{{ formData.address }}</div>
@@ -132,7 +130,7 @@
       //获取详情
       getTableDetail(id) {
           console.log(id,"dskljfksdljf");
-          let url = `/voluntary/position/edit/${id}`;
+          let url = `/voluntary/positionVenues/edit/${id}`;
           console.log(url,"url");
             requestGet(url).then((res) => {
               console.log(res);

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 10/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=EF=BC=8C=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: "其它" },
 
             ]
           },

From 73fa55f178e2dabf73f43155452c41568db6290b 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:48:47 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/Venuemanagement/info.vue        | 102 +++++++++++++-----
 1 file changed, 75 insertions(+), 27 deletions(-)

diff --git a/src/views/modules/volunteer/Venuemanagement/info.vue b/src/views/modules/volunteer/Venuemanagement/info.vue
index a096dfe22..4f3b87d02 100644
--- a/src/views/modules/volunteer/Venuemanagement/info.vue
+++ b/src/views/modules/volunteer/Venuemanagement/info.vue
@@ -2,49 +2,71 @@
     <div>
 
         <div class="dialog-h-content scroll-h">
-
             <el-form ref="ref_form" :model="formData" :rules="dataRule" class="form">
-                    <!-- <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-form-item label="挂靠阵地" prop="type" label-width="100px">
-                            <!-- <el-select  :disabled="showdisabled" v-model="formData.type" placeholder="请选择" clearable class="u-item-width-normal">
+                <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="请输入名称"
+                    <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="workTime" label-width="100px">
+                    <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="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">
+                <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="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>
+                <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>
+            <h3>预约记录</h3>
+            <div class="m-table">
+                <el-table class="table" :data="tableData1" border style="width: 100%" label-position="left"  height="250">
+                    <el-table-column label="序号" header-align="center" align="center" type="index"
+                        width="80"></el-table-column>
+                    <el-table-column prop="time" header-align="center" align="center" label="日期"
+                        :show-overflow-tooltip="true">
+                    </el-table-column>
+                    <el-table-column prop="name" header-align="center" align="center" label="预约人"
+                        :show-overflow-tooltip="true">
+                    </el-table-column>
+                    <el-table-column prop="available" header-align="center" align="center" label="预约时间"
+                        :show-overflow-tooltip="true">
+                    </el-table-column>
+                    <el-table-column prop="status" header-align="center" align="center" label="状态"
+                        :show-overflow-tooltip="true">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.status === 1 ? '已取消' : '已预约' }}</span>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
         </div>
         <!-- <div class="div_btn">
             <el-button size="small" @click="handleCancle">取 消</el-button>
@@ -97,6 +119,7 @@
                   longitude: this.$store.state.user.longitude, //经度
                   latitude: this.$store.state.user.latitude,//纬度
                   },
+                  tableData1:[],
                   showdisabled:false,
               uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
               customerId: localStorage.getItem('customerId'),
@@ -125,6 +148,7 @@
         //父组件传的
         async initForm(type, unitId) {
             this.getTableDetail(unitId)
+            this.gethistory(unitId)
        
       },
       //获取详情
@@ -147,6 +171,30 @@
            
           
       },
+          //获取预约记录
+          gethistory(id) {
+              console.log(id, "dskljfksdljf");
+              let url = `/voluntary/positionVenues/history`;
+              let params = {
+                positionId:"",
+                pageNo:"",
+                pageSize:"",
+                venueId:id,
+              }
+              requestGet(url,params).then((res) => {
+                  console.log(res);
+                  if (res.code == 0) {
+                      this.tableData1 = res.data
+              
+
+                  } else {
+                      this.$message.error(res.msg)
+                  }
+
+              })
+
+
+          },
         //添加标签
         addDomain() {
           if (this.formData.sponsors.length < 4) {