diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue
index 6ab550f5e..8b3c4385b 100644
--- a/src/views/modules/communityParty/activity/index.vue
+++ b/src/views/modules/communityParty/activity/index.vue
@@ -23,11 +23,10 @@
               placeholder="请输入关键字">
             </el-input>
           </el-form-item>
-          
+
           <el-form-item label="活动时间" prop="timeRange">
-            <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至" start-placeholder="开始时间"
-              end-placeholder="结束时间">
+            <el-date-picker v-model="value1" type="datetimerange" range-separator="至" start-placeholder="开始日期"
+              end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="活动地点" prop="address">
@@ -102,8 +101,7 @@
         <el-table-column label="操作" fixed="right" width="230" 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="handleDetail(scope.row)">查看</el-button>
 
             <el-button type="text" v-if="scope.row.status == 0||scope.row.status == 1" style="color:#1C6AFD;"
               size="small" @click="handleEdit(scope.row)">编辑</el-button>
@@ -111,15 +109,13 @@
             <!-- <el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs === '' && scope.row.sumUp === ''" style="color:#1C6AFD;"
               size="small" @click="handleSumm(scope.row)">活动总结</el-button> -->
 
-              <el-button type="text" v-if="scope.row.status == 2 && !scope.row.activityImgs" style="color:#1C6AFD;"
+            <el-button type="text" v-if="scope.row.status == 2 && !scope.row.activityImgs" style="color:#1C6AFD;"
               size="small" @click="handleSumm(scope.row)">活动总结</el-button>
 
-            <el-button  type="text"
-              style="color:rgb(28, 106, 253);" size="small"
+            <el-button type="text" style="color:rgb(28, 106, 253);" size="small"
               @click="handleDelete(scope.row)">删除</el-button>
 
-            <el-button v-if="scope.row.status == 0" type="text"
-              style="color:#D51010;" size="small"
+            <el-button v-if="scope.row.status == 0" type="text" style="color:#D51010;" size="small"
               @click="handleCancel(scope.row)">取消</el-button>
 
           </template>
@@ -133,26 +129,26 @@
     </div>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow" v-if="formShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
-      width="950px" top="5vh" class="dialog-h" @closed="diaClose">
+    <el-dialog :visible.sync="formShow" v-if="formShow" :close-on-click-modal="false" :close-on-press-escape="false"
+      :title="formTitle" width="950px" top="5vh" class="dialog-h" @closed="diaClose">
       <activity-records ref="ref_form" :unitList="corganizerList" :gridList="gridList" @dialogCancle="addFormCancle"
         @dialogOk="addFormOk"></activity-records>
     </el-dialog>
 
-    <el-dialog :visible.sync="initShow" v-if="initShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
-      width="950px" top="5vh" class="dialog-h" @closed="diaInitClose">
+    <el-dialog :visible.sync="initShow" v-if="initShow" :close-on-click-modal="false" :close-on-press-escape="false"
+      :title="formTitle" width="950px" top="5vh" class="dialog-h" @closed="diaInitClose">
       <initiate-activity ref="ref_form" :unitList="corganizerList" :gridList="gridList"
         @dialogCancle="addFormCancleInit" @dialogOk="addFormOkInit"></initiate-activity>
     </el-dialog>
 
 
-    <el-dialog :visible.sync="detailShow" v-if="detailShow"  formShow :close-on-click-modal="false" :close-on-press-escape="false" :title="'活动详情'"
-      width="950px" top="5vh" class="dialog-h" @closed="detailClosed">
+    <el-dialog :visible.sync="detailShow" v-if="detailShow" formShow :close-on-click-modal="false"
+      :close-on-press-escape="false" :title="'活动详情'" width="950px" top="5vh" class="dialog-h" @closed="detailClosed">
       <event-details ref="ref_detail" :gridList="gridList" @diaDetailClose="detailClosed"></event-details>
     </el-dialog>
 
-    <el-dialog :visible.sync="summShow" v-if="summShow"  :close-on-click-modal="false" :close-on-press-escape="false" :title="'活动详情'"
-      width="950px" top="5vh" class="dialog-h" @closed="summDetailClose">
+    <el-dialog :visible.sync="summShow" v-if="summShow" :close-on-click-modal="false" :close-on-press-escape="false"
+      :title="'活动详情'" width="950px" top="5vh" class="dialog-h" @closed="summDetailClose">
       <summ-details ref="ref_detail" :gridList="gridList" @summDetailClose="summDetailClose"></summ-details>
     </el-dialog>
 
diff --git a/src/views/modules/volunteer/VolManage/integral.vue b/src/views/modules/volunteer/VolManage/integral.vue
index d1231a7a8..9cf856283 100644
--- a/src/views/modules/volunteer/VolManage/integral.vue
+++ b/src/views/modules/volunteer/VolManage/integral.vue
@@ -1,58 +1,41 @@
 <template>
-    <div class="g-main"  style="margin: 30px;">
-        <div class="f-flex"  >
-                    <div class="f-flex" style="align-items: center;">
-                    <div>活动查询：</div>
-                    <el-input  placeholder="请输入内容" v-model="input"  style="width: 200px"  clearable>
-                    </el-input>
-                    </div>
-                   <div class="f-flex" style="align-items: center;">
-                    <div>状态：</div>
-                    <el-input placeholder="请输入内容" v-model="input" style="width: 200px" clearable>
-                    </el-input>
-                   </div>
-                   <div>
-                    <el-button type="primary">查询</el-button>
-                   </div>
-        </div>
-        <div >
-      <el-table :data="tableData" border style="width: 700px" >
-        <el-table-column label="序号" width="80" header-align="center" align="center" type="index" ></el-table-column>
-        <el-table-column prop="Community" 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="ActivityCount" 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="ActivityCount" header-align="center" align="center" label="状态" >
-        </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="handleDelete(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="Record" :close-on-click-modal="false" :close-on-press-escape="false" title="活动记录"
-      width="750px" top="10vh" class="dialog-h" @closed="diaClose">
-        <Record :list="fmData"/>
-    </el-dialog>
-    <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
-      width="750px" top="10vh" class="dialog-h" @closed="diaClose">
-        <see :list="fmData"/>
-    </el-dialog>
+  <div class="g-main"  style="padding: 30px;">
+    <el-form :label-position="labelPosition" :model="tableData" :rules="rules" >
+      <el-form-item label="姓名" prop="name">
+        {{ tableData.name }}
+      </el-form-item>
+      <el-form-item label="积分" prop="name">
+        {{ tableData.nickname }}
+      </el-form-item>
+      <el-form-item label="积分行为" width="200px"  required prop="behaviorName">
+        <el-select v-model="behaviorName" placeholder="请选择">
+          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="调整原因"  hide-required-asterisk="true" required prop="textarea">
+        <el-input type="textarea" placeholder="不超过500子" v-model="textarea" maxlength="500" show-word-limit>
+        </el-input>
+
+      </el-form-item>
+      <el-form-item label="操作类型"  hide-required-asterisk="false" required prop="radio">
+        <el-radio-group v-model="radio">
+          <el-radio :label="3">加积分</el-radio>
+          <el-radio :label="6">减积分</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="积分调整" required  prop="integralnum">
+        <el-input-number v-model="integralnum" @change="handleadjustment" :min="1" :max="10"
+          label="描述文字"></el-input-number>
+      </el-form-item>
+    </el-form>
+    <div style="display: flex ; align-items: center;justify-items: center;">
+      <el-button type="info" @click="handleremove" round>取消</el-button>
+      <el-button type="danger" round>确定</el-button>
     </div>
+    <div>
     </div>
+  </div>
 </template>
 <script>
 
@@ -61,8 +44,44 @@ export default {
    name: "see",
     data() {
     return {
+      rules:{
+        behaviorName: [
+            { required: true, message: '请选择积分行为', trigger: 'change' }
+          ],
+          textarea: [
+            { required: true, message: '请填写调整原因', trigger: 'change' }
+          ],
+          radio: [
+            { required: true, message: '请选择操作类型', trigger: 'change' }
+          ],
+          integralnum: [
+            { required: true, message: '请对积分进行调整', trigger: 'change' }
+          ],
+          
+          
+    },
         labelPosition: 'right',
         tableData: [],
+        integralnum: 1,
+        radio:3,
+        textarea: '',
+        options: [{
+          value: '选项1',
+          label: '未打卡'
+        }, {
+          value: '选项2',
+          label: '未参加活动'
+        }, {
+          value: '选项3',
+          label: '早退'
+        }, {
+          value: '选项4',
+          label: '活动积分'
+        }, {
+          value: '选项5',
+          label: '其他'
+        }],
+        behaviorName: ''
     };
   },
   props:{
@@ -71,11 +90,19 @@ export default {
       default: () => {}
     }
   },
-  methods: {},
   created() {
     console.log(this.list,"list");
     this.tableData=this.list
   },
+  methods: {
+    handleremove(){
+      this.$emit('')
+    },
+    handleadjustment(value) {
+      console.log(value,"num");
+  },
+}
+
 }
 
 </script>
diff --git a/src/views/modules/volunteer/activityArchive/add.vue b/src/views/modules/volunteer/activityArchive/add.vue
new file mode 100644
index 000000000..5df0dff83
--- /dev/null
+++ b/src/views/modules/volunteer/activityArchive/add.vue
@@ -0,0 +1,879 @@
+<template>
+    <div>
+
+        <div class="dialog-h-content scroll-h">
+
+            <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" :disabled="formType === 'detail'"
+                class="form">
+                <div v-if="summary">
+                    <el-form-item label="活动类型" label-width="150px" prop="typeId">
+                        <el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable>
+                            <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName"
+                                :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="活动名称" prop="activityName" label-width="150px">
+                        <el-input v-model.trim="formData.activityName" size="small" clearable placeholder="请输入活动名称"
+                            class="u-item-width-normal"></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="活动时间" prop="startTime" label-width="130px">
+                        <!-- <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
+                            value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至"
+                            start-placeholder="开始时间" end-placeholder="结束时间">
+                        </el-date-picker> -->
+                        <el-date-picker v-model.trim="timeRange" type="datetimerange" range-separator="至"
+                            start-placeholder="开始日期" end-placeholder="结束日期" @change="handleTimeChange">
+                        </el-date-picker>
+                    </el-form-item>
+
+                    <!-- <el-form-item label="协办方" prop="assistingParty" label-width="150px">
+                    <el-cascader v-model.trim="formData.assistingParty" :options="corganizerList"
+                        :props="{ label: 'label', value: 'name'}" clearable collapse-tags size="small"
+                        class="u-item-width-normal"></el-cascader>
+                </el-form-item> -->
+                    <el-form-item label="协办方" prop="assistingParty" label-width="150px">
+                        <el-select class="u-item-width-normal" v-model.trim="formData.assistingParty" placeholder="请选择"
+                            clearable>
+                            <el-option v-for="item in corganizerList" :key="item.id" :label="item.label"
+                                :value="item.name" class="u-item-width-normal">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="活动封面图" label-width="140px" prop="coverPic">
+                        <template>
+                            <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
+                                @file-removed="removedImg"></upload-image>
+                        </template>
+                    </el-form-item>
+
+                    <el-form-item label="活动内容" prop="content" label-width="150px" style="display: block">
+                        <div class="item_width_1">
+                            <Tinymce class="tinymce_view " v-model.trim="formData.content" :height="250"
+                                placeholder="请输入活动内容"  />
+                            <!-- <Tinymce class="tinymce_view " v-if="formType != 'detail'" v-model.trim="formData.content"
+                            :height="250" placeholder="请输入活动内容" /> -->
+                            <!-- <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.content">
+                        </el-input> -->
+                        </div>
+                    </el-form-item>
+
+                    <el-form-item label="活动地点" prop="address" label-width="150px" style="display: block">
+                        <div style="width: 500px">
+                            <el-select v-model.trim="searchValue" filterable style="width: 500px" remote
+                                :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
+                                :loading="loading">
+                                <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                                    :key="item.value || index" :label="item.label" :value="item.value">
+                                </el-option>
+                            </el-select>
+                            <div id="app_activity" class="div_map"></div>
+                        </div>
+                    </el-form-item>
+
+                    <el-form-item v-if="formType!=='records'" label="线上报名" style="display: block" prop="peopleCount" label-width="150px">
+                        <el-switch v-model="online" @change="handleOnlineRegistration"></el-switch>
+                    </el-form-item>
+                </div>
+
+                <div v-if="records">
+                    <div v-if="!online">
+                        <el-form-item label="活动人数" label-width="140px">
+                        <el-input-number v-model="formData.participants" @change="handleChange" :min="1" 
+                            label="描述文字"></el-input-number>
+                        </el-form-item>
+                        <el-form-item label="活动总结" prop="sumUp" label-width="150px" style="display: block">
+                            <div class="item_width_1">
+                                <!-- <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.sumUp">
+                                </el-input> -->
+                                <Tinymce class="tinymce_view " v-model.trim="formData.sumUp" :height="250"
+                                    placeholder="请输入活动总结"  @input="validateContent"/>
+                            </div>
+                        </el-form-item>
+
+                        <!-- <el-form-item label="活动照片" label-width="140px">
+                            <template>
+                                <upload-image :defaultFileList="activityImgs" :limit="6"
+                                    @change="onChangeImgs"></upload-image>
+                            </template>
+                        </el-form-item> -->
+
+                        <el-form-item label="活动照片" label-width="140px" prop="activityImgs">
+                            <div>
+                                <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
+                                    :data="{ customerId: customerId }" :show-file-list="true"
+                                    :file-list="formData.activityImgs" :on-preview="handleImgPreview"
+                                    :on-success="handleImgSuccess" :on-remove="handleImgRemove"
+                                    :on-exceed="handleImgExceed" :before-upload="beforeImgUpload"
+                                    list-type="picture-card" :limit="3">
+                                    <i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片 </el-upload>
+                            </div>
+                            <!-- <div>
+                                <div v-if="formData.activityImgs && formData.activityImgs.length > 0">
+                                    <img v-for="(img, index) in formData.activityImgs" :key="index" :src="img" alt="照片"
+                                        style="width: 150px; margin-right: 10px;">
+                                </div>
+                                <div v-else>
+                                    暂无照片
+                                </div>
+                            </div> -->
+                        </el-form-item>
+                    </div>
+                </div>
+
+                <div v-if="online">
+                    <el-form-item label="报名截止时间" label-width="140px" prop="cutOffTime">
+                        <el-date-picker v-model.trim="formData.cutOffTime"  type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                        format="yyyy-MM-dd HH:mm:ss" placeholder="选择报名截止时间" style="width:280px">
+                        </el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="活动积分" label-width="140px" prop="points">
+                        <el-input-number v-model="formData.points" @change="handleChange" :min="1" :max="10"
+                            label="描述文字"></el-input-number>
+                    </el-form-item>
+
+                    <el-form-item label="活动人数" label-width="140px">
+                        <el-input-number v-model="formData.participants" @change="handleChange" :min="1" 
+                            label="描述文字"></el-input-number>
+                    </el-form-item>
+
+                    <el-form-item label="消息推送" label-width="140px">
+                        <el-checkbox-group v-model="formData.sendMessage">
+                            <el-checkbox label="是否通过公众号推送给社区居民"></el-checkbox>
+                        </el-checkbox-group>
+                    </el-form-item>
+                </div>
+            </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>
+               
+        </div>
+    </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } 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 // 新建一个正逆地址解析类
+
+let loading // 加载动画
+export default {
+    data() {
+        let initFormData = () => {
+            let _form = {
+                id: "",
+                typeId: "",
+                activityName: "",//活动名称
+                status: 0,//状态
+                assistingParty: "",//协办方
+                startTime: "",//开始时间
+                endTime: "",//结束时间
+                coverPic: "",//封面图片地址
+                content: "",//活动内容
+                address: "",//地址
+                online: 0,//开关
+                cutOffTime: "",//截止时间
+                points: 0,//积分
+                participants: 0,//活动人数
+                sendMessage: 0,//推送数
+                sumUp: "",//活动总结
+                activityImgs: [],//图片列表
+                longitude: this.$store.state.user.longitude, //经度
+                latitude: this.$store.state.user.latitude,//纬度
+            }
+
+            return _form
+        }
+        return {
+            fileList: [],//封面图片
+            activityImgs: [],//活动照片
+            formType: 'add', //表单操作类型 add新增，edit编辑,records记录
+            records: false,
+            searchOptions: [],
+            searchValue: '',
+            resultList: [],
+            num: 0,
+            loading: false,
+            timeRange: [],
+            online: false,
+            summary: true,
+
+            btnDisable: false,
+
+            keyWords: '',
+            activityId: '',
+            formData: initFormData(),
+            serviceList: [],
+            // gridList: [],
+            agencyId: '',
+
+            demandOptions: [],
+            typeList: [],
+            corganizerList: [],
+            uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+            customerId: localStorage.getItem('customerId'),
+
+        }
+        
+    },
+
+    components: { Tinymce, UploadImage },
+    mounted() {
+        this.activityType()
+        this.listServerOrg()
+    },
+
+    methods: {
+        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 || '';
+    },
+
+        // 上传成功
+        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 listServerOrg() {
+            const url = "/actual/base/serviceitem/listServerOrgNewTask";
+            let params = {
+                serverOrgCategoryCode: "",
+                serverOrgType: "party_unit",
+                serverParentOrgCategoryCode: ""
+            };
+
+            let { data, code, msg } = await requestPost(url, params);
+            if (code == 0) {
+                this.corganizerList = data;
+                // console.log("datadata",this.corganizerList)
+            } else if (code >= 8000) {
+                this.$message.error(msg);
+            }
+        },
+        async activityType() {
+            const url = "/actual/base/activityType/page"
+            let params = {
+                // agencyId: this.agencyId
+                pageSize: 20,
+                pageNo: 1,
+                typeName: "",
+                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);
+                    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)
+                }
+            })
+        },
+
+        handleOnlineRegistration(value) {
+            // 
+            if (value) {
+                this.online = true;
+                this.formData.online = 1;
+            } else {
+                this.online = false;
+                this.formData.cutOffTime = ''
+                this.formData.online = 0;
+            }
+        },
+
+        // onChangeFileList(e) {
+        //     if (e.length > 0) {
+        //         let item = e[0];
+        //         let ob = {
+        //             fileType: '0',
+        //             fileUrl: item.response.data.url
+        //         };
+        //         this.fileList = [ob];
+        //         this.formData.coverPic = ob.fileUrl;
+        //     }
+        // },
+        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.coverPic = e[0].response.data.url;
+            } else {
+                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)
+                })
+            }
+        },
+
+        // 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]
+                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 loadFormData() {
+            const url = '/actual/base/icpartyactivity/detail'
+            // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/detail'
+            let params = {
+                id: this.activityId
+            }
+
+            const { data, code, msg } = await requestPost(url, params)
+
+            if (code === 0) {
+                this.formData = data
+                let style_img = "style='width:50px;height:40px;' "
+
+                if (this.formData.content) {
+                    // this.formData.content = this.formData.content.replace(/<img/g, "<img style='width:200px;height:120px;'")
+                    // let array=this.formData.content.split('<img')
+                }
+
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        async handleComfirm() {
+            this.btnDisable = true
+            setTimeout(() => {
+                this.btnDisable = false
+            }, 10000)
+            // console.log("data/actual/base/communityActivity/save",this.formData)
+            this.$refs['ref_form'].validate((valid, messageObj) => {
+                this.formData.sendMessage = this.formData.sendMessage ? 1 : 0;
+                console.log(this.formData, "2234323424")
+                const dateObj = this.formData.startTime;
+                console.log(dateObj);
+                const formattedDate = dateObj; // 获取日期部分，即 '2424-10-22'
+                if (this.formData.cutOffTime != '' && formattedDate <= this.formData.cutOffTime) {
+                    this.$message.error('报名截止时间要小于活动开始时间')
+                } else if (!valid) {
+                    app.util.validateRule(messageObj)
+                    this.btnDisable = false
+                } else {
+                    this.addActivity()
+                }
+            })
+        },
+        async addActivity() {
+            if (this.formType === 'edit' || this.formType === 'summary') {
+                let url = '/actual/base/communityActivity/update'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
+            } else {
+                let url = '/actual/base/communityActivity/save'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
+            }
+
+
+        },
+
+        handleCancle() {
+
+            this.resetData()
+            this.$emit('dialogCancle')
+
+        },
+
+        // 地图初始化函数，本例取名为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
+                this.searchOptions = []
+                console.log('data,this.searchValue ', this.searchValue)
+
+            }
+        },
+
+        async remoteMethod(query) {
+            console.log(query, "sfsvsdv");
+            if (query !== '') {
+                this.loading = true;
+                const { msg, data } = await map.searchNearby(query);
+                this.loading = false;
+                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.formData.address = selPosition.address + selPosition.name
+        },
+
+        resetData() {
+            this.timeRange = []
+            this.fileList = []
+            this.searchValue = ''
+            this.searchOptions = []
+            this.resultList = []
+            this.activityId = ''
+            this.keyWords = ''
+            this.online = false
+            this.formType = ''
+            this.summary = true
+            this.formData = {
+                id: "",
+                typeId: "",
+                activityName: "",//活动名称
+                status: 0,//状态
+                assistingParty: "",//协办方
+                startTime: "",//开始时间
+                endTime: "",//结束时间
+                coverPic: "",//封面图片地址
+                content: "",//活动内容
+                address: "",//地址
+                online: 0,//开关
+                cutOffTime: "",//截止时间
+                points: 0,//积分
+                participants: 0,//活动人数
+                sendMessage: 0,//推送数
+                sumUp: "",//活动总结
+                activityImgs: [],//图片列表
+                longitude: this.$store.state.user.longitude, //经度
+                latitude: this.$store.state.user.latitude//纬度
+                // longitude: null, //经度
+                // latitude: null//纬度
+            }
+            map=""
+            
+
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: '正在加载……', // 加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' // 背景颜色
+            })
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close()
+            }
+        }
+    },
+    computed: {
+        dataRule() {
+            return {
+                activityName: [
+                    { required: true, message: '活动名称不能为空', trigger: 'blur' }
+                ],
+                typeId: [
+                    { required: true, message: '请选择活动类型', trigger: 'blur' }
+                ],
+                startTime: [
+                    { required: true, message: '请选择活动时间', trigger: 'blur' }
+                ],
+                coverPic: [
+                    { required: true, message: '请选择活动封面图', trigger: 'blur' }
+                ],
+                content: [
+                    { required: true, message: '活动内容不能为空', trigger: 'blur' }
+                ],
+                address: [
+                    { required: true, message: '请选择活动地点', trigger: 'blur' }
+                ],
+                longitude: [
+                    { required: true, message: '坐标不能为空', trigger: 'blur' }
+                ],
+                cutOffTime: [
+                    { required: true, message: '请选择报名截止时间', trigger: 'blur' }
+                ],
+                points: [
+                    { required: true, message: '请选择活动积分', trigger: 'blur' }
+                ],
+                sumUp: [
+                    { required: true, message: '请输入活动总结', trigger: 'blur' }
+                ],
+                activityImgs: [
+                    { required: true, message: '请选择活动照片', trigger: 'blur' }
+                ]
+            }
+        },
+
+    },
+    props: {
+
+        // unitList: {
+        //     type: Array,
+        //     default: []
+        // },
+        gridList: {
+            type: Array,
+            default: []
+        },
+
+
+    }
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
+<style lang="scss" scoped>
+.item_width_1 {
+    width: 560px;
+
+    /deep/.tox .tox-dialog {
+        z-index: 20000;
+    }
+}
+
+.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/activityArchive/index.vue b/src/views/modules/volunteer/activityArchive/index.vue
index 2d9e18b57..4491022ed 100644
--- a/src/views/modules/volunteer/activityArchive/index.vue
+++ b/src/views/modules/volunteer/activityArchive/index.vue
@@ -1,7 +1,578 @@
-<template>
-    <div>
-        fdlkgjfdl655515
+<template>optionsStatus
+    <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-date-picker v-model="formData.activeTime" type="datetimerange" range-separator="至"
+                            start-placeholder="开始日期" end-placeholder="结束日期">
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="状态">
+                        <el-select v-model="formData.StatusName" placeholder="请选择">
+                            <el-option v-for="item in formData.optionsStatus" :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-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%">
+                <el-table-column label="序号" header-align="center" align="center" type="index"></el-table-column>
+                <el-table-column prop="Community" header-align="center" align="center" label="活动标题">
+                </el-table-column>
+                <el-table-column prop="Nickname" header-align="center" align="center" label="活动地点">
+                    <!-- <template slot-scope="scope">
+        <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
+      </template> -->
+                </el-table-column>
+                <el-table-column prop="Name" header-align="center" align="center" label="活动时间">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.status === 0 ? '已下线' : '已发布' }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="Identity" header-align="center" align="center" label="报名截止时间">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.status === 0 ? '已下线' : '已发布' }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="PhoneNumber" header-align="center" align="center" label="主办方">
+                </el-table-column>
+                <el-table-column prop="IDNumber" header-align="center" align="center" label="发布时间">
+                </el-table-column>
+                <el-table-column prop="RegistrationTime" header-align="center" align="center" label="状态">
+                </el-table-column>
+                <el-table-column prop="Points" 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 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="handleintegral(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="Record" :close-on-click-modal="false" :close-on-press-escape="false" title="活动记录"
+                width="750px" top="10vh" class="dialog-h" @closed="diaClose">
+                <Record :list="fmData" />
+            </el-dialog>
+            <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
+                width="750px" top="10vh" class="dialog-h" @closed="diaClose">
+                <see :list="fmData" />
+            </el-dialog>
+            <el-dialog :visible.sync="integral" :close-on-click-modal="false" :close-on-press-escape="false"
+                title="积分调整" width="750px" top="10vh" class="dialog-h" @closed="diaClose">
+                <integral :list="fmData" />
+            </el-dialog>
+        </div>
     </div>
 </template>
-<script></script>
-<style lang="scss" scoped></style>
\ No newline at end of file
+    
+    <script>
+    import { requestPost } from "@/js/dai/request";
+    import nextTick from "dai-js/tools/nextTick";
+    import { mapGetters } from "vuex";
+
+  // //   import projectInfo from "./cpts/project-info";
+    import axios from "axios";
+    
+    export default {
+      components: { },
+    
+      data() {
+        return {
+          formData:{
+            name:"",
+            StatusName:"",
+            activeTime:"",
+            optionsStatus: [{
+          value: '选项1',
+          label: '已发布'
+        }, {
+          value: '选项2',
+          label: '未发布'
+        },],
+          },
+          integral:false,
+          tableLoading: false,
+          formShow:false,
+        //   pageType: "list", // 列表list 处理dispose 详情info 议题详情issue-info
+          pageNo: 1,
+          pageSize: window.localStorage.getItem("pageSize") || 20,
+          total: 1,
+          tableData: [
+    {
+      Community: "Stellar Community",
+      Nickname: "Dawn",
+      Name: "Li Xiaoming",
+      Identity: "Regular Member",
+      PhoneNumber: "13800138000",
+      IDNumber: "420123198901011234",
+      RegistrationTime: "2024-01-15T08:30:00Z",
+      Points: 1250,
+      ActivityCount: 15
+    },
+    {
+      Community: "Stellar Community",
+      Nickname: "Dawn",
+      Name: "Li Xiaoming",
+      Identity: "Regular Member",
+      PhoneNumber: "13800138000",
+      IDNumber: "420123198901011234",
+      RegistrationTime: "2024-01-15T08:30:00Z",
+      Points: 1250,
+      ActivityCount: 15
+    },
+    {
+      Community: "Stellar Community",
+      Nickname: "Dawn",
+      Name: "Li Xiaoming",
+      Identity: "Regular Member",
+      PhoneNumber: "13800138000",
+      IDNumber: "420123198901011234",
+      RegistrationTime: "2024-01-15T08:30:00Z",
+      Points: 1250,
+      ActivityCount: 15
+    },
+    {
+      Community: "Stellar Community",
+      Nickname: "Dawn",
+      Name: "Li Xiaoming",
+      Identity: "Regular Member",
+      PhoneNumber: "13800138000",
+      IDNumber: "420123198901011234",
+      RegistrationTime: "2024-01-15T08:30:00Z",
+      Points: 1250,
+      ActivityCount: 15
+    },
+    {
+      Community: "Stellar Community",
+      Nickname: "Dawn",
+      Name: "Li Xiaoming",
+      Identity: "Regular Member",
+      PhoneNumber: "13800138000",
+      IDNumber: "420123198901011234",
+      RegistrationTime: "2024-01-15T08:30:00Z",
+      Points: 1250,
+      ActivityCount: 15
+    },
+    {
+      Community: "Stellar Community",
+      Nickname: "Dawn",
+      Name: "Li Xiaoming",
+      Identity: "Regular Member",
+      PhoneNumber: "13800138000",
+      IDNumber: "420123198901011234",
+      RegistrationTime: "2024-01-15T08:30:00Z",
+      Points: 1250,
+      ActivityCount: 15
+    },
+  ],
+
+          Record:false,
+       
+       
+        };
+      },
+      computed: {
+        maxTableHeight() {
+          return this.$store.state.inIframe
+            ? this.clientHeight - 400 + this.iframeHeigh
+            : this.clientHeight - 400;
+        },
+        ...mapGetters(["clientHeight", "iframeHeight"]),
+      },
+      watch: {
+        "fmData.endDate": function (val) {
+          if (val && val != "") {
+            console.log(val);
+            let arrayTemp = val.split(" ");
+            this.fmData.endDate = arrayTemp[0] + " 23:59:59";
+          }
+        },
+      },
+      mounted() {
+        // this.getTableData();
+      },
+      methods: {
+        handleTimeChange (time) {
+        if (time) {
+          const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
+          const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
+  
+          this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
+          this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
+        } else {
+          this.formData.startTime = ''
+          this.formData.endTime = ''
+        }
+      },
+  
+        handleintegral(row){
+          this.integral=true
+          console.log(row,"row");
+        },
+        diaClose(){
+          this.formShow=false
+        },
+        resetSearch(){
+          this.formData=[]
+        },
+        handleDetail(row){
+          console.log(row,"row");
+          this.formShow=true
+          this.fmData=row
+  
+        },
+        async handleExportModule() {
+          let url = "/heart/iccommunityselforganization/import-template-download";
+    
+          let params = {};
+          await this.$http({
+            method: "POST",
+            url,
+            responseType: "blob",
+            data: params,
+          })
+            .then((res) => {
+              // this.download(res.data, title + '.xls')
+              if (res.headers["content-disposition"]) {
+                let fileName = window.decodeURI(
+                  res.headers["content-disposition"].split(";")[1].split("=")[1]
+                );
+                console.log("filename", fileName);
+                let blob = new Blob([res.data], {
+                  type: "application/vnd.ms-excel",
+                });
+                var url = window.URL.createObjectURL(blob);
+                var aLink = document.createElement("a");
+                aLink.style.display = "none";
+                aLink.href = url;
+                aLink.setAttribute("download", fileName);
+                document.body.appendChild(aLink);
+                aLink.click();
+                document.body.removeChild(aLink); //下载完成移除元素
+                window.URL.revokeObjectURL(url); //释放掉blob对象
+              } else this.$message.error("下载失败");
+            })
+            .catch((err) => {
+              console.log("err", err);
+              return this.$message.error("网络错误");
+            });
+        },
+        // 上传大图标成功
+        handleExcelSuccess(res, file) {
+          if (res.code === 0 && res.msg === "success") {
+            console.log("resss---ppp", res);
+          } else {
+            this.$message.error(res.msg);
+          }
+        },
+        handleProgress(event, file, fileList) {
+          console.log("percentage", file.percentage);
+        },
+    
+        beforeExcelUpload(file) {
+          console.log("file", file);
+          const isType = file.type === "application/vnd.ms-excel";
+          const isTypeComputer =
+            file.type ===
+            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+          const fileType = isType || isTypeComputer;
+          const isLt1M = file.size / 1024 / 1024 < 10;
+          if (!fileType) {
+            this.$message.error("上传文件只能是xls/xlsx格式！");
+          }
+    
+          if (!isLt1M) {
+            this.$message.error("上传文件大小不能超过 10MB!");
+          }
+          return fileType && isLt1M;
+        },
+        async uploadHttpRequest(file) {
+          this.importLoading = true;
+          this.importBtnTitle = "正在上传中...";
+          this.$message({
+                    showClose: true,
+                    dangerouslyUseHTMLString: true,
+                    message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+                    duration: 3000
+                });
+                let than = this
+                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); //添加文件对象
+          await this.$http
+            .post(
+              "/heart/iccommunityselforganization/importcommunityselforganization",
+              formData
+            )
+            .then((res) => {
+              console.log("res-up", res);
+              if (res.data.code == 0 && res.data.msg == "success") {
+                // this.$message.success('导入成功')
+                this.getTableData();
+              } else this.$message.error(res.data.msg);
+            })
+            .catch((err) => {
+              console.log("失败", err);
+              file.onError(); //上传失败的文件会从文件列表中删除
+              // this.$message.error('导入失败')
+            });
+          // axios({
+          //   url:
+          //     window.SITE_CONFIG["apiURL"] +
+          //     "/heart/iccommunityselforganization/importcommunityselforganization",
+          //   method: "post",
+          //   data: formData,
+          //   // responseType: "blob",
+          // })
+          //   .then((res) => {
+          //     this.importLoading = false;
+          //     this.importBtnTitle = "导入";
+          //     console.log("resresresresresresres", res);
+    
+          //     this.getTableData();
+          //     if (res.data.code == 0) {
+          //       return this.$message.success(res.data.data || "导入成功");
+          //     } else {
+          //       return this.$message.error(res.data.msg);
+          //     }
+          //   })
+          //   .catch((err) => {
+          //     console.log("失败", err);
+          //   });
+          this.importLoading = false;
+          this.importBtnTitle = "导入";
+          this.$refs.upload.clearFiles();
+        },
+        handleSizeChange(val) {
+          console.log(`每页 ${val} 条`);
+          this.pageSize = val;
+          window.localStorage.setItem("pageSize", val);
+          this.getTableData();
+        },
+        handleCurrentChange(val) {
+          console.log(`当前页: ${val}`);
+          this.pageNo = val;
+          this.getTableData();
+        },
+        //查询
+        handleSearch(val) {
+          console.log(this.fmData);
+          this.pageNo = 1;
+          this.getTableData();
+        },
+        resetForm(formName) {
+          (this.fmData = {
+            title: "",
+            status: "",
+            startDate: "",
+            endDate: "",
+            date: ["", ""],
+          }),
+            this.handleSearch();
+        },
+        async handleChu() {
+          const url = "/governance/project/project-list-export";
+          const { pageSize, pageNo, fmData } = this;
+          axios({
+            url: window.SITE_CONFIG["apiURL"] + url,
+            method: "post",
+            data: {
+              pageSize,
+              pageNo,
+              ...fmData,
+            },
+            responseType: "blob",
+          })
+            .then((res) => {
+              console.log(res);
+              // 明明响应标头中有content-disposition但是打印的res中没有这个字段,暂时写死一个吧
+              // let fileName = window.decodeURI(
+              //   res.headers["content-disposition"].split(";")[1].split("=")[1]
+              // );
+              let yy = new Date().getFullYear();
+              var mm =
+                new Date().getMonth() > 9
+                  ? new Date().getMonth() + 1
+                  : new Date().getMonth() == 9
+                  ? new Date().getMonth() + 1
+                  : "0" + (new Date().getMonth() + 1);
+              var dd =
+                new Date().getDate() < 10
+                  ? "0" + new Date().getDate()
+                  : new Date().getDate();
+              let time = `${yy}-${mm}-${dd} `;
+              let fileName = `项目管理${time}`;
+              console.log("filename", fileName);
+              let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
+              var url = window.URL.createObjectURL(blob);
+              var aLink = document.createElement("a");
+              aLink.style.display = "none";
+              aLink.href = url;
+              aLink.setAttribute("download", fileName);
+              document.body.appendChild(aLink);
+              aLink.click();
+              document.body.removeChild(aLink); //下载完成移除元素
+              window.URL.revokeObjectURL(url); //释放掉blob对象
+            })
+            .catch((err) => {
+              console.log("获取导出情失败", err);
+              return this.$message.error("网络错误");
+            });
+        },
+        async handleAdd() {},
+        async handleWatch(rowIndex) {
+          let item = this.tableData[rowIndex];
+          this.currentProject = {
+            projectId: item.projectId,
+          };
+          this.pageType = "info";
+        },
+        async handleEdit(row) {
+          // let item = this.tableData[rowIndex];
+          // this.currentProject = {
+          //   projectId: item.projectId,
+          // };
+          // this.pageType = "edit";
+          this.Record=true
+        },
+        handleClose() {
+          this.pageType = "list";
+          this.currentProject = {
+            projectId: "",
+          };
+        },
+        handleEditSuccess() {
+          this.handleClose();
+          this.getTableData();
+        },
+        async handleDel(rowData, rowIndex) {
+          console.log(rowData, rowIndex);
+          const url =
+            "/heart/iccommunityselforganization/delcommunityselforganization";
+          const { tableData } = this;
+    
+          const { data, code, msg } = await requestPost(url, {
+            orgId: tableData[rowIndex].orgId,
+          });
+    
+          if (code === 0) {
+            this.$message.success("删除成功！");
+            this.getTableData();
+          } else {
+            this.$message.success("操作失败！");
+          }
+        },
+        async getTableData() {
+          // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
+          const url = "/governance/project/project-list";
+          const { pageSize, pageNo, fmData } = this;
+          const { data, code, msg } = await requestPost(url, {
+            pageSize,
+            pageNo,
+            ...fmData,
+          });
+          if (code === 0) {
+            console.log("列表请求成功！！！！！！！！！！！！！！");
+            this.total = data.total || 0;
+            this.tableData = data.list
+              ? data.list.map((item) => {
+                  return item;
+                })
+              : [];
+    
+            this.tableData.forEach((item) => {
+              if (item.origin === "issue") {
+                item.originName = "议题 ";
+              } else if (item.origin === "agency") {
+                item.originName = "项目立项";
+              } else if (item.origin === "resi_event") {
+                item.originName = "旧版事件上报";
+              } else if (item.origin === "work_event") {
+                item.originName = "巡查上报";
+              } else if (item.origin === "ic_event") {
+                item.originName = "事件";
+              } else {
+                item.sourceTypeName = "--";
+              }
+            });
+          } else {
+          }
+        },
+      },
+    };
+    </script>
+    
+    <style lang="scss" scoped>
+    @import "@/assets/scss/modules/management/list-main.scss";
+      .g-main {
+        width: 100%;
+      }
+      .m-search {
+        background: #ffffff;
+        border-radius: 4px;
+        padding: 30px 20px 5px;
+        box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+      }
+      .item_width_1 {
+        width: 260px;
+      }
+      .item_width_2 {
+        width: 495px;
+      }
+      .m-table {
+        background: #ffffff;
+        box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+        border-radius: 4px;
+        margin-top: 15px;
+        padding: 23px 30px 10px;
+        .table {
+          margin-top: 20px;
+        }
+      }
+      .div_btn {
+        display: flex;
+        justify-content: space-between;
+      }
+      .el-row {
+        /* margin-bottom: 20px; */
+        display: flex;
+        flex-wrap: wrap;
+        margin-top: 10px;
+        margin-right: 50px;
+      }
+    
+    </style>
+    
\ No newline at end of file