diff --git a/package.json b/package.json
index 799ec0ed1..76454b2f6 100644
--- a/package.json
+++ b/package.json
@@ -19,60 +19,60 @@
     "@antv/l7": "2.9.14",
     "@antv/l7-draw": "3.0.5",
     "@antv/l7-maps": "2.9.14",
-    "@riophae/vue-treeselect": "^0.4.0",
-    "@tinymce/tinymce-vue": "^3.2.8",
-    "async-validator": "^4.2.5",
-    "axios": "^0.19.0",
-    "babel-eslint": "^8.0.1",
-    "babel-plugin-component": "^1.1.1",
-    "echarts": "^5.2.2",
-    "echarts-gl": "^2.0.9",
+    "@riophae/vue-treeselect": "0.4.0",
+    "@tinymce/tinymce-vue": "3.2.8",
+    "async-validator": "4.2.5",
+    "axios": "0.19.0",
+    "babel-eslint": "8.0.1",
+    "babel-plugin-component": "1.1.1",
+    "echarts": "5.2.2",
+    "echarts-gl": "2.0.9",
     "element-theme": "2.0.1",
     "element-ui": "2.13.2",
-    "file-saver": "^2.0.5",
-    "gulp-autoprefixer": "^6.1.0",
-    "gulp-clean-css": "^4.2.0",
-    "gulp-load-plugins": "^2.0.0",
-    "gulp-rename": "^1.4.0",
-    "gulp-sass": "^4.0.2",
-    "js-cookie": "^2.2.0",
-    "jsencrypt": "^3.0.3",
-    "lodash": "^4.17.15",
-    "mint-ui": "^2.2.13",
-    "node-sass": "^4.12.0",
-    "ol": "^6.9.0",
-    "portfinder": "^1.0.21",
-    "proj4": "^2.8.0",
-    "qs": "^6.7.0",
-    "quill": "^1.3.6",
-    "screenfull": "^4.2.1",
-    "sortablejs": "^1.12.0",
-    "svg-sprite-loader": "^4.1.6",
-    "throttle-debounce": "^3.0.1",
-    "v-distpicker": "^1.2.2",
-    "vue": "^2.6.11",
-    "vue-baidu-map": "^0.21.22",
-    "vue-i18n": "^8.12.0",
-    "vue-quill-editor": "^3.0.6",
-    "vue-router": "^3.0.7",
-    "vuex": "^3.1.1",
-    "xlsx": "^0.17.1"
+    "file-saver": "2.0.5",
+    "gulp-autoprefixer": "6.1.0",
+    "gulp-clean-css": "4.2.0",
+    "gulp-load-plugins": "2.0.0",
+    "gulp-rename": "1.4.0",
+    "gulp-sass": "4.0.2",
+    "js-cookie": "2.2.0",
+    "jsencrypt": "3.0.3",
+    "lodash": "4.17.15",
+    "mint-ui": "2.2.13",
+    "node-sass": "4.12.0",
+    "ol": "6.9.0",
+    "portfinder": "1.0.21",
+    "proj4": "2.8.0",
+    "qs": "6.7.0",
+    "quill": "1.3.6",
+    "screenfull": "4.2.1",
+    "sortablejs": "1.12.0",
+    "svg-sprite-loader": "4.1.6",
+    "throttle-debounce": "3.0.1",
+    "v-distpicker": "1.2.2",
+    "vue": "2.6.11",
+    "vue-baidu-map": "0.21.22",
+    "vue-i18n": "8.12.0",
+    "vue-quill-editor": "3.0.6",
+    "vue-router": "3.0.7",
+    "vuex": "3.1.1",
+    "xlsx": "0.17.1"
   },
   "devDependencies": {
-    "@antv/f2": "^3.8.10-beta.1",
+    "@antv/f2": "3.8.10-beta.1",
     "@tinymce/tinymce-vue": "3.2.8",
-    "@vue/cli-plugin-babel": "^3.10.0",
-    "@vue/cli-plugin-eslint": "^3.10.0",
-    "@vue/cli-service": "^3.10.0",
-    "@vue/eslint-config-standard": "^4.0.0",
-    "dai-js": "^0.0.12",
-    "element-theme-chalk": "^2.13.0",
-    "natives": "^1.1.6",
-    "ol": "^6.9.0",
-    "sass-loader": "^7.3.1",
-    "script-loader": "^0.7.2",
+    "@vue/cli-plugin-babel": "3.10.0",
+    "@vue/cli-plugin-eslint": "3.10.0",
+    "@vue/cli-service": "3.10.0",
+    "@vue/eslint-config-standard": "4.0.0",
+    "dai-js": "0.0.12",
+    "element-theme-chalk": "2.13.0",
+    "natives": "1.1.6",
+    "ol": "6.9.0",
+    "sass-loader": "7.3.1",
+    "script-loader": "0.7.2",
     "tinymce": "5.8.2",
-    "vue-template-compiler": "^2.6.11"
+    "vue-template-compiler": "2.6.11"
   },
   "eslintConfig": {
     "root": true,
diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
index a63b56854..4860522fc 100644
--- a/src/views/modules/base/epidemic/antiInfo.vue
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -293,6 +293,7 @@
                :close-on-press-escape="false"
                :title="formTitle"
                width="1150px"
+               :z-index="2000"
                top="5vh"
                class="dialog-h"
                @closed="handleCnalceForm">
@@ -878,7 +879,7 @@ export default {
       let params = {
         id
       }
-
+      // this.$message.error('111')
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
index bbc79ac31..4b8e251ec 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
@@ -171,14 +171,14 @@
 
     </div>
 
-    <!-- <div class="div_btn">
+    <div class="div_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
-    </div> -->
+    </div>
   </div>
 </template>
 
diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue
index fdf967767..df60972ef 100644
--- a/src/views/modules/communityService/fuwujilu/addForm.vue
+++ b/src/views/modules/communityService/fuwujilu/addForm.vue
@@ -1,229 +1,304 @@
 <template>
   <div>
-    <div class="dialog-h-content scroll-h"
-         :class="{ 'visiual-form': source === 'visiual' }">
-      <el-form v-if="formType === 'add'"
-               ref="ref_form"
-               :inline="true"
-               :model="formData"
-               :rules="dataRule"
-               class="div_form">
-        <el-form-item label="服务分类"
-                      prop="serviceCategoryKey"
-                      label-width="150px"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      style="display: block">
-          <el-select v-model="formData.serviceCategoryKey"
-                     class="item_width_1"
-                     placeholder="请选择"
-                     clearable>
-            <el-option v-for="item in categrayOptions"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+    <div
+      class="dialog-h-content scroll-h"
+      :class="{ 'visiual-form': source === 'visiual' }"
+    >
+      <el-form
+        v-if="formType === 'add'"
+        ref="ref_form"
+        :inline="true"
+        :model="formData"
+        :rules="dataRule"
+        class="div_form"
+      >
+        <el-form-item
+          label="服务分类"
+          prop="serviceCategoryKey"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-select
+            v-model="formData.serviceCategoryKey"
+            class="item_width_1"
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in categrayOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="服务名称"
-                      prop="serviceName"
-                      label-width="150px"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入服务名称"
-                    v-model="formData.serviceName">
+        <el-form-item
+          label="服务名称"
+          prop="serviceName"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入服务名称"
+            v-model="formData.serviceName"
+          >
           </el-input>
         </el-form-item>
 
-        <el-form-item label="服务组织"
-                      prop="serviceOrgId"
-                      label-width="150px"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      style="display: block">
-          <el-select v-model="formData.serviceOrgType"
-                     class="input-width-small"
-                     placeholder="请选择"
-                     clearable
-                     @change="handleServiceChange('add', $event)">
-            <el-option v-for="item in serviceOptions"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+        <el-form-item
+          label="服务组织"
+          prop="serviceOrgId"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-select
+            v-model="formData.serviceOrgType"
+            class="input-width-small"
+            placeholder="请选择"
+            clearable
+            @change="handleServiceChange('add', $event)"
+          >
+            <el-option
+              v-for="item in serviceOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
           -
-          <el-select v-model="formData.serviceOrgId"
-                     class="input-width-middle"
-                     filterable
-                     placeholder="请选择"
-                     clearable>
-            <el-option v-for="item in serviceOptiondList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+          <el-select
+            v-model="formData.serviceOrgId"
+            class="input-width-middle"
+            filterable
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in serviceOptiondList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item label="服务范围"
-                      prop="objList"
-                      label-width="150px"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      style="display: block">
-          <el-cascader class="item_width_1"
-                       ref="myCascader"
-                       v-model="scopeIdArray"
-                       :key="iscascaderShow"
-                       :options="casOptions"
-                       :props="optionProps"
-                       :show-all-levels="false"
-                       @change="handleChangeScope"></el-cascader>
+        <el-form-item
+          label="服务范围"
+          prop="objList"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-cascader
+            class="item_width_1"
+            ref="myCascader"
+            v-model="scopeIdArray"
+            :key="iscascaderShow"
+            :options="casOptions"
+            :props="optionProps"
+            :show-all-levels="false"
+            @change="handleChangeScope"
+          ></el-cascader>
         </el-form-item>
 
-        <el-form-item label="政策依据"
-                      prop="policyId"
-                      label-width="150px"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      style="display: block">
-          <el-select v-model="formData.policyId"
-                     class="input-width-small"
-                     placeholder="请选择"
-                     clearable>
-            <el-option v-for="item in policyList"
-                       :key="item.policyId"
-                       :label="item.title"
-                       :value="item.policyId">
+        <el-form-item
+          label="政策依据"
+          prop="policyId"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-select
+            v-model="formData.policyId"
+            class="input-width-small"
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in policyList"
+              :key="item.policyId"
+              :label="item.title"
+              :value="item.policyId"
+            >
             </el-option>
           </el-select>
 
-          <el-button style="margin-left: 10px"
-                     type="primary"
-                     size="small"
-                     @click="handlePersonList">预览</el-button>
+          <el-button
+            style="margin-left: 10px"
+            type="primary"
+            size="small"
+            @click="handlePersonList"
+            >预览</el-button
+          >
         </el-form-item>
 
-        <el-form-item label="经办人"
-                      prop="principalName"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入联系人姓名"
-                    v-model="formData.principalName">
+        <el-form-item
+          label="经办人"
+          prop="principalName"
+          :class="{ 'form-item': source === 'visiual' }"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入联系人姓名"
+            v-model="formData.principalName"
+          >
           </el-input>
         </el-form-item>
-        <el-form-item label="联系方式"
-                      prop="principalContact"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入联系人电话"
-                    v-model="formData.principalContact">
+        <el-form-item
+          label="联系方式"
+          prop="principalContact"
+          :class="{ 'form-item': source === 'visiual' }"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入联系人电话"
+            v-model="formData.principalContact"
+          >
           </el-input>
         </el-form-item>
 
-        <el-form-item label="服务时间"
-                      label-width="150px"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      prop="serviceTimeStart">
-          <el-date-picker v-model="formData.serviceTimeStart"
-                          :picker-options="startPickerOptions"
-                          class="item_width_2"
-                          style="width: 220px"
-                          type="date"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          value="yyyy-MM-dd"
-                          placeholder="开始时间">
+        <el-form-item
+          label="服务时间"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          prop="serviceTimeStart"
+        >
+          <el-date-picker
+            v-model="formData.serviceTimeStart"
+            :picker-options="startPickerOptions"
+            class="item_width_2"
+            style="width: 220px"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            value="yyyy-MM-dd"
+            placeholder="开始时间"
+          >
           </el-date-picker>
           <span class="data-tag">至</span>
-          <el-date-picker v-model="formData.serviceTimeEnd"
-                          :picker-options="endPickerOptions"
-                          class="item_width_2 data-tag"
-                          style="width: 220px"
-                          type="date"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          value="yyyy-MM-dd"
-                          placeholder="结束时间">
+          <el-date-picker
+            v-model="formData.serviceTimeEnd"
+            :picker-options="endPickerOptions"
+            class="item_width_2 data-tag"
+            style="width: 220px"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            value="yyyy-MM-dd"
+            placeholder="结束时间"
+          >
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="备注"
-                      prop="remark"
-                      label-width="150px"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    type="textarea"
-                    maxlength="1000"
-                    show-word-limit
-                    :rows="3"
-                    placeholder="请输入备注，不超过1000字"
-                    v-model="formData.remark"></el-input>
+        <el-form-item
+          label="备注"
+          prop="remark"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="textarea"
+            maxlength="1000"
+            show-word-limit
+            :rows="3"
+            placeholder="请输入备注，不超过1000字"
+            v-model="formData.remark"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="直接反馈"
-                      prop="remark"
-                      label-width="150px"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      style="display: block">
-          <el-checkbox :label="'是'"
-                       v-model="showFeedback"
-                       @change="handleChangeFeedback"></el-checkbox>
+        <el-form-item
+          label="直接反馈"
+          prop="remark"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-checkbox
+            :label="'是'"
+            v-model="showFeedback"
+            @change="handleChangeFeedback"
+          ></el-checkbox>
         </el-form-item>
       </el-form>
       <div v-show="formType === 'feedback' || showFeedback">
         <!-- <h3 class="d-h3">反馈内容</h3> -->
 
-        <el-form ref="ref_form_feedback"
-                 :inline="true"
-                 :model="feedbackFormData"
-                 :rules="feedbackDataRule"
-                 class="div_form">
-          <el-form-item label="服务目标"
-                        prop="serviceGoal"
-                        :class="{ 'form-item': source === 'visiual' }"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      type="textarea"
-                      maxlength="1000"
-                      show-word-limit
-                      :rows="3"
-                      placeholder="请输入服务目标，不超过1000字"
-                      v-model="feedbackFormData.serviceGoal"></el-input>
+        <el-form
+          ref="ref_form_feedback"
+          :inline="true"
+          :model="feedbackFormData"
+          :rules="feedbackDataRule"
+          class="div_form"
+        >
+          <el-form-item
+            label="服务目标"
+            prop="serviceGoal"
+            :class="{ 'form-item': source === 'visiual' }"
+            label-width="150px"
+            style="display: block"
+          >
+            <el-input
+              class="item_width_1"
+              type="textarea"
+              maxlength="1000"
+              show-word-limit
+              :rows="3"
+              placeholder="请输入服务目标，不超过1000字"
+              v-model="feedbackFormData.serviceGoal"
+            ></el-input>
           </el-form-item>
 
-          <el-form-item label="服务效果"
-                        prop="serviceEffect"
-                        label-width="150px"
-                        :class="{ 'form-item': source === 'visiual' }"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      type="textarea"
-                      maxlength="1000"
-                      show-word-limit
-                      :rows="3"
-                      placeholder="请输入服务效果，不超过1000字"
-                      v-model="feedbackFormData.serviceEffect"></el-input>
+          <el-form-item
+            label="服务效果"
+            prop="serviceEffect"
+            label-width="150px"
+            :class="{ 'form-item': source === 'visiual' }"
+            style="display: block"
+          >
+            <el-input
+              class="item_width_1"
+              type="textarea"
+              maxlength="1000"
+              show-word-limit
+              :rows="3"
+              placeholder="请输入服务效果，不超过1000字"
+              v-model="feedbackFormData.serviceEffect"
+            ></el-input>
           </el-form-item>
 
-          <el-form-item label="服务人数"
-                        style="display: block"
-                        :class="{ 'form-item': source === 'visiual' }"
-                        prop="servicePeopleNumber"
-                        label-width="150px">
-            <el-input-number class="item_width_2"
-                             v-model="feedbackFormData.servicePeopleNumber"
-                             :min="0"
-                             :max="9999"
-                             label="服务人数"></el-input-number>
+          <el-form-item
+            label="服务人数"
+            style="display: block"
+            :class="{ 'form-item': source === 'visiual' }"
+            prop="servicePeopleNumber"
+            label-width="150px"
+          >
+            <el-input-number
+              class="item_width_2"
+              v-model="feedbackFormData.servicePeopleNumber"
+              :min="0"
+              :max="9999"
+              label="服务人数"
+            ></el-input-number>
           </el-form-item>
 
-          <el-form-item label="服务状态"
-                        style="display: block"
-                        label-width="150px"
-                        :class="{ 'form-item': source === 'visiual' }"
-                        prop="serviceStatus">
+          <el-form-item
+            label="服务状态"
+            style="display: block"
+            label-width="150px"
+            :class="{ 'form-item': source === 'visiual' }"
+            prop="serviceStatus"
+          >
             <span>已完成</span>
             <!-- <el-select class="item_width_1"
                        v-model="feedbackFormData.serviceStatus"
@@ -236,71 +311,93 @@
               </el-option>
             </el-select> -->
           </el-form-item>
-          <el-form-item label="满意度"
-                        style="display: block"
-                        label-width="150px"
-                        :class="{ 'form-item': source === 'visiual' }"
-                        prop="satisfaction">
-            <el-select class="item_width_2"
-                       v-model="feedbackFormData.satisfaction"
-                       placeholder="全部"
-                       clearable>
-              <el-option v-for="item in satisfyArray"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+          <el-form-item
+            label="满意度"
+            style="display: block"
+            label-width="150px"
+            :class="{ 'form-item': source === 'visiual' }"
+            prop="satisfaction"
+          >
+            <el-select
+              class="item_width_2"
+              v-model="feedbackFormData.satisfaction"
+              placeholder="全部"
+              clearable
+            >
+              <el-option
+                v-for="item in satisfyArray"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="地址"
-                        prop="address"
-                        :class="{ 'form-item': source === 'visiual' }"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      v-model="feedbackFormData.address"></el-input>
+          <el-form-item
+            label="地址"
+            prop="address"
+            :class="{ 'form-item': source === 'visiual' }"
+            label-width="150px"
+            style="display: block"
+          >
+            <el-input
+              class="item_width_1"
+              v-model="feedbackFormData.address"
+            ></el-input>
           </el-form-item>
-          <el-form-item label="地图位置"
-                        label-width="150px"
-                        :class="{ 'form-item': source === 'visiual' }"
-                        style="display: block">
+          <el-form-item
+            label="地图位置"
+            label-width="150px"
+            :class="{ 'form-item': source === 'visiual' }"
+            style="display: block"
+          >
             <div style="width: 500px">
               <div class="div_map">
                 <div id="map_app"></div>
                 <div class="div_searchmap">
-                  <el-input maxlength="50"
-                            size="mini"
-                            placeholder="请输入关键字"
-                            v-model="keyWords">
+                  <el-input
+                    maxlength="50"
+                    placeholder="请输入关键字"
+                    v-model="keyWords"
+                  >
                   </el-input>
-                  <el-button style="margin-left: 10px"
-                             type="primary"
-                             size="mini"
-                             @click="handleSearchMap">查询</el-button>
+                  <el-button
+                    style="margin-left: 10px"
+                    type="primary"
+                    size="mini"
+                    @click="handleSearchMap"
+                    >查询</el-button
+                  >
                 </div>
               </div>
             </div>
           </el-form-item>
 
-          <el-form-item class="block"
-                        label="附件"
-                        :class="{ 'form-item': source === 'visiual' }"
-                        label-width="150px"
-                        prop="attach">
-            <el-upload :headers="$getElUploadHeaders()"
-                       class="upload-demo"
-                       :action="uploadUlr"
-                       accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
-                       :on-success="handleFileSuccess"
-                       :on-remove="handleFileRemove"
-                       :limit="3"
-                       :before-upload="beforeUpload"
-                       :file-list="fileList">
-              <el-button size="small"
-                         :disabled="fileList.length === 3"
-                         type="primary">点击上传</el-button>
-              <div slot="tip"
-                   class="el-upload__tip">支持图片、word、pdf</div>
+          <el-form-item
+            class="block"
+            label="附件"
+            :class="{ 'form-item': source === 'visiual' }"
+            label-width="150px"
+            prop="attach"
+          >
+            <el-upload
+              :headers="$getElUploadHeaders()"
+              class="upload-demo"
+              :action="uploadUlr"
+              accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
+              :on-success="handleFileSuccess"
+              :on-remove="handleFileRemove"
+              :limit="3"
+              :before-upload="beforeUpload"
+              :file-list="fileList"
+            >
+              <el-button
+                size="small"
+                :disabled="fileList.length === 3"
+                type="primary"
+                >点击上传</el-button
+              >
+              <div slot="tip" class="el-upload__tip">支持图片、word、pdf</div>
             </el-upload>
           </el-form-item>
         </el-form>
@@ -308,29 +405,35 @@
     </div>
 
     <div class="div_btn">
-      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        size="small"
+        type="primary"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
+      >
     </div>
 
-    <el-dialog v-if="showPersonList"
-               :visible.sync="showPersonList"
-               :append-to-body="true"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'政策预览'"
-               width="1150px"
-               top="5vh"
-               class="dialog-h"
-               @closed="showPersonList = false">
-      <person-list ref="ref_detail_form"
-                   :policyId="policyId"
-                   :ruleList="ruleList"
-                   @handleOk="handleOk"
-                   @handleClose="handleClose">
+    <el-dialog
+      v-if="showPersonList"
+      :visible.sync="showPersonList"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="'政策预览'"
+      width="1150px"
+      top="5vh"
+      class="dialog-h"
+      @closed="showPersonList = false"
+    >
+      <person-list
+        ref="ref_detail_form"
+        :policyId="policyId"
+        :ruleList="ruleList"
+        @handleOk="handleOk"
+        @handleClose="handleClose"
+      >
       </person-list>
     </el-dialog>
   </div>
@@ -342,14 +445,11 @@ import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
 import personList from "../policy/personList";
 import nextTick from "dai-js/tools/nextTick";
-
-var map;
-var search;
-var markers;
-var infoWindowList;
-var geocoder; // 新建一个正逆地址解析类
+import daiMap from "@/utils/dai-map";
 
 let loading; // 加载动画
+let map;
+
 export default {
   props: {
     defaultData: {
@@ -377,7 +477,7 @@ export default {
     },
     categrayArray: {
       type: Array,
-      default () {
+      default() {
         return [];
       },
     },
@@ -388,7 +488,7 @@ export default {
     },
   },
 
-  data () {
+  data() {
     let endDisabledDate = (time) => {
       //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
       let nowData = Date.now();
@@ -501,7 +601,7 @@ export default {
   },
 
   computed: {
-    dataRule () {
+    dataRule() {
       return {
         serviceName: [
           { required: true, message: "服务名称不能为空", trigger: "change" },
@@ -518,7 +618,7 @@ export default {
         ],
       };
     },
-    feedbackDataRule () {
+    feedbackDataRule() {
       return {
         serviceGoal: [
           { required: true, message: "服务目标不能为空", trigger: "blur" },
@@ -552,7 +652,7 @@ export default {
 
   components: { personList },
 
-  async mounted () {
+  async mounted() {
     this.startLoading();
     // 都已经重置了，还放在prop里干嘛，我不理解
     this.categrayOptions = this.categrayArray;
@@ -560,7 +660,7 @@ export default {
     this.getCategrayList();
     this.getDictOptions();
     this.getPolicyList();
-    if (this.formType === 'feedback' || this.showFeedback) {
+    if (this.formType === "feedback" || this.showFeedback) {
       this.initMap();
       this.$refs.ref_form_feedback.resetFields();
     }
@@ -577,7 +677,7 @@ export default {
   },
 
   methods: {
-    async iniDefaultData () {
+    async iniDefaultData() {
       const { defaultData } = this;
       console.log("iniDefaultData3", defaultData);
       if (defaultData) {
@@ -598,7 +698,7 @@ export default {
     },
 
     //加载组织数据
-    async handlePersonList () {
+    async handlePersonList() {
       if (!this.formData.policyId) {
         this.$message.info("请先选择政策");
         return false;
@@ -610,7 +710,7 @@ export default {
       this.showPersonList = true;
     },
 
-    async loadRuleList () {
+    async loadRuleList() {
       const url = "/heart/policy/rulelist/" + this.policyId;
 
       let params = {};
@@ -624,14 +724,14 @@ export default {
       }
     },
 
-    handleClose () {
+    handleClose() {
       this.showPersonList = false;
     },
-    handleOk () {
+    handleOk() {
       this.showPersonList = false;
     },
 
-    async getPolicyList () {
+    async getPolicyList() {
       const url = "/heart/policy/policyListSelect";
 
       let params = {};
@@ -644,7 +744,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getDictOptions () {
+    async getDictOptions() {
       this.$http
         .post("/sys/dict/data/dictlist", {
           dictType: "user_demand_service_type",
@@ -662,7 +762,7 @@ export default {
     },
 
     // 字典
-    async getCategrayList () {
+    async getCategrayList() {
       const url = "/sys/dict/data/dictlist";
 
       let params = {
@@ -677,14 +777,14 @@ export default {
         this.$message.error(msg);
       }
     },
-    handleServiceChange (type, val) {
+    handleServiceChange(type, val) {
       if (val === "social_org") {
         if (type === "add") this.getServiceuserList(val, "add_demand");
         else this.getServiceuserList(val, "query_demand");
       } else this.getServiceuserList(val, "");
     },
 
-    async getServiceuserList (serviceType, query) {
+    async getServiceuserList(serviceType, query) {
       if (!serviceType) return false;
 
       const params = {
@@ -705,7 +805,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    handleChangeFeedback (val) {
+    handleChangeFeedback(val) {
       this.showFeedback = val;
 
       if (this.firstInitMap) {
@@ -716,7 +816,7 @@ export default {
     },
 
     // 获取服务范围树
-    async loadScopeTree () {
+    async loadScopeTree() {
       const url = "/gov/org/icServiceProject/service/serviceScopeTree";
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
       let params = {};
@@ -733,7 +833,7 @@ export default {
       }
     },
 
-    handleChangeScope (value) {
+    handleChangeScope(value) {
       this.formData.objList = [];
       let selArray = this.$refs["myCascader"].getCheckedNodes();
       console.log("handleChangeScope", selArray);
@@ -743,8 +843,8 @@ export default {
             element.data.objectType === "grid"
               ? "grid"
               : element.data.objectType === "neighborhood"
-                ? "neighborhood"
-                : "agency",
+              ? "neighborhood"
+              : "agency",
           objectId: element.data.objectId,
           objectName: element.data.objectName,
         };
@@ -752,7 +852,7 @@ export default {
       });
     },
 
-    async handleComfirm () {
+    async handleComfirm() {
       if (this.formType === "add") {
         this.handleAdd();
       } else if (this.formType === "feedback") {
@@ -760,7 +860,7 @@ export default {
       }
     },
 
-    async handleAdd () {
+    async handleAdd() {
       this.btnDisable = true;
       setTimeout(() => {
         this.btnDisable = false;
@@ -794,7 +894,7 @@ export default {
       });
     },
 
-    async addFuwu () {
+    async addFuwu() {
       if (this.showFeedback) {
         this.feedbackFormData.fileList = [];
         this.feedbackFormData.fileList = [...this.fileList];
@@ -839,7 +939,7 @@ export default {
       }
     },
 
-    async handleFeedback () {
+    async handleFeedback() {
       this.btnDisable = true;
       setTimeout(() => {
         this.btnDisable = false;
@@ -855,7 +955,7 @@ export default {
       });
     },
 
-    async addFeecback () {
+    async addFeecback() {
       this.feedbackFormData.fileList = [];
       this.feedbackFormData.fileList = [...this.fileList];
       this.feedbackFormData.serviceRecordId = this.serviceRecordId;
@@ -880,7 +980,7 @@ export default {
       }
     },
 
-    beforeUpload (file) {
+    beforeUpload(file) {
       const array = file.name.split(".");
       const extension = array[array.length - 1];
 
@@ -906,7 +1006,7 @@ export default {
       }
     },
 
-    handleFileRemove (file) {
+    handleFileRemove(file) {
       if (file && file.status === "success") {
         this.fileList.splice(
           this.fileList.findIndex((item) => item.uid === file.uid),
@@ -915,7 +1015,7 @@ export default {
       }
     },
 
-    handleFileSuccess (res, file) {
+    handleFileSuccess(res, file) {
       if (res.code === 0 && res.msg === "success") {
         const array = file.name.split(".");
         const fileType = array[array.length - 1];
@@ -948,7 +1048,7 @@ export default {
     },
 
     //下载
-    handleFileDownload (file) {
+    handleFileDownload(file) {
       var a = document.createElement("a");
       var event = new MouseEvent("click");
       a.download = file.name;
@@ -956,137 +1056,61 @@ export default {
       a.href = file.url;
       a.dispatchEvent(event);
     },
-    handleCancle () {
+    handleCancle() {
       this.resetData();
       this.$emit("handleClose");
     },
 
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
-      // 定义地图中心点坐标
+    initMap() {
       let { latitude, longitude } = this.$store.state.user;
-      console.log('lat' + latitude + ',lon' + longitude)
 
-
-      if (!latitude || latitude == "" || latitude == "0") {
-        latitude = 39.9088810666821;
-        longitude = 116.39743841556731;
-      }
-      var center = new window.TMap.LatLng(latitude, longitude)
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById("map_app"), {
-        center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
-        pitch: 43.5, // 设置俯仰角
-        rotation: 45, // 设置地图旋转角度
-      });
-
-      search = new window.TMap.service.Search({ pageSize: 10 });
-      // 新建一个地点搜索类
-      markers = new TMap.MultiMarker({
-        map: map,
-        geometries: [],
-      });
-      infoWindowList = Array(10);
-
-      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+      map = new daiMap(
+        document.getElementById("map_app"),
+        { latitude, longitude },
+        {
+          zoom: 16.2, // 设置地图缩放级别
+          pitch: 43.5, // 设置俯仰角
+          rotation: 45, // 设置地图旋转角度
+        }
+      );
 
       // 监听地图平移结束
-      map.on("panend", () => {
-        this.handleMoveCenter();
+      map.on("dragend", (e) => {
+        this.handleMoveCenter(e);
       });
-      this.handleMoveCenter();
-      // this.convert();
 
-      this.firstInitMap = false;
+      map.setCenter(latitude, longitude);
+      map.setMarker(latitude, longitude);
     },
 
-    setMarker (lat, lng) {
-      markers.setGeometries([]);
-      markers.add([
-        {
-          id: "4",
-          styleId: "marker",
-          position: new TMap.LatLng(lat, lng),
-          properties: {
-            title: "marker4",
-          },
-        },
-      ]);
-    },
-
-    handleSearchMap () {
-      infoWindowList.forEach((infoWindow) => {
-        infoWindow.close();
-      });
-      infoWindowList.length = 0;
-      markers.setGeometries([]);
-      // 在地图显示范围内以给定的关键字搜索地点
-      search
-        .searchNearby({
-          keyword: this.keyWords,
-          radius: 1000,
-          autoExtend: true,
-          center: map.getCenter(),
-        })
-        .then((result) => {
-          let { data } = result;
-          if (Array.isArray(data) && data.length > 0) {
-            const {
-              location: { lat, lng },
-            } = data[0];
-
-            map.setCenter(new TMap.LatLng(lat, lng));
-            this.setMarker(lat, lng);
-            this.feedbackFormData.latitude = lat;
-            this.feedbackFormData.longitude = lng;
-            this.convert();
-          } else {
-            this.$message.error("未检索到相关位置坐标");
-          }
-        });
-    },
-
-    handleMoveCenter () {
+    async handleMoveCenter() {
       //修改地图中心点
-      const center = map.getCenter();
-      const lat = center.getLat();
-      const lng = center.getLng();
+      const { lat, lng } = map.getCenter();
       this.feedbackFormData.latitude = lat;
       this.feedbackFormData.longitude = lng;
-      this.setMarker(lat, lng);
-      this.convert(lat, lng);
+      map.setMarker(lat, lng);
+
+      let { msg, data } = await map.getAddress(lat, lng);
+      if (msg == "success") {
+        this.feedbackFormData.address = data.address;
+      }
     },
 
-    convert (lat, lng) {
-      markers.setGeometries([]);
-      // var input = document.getElementById('location').value.split(',');
-      let location;
-      if (lat && lng) {
-        location = new TMap.LatLng(lat, lng);
+    async handleSearchMap() {
+      const { msg, data } = await map.searchNearby(this.keyWords);
+      if (msg == "success") {
+        const { lat, lng } = data;
+        map.setCenter(lat, lng);
+        map.setMarker(lat, lng);
+        this.feedbackFormData.latitude = lat;
+        this.feedbackFormData.longitude = lng;
       } else {
-        location = new TMap.LatLng(
-          this.feedbackFormData.latitude,
-          this.feedbackFormData.longitude
-        );
+        this.$message.error("未检索到相关位置坐标");
       }
-
-      // map.setCenter(location);
-      markers.updateGeometries([
-        {
-          id: "main", // 点标注数据数组
-          position: location,
-        },
-      ]);
-      geocoder
-        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
-        .then((result) => {
-          this.feedbackFormData.address = result.result.address;
-          // 显示搜索到的地址
-        });
     },
 
-    resetData () {
+    resetData() {
       this.formData = {
         objList: [], //
         principalName: "", //经办人(责任人)姓名
@@ -1109,7 +1133,7 @@ export default {
       };
     },
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -1117,7 +1141,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue
index eade139ad..a666746ca 100644
--- a/src/views/modules/communityService/fuwujilu/detailForm.vue
+++ b/src/views/modules/communityService/fuwujilu/detailForm.vue
@@ -1,511 +1,377 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-      <div v-if="initLoading"
-           class="m-row">
+      <div v-if="initLoading" class="m-row">
         <div class="m-info">
           <div class="info-prop">
             <span class="info-title-2">服务名称：</span>
-            <span>{{ formData.serviceName||'--'  }}</span>
+            <span>{{ formData.serviceName || "--" }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-2">服务组织：</span>
-            <span>{{ serviceOrgName||'--'  }}</span>
+            <span>{{ serviceOrgName || "--" }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-2">服务范围：</span>
-            <span>{{ formData.gridIdListName ||'--' }}</span>
+            <span>{{ formData.gridIdListName || "--" }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-2">政策依据：</span>
-            <span>{{ formData.policyTitle||'--'  }}</span>
-            <el-button v-if="formData.policyId"
-                       style="margin-left: 10px"
-                       type="primary"
-                       size="small"
-                       @click="handlePersonList">预览</el-button>
+            <span>{{ formData.policyTitle || "--" }}</span>
+            <el-button
+              v-if="formData.policyId"
+              style="margin-left: 10px"
+              type="primary"
+              size="small"
+              @click="handlePersonList"
+              >预览</el-button
+            >
           </div>
           <div class="info-prop">
             <span class="info-title-2">经办人：</span>
-            <span>{{ formData.principalName||'--'  }}</span>
+            <span>{{ formData.principalName || "--" }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-2">联系方式：</span>
-            <span>{{ formData.principalContact||'--' }}</span>
+            <span>{{ formData.principalContact || "--" }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-2">服务时间：</span>
-            <span>{{ formData.serviceTimeStart||'--' }}</span>至
-            <span>{{ formData.serviceTimeEnd||'--' }}</span>
+            <span>{{ formData.serviceTimeStart || "--" }}</span
+            >至
+            <span>{{ formData.serviceTimeEnd || "--" }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-2">备注：</span>
-            <span>{{ formData.remark||'--' }}</span>
+            <span>{{ formData.remark || "--" }}</span>
           </div>
 
-          <div v-show="formData.serviceStatus==='completed'">
+          <div v-show="formData.serviceStatus === 'completed'">
             <h3 class="d-h3">反馈内容</h3>
 
             <div class="info-prop">
               <span class="info-title-2">服务目标：</span>
-              <span>{{ feedbackFormData.serviceGoal||'--'  }}</span>
+              <span>{{ feedbackFormData.serviceGoal || "--" }}</span>
             </div>
             <div class="info-prop">
               <span class="info-title-2">服务效果：</span>
-              <span>{{ feedbackFormData.serviceEffect||'--'  }}</span>
+              <span>{{ feedbackFormData.serviceEffect || "--" }}</span>
             </div>
             <div class="info-prop">
               <span class="info-title-2">服务人数：</span>
-              <span>{{ feedbackFormData.servicePeopleNumber||0  }}</span>
+              <span>{{ feedbackFormData.servicePeopleNumber || 0 }}</span>
             </div>
 
             <div class="info-prop">
               <span class="info-title-2">服务状态：</span>
-              <span>{{ feedbackFormData.serviceStatusShow||'--'  }}</span>
+              <span>{{ feedbackFormData.serviceStatusShow || "--" }}</span>
             </div>
             <div class="info-prop">
               <span class="info-title-2">满意度：</span>
-              <span>{{ feedbackFormData.satisfactionShow||'--'  }}</span>
+              <span>{{ feedbackFormData.satisfactionShow || "--" }}</span>
             </div>
 
             <div class="info-prop">
               <span class="info-title-2">地理位置：</span>
-              <span>{{ feedbackFormData.address||'--'  }}</span>
+              <span>{{ feedbackFormData.address || "--" }}</span>
             </div>
 
             <div class="info-prop">
               <span class="info-title-2">地图位置：</span>
               <div class="div_map">
-
                 <div id="app_detail"></div>
-
               </div>
             </div>
 
             <div class="info-prop">
               <span class="info-title-2">附件：</span>
-              <file-list v-if="fileList.length>0"
-                         :fileList="fileList"></file-list>
+              <file-list
+                v-if="fileList.length > 0"
+                :fileList="fileList"
+              ></file-list>
               <span v-else>--</span>
-
             </div>
-
           </div>
-
         </div>
       </div>
-
     </div>
 
     <div class="div-btn">
-      <el-button size="small"
-                 @click="handleCancle">关 闭</el-button>
-
+      <el-button size="small" @click="handleCancle">关 闭</el-button>
     </div>
 
-    <el-dialog v-if="showPersonList"
-               :visible.sync="showPersonList"
-               :append-to-body="true"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'政策预览'"
-               width="1150px"
-               top="5vh"
-               class="dialog-h"
-               @closed="showPersonList = false">
-      <person-list ref="ref_detail_form"
-                   :policyId="policyId"
-                   :ruleList="ruleList"
-                   @handleOk="handleOk"
-                   @handleClose="handleClose">
+    <el-dialog
+      v-if="showPersonList"
+      :visible.sync="showPersonList"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="'政策预览'"
+      width="1150px"
+      top="5vh"
+      class="dialog-h"
+      @closed="showPersonList = false"
+    >
+      <person-list
+        ref="ref_detail_form"
+        :policyId="policyId"
+        :ruleList="ruleList"
+        @handleOk="handleOk"
+        @handleClose="handleClose"
+      >
       </person-list>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost } from '@/js/dai/request'
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
 import personList from "../policy/personList";
-import fileList from '@/views/components/fileList'
+import fileList from "@/views/components/fileList";
+import daiMap from "@/utils/dai-map";
 
+var map;
+let loading; // 加载动画
 
-var map
-var search
-var markers
-var infoWindowList
-var geocoder // 新建一个正逆地址解析类
-
-let loading // 加载动画
 export default {
-  data () {
-
+  data() {
     return {
-
-
       initLoading: false,
 
-      keyWords: '',
+      keyWords: "",
       formData: {},
 
       feedbackFormData: {
-        serviceProjectId: '',//	服务项目id	
-        serviceName: '',
-        serviceGoal: '',//	服务目标	
-        serviceEffect: '',//	服务效果	
-        servicePeopleNumber: null,//	服务人数	
-        serviceStatus: 'completed',//	服务状态。in_service服务中；completed:已完成	
-        satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect	
-        longitude: '',//	经度	
-        latitude: '',//	维度	
-        address: '',
-        fileList: [],//	附件列表
+        serviceProjectId: "", //	服务项目id
+        serviceName: "",
+        serviceGoal: "", //	服务目标
+        serviceEffect: "", //	服务效果
+        servicePeopleNumber: null, //	服务人数
+        serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+        satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+        longitude: "", //	经度
+        latitude: "", //	维度
+        address: "",
+        fileList: [], //	附件列表
       },
 
-
       policyId: "",
       showPersonList: false,
       ruleList: [],
       policyList: [],
-
-
-
-
-    }
+    };
   },
   components: { personList, fileList },
-  async mounted () {
-    await this.getPolicyList()
+  async mounted() {
+    await this.getPolicyList();
     // if (this.serviceRecordId) {//详情
-    await this.loadInfo()
-    this.initLoading = true
+    await this.loadInfo();
+    this.initLoading = true;
 
-    if (this.formData.serviceStatus === 'completed') {
+    if (
+      this.formData.serviceStatus === "completed" &&
+      this.feedbackFormData.latitude
+    ) {
       this.$nextTick(() => {
-        this.initMap()
-      })
+        this.initMap();
+      });
     }
   },
 
-
   methods: {
-
-    diaDestroy () {
-      if (map) {
-        map.destroy()
-      }
-    },
+    diaDestroy() {},
 
     //加载组织数据
-    async handlePersonList () {
+    async handlePersonList() {
       if (!this.formData.policyId) {
-        this.$message.info('请先选择政策')
-        return false
+        this.$message.info("请先选择政策");
+        return false;
       }
 
-      this.policyId = this.formData.policyId
-      await this.loadRuleList()
+      this.policyId = this.formData.policyId;
+      await this.loadRuleList();
 
       this.showPersonList = true;
     },
 
-    async loadRuleList () {
+    async loadRuleList() {
+      const url = "/heart/policy/rulelist/" + this.policyId;
 
-      const url = "/heart/policy/rulelist/" + this.policyId
+      let params = {};
 
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.ruleList = data
-
+        this.ruleList = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
     },
 
-    handleClose () {
-      this.showPersonList = false
+    handleClose() {
+      this.showPersonList = false;
     },
 
+    async getPolicyList() {
+      const url = "/heart/policy/policyListSelect";
 
-    async getPolicyList () {
-      const url = '/heart/policy/policyListSelect'
-
-      let params = {}
+      let params = {};
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.policyList = data
+        this.policyList = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
     //加载组织
-    async loadInfo () {
-      const url = '/heart/icServiceRecordV2/detail'
+    async loadInfo() {
+      const url = "/heart/icServiceRecordV2/detail";
 
       let params = {
-        serviceRecordId: this.serviceRecordId
-      }
+        serviceRecordId: this.serviceRecordId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.formData = { ...data }
-        this.formData.serviceRecordId = this.serviceRecordId
-        this.feedbackFormData = { ...data.feedback }
-        this.formData.policyName = ''
-        this.formData.gridIdListName = ''
-        this.feedbackFormData.serviceStatusShow = ''
-        this.feedbackFormData.satisfactionShow = ''
-
-        let arr = []
-        this.formData.gridIdList.forEach(element => {
-          arr.push(element.objectName)
+        this.formData = { ...data };
+        this.formData.serviceRecordId = this.serviceRecordId;
+        this.feedbackFormData = { ...data.feedback };
+        this.formData.policyName = "";
+        this.formData.gridIdListName = "";
+        this.feedbackFormData.serviceStatusShow = "";
+        this.feedbackFormData.satisfactionShow = "";
+
+        let arr = [];
+        this.formData.gridIdList.forEach((element) => {
+          arr.push(element.objectName);
         });
-        this.formData.gridIdListName = arr.join(',')
-        this.statusArray.forEach(element => {
+        this.formData.gridIdListName = arr.join(",");
+        this.statusArray.forEach((element) => {
           if (this.formData.serviceStatus === element.value) {
-            this.feedbackFormData.serviceStatusShow = element.label
+            this.feedbackFormData.serviceStatusShow = element.label;
           }
         });
-        this.satisfyArray.forEach(element => {
+        this.satisfyArray.forEach((element) => {
           if (this.feedbackFormData.satisfaction === element.value) {
-            this.feedbackFormData.satisfactionShow = element.label
+            this.feedbackFormData.satisfactionShow = element.label;
           }
         });
-        this.policyList.forEach(element => {
+        this.policyList.forEach((element) => {
           if (this.formData.policyId === element.policyId) {
-            this.formData.policyName = element.title
+            this.formData.policyName = element.title;
           }
         });
 
-        this.fileList = []
-        if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
-          data.feedback.fileList.forEach(element => {
+        this.fileList = [];
+        if (
+          data.feedback &&
+          data.feedback.fileList &&
+          data.feedback.fileList.length > 0
+        ) {
+          data.feedback.fileList.forEach((element) => {
             let obj = {
               name: element.name,
               format: element.format,
               url: element.url,
-              type: element.type
-
-            }
-            this.fileList.push(obj)
+              type: element.type,
+            };
+            this.fileList.push(obj);
           });
         }
-
-
-
-
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
-
-
-    handleCancle () {
-      this.resetData()
-      this.$emit('diaDetailClose')
-
+    handleCancle() {
+      this.resetData();
+      this.$emit("diaDetailClose");
     },
 
-
-
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
-      // 定义地图中心点坐标
-      let { latitude, longitude } = this.$store.state.user;
-      console.log('lat' + latitude + ',lon' + longitude)
-
-      if (this.formData.latitude && this.formData.longitude) {
-        latitude = this.formData.latitude
-        longitude = this.formData.longitude
-      }
-      if (!latitude || latitude == "" || latitude == "0") {
-        latitude = 39.9088810666821;
-        longitude = 116.39743841556731;
-      }
-      var center = new window.TMap.LatLng(latitude, latitude)
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById('app_detail'), {
-        center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
-        pitch: 43.5, // 设置俯仰角
-        rotation: 45 // 设置地图旋转角度
-      })
-
-      search = new window.TMap.service.Search({ pageSize: 10 })
-      // 新建一个地点搜索类
-      markers = new TMap.MultiMarker({
-        map: map,
-        geometries: []
-      })
-      infoWindowList = Array(10)
-
-      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
-
-      // 监听地图平移结束
-      map.on('panend', () => {
-        this.handleMoveCenter()
-      })
-      this.handleMoveCenter()
-      this.convert()
-    },
+    initMap() {
+      let { latitude, longitude } = this.feedbackFormData;
 
-    setMarker (lat, lng) {
-      markers.setGeometries([])
-      markers.add([
+      map = new daiMap(
+        document.getElementById("app_detail"),
+        { latitude, longitude },
         {
-          id: '4',
-          styleId: 'marker',
-          position: new TMap.LatLng(lat, lng),
-          properties: {
-            title: 'marker4'
-          }
+          zoom: 16.2, // 设置地图缩放级别
+          pitch: 43.5, // 设置俯仰角
+          rotation: 45, // 设置地图旋转角度
         }
-      ])
-    },
+      );
 
-    handleSearchMap () {
-      infoWindowList.forEach((infoWindow) => {
-        infoWindow.close()
-      })
-      infoWindowList.length = 0
-      markers.setGeometries([])
-      // 在地图显示范围内以给定的关键字搜索地点
-      search
-        .searchRectangle({
-          keyword: this.keyWords,
-          bounds: map.getBounds()
-        })
-        .then((result) => {
-          let { data } = result
-          if (Array.isArray(data) && data.length > 0) {
-            const {
-              location: { lat, lng }
-            } = data[0]
-
-
-            map.setCenter(new TMap.LatLng(lat, lng))
-            this.setMarker(lat, lng)
-            this.formData.latitude = lat
-            this.formData.longitude = lng
-            this.convert()
-          } else {
-            this.$message.error('未检索到相关位置坐标')
-          }
-        })
-    },
-
-    handleMoveCenter () {
-      //修改地图中心点
-      const center = map.getCenter()
-      const lat = center.getLat()
-      const lng = center.getLng()
-      this.formData.latitude = lat
-      this.formData.longitude = lng
-      this.setMarker(lat, lng)
-      this.convert(lat, lng)
+      map.setCenter(latitude, longitude);
+      map.setMarker(latitude, longitude);
     },
 
-    convert (lat, lng) {
-      markers.setGeometries([]);
-      // var input = document.getElementById('location').value.split(',');
-      let location
-      if (lat && lng) {
-        location = new TMap.LatLng(lat, lng);
-      } else {
-        location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
-      }
-
-      // map.setCenter(location);
-      markers.updateGeometries([
-        {
-          id: 'main', // 点标注数据数组
-          position: location,
-        },
-      ]);
-      geocoder
-        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
-        .then((result) => {
-          this.formData.address = result.result.address
-          // 显示搜索到的地址
-        });
-    },
-    handleOk () {
-      this.showPersonList = false
+    handleOk() {
+      this.showPersonList = false;
     },
 
-    resetData () {
-      this.formData = {}
+    resetData() {
+      this.formData = {};
     },
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
-        loading.close()
+        loading.close();
       }
-    }
+    },
   },
   computed: {
-    dataRule () {
+    dataRule() {
       return {
-
-
         serviceTimeStart: [
-          { required: true, message: '服务时间不能为空', trigger: 'blur' }
+          { required: true, message: "服务时间不能为空", trigger: "blur" },
         ],
-
-
-      }
+      };
     },
   },
   props: {
-
     serviceRecordId: {
       type: String,
-      required: true
+      required: true,
     },
     serviceOrgName: {
       type: String,
-      required: true
+      required: true,
     },
 
-
     satisfyArray: {
       type: Array,
-      default () {
-        return []
-      }
+      default() {
+        return [];
+      },
     },
     statusArray: {
       type: Array,
-      default () {
-        return []
-      }
+      default() {
+        return [];
+      },
     },
-  }
-}
+  },
+};
 </script>
 
-
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/management/detail-main.scss";
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 685e21816..7e66c198d 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -123,6 +123,7 @@
         <el-table ref="ref_table"
                   :data="tableData"
                   border
+                  :empty-text="loadInfo"
                   :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
                   class="table"
                   style="width: 100%"
@@ -386,6 +387,7 @@ export default {
   data () {
     return {
       tableData: [],
+      loadInfo: '',
 
       pageNo: 1,
       pageSize: window.localStorage.getItem("pageSize") || 20,
@@ -741,6 +743,7 @@ export default {
     },
 
     async getTableData () {
+      this.loadInfo = '数据加载中'
       const { tableUrl: url } = this;
       if (!url) return;
 
@@ -754,6 +757,12 @@ export default {
       if (code === 0) {
         this.total = data.total || 0;
         this.tableData = data.list ? this.cookTableData(data.list) : [];
+        if (this.tableData.length === 0) {
+          this.loadInfo = '暂无数据'
+        } else {
+          this.loadInfo = ''
+
+        }
       } else {
         this.$message.error(msg);
       }
diff --git a/src/views/modules/renFangTongJi/index.vue b/src/views/modules/renFangTongJi/index.vue
index 8fcd403d7..c4b8224fe 100644
--- a/src/views/modules/renFangTongJi/index.vue
+++ b/src/views/modules/renFangTongJi/index.vue
@@ -1,107 +1,86 @@
 <template>
   <el-card class="g-cnt">
     <div class="m-cards">
-      <div
-        class="item"
-        :key="item.name"
-        @click="handleClickCard(item)"
-        v-for="item in list"
-      >
+      <div class="item"
+           :key="item.name"
+           @click="handleClickCard(item)"
+           v-for="item in list">
         <div class="item-left">
           <div class="num">{{ item.num }}</div>
           <div class="name">{{ item.name }}</div>
         </div>
-        <div class="item-right">
+        <!-- <div class="item-right">
           <div class="hint">
             <div class="hint-title">较上月</div>
             <b v-if="item.variation >= 0">+ {{ item.variationAbs }}</b>
             <b v-else>- {{ item.variationAbs }}</b>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
 
     <div class="m-tb">
       <h3>下级平台使用进度汇总</h3>
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%"
-        class="tb"
-        :height="maxTableHeight"
-        align="center"
-      >
-        <el-table-column label="序号" type="index" align="center" width="50" />
-        <el-table-column
-          prop="orgName"
-          label="所属组织"
-          width="150"
-          align="center"
-        >
+      <el-table :data="tableData"
+                border
+                style="width: 100%"
+                class="tb"
+                :empty-text="loadInfo"
+                :height="maxTableHeight"
+                align="center">
+        <el-table-column label="序号"
+                         type="index"
+                         align="center"
+                         width="50" />
+        <el-table-column prop="orgName"
+                         label="所属组织"
+                         width="150"
+                         align="center">
         </el-table-column>
-        <el-table-column
-          prop="usingCommunityNum"
-          label="开通平台社区数"
-          align="center"
-        >
+        <el-table-column prop="usingCommunityNum"
+                         label="开通平台社区数"
+                         align="center">
           <template slot-scope="scope">
-            <a style="cursor: pointer" @click="showDetail(scope.row.orgId)">{{
+            <a style="cursor: pointer"
+               @click="showDetail(scope.row.orgId)">{{
               scope.row.usingCommunityNum
             }}</a>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="userTotal"
-          label="人口总数"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="czUserTotal"
-          label="常住人口总数"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="ldUserTotal"
-          label="流动人口总数"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="houseTotal"
-          label="房屋总数"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="zzHouseTotal"
-          label="自住房屋总数"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="czHouseTotal"
-          label="出租房屋总数"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="xzHouseTotal"
-          label="闲置房屋总数"
-          align="center"
-        ></el-table-column>
+        <el-table-column prop="userTotal"
+                         label="人口总数"
+                         align="center"></el-table-column>
+        <el-table-column prop="czUserTotal"
+                         label="常住人口总数"
+                         align="center"></el-table-column>
+        <el-table-column prop="ldUserTotal"
+                         label="流动人口总数"
+                         align="center"></el-table-column>
+        <el-table-column prop="houseTotal"
+                         label="房屋总数"
+                         align="center"></el-table-column>
+        <el-table-column prop="zzHouseTotal"
+                         label="自住房屋总数"
+                         align="center"></el-table-column>
+        <el-table-column prop="czHouseTotal"
+                         label="出租房屋总数"
+                         align="center"></el-table-column>
+        <el-table-column prop="xzHouseTotal"
+                         label="闲置房屋总数"
+                         align="center"></el-table-column>
       </el-table>
     </div>
 
     <!-- 修改弹出框 -->
-    <el-dialog
-      v-if="displayedDetail"
-      :visible="true"
-      title="社区列表 "
-      width="1150px"
-      top="5vh"
-      @close="displayedDetail = false"
-    >
-      <shequtongji
-        ref="shequtongji"
-        :orgId="detailOrgId"
-        :orgIds="[orgId, detailOrgId]"
-      />
+    <el-dialog v-if="displayedDetail"
+               :visible="true"
+               title="社区列表 "
+               width="1150px"
+               top="5vh"
+               @close="displayedDetail = false">
+      <shequtongji ref="shequtongji"
+                   :orgId="detailOrgId"
+                   :orgIds="[orgId, detailOrgId]" />
     </el-dialog>
   </el-card>
 </template>
@@ -115,10 +94,12 @@ import shequtongji from "./cpts/shequtongji";
 export default {
   name: "renFangTongJi",
   components: { shequtongji },
-  data() {
+  data () {
     return {
       displayedDetail: false,
       tableData: [],
+      tableLoading: false,
+      loadInfo: '',
 
       orgId: "",
       orgType: "",
@@ -185,35 +166,35 @@ export default {
     };
   },
   computed: {
-    maxTableHeight() {
+    maxTableHeight () {
       return this.clientHeight - 420;
     },
     ...mapGetters(["clientHeight"]),
   },
   watch: {
-    orgId() {
+    orgId () {
       this.getTableData();
     },
   },
-  mounted() {
+  mounted () {
     this.getCommunityData();
     this.getResiData();
     this.getHouseData();
     this.getTableData();
   },
   methods: {
-    handleClickCard(item) {
+    handleClickCard (item) {
       if (item.name == "开通平台社区数") {
         this.showDetail();
       }
     },
 
-    async showDetail(orgId = "") {
+    async showDetail (orgId = "") {
       this.displayedDetail = true;
       this.detailOrgId = orgId;
     },
 
-    async getCommunityData() {
+    async getCommunityData () {
       const url = "/gov/org/agency/usingCommunityStats";
 
       const { data, code, msg } = await requestPost(url, {
@@ -230,7 +211,7 @@ export default {
       }
     },
 
-    async getResiData() {
+    async getResiData () {
       const url = "/epmetuser/icresiuser/userchart";
 
       const { data, code, msg } = await requestPost(url, {
@@ -257,7 +238,7 @@ export default {
       }
     },
 
-    async getHouseData() {
+    async getHouseData () {
       const url = "/gov/org/house/housechart";
 
       const { data, code, msg } = await requestPost(url, {
@@ -286,7 +267,9 @@ export default {
       }
     },
 
-    async getTableData() {
+    async getTableData () {
+      this.loadInfo = '数据加载中'
+      this.tableLoading = true
       const url = "/gov/org/house/subuserhouselist";
 
       const { data, code, msg } = await requestPost(url, {
@@ -297,9 +280,17 @@ export default {
       if (code === 0) {
         this.tableData = data
           ? data.map((item) => {
-              return item;
-            })
+            return item;
+          })
           : [];
+
+        if (this.tableData.length === 0) {
+          this.loadInfo = '暂无数据'
+        } else {
+          this.loadInfo = ''
+
+        }
+
       }
     },
   },
@@ -318,6 +309,7 @@ export default {
 
   .item {
     display: flex;
+    justify-content: center;
     width: 24%;
     margin-top: 15px;
     // margin-right: 1%;
diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue
index 1e9825252..03c824e91 100644
--- a/src/views/modules/shequ/index.vue
+++ b/src/views/modules/shequ/index.vue
@@ -823,7 +823,8 @@ export default {
           });
         }
       });
-      return selectedFuncIdList.map((id) => obj[id]);
+      console.log('88888888888888888', selectedFuncIdList)
+      return selectedFuncIdList.filter((id) => obj[id]).map((id) => obj[id]);
     },
     maxTableHeight() {
       // return this.clientHeight - 450;
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
index 77c0193f0..f5a0c1bce 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
@@ -1,10 +1,12 @@
 <template>
   <div class="">
-    <el-form ref="ref_form"
-             :inline="false"
-             :model="formData"
-             :rules="dataRule"
-             label-width="100px">
+    <el-form
+      ref="ref_form"
+      :inline="false"
+      :model="formData"
+      :rules="dataRule"
+      label-width="100px"
+    >
       <!-- <el-form-item label="事件分类"
                     label-width="150px"
                     prop="categoryId">
@@ -17,105 +19,124 @@
                      :show-all-levels="false"
                      @change="handleChangeCate"></el-cascader>
       </el-form-item> -->
-      <el-form-item label="服务内容"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="content">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.content"
-                    :autosize="{ minRows: 2, maxRows: 10 }"
-                    type="textarea"
-                    clearable
-                    class="cell-width-area"
-                    placeholder="请输入内容"></el-input>
+      <el-form-item
+        label="服务内容"
+        label-width="150px"
+        :class="{ 'form-item': source === 'visiual' }"
+        prop="content"
+      >
+        <div :class="{ 'visiual-form': source === 'visiual' }">
+          <el-input
+            v-model="formData.content"
+            :autosize="{ minRows: 2, maxRows: 10 }"
+            type="textarea"
+            clearable
+            class="cell-width-area"
+            placeholder="请输入内容"
+          ></el-input>
         </div>
       </el-form-item>
 
-      <el-form-item label="服务类型"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="categoryCode">
-        <div :class="{'visiual-form':source==='visiual'}">
-
-          <el-cascader v-model="formData.categoryCode"
-                       :options="demandOptions"
-                       clearable
-                       class="cell-width-1"
-                       @change="handleCateSlect"></el-cascader>
+      <el-form-item
+        label="服务类型"
+        label-width="150px"
+        :class="{ 'form-item': source === 'visiual' }"
+        prop="categoryCode"
+      >
+        <div :class="{ 'visiual-form': source === 'visiual' }">
+          <el-cascader
+            v-model="formData.categoryCode"
+            :options="demandOptions"
+            clearable
+            class="cell-width-1"
+            @change="handleCateSlect"
+          ></el-cascader>
         </div>
-
       </el-form-item>
 
-      <el-form-item label="服务时间"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="wantServiceTime">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-date-picker v-model="formData.wantServiceTime"
-                          type="datetime"
-                          class="cell-width-1"
-                          clearable
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择日期时间">
+      <el-form-item
+        label="服务时间"
+        label-width="150px"
+        :class="{ 'form-item': source === 'visiual' }"
+        prop="wantServiceTime"
+      >
+        <div :class="{ 'visiual-form': source === 'visiual' }">
+          <el-date-picker
+            v-model="formData.wantServiceTime"
+            type="datetime"
+            class="cell-width-1"
+            clearable
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择日期时间"
+          >
           </el-date-picker>
         </div>
       </el-form-item>
 
-      <el-form-item label="需求人"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="demandUserName">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.demandUserName"
-                    class="cell-width-1"></el-input>
+      <el-form-item
+        label="需求人"
+        label-width="150px"
+        :class="{ 'form-item': source === 'visiual' }"
+        prop="demandUserName"
+      >
+        <div :class="{ 'visiual-form': source === 'visiual' }">
+          <el-input
+            v-model="formData.demandUserName"
+            class="cell-width-1"
+          ></el-input>
         </div>
-
       </el-form-item>
-      <el-form-item label="联系电话"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="demandUserMobile">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.demandUserMobile"
-                    class="cell-width-1"></el-input>
+      <el-form-item
+        label="联系电话"
+        label-width="150px"
+        :class="{ 'form-item': source === 'visiual' }"
+        prop="demandUserMobile"
+      >
+        <div :class="{ 'visiual-form': source === 'visiual' }">
+          <el-input
+            v-model="formData.demandUserMobile"
+            class="cell-width-1"
+          ></el-input>
         </div>
-
       </el-form-item>
-      <el-form-item label="服务地点"
-                    prop="serviceLocation"
-                    :class="{'form-item':source==='visiual'}"
-                    label-width="150px"
-                    style="display: block">
-
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input class="cell-width-1"
-                    v-model="formData.serviceLocation">
+      <el-form-item
+        label="服务地点"
+        prop="serviceLocation"
+        :class="{ 'form-item': source === 'visiual' }"
+        label-width="150px"
+        style="display: block"
+      >
+        <div :class="{ 'visiual-form': source === 'visiual' }">
+          <el-input class="cell-width-1" v-model="formData.serviceLocation">
           </el-input>
         </div>
-
       </el-form-item>
-      <el-form-item label="位置坐标"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="longitude"
-                    label-width="150px"
-                    style="display: block">
-        <div style="width:500px">
-
+      <el-form-item
+        label="位置坐标"
+        :class="{ 'form-item': source === 'visiual' }"
+        prop="longitude"
+        label-width="150px"
+        style="display: block"
+      >
+        <div style="width: 500px">
           <div class="div_map">
-            <div id="app_map">
-
-            </div>
+            <div id="app_map"></div>
             <div class="div_searchmap">
-              <el-input class="cell-width-map"
-                        maxlength="50"
-                        size="mini"
-                        placeholder="请输入关键字"
-                        v-model="keyWords">
+              <el-input
+                class="cell-width-map"
+                maxlength="50"
+                size="mini"
+                placeholder="请输入关键字"
+                v-model="keyWords"
+              >
               </el-input>
-              <el-button style="margin-left: 10px"
-                         type="primary"
-                         size="mini"
-                         @click="handleSearchMap">查询</el-button>
+              <el-button
+                style="margin-left: 10px"
+                type="primary"
+                size="mini"
+                @click="handleSearchMap"
+                >查询</el-button
+              >
             </div>
           </div>
 
@@ -136,103 +157,108 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="门牌号"
-                    :class="{'form-item':source==='visiual'}"
-                    label-width="150px"
-                    prop="locationDetail">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.locationDetail"
-                    class="cell-width-1"></el-input>
+      <el-form-item
+        label="门牌号"
+        :class="{ 'form-item': source === 'visiual' }"
+        label-width="150px"
+        prop="locationDetail"
+      >
+        <div :class="{ 'visiual-form': source === 'visiual' }">
+          <el-input
+            v-model="formData.locationDetail"
+            class="cell-width-1"
+          ></el-input>
         </div>
-
       </el-form-item>
 
-      <el-form-item label="服务方"
-                    :class="{'form-item':source==='visiual'}"
-                    label-width="150px"
-                    prop="serverId">
-
+      <el-form-item
+        label="服务方"
+        :class="{ 'form-item': source === 'visiual' }"
+        label-width="150px"
+        prop="serverId"
+      >
         <template>
-          <div :class="[{'single-select':source==='visiual'},'sel-service']">
-            <el-select v-model="formData.serviceType"
-                       class="cell-width-1"
-                       placeholder="请选择"
-                       clearable
-                       @change="handleServiceChange('add', $event)">
-              <el-option v-for="item in serviceOptions"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+          <div
+            :class="[{ 'single-select': source === 'visiual' }, 'sel-service']"
+          >
+            <el-select
+              v-model="formData.serviceType"
+              class="cell-width-1"
+              placeholder="请选择"
+              clearable
+              @change="handleServiceChange('add', $event)"
+            >
+              <el-option
+                v-for="item in serviceOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
             -
-            <el-select v-model="formData.serverId"
-                       class="cell-width-1"
-                       filterable
-                       placeholder="请选择"
-                       clearable>
-              <el-option v-for="item in serviceOptiondList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+            <el-select
+              v-model="formData.serverId"
+              class="cell-width-1"
+              filterable
+              placeholder="请选择"
+              clearable
+            >
+              <el-option
+                v-for="item in serviceOptiondList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </div>
         </template>
       </el-form-item>
-
     </el-form>
-
   </div>
 </template>
 
 <script>
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
-import formVltHelper from "dai-js/tools/formVltHelper";
-
-import { isCard } from "@/utils/validate";
+import daiMap from "@/utils/dai-map";
 
 let loading; // 加载动画
-var map
-var search
-var markers
-var infoWindowList
-var geocoder // 新建一个正逆地址解析类
+var map;
 
-function iniFmData () {
+function iniFmData() {
   return {
-    operationType: '2',//处理方式[0:已回复 1:已转项目  2:已转服务]	
-    icEventId: '',//事件Id	
-    gridId: '',//	
-    categoryCode: '',//	二级服务分类编码	
-    parentCode: '',//	父级服务分类编码	
-    content: '',//		服务内容1000字	
-    reportType: 'self_help',//	社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help	
-    reportUserName: '',//	上报人姓名	
-    reportUserMobile: '',//	自身上报时存储注册居民的手机号	
-    reportTime: '',//	上报时间	
-    demandUserId: '',//	需求人：user.id或者ic_resi_user.id	
-    demandUserName: '',//	需求人姓名	
-    demandUserMobile: '',//需求人联系电话	
-    wantServiceTime: '',//	希望服务时间
-    serviceType: '',
-    serverId: '',
-    locationDetail: '',
-    serviceLocation: '',//事件地址	
-    latitude: '',//	经度	
-    longitude: '',//维度	
+    operationType: "2", //处理方式[0:已回复 1:已转项目  2:已转服务]
+    icEventId: "", //事件Id
+    gridId: "", //
+    categoryCode: "", //	二级服务分类编码
+    parentCode: "", //	父级服务分类编码
+    content: "", //		服务内容1000字
+    reportType: "self_help", //	社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help
+    reportUserName: "", //	上报人姓名
+    reportUserMobile: "", //	自身上报时存储注册居民的手机号
+    reportTime: "", //	上报时间
+    demandUserId: "", //	需求人：user.id或者ic_resi_user.id
+    demandUserName: "", //	需求人姓名
+    demandUserMobile: "", //需求人联系电话
+    wantServiceTime: "", //	希望服务时间
+    serviceType: "",
+    serverId: "",
+    locationDetail: "",
+    serviceLocation: "", //事件地址
+    latitude: "", //	经度
+    longitude: "", //维度
     // categoryId: ''
   };
 }
 export default {
-  data () {
+  data() {
     return {
       btnDisable: false,
       customerId: localStorage.getItem("customerId"),
       demandOptions: [],
-      serviceOptions: [
-      ],
+      serviceOptions: [],
       serviceOptiondList: [],
 
       casOptions: [],
@@ -241,25 +267,25 @@ export default {
       selCateObj: {},
       optionProps: {
         multiple: false,
-        value: 'id',
-        label: 'name',
-        children: 'subCategory',
+        value: "id",
+        label: "name",
+        children: "subCategory",
       },
 
       formData: iniFmData(),
 
-
       okflag: false,
       //地图相关
-      keyWords: '',
+      keyWords: "",
 
-      eventDetailCopy: {}
+      eventDetailCopy: {},
     };
   },
+
   components: {},
-  computed: {
-    dataRule () {
 
+  computed: {
+    dataRule() {
       return {
         // categoryId: [
         //   { required: true, message: "请填写事件分类", trigger: "blur" },
@@ -285,14 +311,11 @@ export default {
         serverId: [
           { required: true, message: "服务方不能为空", trigger: "blur" },
         ],
-
       };
     },
-
-
   },
-  props: {
 
+  props: {
     demandUserId: {
       type: String,
       default: "",
@@ -312,156 +335,142 @@ export default {
 
     eventDetailData: {
       type: Object,
-      default () {
-        return {}
-      }
+      default() {
+        return {};
+      },
     },
 
-    source: {//展示来源：manage  管理平台    visiual  可视化平台
+    source: {
+      //展示来源：manage  管理平台    visiual  可视化平台
       type: String,
-      default: 'manage'
-    }
-
+      default: "manage",
+    },
   },
+
   watch: {
     demandUserName: function (val) {
-
-      this.formData.reportUserName = val
-      this.formData.demandUserName = val
+      this.formData.reportUserName = val;
+      this.formData.demandUserName = val;
     },
     demandUserMobile: function (val) {
-
-      this.formData.reportUserMobile = val
-      this.formData.demandUserMobile = val
+      this.formData.reportUserMobile = val;
+      this.formData.demandUserMobile = val;
     },
     demandUserId: function (val) {
-
-      this.formData.demandUserId = val
+      this.formData.demandUserId = val;
     },
   },
-  created () {
-
 
-  },
-
-  async mounted () {
-    const { user } = this.$store.state
-    this.agencyId = user.agencyId
-    this.getCategoryList();
-    this.getDemandOptions();
-    this.getServiceOption()
-    // this.formData = { ...this.formDataTemp }
-    this.initMap()
+  async mounted() {
+    const { user } = this.$store.state;
+    this.agencyId = user.agencyId;
 
     if (this.eventId) {
       this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
-      this.formData.reportUserMobile = this.eventDetailCopy.mobile
-      this.formData.reportUserName = this.eventDetailCopy.name
-      this.formData.reportTime = this.eventDetailCopy.happenTime
-      this.formData.gridId = this.eventDetailCopy.gridId
-      this.formData.demandUserId = this.eventDetailCopy.reportUserId
-      this.formData.demandUserName = this.eventDetailCopy.name
-      this.formData.demandUserMobile = this.eventDetailCopy.mobile
-
-      if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
+      this.formData.reportUserMobile = this.eventDetailCopy.mobile;
+      this.formData.reportUserName = this.eventDetailCopy.name;
+      this.formData.reportTime = this.eventDetailCopy.happenTime;
+      this.formData.gridId = this.eventDetailCopy.gridId;
+      this.formData.demandUserId = this.eventDetailCopy.reportUserId;
+      this.formData.demandUserName = this.eventDetailCopy.name;
+      this.formData.demandUserMobile = this.eventDetailCopy.mobile;
+
+      if (
+        this.eventDetailCopy.parentCategoryId &&
+        this.eventDetailCopy.categoryId
+      ) {
         // this.selCategoryArray = []
         // this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId)
         // this.selCategoryArray.push(this.eventDetailCopy.categoryId)
         // this.formData.categoryId = this.eventDetailCopy.categoryId
-
         // this.selCateObj = {
         //   name: this.eventDetailCopy.categoryName,
         //   id: this.eventDetailCopy.categoryId
         // }
       }
-
     } else {
-      this.formData.demandUserName = this.demandUserName
-      this.formData.demandUserMobile = this.demandUserMobile
-      this.formData.demandUserId = this.demandUserId
+      this.formData.demandUserName = this.demandUserName;
+      this.formData.demandUserMobile = this.demandUserMobile;
+      this.formData.demandUserId = this.demandUserId;
     }
 
+    this.getCategoryList();
+    this.getDemandOptions();
+    this.getServiceOption();
+
+    this.initMap();
   },
 
   methods: {
+    async getCategoryList() {
+      const url = "/gov/issue/issueprojectcategorydict/list";
 
-    async getCategoryList () {
-      const url = "/gov/issue/issueprojectcategorydict/list"
+      let params = {};
 
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-
-        let treeDataNew = this.filterTree(data)
+        let treeDataNew = this.filterTree(data);
 
         //组织级联数据
-        ++this.iscascaderShow
-        this.casOptions = []
-
-
-        this.casOptions = treeDataNew
+        ++this.iscascaderShow;
+        this.casOptions = [];
 
+        this.casOptions = treeDataNew;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
     },
 
-    handleChangeCate () {
-      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
-      this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
-      this.formData.categoryId = this.selCateObj.id
+    handleChangeCate() {
+      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data);
+      this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data;
+      this.formData.categoryId = this.selCateObj.id;
     },
 
     //重构树，去除网格
-    filterTree (arr) {
-      let childs = arr
+    filterTree(arr) {
+      let childs = arr;
       for (let i = childs.length; i--; i > 0) {
         if (childs[i].subCategory) {
           if (childs[i].subCategory.length) {
-            this.filterTree(childs[i].subCategory)
+            this.filterTree(childs[i].subCategory);
           } else {
-            delete childs[i].subCategory
+            delete childs[i].subCategory;
           }
         }
       }
-      return arr
+      return arr;
     },
 
-    async getDemandOptions () {
-      const url = "/heart/icresidemanddict/demandoption"
-      let params = {}
+    async getDemandOptions() {
+      const url = "/heart/icresidemanddict/demandoption";
+      let params = {};
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
         this.demandOptions = this.getFlagData(
           this.getTreeData(data),
           "usableFlag"
         );
-
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
     },
 
-    async getServiceOption () {
-      const url = "/sys/dict/data/dictlist"
-      let params = { dictType: "user_demand_service_type", }
+    async getServiceOption() {
+      const url = "/sys/dict/data/dictlist";
+      let params = { dictType: "user_demand_service_type" };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
         this.serviceOptions = data;
-
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
     },
 
-    getTreeData (data) {
+    getTreeData(data) {
       if (!Array.isArray(data)) return [];
       let arr = data.map((item) => {
         let _item = {};
@@ -476,7 +485,8 @@ export default {
       });
       return arr;
     },
-    getFlagData (data, flag) {
+
+    getFlagData(data, flag) {
       if (!Array.isArray(data)) return [];
       let arr1 = data.filter((item) => item[flag]);
       let arr2 = arr1.map((item) => {
@@ -488,7 +498,7 @@ export default {
       return arr2;
     },
 
-    handleCateSlect (val) {
+    handleCateSlect(val) {
       console.log("val", val);
       if (val.length === 1) {
         this.demandOptions.forEach((item) => {
@@ -501,7 +511,7 @@ export default {
       }
     },
 
-    handleServiceChange (type, val) {
+    handleServiceChange(type, val) {
       if (val === "social_org") {
         if (type === "add") {
           this.getServiceuserList(val, "add_demand");
@@ -513,8 +523,7 @@ export default {
       }
     },
 
-    async getServiceuserList (serviceType, query) {
-
+    async getServiceuserList(serviceType, query) {
       if (!serviceType) return false;
       const { demandUserId } = this.formData;
       const params = {
@@ -523,154 +532,83 @@ export default {
         queryPurpose: query,
       };
 
+      const url = "/heart/userdemand/servicelist";
 
-      const url = "/heart/userdemand/servicelist"
-
-
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
         this.serviceOptiondList = data.filter(
           (item) => item.value != demandUserId
         );
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
-
     },
 
-    async getDemandInfo () {
-      this.okflag = false
+    async getDemandInfo() {
+      this.okflag = false;
       this.$refs["ref_form"].validate((valid, messageObj) => {
         if (!valid) {
           app.util.validateRule(messageObj);
           // this.formData.categoryId = this.selCateObj.id
         } else {
-
-          this.okflag = true
+          this.okflag = true;
         }
       });
     },
 
+    resetData() {},
 
-    resetData () {
-
-    },
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
-      // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById('app_map'), {
-        center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
-        pitch: 43.5, // 设置俯仰角
-        rotation: 45 // 设置地图旋转角度
-      })
-
-      search = new window.TMap.service.Search({ pageSize: 10 })
-      // 新建一个地点搜索类
-      markers = new TMap.MultiMarker({
-        map: map,
-        geometries: []
-      })
-      infoWindowList = Array(10)
-
-      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
-
-      // 监听地图平移结束
-      map.on('panend', () => {
-        this.handleMoveCenter()
-      })
-      this.handleMoveCenter()
-      this.convert()
-    },
+    initMap() {
+      let { latitude, longitude } = this.$store.state.user;
 
-    setMarker (lat, lng) {
-      markers.setGeometries([])
-      markers.add([
+      map = new daiMap(
+        document.getElementById("app_map"),
+        { latitude, longitude },
         {
-          id: '4',
-          styleId: 'marker',
-          position: new TMap.LatLng(lat, lng),
-          properties: {
-            title: 'marker4'
-          }
+          zoom: 16.2, // 设置地图缩放级别
+          pitch: 43.5, // 设置俯仰角
+          rotation: 45, // 设置地图旋转角度
         }
-      ])
-    },
+      );
 
-    handleSearchMap () {
-      infoWindowList.forEach((infoWindow) => {
-        infoWindow.close()
-      })
-      infoWindowList.length = 0
-      markers.setGeometries([])
-      // 在地图显示范围内以给定的关键字搜索地点
-      search
-        .searchRectangle({
-          keyword: this.keyWords,
-          bounds: map.getBounds()
-        })
-        .then((result) => {
-          let { data } = result
-          if (Array.isArray(data) && data.length > 0) {
-            const {
-              location: { lat, lng }
-            } = data[0]
-
-
-            map.setCenter(new TMap.LatLng(lat, lng))
-            this.setMarker(lat, lng)
-            this.formData.latitude = lat
-            this.formData.longitude = lng
-            this.convert()
-          } else {
-            this.$message.error('未检索到相关位置坐标')
-          }
-        })
+      // 监听地图平移结束
+      map.on("dragend", (e) => {
+        this.handleMoveCenter(e);
+      });
+
+      map.setCenter(latitude, longitude);
+      map.setMarker(latitude, longitude);
     },
 
-    handleMoveCenter () {
+    async handleMoveCenter() {
       //修改地图中心点
-      const center = map.getCenter()
-      const lat = center.getLat()
-      const lng = center.getLng()
-      this.formData.latitude = lat
-      this.formData.longitude = lng
-      this.setMarker(lat, lng)
-      this.convert(lat, lng)
+      const { lat, lng } = map.getCenter();
+      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;
+      }
     },
 
-    convert (lat, lng) {
-      markers.setGeometries([]);
-      // var input = document.getElementById('location').value.split(',');
-      let location
-      if (lat && lng) {
-        location = new TMap.LatLng(lat, lng);
+    async handleSearchMap() {
+      const { msg, data } = await map.searchNearby(this.keyWords);
+      if (msg == "success") {
+        const { lat, lng } = data;
+        map.setCenter(lat, lng);
+        map.setMarker(lat, lng);
+        this.formData.latitude = lat;
+        this.formData.longitude = lng;
       } else {
-        location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
+        this.$message.error("未检索到相关位置坐标");
       }
-
-      // map.setCenter(location);
-      markers.updateGeometries([
-        {
-          id: 'main', // 点标注数据数组
-          position: location,
-        },
-      ]);
-      geocoder
-        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
-        .then((result) => {
-          this.formData.serviceLocation = result.result.address
-          // 显示搜索到的地址
-        });
     },
 
-
-
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -678,7 +616,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
@@ -688,14 +626,11 @@ export default {
 };
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/visual/a_customize.scss";
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
 </style>
 
-
-
-
 <style>
 .el-dialog__body {
   padding: 0 10px 20px !important;